Upgraded dependencies.

Author: dblock

Gemfile.lock

@@ -1,11 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activesupport (5.0.2)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.0)
@@ -15,7 +15,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bson (4.2.1)
+    bson (4.3.0)
     builder (3.2.3)
     celluloid (0.17.3)
       celluloid-essentials
@@ -44,7 +44,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     database_cleaner (1.5.3)
-    declarative (0.0.9)
+    declarative (0.0.10)
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -67,32 +67,30 @@ GEM
       faraday (~> 0.9)
       faraday_middleware (>= 0.9.1, < 1.0)
       oj (~> 2.0)
-    foreman (0.83.0)
+    foreman (0.84.0)
       thor (~> 0.19.1)
     futuroscope (0.1.11)
     giphy (3.0.0)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       faraday_middleware-parse_oj (~> 0.3)
       launchy (~> 2.4)
-    gli (2.15.0)
-    grape (0.19.1)
+    gli (2.17.1)
+    grape (1.0.3)
       activesupport
       builder
-      hashie (>= 2.1.0)
-      multi_json (>= 1.3.2)
-      multi_xml (>= 0.5.2)
-      mustermann-grape (~> 0.4.0)
+      mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
       virtus (>= 1.0.0)
-    grape-roar (0.4.0)
+    grape-roar (0.4.1)
       grape
+      multi_json
       roar (~> 1.1.0)
-    grape-swagger (0.26.1)
+    grape-swagger (0.28.0)
       grape (>= 0.16.2)
     hashdiff (0.3.2)
-    hashie (3.5.5)
+    hashie (3.5.7)
     heroku (3.43.9999)
       heroku-api (= 0.4.2)
       launchy (= 2.4.3)
@@ -105,7 +103,7 @@ GEM
     heroku-api (0.4.2)
       excon (~> 0.45)
       multi_json (~> 1.8)
-    hitimes (1.2.4)
+    hitimes (1.2.6)
     hyperclient (0.8.2)
       faraday
       faraday-digestauth
@@ -114,43 +112,41 @@ GEM
       futuroscope
       net-http-digest_auth
       uri_template
-    i18n (0.8.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.0.3)
     jsonpath (0.5.8)
       multi_json
-    kaminari-core (1.0.1)
+    kaminari-core (1.1.1)
     kaminari-grape (1.0.1)
       grape
       kaminari-core (~> 1.0)
-    kgio (2.11.0)
+    kgio (2.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     mime-types (1.25.1)
-    minitest (5.10.1)
-    mongo (2.4.1)
-      bson (>= 4.2.1, < 5.0.0)
-    mongoid (6.1.0)
-      activemodel (~> 5.0)
-      mongo (>= 2.4.1, < 3.0.0)
-    mongoid-compatibility (0.4.1)
+    minitest (5.11.3)
+    mongo (2.5.3)
+      bson (>= 4.3.0, < 5.0.0)
+    mongoid (7.0.1)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    mongoid-compatibility (0.5.1)
       activesupport
       mongoid (>= 2.0)
-    mongoid-scroll (0.3.5)
+    mongoid-scroll (0.3.6)
       i18n
       mongoid (>= 3.0)
       mongoid-compatibility
-    mongoid-shell (0.4.3)
+    mongoid-shell (0.4.6)
       i18n
       mongoid (>= 3.0.0)
       mongoid-compatibility
     multi_json (1.11.2)
-    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (0.4.0)
-      tool (~> 0.2)
-    mustermann-grape (0.4.0)
-      mustermann (= 0.4.0)
+    mustermann (1.0.2)
+    mustermann-grape (1.0.0)
+      mustermann (~> 1.0.0)
     net-http-digest_auth (1.4.1)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
@@ -160,17 +156,17 @@ GEM
       newrelic_rpm
       slack-ruby-bot
     newrelic_rpm (3.18.1.330)
-    nio4r (2.0.0)
+    nio4r (2.3.1)
     oj (2.18.3)
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
     powerpack (0.1.1)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-cors (0.4.1)
+    rack-cors (1.0.2)
     rack-rewrite (1.5.1)
     rack-robotz (0.0.4)
       rack
@@ -179,10 +175,10 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rainbow (3.0.0)
-    raindrops (0.17.0)
+    raindrops (0.19.0)
     rake (12.0.0)
     rdoc (5.1.0)
-    representable (3.0.3)
+    representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
@@ -214,10 +210,10 @@ GEM
     ruby-progressbar (1.9.0)
     rubyzip (1.1.7)
     safe_yaml (1.0.4)
-    slack-ruby-bot (0.10.1)
+    slack-ruby-bot (0.11.1)
       hashie
       slack-ruby-client (>= 0.6.0)
-    slack-ruby-bot-server (0.6.0)
+    slack-ruby-bot-server (0.6.1)
       celluloid-io
       foreman
       grape
@@ -229,24 +225,22 @@ GEM
       rack-server-pages
       slack-ruby-bot
       unicorn
-    slack-ruby-client (0.8.0)
+    slack-ruby-client (0.11.1)
       activesupport
       faraday (>= 0.9)
       faraday_middleware
       gli
       hashie
-      json
       websocket-driver
     thor (0.19.4)
     thread_safe (0.3.6)
     timers (4.1.2)
       hitimes
-    tool (0.2.3)
-    tzinfo (1.2.2)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unicode-display_width (1.3.2)
-    unicorn (5.2.0)
+    unicorn (5.4.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uri_template (0.7.0)
@@ -260,9 +254,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby

public/index.html

@@ -15,7 +15,7 @@ <h3>Whoa, an API explorer for the Slack Web API.</h3>
   </p>
   <p id='messages' />
   <p id='register'>
-    <a href="https://slack.com/oauth/authorize?scope=bot&client_id=4657200833.17789106022"><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/[email protected] 2x"></a>
+    <a href="https://slack.com/oauth/authorize?scope=bot&client_id=4657200833.43554619095"><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/[email protected] 2x"></a>
   </p>
   <p id='active_teams_count'>&nbsp;</p>
   <p>

slack-api-explorer.rb

@@ -1,3 +1,8 @@
+ENV['RACK_ENV'] ||= 'development'
+
+require 'bundler/setup'
+Bundler.require :default, ENV['RACK_ENV']
+
 Dir[File.expand_path('../config/initializers', __FILE__) + '/**/*.rb'].each do |file|
   require file
 end

slack-api-explorer/api/endpoints/teams_endpoint.rb

@@ -59,7 +59,7 @@ class TeamsEndpoint < Grape::API
             )
           end
 
-          SlackApiExplorer::Service.start!(team)
+          SlackApiExplorer::Service.instance.start!(team)
           present team, with: Api::Presenters::TeamPresenter
         end
       end

spec/api/cors_spec.rb

@@ -6,23 +6,23 @@
   context 'CORS' do
     it 'supports options' do
       options '/api', {},
-              'HTTP_ORIGIN' => 'http://cors.example.com',
+              'HTTP_ORIGIN' => '*',
               'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'Origin, Accept, Content-Type',
               'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET'
 
       expect(last_response.status).to eq 200
-      expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://cors.example.com'
+      expect(last_response.headers['Access-Control-Allow-Origin']).to eq '*'
       expect(last_response.headers['Access-Control-Expose-Headers']).to eq ''
     end
     it 'includes Access-Control-Allow-Origin in the response' do
-      get '/api', {}, 'HTTP_ORIGIN' => 'http://cors.example.com'
+      get '/api', {}, 'HTTP_ORIGIN' => '*'
       expect(last_response.status).to eq 200
-      expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://cors.example.com'
+      expect(last_response.headers['Access-Control-Allow-Origin']).to eq '*'
     end
     it 'includes Access-Control-Allow-Origin in errors' do
-      get '/api/invalid', {}, 'HTTP_ORIGIN' => 'http://cors.example.com'
+      get '/api/invalid', {}, 'HTTP_ORIGIN' => '*'
       expect(last_response.status).to eq 404
-      expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://cors.example.com'
+      expect(last_response.headers['Access-Control-Allow-Origin']).to eq '*'
     end
   end
 end

spec/api/endpoints/teams_endpoint_spec.rb

@@ -71,7 +71,7 @@
         ENV.delete('SLACK_CLIENT_SECRET')
       end
       it 'creates a team' do
-        expect(SlackApiExplorer::Service).to receive(:start!)
+        expect(SlackApiExplorer::Service.instance).to receive(:start!)
         expect do
           team = client.teams._post(code: 'code')
           expect(team.team_id).to eq 'team_id'
@@ -81,7 +81,7 @@
         end.to change(Team, :count).by(1)
       end
       it 'reactivates a deactivated team' do
-        expect(SlackApiExplorer::Service).to receive(:start!)
+        expect(SlackApiExplorer::Service.instance).to receive(:start!)
         existing_team = Fabricate(:team, token: 'token', active: false)
         expect do
           team = client.teams._post(code: 'code')
@@ -101,7 +101,7 @@
         end
       end
       it 'reactivates a deactivated team with a different code' do
-        expect(SlackApiExplorer::Service).to receive(:start!)
+        expect(SlackApiExplorer::Service.instance).to receive(:start!)
         existing_team = Fabricate(:team, token: 'old', team_id: 'team_id', active: false)
         expect do
           team = client.teams._post(code: 'code')

spec/api/swagger_documentation_spec.rb

@@ -9,7 +9,7 @@
       JSON.parse(last_response.body)
     end
     it 'documents root level apis' do
-      expect(subject['paths'].keys).to eq ['/api/status', '/api/teams/{id}', '/api/teams']
+      expect(subject['paths'].keys.sort).to eq ['/api/status', '/api/teams/{id}', '/api/teams'].sort
     end
   end
 
@@ -19,7 +19,7 @@
       JSON.parse(last_response.body)
     end
     it 'documents teams apis' do
-      expect(subject['paths'].keys).to eq ['/api/teams/{id}', '/api/teams']
+      expect(subject['paths'].keys.sort).to eq ['/api/teams/{id}', '/api/teams'].sort
     end
   end
 end