maitre_d 0.4.0 → 0.5.0

data/spec/api/cloud_control/single_sign_on_spec.rb

@@ -1,49 +1,49 @@
 require 'spec_helper'
 
-describe 'CloudControl SSO API' do
+describe 'CloudControl SSO API', :type => :request do
   let(:timestamp) { Time.now.to_i }
   let(:nav_data)  { 'heroku-nav-data-goes-here' }
   let(:token)     {
-    pre_token = "789:rock salt:#{timestamp.to_s}"
+    pre_token = "789:#{MaitreD::CloudControl.sso_salt}:#{timestamp.to_s}"
     Digest::SHA1.hexdigest(pre_token).to_s
   }
 
   it "renders a 403 if the token is incorrect" do
-    get '/cloudcontrol/resources/789', :token => 'foo',
+    post '/cloudcontrol/resources/sso', :id => '789', :token => 'foo',
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    response.status.should == 403
+    expect(response.status).to eq(403)
   end
 
   it "renders a 403 if the timestamp is older than 5 minutes" do
     timestamp = 5.minutes.ago.to_i - 1
-    pre_token = "789:rock salt:#{timestamp.to_s}"
+    pre_token = "789:#{MaitreD::CloudControl.sso_salt}:#{timestamp.to_s}"
     token     = Digest::SHA1.hexdigest(pre_token).to_s
 
-    get '/cloudcontrol/resources/789', :token => token,
+    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    response.status.should == 403
+    expect(response.status).to eq(403)
   end
 
   it "sets the heroku nav data cookie" do
-    get '/cloudcontrol/resources/789', :token => token,
+    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    cookies['heroku-nav-data'].should == nav_data
+    expect(cookies['heroku-nav-data']).to eq(nav_data)
   end
 
   it "redirects to the appropriate URL" do
-    get '/cloudcontrol/resources/789', :token => token,
+    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    response.should redirect_to('/my/dashboard')
+    expect(response).to redirect_to('/my/dashboard')
   end
 
   it "should set the provided session variables" do
-    get '/cloudcontrol/resources/789', :token => token,
+    post '/cloudcontrol/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    session[:app_id].should == '789'
+    expect(session[:app_id]).to eq('789')
   end
 end

data/spec/api/heroku/provisioning_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
-describe 'Heroku Provisioning API' do
-  let(:authorisation) { "Basic #{Base64.encode64('foo:bar')}" }
+describe 'Heroku Provisioning API', :type => :request do
+  let(:config)        { MaitreD::Heroku }
+  let(:authorisation) {
+    "Basic #{Base64.encode64("#{config.id}:#{config.password}")}"
+  }
   let(:json_response) { JSON.parse response.body }
 
   describe 'Provisioning' do
@@ -14,35 +17,38 @@ describe 'Heroku Provisioning API' do
     }
 
     it "returns a 401 if the HTTP authorisation does not match" do
-      post '/heroku/resources', params,
+      post '/heroku/resources', JSON.dump(params),
         {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
 
-      response.status.should == 401
+      expect(response.status).to eq(401)
     end
 
     it "returns the resource id" do
-      post '/heroku/resources', params, {'HTTP_AUTHORIZATION' => authorisation}
+      post '/heroku/resources', JSON.dump(params),
+        {'HTTP_AUTHORIZATION' => authorisation}
 
-      json_response['id'].should == '123'
+      expect(json_response['id']).to eq('123')
     end
 
     it "returns the resource configuration" do
-      post '/heroku/resources', params, {'HTTP_AUTHORIZATION' => authorisation}
+      post '/heroku/resources', JSON.dump(params),
+        {'HTTP_AUTHORIZATION' => authorisation}
 
-      json_response['config'].should == {'FOO_PROVISIONED' => "true"}
+      expect(json_response['config']).to eq({'FOO_PROVISIONED' => "true"})
     end
 
     it "returns a custom message" do
-      post '/heroku/resources', params, {'HTTP_AUTHORIZATION' => authorisation}
+      post '/heroku/resources', JSON.dump(params),
+        {'HTTP_AUTHORIZATION' => authorisation}
 
-      json_response['message'].should == 'Add-on provisioned!'
+      expect(json_response['message']).to eq('Add-on provisioned!')
     end
-    
+
     it "returns the region if it exists" do
-      post '/heroku/resources', params.merge(:region => 'us-west'),
+      post '/heroku/resources', JSON.dump(params.merge(:region => 'us-west')),
         {'HTTP_AUTHORIZATION' => authorisation}
-      
-      json_response['region'].should == 'us-west'
+
+      expect(json_response['region']).to eq('us-west')
     end
   end
 
@@ -52,22 +58,24 @@ describe 'Heroku Provisioning API' do
     }
 
     it "returns a 401 if the HTTP authorisation does not match" do
-      put '/heroku/resources/7', params,
+      put '/heroku/resources/7', JSON.dump(params),
         {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
 
-      response.status.should == 401
+      expect(response.status).to eq(401)
     end
 
     it "returns the new resource configuration" do
-      put '/heroku/resources/7', params, {'HTTP_AUTHORIZATION' => authorisation}
+      put '/heroku/resources/7', JSON.dump(params),
+        {'HTTP_AUTHORIZATION' => authorisation}
 
-      json_response['config'].should == {'FOO_PROVISIONED' => "false"}
+      expect(json_response['config']).to eq({'FOO_PROVISIONED' => "false"})
     end
 
     it "returns a custom message" do
-      put '/heroku/resources/7', params, {'HTTP_AUTHORIZATION' => authorisation}
+      put '/heroku/resources/7', JSON.dump(params),
+        {'HTTP_AUTHORIZATION' => authorisation}
 
-      json_response['message'].should == 'Add-on upgraded or downgraded.'
+      expect(json_response['message']).to eq('Add-on upgraded or downgraded.')
     end
   end
 
@@ -76,19 +84,19 @@ describe 'Heroku Provisioning API' do
       delete '/heroku/resources/28', {},
         {'HTTP_AUTHORIZATION' => 'Basic foobarbaz'}
 
-      response.status.should == 401
+      expect(response.status).to eq(401)
     end
 
     it "returns with a status of 200" do
       delete '/heroku/resources/28', {}, {'HTTP_AUTHORIZATION' => authorisation}
 
-      response.status.should == 200
+      expect(response.status).to eq(200)
     end
 
     it "returns a custom message" do
       delete '/heroku/resources/28', {}, {'HTTP_AUTHORIZATION' => authorisation}
 
-      json_response['message'].should == 'Add-on removed.'
+      expect(json_response['message']).to eq('Add-on removed.')
     end
   end
 end

data/spec/api/heroku/single_sign_on_spec.rb

@@ -1,49 +1,49 @@
 require 'spec_helper'
 
-describe 'Heroku SSO API' do
+describe 'Heroku SSO API', :type => :request do
   let(:timestamp) { Time.now.to_i }
   let(:nav_data)  { 'heroku-nav-data-goes-here' }
   let(:token)     {
-    pre_token = "789:sea salt:#{timestamp.to_s}"
+    pre_token = "789:#{MaitreD::Heroku.sso_salt}:#{timestamp.to_s}"
     Digest::SHA1.hexdigest(pre_token).to_s
   }
 
   it "renders a 403 if the token is incorrect" do
-    get '/heroku/resources/789', :token => 'foo',
+    post '/heroku/resources/sso', :id => '789', :token => 'foo',
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    response.status.should == 403
+    expect(response.status).to eq(403)
   end
 
   it "renders a 403 if the timestamp is older than 5 minutes" do
     timestamp = 5.minutes.ago.to_i - 1
-    pre_token = "789:sea salt:#{timestamp.to_s}"
+    pre_token = "789:#{MaitreD::Heroku.sso_salt}:#{timestamp.to_s}"
     token     = Digest::SHA1.hexdigest(pre_token).to_s
 
-    get '/heroku/resources/789', :token => token,
+    post '/heroku/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    response.status.should == 403
+    expect(response.status).to eq(403)
   end
 
   it "sets the heroku nav data cookie" do
-    get '/heroku/resources/789', :token => token,
+    post '/heroku/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    cookies['heroku-nav-data'].should == nav_data
+    expect(cookies['heroku-nav-data']).to eq(nav_data)
   end
 
   it "redirects to the appropriate URL" do
-    get '/heroku/resources/789', :token => token,
+    post '/heroku/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
 
-    response.should redirect_to('/my/dashboard')
+    expect(response).to redirect_to('/my/dashboard')
   end
-  
+
   it "should set the provided session variables" do
-    get '/heroku/resources/789', :token => token,
+    post '/heroku/resources/sso', :id => '789', :token => token,
       :timestamp => timestamp, 'nav-data' => nav_data
-    
-    session[:app_id].should == '789'
+
+    expect(session[:app_id]).to eq('789')
   end
 end

data/spec/internal/app/listeners/cloud_control_listener.rb

@@ -1,5 +1,5 @@
 class CloudControlListener
-  def provision(cloud_control_id, plan, callback_url, logplex_token, options)
+  def provision(cloud_control_id, plan, region, callback_url, logplex_token, options)
     {
       :id      => '123',
       :config  => {'FOO_PROVISIONED' => 'true'},

data/spec/internal/app/listeners/heroku_listener.rb

@@ -1,4 +1,4 @@
-class HerokuListener < MaitreD::Heroku::Listener
+class HerokuListener
   def provision(heroku_id, plan, region, callback_url, logplex_token, options)
     {
       :id      => '123',

data/spec/internal/config/initializers/heroku.rb

@@ -2,7 +2,7 @@ require 'maitre_d/heroku'
 
 MaitreD::Heroku.configure do |config|
   config.id       = 'foo'
-  config.password = 'bar'
-  config.sso_salt = 'sea salt'
+  config.password = '056e8ff3d55ea6e1a7cc4aa7afeaf3ac'
+  config.sso_salt = 'db0ce73d4bd2dfa1d66c713a9aaf8f76'
   config.listener = HerokuListener
 end

data/spec/internal/config/routes.rb

@@ -1,8 +1,6 @@
 Rails.application.routes.draw do
-  mount MaitreD::Broadstack::API   => '/broadstack'
-  mount MaitreD::Heroku::API       => '/heroku'
-  mount MaitreD::CloudControl::API => '/cloudcontrol'
-  mount MaitreD::Opperator::API    => '/opperator'
+  mount MaitreD::API.new(MaitreD::Heroku)       => '/heroku'
+  mount MaitreD::API.new(MaitreD::CloudControl) => '/cloudcontrol'
 
   class Dashboard
     def self.call(env)
@@ -10,5 +8,5 @@ Rails.application.routes.draw do
         ['Dashboard']]
     end
   end
-  match '/my/dashboard' => Dashboard
+  get '/my/dashboard' => Dashboard
 end

data/spec/spec_helper.rb

@@ -8,6 +8,5 @@ Combustion.initialize! :action_controller
 require 'rspec/rails'
 
 RSpec.configure do |config|
-  config.include RSpec::Rails::RequestExampleGroup, :type => :request,
-    :example_group => {:file_path => /spec\/api/}
+  config.include RSpec::Rails::RequestExampleGroup, :type => :request
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: maitre_d
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sliver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -30,42 +58,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.1.0
 description: A Rack API (through Grape) for Heroku add-on providers.
 email:
 - pat@freelancing-gods.com
@@ -73,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - HISTORY
 - LICENCE
@@ -83,36 +111,23 @@ files:
 - addon-manifest.json
 - config.ru
 - lib/maitre_d.rb
-- lib/maitre_d/broadstack.rb
-- lib/maitre_d/broadstack/api.rb
-- lib/maitre_d/broadstack/api_helpers.rb
+- lib/maitre_d/api.rb
+- lib/maitre_d/api/authenticated.rb
+- lib/maitre_d/api/change_plan.rb
+- lib/maitre_d/api/create.rb
+- lib/maitre_d/api/delete.rb
+- lib/maitre_d/api/sso.rb
 - lib/maitre_d/cloud_control.rb
-- lib/maitre_d/cloud_control/api.rb
-- lib/maitre_d/cloud_control/api_helpers.rb
 - lib/maitre_d/heroku.rb
-- lib/maitre_d/heroku/api.rb
-- lib/maitre_d/heroku/api_helpers.rb
-- lib/maitre_d/heroku/listener.rb
-- lib/maitre_d/opperator.rb
-- lib/maitre_d/opperator/api.rb
-- lib/maitre_d/opperator/api_helpers.rb
-- lib/maitre_d/opperator/listener.rb
 - maitre_d.gemspec
-- spec/api/broadstack/provisioning_spec.rb
-- spec/api/broadstack/single_sign_on_spec.rb
 - spec/api/cloud_control/provisioning_spec.rb
 - spec/api/cloud_control/single_sign_on_spec.rb
 - spec/api/heroku/provisioning_spec.rb
 - spec/api/heroku/single_sign_on_spec.rb
-- spec/api/opperator/provisioning_spec.rb
-- spec/internal/app/listeners/broadstack_listener.rb
 - spec/internal/app/listeners/cloud_control_listener.rb
 - spec/internal/app/listeners/heroku_listener.rb
-- spec/internal/app/listeners/opperator_listener.rb
-- spec/internal/config/initializers/broadstack.rb
 - spec/internal/config/initializers/cloud_control.rb
 - spec/internal/config/initializers/heroku.rb
-- spec/internal/config/initializers/opperator.rb
 - spec/internal/config/routes.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
@@ -126,12 +141,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -141,21 +156,14 @@ signing_key:
 specification_version: 4
 summary: Rack APIs for Heroku add-ons
 test_files:
-- spec/api/broadstack/provisioning_spec.rb
-- spec/api/broadstack/single_sign_on_spec.rb
 - spec/api/cloud_control/provisioning_spec.rb
 - spec/api/cloud_control/single_sign_on_spec.rb
 - spec/api/heroku/provisioning_spec.rb
 - spec/api/heroku/single_sign_on_spec.rb
-- spec/api/opperator/provisioning_spec.rb
-- spec/internal/app/listeners/broadstack_listener.rb
 - spec/internal/app/listeners/cloud_control_listener.rb
 - spec/internal/app/listeners/heroku_listener.rb
-- spec/internal/app/listeners/opperator_listener.rb
-- spec/internal/config/initializers/broadstack.rb
 - spec/internal/config/initializers/cloud_control.rb
 - spec/internal/config/initializers/heroku.rb
-- spec/internal/config/initializers/opperator.rb
 - spec/internal/config/routes.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico