committee 0.4.10 → 0.4.11

data/lib/committee/middleware/request_validation.rb

@@ -2,6 +2,7 @@ module Committee::Middleware
   class RequestValidation < Base
     def initialize(app, options={})
       super
+      @allow_extra = options[:allow_extra]
       @prefix = options[:prefix]
     end
 
@@ -10,7 +11,12 @@ module Committee::Middleware
       env[@params_key] = Committee::RequestUnpacker.new(request).call
       link, _ = @router.routes_request?(request, prefix: @prefix)
       if link
-        Committee::ParamValidator.new(env[@params_key], @schema, link).call
+        Committee::ParamValidator.new(
+          env[@params_key],
+          @schema,
+          link,
+          allow_extra: @allow_extra
+        ).call
       end
       @app.call(env)
     rescue Committee::BadRequest

data/lib/committee/param_validator.rb

@@ -2,15 +2,16 @@ module Committee
   class ParamValidator
     include Validation
 
-    def initialize(params, schema, link_schema)
+    def initialize(params, schema, link_schema, options = {})
       @params = params
       @schema = schema
       @link_schema = link_schema
+      @allow_extra = options[:allow_extra]
     end
 
     def call
       detect_missing!
-      detect_extra!
+      detect_extra! if !@allow_extra
       check_data!
     end
 

data/test/middleware/request_validation_test.rb

@@ -46,6 +46,18 @@ describe Committee::Middleware::RequestValidation do
     assert_match /unknown params/i, last_response.body
   end
 
+  it "doesn't error on an extra parameter with allow_extra" do
+    @app = new_rack_app(allow_extra: true)
+    params = {
+      "app" => "heroku-api",
+      "cloud" => "production",
+      "recipient" => "owner@heroku.com",
+    }
+    header "Content-Type", "application/json"
+    post "/account/app-transfers", MultiJson.encode(params)
+    assert_equal 200, last_response.status
+  end
+
   it "rescues JSON errors" do
     @app = new_rack_app
     header "Content-Type", "application/json"

data/test/param_validator_test.rb

@@ -12,28 +12,24 @@ describe Committee::ParamValidator do
       "app" => "heroku-api",
       "recipient" => "owner@heroku.com",
     }
-    Committee::ParamValidator.new(params, @schema, @link_schema).call
+    validate(params, @schema, @link_schema)
   end
 
   it "detects a missing parameter" do
     e = assert_raises(Committee::InvalidParams) do
-      Committee::ParamValidator.new({}, @schema, @link_schema).call
+      validate({}, @schema, @link_schema)
     end
     message = "Require params: app, recipient."
     assert_equal message, e.message
   end
 
-  it "detects an extraneous parameter" do
+  it "doesn't error on an extraneous parameter with allow_extra" do
     params = {
       "app" => "heroku-api",
       "cloud" => "production",
       "recipient" => "owner@heroku.com",
     }
-    e = assert_raises(Committee::InvalidParams) do
-      Committee::ParamValidator.new(params, @schema, @link_schema).call
-    end
-    message = "Unknown params: cloud."
-    assert_equal message, e.message
+    validate(params, @schema, @link_schema, allow_extra: true)
   end
 
   it "detects a parameter of the wrong type" do
@@ -42,7 +38,7 @@ describe Committee::ParamValidator do
       "recipient" => 123,
     }
     e = assert_raises(Committee::InvalidType) do
-      Committee::ParamValidator.new(params, @schema, @link_schema).call
+      validate(params, @schema, @link_schema)
     end
     message = %{Invalid type for key "recipient": expected 123 to be ["string"].}
     assert_equal message, e.message
@@ -54,7 +50,7 @@ describe Committee::ParamValidator do
       "recipient" => "not-email",
     }
     e = assert_raises(Committee::InvalidFormat) do
-      Committee::ParamValidator.new(params, @schema, @link_schema).call
+      validate(params, @schema, @link_schema)
     end
     message = %{Invalid format for key "recipient": expected "not-email" to be "email".}
     assert_equal message, e.message
@@ -66,7 +62,7 @@ describe Committee::ParamValidator do
     }
     link_schema = @schema["app"]["links"][0]
     e = assert_raises(Committee::InvalidPattern) do
-      Committee::ParamValidator.new(params, @schema, link_schema).call
+      validate(params, @schema, link_schema)
     end
     message = %{Invalid pattern for key "name": expected %@! to match "(?-mix:^[a-z][a-z0-9-]{3,30}$)".}
     assert_equal message, e.message
@@ -81,7 +77,7 @@ describe Committee::ParamValidator do
         ]
       }
       link_schema = @schema["stack"]["links"][2]
-      Committee::ParamValidator.new(params, @schema, link_schema).call
+      validate(params, @schema, link_schema)
     end
 
     it "detects an array item with a parameter of the wrong type" do
@@ -92,7 +88,7 @@ describe Committee::ParamValidator do
       }
       link_schema = @schema["stack"]["links"][2]
       e = assert_raises(Committee::InvalidType) do
-        Committee::ParamValidator.new(params, @schema, link_schema).call
+        validate(params, @schema, link_schema)
       end
       message = %{Invalid type for key "state": expected 123 to be ["string"].}
       assert_equal message, e.message
@@ -106,7 +102,7 @@ describe Committee::ParamValidator do
         "flags" => [ "vip", "customer" ]
       }
       link_schema = @schema["account"]["links"][1]
-      Committee::ParamValidator.new(params, @schema, link_schema).call
+      validate(params, @schema, link_schema)
     end
 
     it "detects an array item with a parameter of the wrong type" do
@@ -116,10 +112,16 @@ describe Committee::ParamValidator do
       }
       link_schema = @schema["account"]["links"][1]
       e = assert_raises(Committee::InvalidType) do
-        Committee::ParamValidator.new(params, @schema, link_schema).call
+        validate(params, @schema, link_schema)
       end
       message = %{Invalid type for key "flags": expected 999 to be ["string"].}
       assert_equal message, e.message
     end
   end
+
+  private
+
+  def validate(params, schema, link_schema, options = {})
+    Committee::ParamValidator.new(params, schema, link_schema, options).call
+  end
 end

data/test/router_test.rb

@@ -8,15 +8,19 @@ describe Committee::Router do
   end
 
   it "builds routes without parameters" do
-    assert @router.routes?("GET", "/apps")
+    refute_nil @router.routes?("GET", "/apps")[0]
   end
 
   it "builds routes with parameters" do
-    assert @router.routes?("GET", "/apps/123")
+    refute_nil @router.routes?("GET", "/apps/123")[0]
+  end
+
+  it "doesn't match anything on a /" do
+    assert_nil @router.routes?("GET", "/")[0]
   end
 
   it "takes a prefix" do
     # this is a sociopathic example
-    assert @router.routes?("GET", "/kpi/apps/123", prefix: "/kpi")
+    refute_nil @router.routes?("GET", "/kpi/apps/123", prefix: "/kpi")[0]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -44,22 +44,6 @@ dependencies:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -76,22 +60,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - brandur@mutelight.org