diff options
| author | Alexandre Pretto Nunes <anunes@thoughtworks.com> | 2014-08-04 18:03:06 -0300 |
|---|---|---|
| committer | Alexandre Pretto Nunes <anunes@thoughtworks.com> | 2014-08-04 18:03:21 -0300 |
| commit | ecccb18a6094bd03d927170500eeb43a587621a2 (patch) | |
| tree | aa0dd6ae3eeb8cdcefa108b181bca162f1671ed0 /fake-service | |
| parent | 255c910842126fd55ac1c0f933ab1d016f534e27 (diff) | |
Move web server functionality to the service, and update web-ui grunt tasks
Diffstat (limited to 'fake-service')
| -rw-r--r-- | fake-service/Gemfile | 1 | ||||
| -rw-r--r-- | fake-service/Gemfile.lock | 3 | ||||
| -rw-r--r-- | fake-service/lib/pixelated_service/server.rb | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/fake-service/Gemfile b/fake-service/Gemfile index d7ecedc8..5b3eccda 100644 --- a/fake-service/Gemfile +++ b/fake-service/Gemfile @@ -3,6 +3,7 @@ source 'https://rubygems.org' gem "rake" gem "sinatra" gem "sinatra-contrib" +gem "sinatra-index" gem "json" gem "faker" gem "shotgun" diff --git a/fake-service/Gemfile.lock b/fake-service/Gemfile.lock index f6695218..a5462ffb 100644 --- a/fake-service/Gemfile.lock +++ b/fake-service/Gemfile.lock @@ -85,6 +85,8 @@ GEM rack-test sinatra (~> 1.4.0) tilt (~> 1.3) + sinatra-index (0.0.2) + sinatra spoon (0.0.4) ffi tilt (1.4.1) @@ -113,3 +115,4 @@ DEPENDENCIES shotgun sinatra sinatra-contrib + sinatra-index diff --git a/fake-service/lib/pixelated_service/server.rb b/fake-service/lib/pixelated_service/server.rb index d825a5e2..acf247b1 100644 --- a/fake-service/lib/pixelated_service/server.rb +++ b/fake-service/lib/pixelated_service/server.rb @@ -1,13 +1,17 @@ require 'sinatra/base' require 'sinatra/json' +require 'sinatra-index' require 'json' require 'net/http' module PixelatedService class Server < Sinatra::Base set :root, File.join(File.dirname(__FILE__), '../../') + set :public_folder, File.join(File.dirname(__FILE__), '../../../web-ui/app/') def json_body; JSON.parse request.body.read.to_s; end + register Sinatra::Index + use_static_index 'index.html' if ENV['RACK_ENV'] == 'staging' get '/' do File.read(File.join(settings.root, 'public', 'index.html')) end |