maitre_d 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e79119958343605dabd87304c21e2e9c770711b
-  data.tar.gz: 4ed73d17abf94091dfb18e566984637699e8569a
+  metadata.gz: f3c4e61ea06b3875e6b2a365f0acabad42b242a9
+  data.tar.gz: 3767ddfb5f8b6e7d2f044ba6b978a4a9eb88b58e
 SHA512:
-  metadata.gz: 36feafdb16cd476413a95b34da6dfc675c43fa47772b04d6ec34117aeb71c42646556700920582689dda9fa845667451c93f8812408d340e14cd76eb5fe6cb3a
-  data.tar.gz: aa9b728329779092e8f1482e50db5dbfe45751cce6957135ec35f8d7f959b162cd55fbcd0e093db3534b7bf82249becbccdc3604981f217dc780b61b5d7c10bd
+  metadata.gz: e4c934c994c138437397a82f584a25e2631aaea6182b09a97d2a1952f1c0687894750d48e79b44b7ae863ce92cfb260de731cbd26d9d310d7f72bfee5a84e566
+  data.tar.gz: 184847e1566082599f09efead691839955baca8f6100b0472b4c1a09b880d20089a9982c07a3614e34c6b445594d5ebacda971ba1424d14f2309c6305442fe2d

data/README.textile

@@ -2,7 +2,7 @@ h1. Maître d'
 
 "!https://secure.travis-ci.org/flying-sphinx/maitre_d.png!":http://travis-ci.org/flying-sphinx/maitre_d
 
-Rack APIs powered by Grape for managing Heroku, CloudControl and Opperator add-ons. If used within a Rails application, it'll automatically be mounted as a Rails engine at the appropriate paths.
+Rack APIs powered by Grape for managing Heroku, CloudControl and Opperator add-ons.
 
 Maître d' manages all the authorisation checking for API requests and provides simple hooks for you to write just the code you need to handle provisioning, plan changes, deprovisioning and single-sign-on (SSO) requests.
 
@@ -13,11 +13,16 @@ Add the following to your Gemfile - and take note that we need the git repositor
 <pre><code>gem 'grape',
   :git => 'git://github.com/intridea/grape.git',
   :ref => '212c96cdfb253a59bc93790808c568e559d04468'
-gem 'maitre_d', '~> 0.1.2'</code></pre>
+gem 'maitre_d', '~> 0.4.0'</code></pre>
 
 h3. With Rails
 
-Because there's a Rails engine as part of Maître d', the API routing is set up automatically. Jump forward to the configuration and listener setup below.
+Add the appropriate Rack apps to your routes file:
+
+<pre><code>mount MaitreD::Broadstack::API   => '/broadstack'
+mount MaitreD::Heroku::API       => '/heroku'
+mount MaitreD::CloudControl::API => '/cloudcontrol'
+mount MaitreD::Opperator::API    => '/opperator'</code></pre>
 
 h3. Without Rails
 
@@ -27,13 +32,17 @@ h2. Configuration
 
 You'll need to provide Maître d' with the appropriate provider credentials - in a Rails app, this would go in an initializer, but for Rack/Sinatra apps just get the values set before the routing is defined.
 
-<pre><code>MaitreD::Heroku.configure do |config|
+<pre><code>require 'maitre_d/heroku'
+
+MaitreD::Heroku.configure do |config|
   config.id       = 'addon-id'
   config.password = 'random'
   config.sso_salt = 'gibberish'
   config.listener = HerokuListener
 end
 
+require 'maitre_d/cloud_control'
+
 MaitreD::CloudControl.configure do |config|
   config.id       = 'addon-id'
   config.password = 'random'
@@ -41,6 +50,8 @@ MaitreD::CloudControl.configure do |config|
   config.listener = CloudControlListener
 end
 
+require 'maitre_d/opperator'
+
 MaitreD::Opperator.configure do |config|
   config.shared_secret = 'something-special'
   config.listener      = OpperatorListener
@@ -154,4 +165,4 @@ Contributions are very much welcome - but keep in mind the following:
 
 h2. Credits
 
-Copyright (c) 2011-2012, Maître d' is developed and maintained by Pat Allan, and is released under the open MIT Licence.
+Copyright (c) 2011-2014, Maître d' is developed and maintained by Pat Allan, and is released under the open MIT Licence.

data/lib/maitre_d.rb

@@ -2,10 +2,3 @@ require 'grape'
 
 module MaitreD
 end
-
-require 'maitre_d/broadstack'
-require 'maitre_d/heroku'
-require 'maitre_d/cloud_control'
-require 'maitre_d/opperator'
-
-require 'maitre_d/engine' if defined?(Rails)

data/lib/maitre_d/cloud_control/api_helpers.rb

@@ -1,3 +1,5 @@
+require 'maitre_d/heroku/api_helpers'
+
 module MaitreD::CloudControl::APIHelpers
   include MaitreD::Heroku::APIHelpers
 

data/lib/maitre_d/heroku/api_helpers.rb

@@ -1,44 +1,46 @@
-module MaitreD::Heroku::APIHelpers
-  def authenticate!
-    error!('401 Unauthorized', 401) unless valid_authorization?
-  end
-
-  def listener
-    MaitreD::Heroku.listener.new
-  end
-
-  def provider_id
-    params[:heroku_id]
-  end
-
-  def session
-    env['rack.session']
-  end
-
-  def valid_timestamp?
-    params[:timestamp].to_i >= (Time.now - 5*60).to_i
-  end
-
-  def valid_token?
-    expected_token == params[:token]
-  end
-
-  private
-
-  def expected_token
-    @expected_token ||= Digest::SHA1.hexdigest(
-      "#{params[:id]}:#{MaitreD::Heroku.sso_salt}:#{params[:timestamp]}"
-    ).to_s
-  end
-
-  def valid_authorization?
-    valid_authorization.strip == env['HTTP_AUTHORIZATION'].strip
-  end
-
-  def valid_authorization
-    encoded_authorization = Base64.encode64(
-      "#{MaitreD::Heroku.id}:#{MaitreD::Heroku.password}"
-    )
-    "Basic #{encoded_authorization}"
+module MaitreD::Heroku
+  module APIHelpers
+    def authenticate!
+      error!('401 Unauthorized', 401) unless valid_authorization?
+    end
+
+    def listener
+      MaitreD::Heroku.listener.new
+    end
+
+    def provider_id
+      params[:heroku_id]
+    end
+
+    def session
+      env['rack.session']
+    end
+
+    def valid_timestamp?
+      params[:timestamp].to_i >= (Time.now - 5*60).to_i
+    end
+
+    def valid_token?
+      expected_token == params[:token]
+    end
+
+    private
+
+    def expected_token
+      @expected_token ||= Digest::SHA1.hexdigest(
+        "#{params[:id]}:#{MaitreD::Heroku.sso_salt}:#{params[:timestamp]}"
+      ).to_s
+    end
+
+    def valid_authorization?
+      valid_authorization.strip == env['HTTP_AUTHORIZATION'].strip
+    end
+
+    def valid_authorization
+      encoded_authorization = Base64.encode64(
+        "#{MaitreD::Heroku.id}:#{MaitreD::Heroku.password}"
+      )
+      "Basic #{encoded_authorization}"
+    end
   end
 end

data/maitre_d.gemspec

@@ -3,12 +3,12 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'maitre_d'
-  s.version     = '0.3.0'
+  s.version     = '0.4.0'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'http://github.com/flying-sphinx/maitre_d'
-  s.summary     = 'Rack API and Rails Engine for Heroku and Opperator add-ons'
-  s.description = 'A Rack API (through Grape) for Heroku and Opperator add-on providers - which can also be attached as a Rails Engine.'
+  s.summary     = 'Rack APIs for Heroku add-ons'
+  s.description = 'A Rack API (through Grape) for Heroku add-on providers.'
 
   s.rubyforge_project = "maitre_d"
 

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

@@ -1,3 +1,5 @@
+require 'maitre_d/broadstack'
+
 MaitreD::Broadstack.configure do |config|
   config.id       = 'foo'
   config.password = 'bar'

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

@@ -1,3 +1,5 @@
+require 'maitre_d/cloud_control'
+
 MaitreD::CloudControl.configure do |config|
   config.id       = 'baz'
   config.password = 'qux'

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

@@ -1,3 +1,5 @@
+require 'maitre_d/heroku'
+
 MaitreD::Heroku.configure do |config|
   config.id       = 'foo'
   config.password = 'bar'

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

@@ -1,3 +1,5 @@
+require 'maitre_d/opperator'
+
 MaitreD::Opperator.configure do |config|
   config.shared_secret = 'something-special'
   config.listener      = OpperatorListener

data/spec/internal/config/routes.rb

@@ -1,4 +1,9 @@
 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'
+
   class Dashboard
     def self.call(env)
       [200, {'Content-Type' => 'text/plain', 'Content-Length' => '9'},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maitre_d
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combustion
@@ -66,8 +66,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-description: A Rack API (through Grape) for Heroku and Opperator add-on providers
-  - which can also be attached as a Rails Engine.
+description: A Rack API (through Grape) for Heroku add-on providers.
 email:
 - pat@freelancing-gods.com
 executables: []
@@ -83,7 +82,6 @@ files:
 - Rakefile
 - addon-manifest.json
 - config.ru
-- config/routes.rb
 - lib/maitre_d.rb
 - lib/maitre_d/broadstack.rb
 - lib/maitre_d/broadstack/api.rb
@@ -91,7 +89,6 @@ files:
 - lib/maitre_d/cloud_control.rb
 - lib/maitre_d/cloud_control/api.rb
 - lib/maitre_d/cloud_control/api_helpers.rb
-- lib/maitre_d/engine.rb
 - lib/maitre_d/heroku.rb
 - lib/maitre_d/heroku/api.rb
 - lib/maitre_d/heroku/api_helpers.rb
@@ -139,10 +136,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: maitre_d
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Rack API and Rails Engine for Heroku and Opperator add-ons
+summary: Rack APIs for Heroku add-ons
 test_files:
 - spec/api/broadstack/provisioning_spec.rb
 - spec/api/broadstack/single_sign_on_spec.rb

data/config/routes.rb

@@ -1,6 +0,0 @@
-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'
-end

data/lib/maitre_d/engine.rb

@@ -1,3 +0,0 @@
-class MaitreD::Engine < Rails::Engine
-  paths['config'] << 'config'
-end