committee 2.0.0.pre7 → 2.0.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e47c09e8ea8d73d5c06992555c2c02671be06ac
-  data.tar.gz: c3671183b4ccbf5d6b69bcd89a74c8828a84e7f9
+  metadata.gz: a52179d89e7de15a76b440454d27fc478ca2e75b
+  data.tar.gz: 5a98b675cffcefd898612e6806dc466d58fa9d64
 SHA512:
-  metadata.gz: c51f69cf118128c3bf0f8f3df13a89d282a8a997a3ebdedb84c579ebad3fbe773471e0f8e1ad025631774d229f854df3bd38863e32ea78a99daf9bb70f416559
-  data.tar.gz: 50265b73bee7f7ef9f53e4b412ac2b9b85dae0733c7a5a4d30bafeee863e56d8a86a6f578e7154866c53d475a9d42afa6f393430461bfa22308a17cd427e2bcc
+  metadata.gz: 59cab2ff0859d8ae77a734f3bdfe5103c9b52c70c2cbca18846739e9afff0280a900910479c72697e743bfc92b833864ce34529fd33a8ff45dec84bb03d6d2a0
+  data.tar.gz: 4034113794bb7f991542919a7f8f0b22bb8b4c5c52a1c9e5be03dba15ece0a3cb8d0fcaa451cd716e6c935d28f6d3185d200b06f0e3640e653c5d62179b09f5d

data/lib/committee/middleware/request_validation.rb

@@ -64,12 +64,8 @@ module Committee::Middleware
         validator = Committee::RequestValidator.new(link, check_content_type: @check_content_type)
         validator.call(request, request.env[@params_key])
 
-        request.env["rack.request.query_hash"].merge!(
-          Committee::ParameterCoercer
-            .new(request.env["rack.request.query_hash"], link.schema,
-               coerce_date_times: @coerce_date_times)
-            .call
-        )
+        parameter_coerce(request, link, @params_key)
+        parameter_coerce(request, link, "rack.request.query_hash") if !request.GET.nil? && !link.schema.nil?
 
         @app.call(request.env)
       elsif @strict
@@ -91,5 +87,16 @@ module Committee::Middleware
       raise Committee::InvalidRequest if @raise
       @error_class.new(400, :bad_request, "Request body wasn't valid JSON.").render
     end
+
+    private
+
+      def parameter_coerce(request, link, coerce_key)
+        request.env[coerce_key].merge!(
+            Committee::ParameterCoercer
+                .new(request.env[coerce_key], link.schema,
+                     coerce_date_times: @coerce_date_times)
+                .call
+        )
+      end
   end
 end

data/test/middleware/request_validation_test.rb

@@ -17,11 +17,37 @@ describe Committee::Middleware::RequestValidation do
     assert_equal 200, last_response.status
   end
 
-  it "passes given a datetime and with coerce_date_times enabled" do
-    @app = new_rack_app(coerce_date_times: true, schema: hyper_schema)
+  it "passes given a datetime and with coerce_date_times enabled on GET endpoint" do
+    key_name = "update_time"
     params = {
-        "update_time" => "2016-04-01T16:00:00.000+09:00"
+        key_name => "2016-04-01T16:00:00.000+09:00",
+        "query" => "cloudnasium"
+    }
+
+    check_parameter = lambda { |env|
+      assert_equal DateTime, env['rack.request.query_hash'][key_name].class
+      [200, {}, []]
     }
+
+    @app = new_rack_app_with_lambda(check_parameter, coerce_date_times: true, schema: hyper_schema)
+
+    get "/search/apps", params
+    assert_equal 200, last_response.status
+  end
+
+  it "passes given a datetime and with coerce_date_times enabled on POST endpoint" do
+    key_name = "update_time"
+    params = {
+        key_name => "2016-04-01T16:00:00.000+09:00"
+    }
+
+    check_parameter = lambda { |env|
+      assert_equal DateTime, env['committee.params'][key_name].class
+      [200, {}, []]
+    }
+
+    @app = new_rack_app_with_lambda(check_parameter, coerce_date_times: true, schema: hyper_schema)
+
     header "Content-Type", "application/json"
     post "/apps", JSON.generate(params)
     assert_equal 200, last_response.status
@@ -157,11 +183,16 @@ describe Committee::Middleware::RequestValidation do
   private
 
   def new_rack_app(options = {})
+    new_rack_app_with_lambda(lambda { |_|
+      [200, {}, []]
+    }, options)
+  end
+
+
+  def new_rack_app_with_lambda(check_lambda, options = {})
     Rack::Builder.new {
       use Committee::Middleware::RequestValidation, options
-      run lambda { |_|
-        [200, {}, []]
-      }
+      run check_lambda
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre7
+  version: 2.0.0.pre8
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema