committee 1.0.3 → 1.0.4

data/lib/committee/middleware/request_validation.rb

@@ -10,9 +10,10 @@ 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)
-        Committee::RequestValidator.new.call(link, env[@params_key])
+        validator = Committee::RequestValidator.new(link)
+        validator.call(request)
+        env[@params_key] = validator.data
       end
       @app.call(env)
     rescue Committee::BadRequest, Committee::InvalidRequest

data/lib/committee/request_validator.rb

@@ -1,16 +1,30 @@
 module Committee
   class RequestValidator
-    def initialize(options = {})
+    attr_accessor :data
+
+    def initialize(link, options = {})
+      @link = link
     end
 
-    def call(link, params)
-      if link.schema
-        valid, errors = link.schema.validate(params)
+    def call(request)
+      check_content_type!(request)
+      @data = Committee::RequestUnpacker.new(request).call
+      if @link.schema
+        valid, errors = @link.schema.validate(@data)
         if !valid
           errors = JsonSchema::SchemaError.aggregate(errors).join("\n")
           raise InvalidRequest, "Invalid request.\n\n#{errors}"
         end
       end
     end
+
+    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}".}
+      end
+    end
   end
 end

data/lib/committee/test/methods.rb

@@ -25,7 +25,7 @@ module Committee::Test
     end
 
     def assert_schema_content_type
-      Committee.warn_deprecated("Use of #assert_schema_content_type is deprecated; use #assert_schema_conform instead.")
+      Committee.warn_deprecated("Committee: use of #assert_schema_content_type is deprecated; use #assert_schema_conform instead.")
     end
 
     # can be overridden alternatively to #schema_path in case the schema is

data/test/middleware/request_validation_test.rb

@@ -28,17 +28,6 @@ describe Committee::Middleware::RequestValidation do
     assert_match /invalid request/i, last_response.body
   end
 
-  it "detects an invalid Content-Type" do
-    @app = new_rack_app
-    header "Content-Type", "application/whats-this"
-    params = {
-      "name" => "cloudnasium"
-    }
-    post "/apps", MultiJson.encode(params)
-    assert_equal 400, last_response.status
-    assert_match /unsupported content-type/i, last_response.body
-  end
-
   it "rescues JSON errors" do
     @app = new_rack_app
     header "Content-Type", "application/json"

data/test/request_validator_test.rb

@@ -1,5 +1,7 @@
 require_relative "test_helper"
 
+require "stringio"
+
 describe Committee::RequestValidator do
   before do
     @schema =
@@ -13,7 +15,16 @@ describe Committee::RequestValidator do
     params = {
       "name" => "heroku-api",
     }
-    call(params)
+    call(request(params))
+  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"))
+    }
+    message =
+      %{"Content-Type" request header must be set to "application/json".}
+    assert_equal message, e.message
   end
 
   it "detects a parameter of the wrong pattern" do
@@ -21,7 +32,7 @@ describe Committee::RequestValidator do
       "name" => "%@!"
     }
     e = assert_raises(Committee::InvalidRequest) do
-      call(params)
+      call(request(params))
     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
@@ -29,7 +40,15 @@ describe Committee::RequestValidator do
 
   private
 
-  def call(params)
-    Committee::RequestValidator.new.call(@link, params)
+  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)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors: