committee 0.4.7 → 0.4.8

data/lib/committee/middleware/request_validation.rb

@@ -1,9 +1,14 @@
 module Committee::Middleware
   class RequestValidation < Base
+    def initialize(app, options={})
+      super
+      @prefix = options[:prefix]
+    end
+
     def call(env)
       request = Rack::Request.new(env)
       env[@params_key] = Committee::RequestUnpacker.new(request).call
-      link, _ = @router.routes_request?(request)
+      link, _ = @router.routes_request?(request, prefix: @prefix)
       if link
         Committee::ParamValidator.new(env[@params_key], @schema, link).call
       end

data/lib/committee/middleware/response_validation.rb

@@ -1,9 +1,15 @@
 module Committee::Middleware
   class ResponseValidation < Base
+    def initialize(app, options={})
+      super
+      @prefix = options[:prefix]
+    end
+
     def call(env)
       status, headers, response = @app.call(env)
       request = Rack::Request.new(env)
-      link_schema, type_schema = @router.routes_request?(request)
+      link_schema, type_schema =
+        @router.routes_request?(request, prefix: @prefix)
       if type_schema
         check_content_type!(headers)
         str = response.reduce("") { |str, s| str << s }

data/lib/committee/middleware/stub.rb

@@ -3,11 +3,12 @@ module Committee::Middleware
     def initialize(app, options={})
       super
       @cache = {}
+      @prefix = options[:prefix]
     end
 
     def call(env)
       request = Rack::Request.new(env)
-      link_schema, type_schema = @router.routes_request?(request)
+      link_schema, type_schema = @router.routes_request?(request, prefix: @prefix)
       if type_schema
         str = cache(link_schema["method"], link_schema["href"]) do
           data = Committee::ResponseGenerator.new(@schema, type_schema, link_schema).call

data/test/middleware/request_validation_test.rb

@@ -3,57 +3,79 @@ require_relative "../test_helper"
 describe Committee::Middleware::RequestValidation do
   include Rack::Test::Methods
 
-  StubApp = Rack::Builder.new {
-    use Committee::Middleware::RequestValidation,
-      schema: File.read("./test/data/schema.json")
-    run lambda { |_|
-      [200, {}, []]
-    }
-  }
-
   def app
-    StubApp
-  end
-
-  before do
-    header "Content-Type", "application/json"
+    @app
   end
 
   it "detects an invalid Content-Type" do
+    @app = new_rack_app
     header "Content-Type", "application/whats-this"
     post "/account/app-transfers", "{}"
     assert_equal 400, last_response.status
   end
 
   it "passes through a valid request" do
+    @app = new_rack_app
     params = {
       "app" => "heroku-api",
       "recipient" => "owner@heroku.com",
     }
+    header "Content-Type", "application/json"
     post "/account/app-transfers", MultiJson.encode(params)
     assert_equal 200, last_response.status
   end
 
   it "detects a missing parameter" do
+    @app = new_rack_app
+    header "Content-Type", "application/json"
     post "/account/app-transfers", "{}"
     assert_equal 422, last_response.status
     assert_match /require params/i, last_response.body
   end
 
   it "detects an extra parameter" do
+    @app = new_rack_app
     params = {
       "app" => "heroku-api",
       "cloud" => "production",
       "recipient" => "owner@heroku.com",
     }
+    header "Content-Type", "application/json"
     post "/account/app-transfers", MultiJson.encode(params)
     assert_equal 422, last_response.status
     assert_match /unknown params/i, last_response.body
   end
 
   it "rescues JSON errors" do
+    @app = new_rack_app
+    header "Content-Type", "application/json"
     post "/account/app-transfers", "{x:y}"
     assert_equal 400, last_response.status
     assert_match /valid json/i, last_response.body
   end
+
+  it "takes a prefix" do
+    @app = new_rack_app(prefix: "/v1")
+    params = {
+      "app" => "heroku-api",
+      "recipient" => "owner@heroku.com",
+    }
+    header "Content-Type", "application/json"
+    post "/v1/account/app-transfers", MultiJson.encode(params)
+    assert_equal 200, last_response.status
+  end
+
+  private
+
+  def new_rack_app(options = {})
+    options = {
+      schema: File.read("./test/data/schema.json")
+    }.merge(options)
+    Rack::Builder.new {
+      use Committee::Middleware::RequestValidation, options
+      run lambda { |_|
+        [200, {}, []]
+      }
+    }
+  end
 end

data/test/middleware/response_validation_test.rb

@@ -14,7 +14,8 @@ describe Committee::Middleware::ResponseValidation do
   end
 
   it "detects an invalid response Content-Type" do
-    @app = new_rack_app(MultiJson.encode([ValidApp]), {})
+    @app = new_rack_app(MultiJson.encode([ValidApp]),
+      { "Content-Type" => "application/xml" })
     get "/apps"
     assert_equal 500, last_response.status
     assert_match /response header must be set to/i, last_response.body
@@ -52,10 +53,23 @@ describe Committee::Middleware::ResponseValidation do
     assert_match /valid json/i, last_response.body
   end
 
-  def new_rack_app(response, headers={ "Content-Type" => "application/json" })
+  it "takes a prefix" do
+    @app = new_rack_app(MultiJson.encode([ValidApp]), {}, prefix: "/v1")
+    get "/v1/apps"
+    assert_equal 200, last_response.status
+  end
+
+  private
+
+  def new_rack_app(response, headers = {}, options = {})
+    headers = {
+      "Content-Type" => "application/json"
+    }.merge(headers)
+    options = {
+      schema: File.read("./test/data/schema.json")
+    }.merge(options)
     Rack::Builder.new {
-      use Committee::Middleware::ResponseValidation,
-        schema: File.read("./test/data/schema.json")
+      use Committee::Middleware::ResponseValidation, options
       run lambda { |_|
         [200, headers, [response]]
       }

data/test/middleware/stub_test.rb

@@ -3,22 +3,37 @@ require_relative "../test_helper"
 describe Committee::Middleware::Stub do
   include Rack::Test::Methods
 
-  ParamValidationApp = Rack::Builder.new {
-    use Committee::Middleware::Stub,
-      schema: File.read("./test/data/schema.json")
-    run lambda { |_|
-      [200, {}, []]
-    }
-  }
-
   def app
-    ParamValidationApp
+    @app
   end
 
   it "responds with a stubbed response" do
+    @app = new_rack_app
     get "/apps/heroku-api"
     assert_equal 200, last_response.status
     data = MultiJson.decode(last_response.body)
     assert_equal ValidApp.keys.sort, data.keys.sort
   end
+
+  it "takes a prefix" do
+    @app = new_rack_app(prefix: "/v1")
+    get "/v1/apps/heroku-api"
+    assert_equal 200, last_response.status
+    data = MultiJson.decode(last_response.body)
+    assert_equal ValidApp.keys.sort, data.keys.sort
+  end
+
+  private
+
+  def new_rack_app(options = {})
+    options = {
+      schema: File.read("./test/data/schema.json")
+    }.merge(options)
+    Rack::Builder.new {
+      use Committee::Middleware::Stub, options
+      run lambda { |_|
+        [200, {}, []]
+      }
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json