committee 1.0.6 → 1.0.7

data/lib/committee/middleware/request_validation.rb

@@ -3,6 +3,7 @@ module Committee::Middleware
     def initialize(app, options={})
       super
       @prefix = options[:prefix]
+      @strict = options[:strict]
 
       # deprecated
       @allow_extra = options[:allow_extra]
@@ -10,12 +11,19 @@ module Committee::Middleware
 
     def call(env)
       request = Rack::Request.new(env)
+      env[@params_key] = Committee::RequestUnpacker.new(request).call
       if link = @router.routes_request?(request, prefix: @prefix)
         validator = Committee::RequestValidator.new(link)
-        validator.call(request)
-        env[@params_key] = validator.data
+        validator.call(request, env[@params_key])
+        @app.call(env)
+      else
+        if @strict
+          render_error(404, :not_found,
+            "That request method and path combination isn't defined.")
+        else
+          @app.call(env)
+        end
       end
-      @app.call(env)
     rescue Committee::BadRequest, Committee::InvalidRequest
       render_error(400, :bad_request, $!.message)
     rescue MultiJson::LoadError

data/lib/committee/request_validator.rb

@@ -1,16 +1,13 @@
 module Committee
   class RequestValidator
-    attr_accessor :data
-
     def initialize(link, options = {})
       @link = link
     end
 
-    def call(request)
+    def call(request, data)
       check_content_type!(request)
-      @data = Committee::RequestUnpacker.new(request).call
       if @link.schema
-        valid, errors = @link.schema.validate(@data)
+        valid, errors = @link.schema.validate(data)
         if !valid
           errors = JsonSchema::SchemaError.aggregate(errors).join("\n")
           raise InvalidRequest, "Invalid request.\n\n#{errors}"
@@ -21,9 +18,11 @@ module Committee
     private
 
     def check_content_type!(request)
-      unless Rack::Mime.match?(@link.enc_type, request.content_type)
-        raise Committee::InvalidRequest,
-          %{"Content-Type" request header must be set to "#{@link.enc_type}".}
+      if request.content_type
+        unless Rack::Mime.match?(@link.enc_type, request.content_type)
+          raise Committee::InvalidRequest,
+            %{"Content-Type" request header must be set to "#{@link.enc_type}".}
+        end
       end
     end
   end

data/test/middleware/request_validation_test.rb

@@ -57,6 +57,18 @@ describe Committee::Middleware::RequestValidation do
     assert_equal 200, last_response.status
   end
 
+  it "routes to paths not in schema" do
+    @app = new_rack_app
+    get "/not-a-resource"
+    assert_equal 200, last_response.status
+  end
+
+  it "doesn't route to paths not in schema when in strict mode" do
+    @app = new_rack_app(strict: true)
+    get "/not-a-resource"
+    assert_equal 404, last_response.status
+  end
+
   private
 
   def new_rack_app(options = {})

data/test/request_validator_test.rb

@@ -9,18 +9,23 @@ describe Committee::RequestValidator do
     @schema.expand_references!
     # POST /apps/:id
     @link = @link = @schema.properties["app"].links[0]
+    @request = Rack::Request.new({
+      "CONTENT_TYPE" => "application/json",
+    })
   end
 
   it "passes through a valid request" do
-    params = {
+    data = {
       "name" => "heroku-api",
     }
-    call(request(params))
+    call(data)
   end
 
   it "detects an invalid request Content-Type" do
     e = assert_raises(Committee::InvalidRequest) {
-      call(Rack::Request.new("CONTENT_TYPE" => "application/x-www-form-urlencoded"))
+      @request =
+        Rack::Request.new("CONTENT_TYPE" => "application/x-www-form-urlencoded")
+      call({})
     }
     message =
       %{"Content-Type" request header must be set to "application/json".}
@@ -28,11 +33,11 @@ describe Committee::RequestValidator do
   end
 
   it "detects a parameter of the wrong pattern" do
-    params = {
+    data = {
       "name" => "%@!"
     }
     e = assert_raises(Committee::InvalidRequest) do
-      call(request(params))
+      call(data)
     end
     message = %{Invalid request.\n\n#/name: failed schema #/definitions/app/links/0/schema/properties/name: Expected string to match pattern "/^[a-z][a-z0-9-]{3,30}$/", value was: %@!.}
     assert_equal message, e.message
@@ -40,15 +45,7 @@ describe Committee::RequestValidator do
 
   private
 
-  def call(request)
-    Committee::RequestValidator.new(@link).call(request)
-  end
-
-  def request(params)
-    env = {
-      "CONTENT_TYPE" => "application/json",
-      "rack.input"   => StringIO.new(MultiJson.encode(params))
-    }
-    Rack::Request.new(env)
+  def call(data)
+    Committee::RequestValidator.new(@link).call(@request, data)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema