committee 2.0.0.pre3 → 2.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e120c18b8e980fa98259dcb4d874b0dd095224b
-  data.tar.gz: de67a03b9afba89cbb0dce7b5654fedfb02a5dc7
+  metadata.gz: ba1386b19ed18bfad94a7306dc91adecd1df8986
+  data.tar.gz: 65543870a13c61dd5077f06865690c5f21fdae94
 SHA512:
-  metadata.gz: 59339f5504e9945a8cdc1248eaf47187d0eafb7cfe90c802a3f1e0b391b40154266d157cc3c16b48992ca39fe783c27ef8b8b3f7eeaeff39961c24d7a6e95052
-  data.tar.gz: d5252e28f9e64e2e8fd2812189ed425a32d01e55e1949588cf94d98ec537ee9fad7a0aa93be8672d8affd0946fc411ad00abe1d36e0c3a4b11db9b32d94cc5ef
+  metadata.gz: e9ffac6d7c7f874b7e15701ad1a20a531a9bc6204aa61337c410f8d3fb0db077f30d5bc8e8c1aadb65ba37944399affbd7522ea6439638648d05c3bcd363ba66
+  data.tar.gz: 29b5db2813226fd23f7db76aa76cc01a744b64d2f6c00e317cadfc52dddad76ef6cd48dd8f68781bdbdde414295431bedf7c8f9f79648a3f592a1a65583cf183

data/lib/committee/middleware/request_validation.rb

@@ -8,6 +8,7 @@ module Committee::Middleware
       @check_content_type  = options.fetch(:check_content_type, true)
       @optimistic_json     = options.fetch(:optimistic_json, false)
       @strict              = options[:strict]
+      @coerce_date_times   = options.fetch(:coerce_date_times, false)
 
       @coerce_form_params = options.fetch(:coerce_form_params,
         @schema.driver.default_coerce_form_params)
@@ -62,6 +63,14 @@ module Committee::Middleware
       if link
         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
+        )
+
         @app.call(request.env)
       elsif @strict
         raise Committee::NotFound

data/lib/committee/parameter_coercer.rb

@@ -0,0 +1,39 @@
+module Committee
+  class ParameterCoercer
+    def initialize(params, schema, options = {})
+      @params = params
+      @schema = schema
+
+      @coerce_date_times = options.fetch(:coerce_date_times, false)
+    end
+
+    def call
+      coerced = {}
+      @schema.properties.each do |k, s|
+        original_val = @params[k]
+
+        unless original_val.nil?
+          s.type.each do |to_type|
+            if @coerce_date_times && to_type == "string" && s.format == "date-time"
+              coerce_val = parse_date_time(original_val)
+              coerced[k] = coerce_val if coerce_val
+            end
+
+            break if coerced.key?(k)
+          end
+        end
+      end
+
+      coerced
+    end
+
+    private
+      def parse_date_time(original_val)
+        begin
+          DateTime.parse(original_val)
+        rescue ArgumentError => e
+          raise ::Committee::InvalidResponse unless e.message =~ /invalid date/
+        end
+      end
+  end
+end

data/lib/committee.rb

@@ -4,6 +4,7 @@ require "rack"
 
 require_relative "committee/errors"
 require_relative "committee/string_params_coercer"
+require_relative "committee/parameter_coercer"
 require_relative "committee/request_unpacker"
 require_relative "committee/request_validator"
 require_relative "committee/response_generator"

data/test/middleware/request_validation_test.rb

@@ -17,6 +17,27 @@ describe Committee::Middleware::RequestValidation do
     assert_equal 200, last_response.status
   end
 
+  it "pass datetime string and coerce_date_times option enable" do
+    @app = new_rack_app(coerce_date_times: true, schema: hyper_schema)
+    params = {
+        "update_time" => "2016-04-01T16:00:00.000+09:00"
+    }
+    header "Content-Type", "application/json"
+    post "/apps", JSON.generate(params)
+    assert_equal 200, last_response.status
+  end
+
+  it "pass invalid datetime string and coerce_date_times option enable" do
+    @app = new_rack_app(coerce_date_times: true, schema: hyper_schema)
+    params = {
+        "update_time" => "invalid_datetime_format"
+    }
+    header "Content-Type", "application/json"
+    post "/apps", JSON.generate(params)
+    assert_equal 400, last_response.status
+    assert_match /invalid request/i, last_response.body
+  end
+
   it "detects an invalid request" do
     @app = new_rack_app(schema: hyper_schema)
     header "Content-Type", "application/json"

data/test/parameter_coercer_test.rb

@@ -0,0 +1,33 @@
+require_relative "test_helper"
+
+require "stringio"
+
+describe Committee::ParameterCoercer do
+  before do
+    @schema = JsonSchema.parse!(hyper_schema_data)
+    @schema.expand_references!
+    # POST /apps/:id
+    @link = @link = @schema.properties["app"].links[0]
+  end
+
+  it "pass datetime string" do
+    params = { "update_time" => "2016-04-01T16:00:00.000+09:00"}
+    converted_params = call(params, coerce_date_times: true)
+
+    assert_kind_of DateTime, converted_params["update_time"]
+  end
+
+  it "pass invalid datetime string, not convert" do
+    params = { "update_time" => "llmfllmf"}
+    converted_params = call(params, coerce_date_times: true)
+
+    assert_nil converted_params["update_time"]
+  end
+
+  private
+
+  def call(params, options={})
+    link = Committee::Drivers::HyperSchema::Link.new(@link)
+    Committee::ParameterCoercer.new(params, link.schema, options).call
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre4
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -163,6 +163,7 @@ files:
 - lib/committee/middleware/request_validation.rb
 - lib/committee/middleware/response_validation.rb
 - lib/committee/middleware/stub.rb
+- lib/committee/parameter_coercer.rb
 - lib/committee/request_unpacker.rb
 - lib/committee/request_validator.rb
 - lib/committee/response_generator.rb
@@ -181,6 +182,7 @@ files:
 - test/middleware/request_validation_test.rb
 - test/middleware/response_validation_test.rb
 - test/middleware/stub_test.rb
+- test/parameter_coercer_test.rb
 - test/request_unpacker_test.rb
 - test/request_validator_test.rb
 - test/response_generator_test.rb