committee 3.0.0.beta2 → 3.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a84dd861016ddeaee3ad16d447427f58aa2bca50347412a1ad6096240a85880
-  data.tar.gz: 4b7f456688b1be6456af985971c84b1387c0d8af5ef7c4c4545f6fd65c8c8929
+  metadata.gz: 4af30e34beff4126b7d69135a887fd8e984741f0700be148eaad1109b7b96511
+  data.tar.gz: 98075cfbcf0207f6d4278eaef4d6fb9d13681648748d768a35e637c45e96be5b
 SHA512:
-  metadata.gz: e491038b0ef712064edfab1417dc7c57834f501270530638d978a528b7ba4e50d80b757bf0c0533dd5238fc4ac69595f1216bcc64ddddd516cf9a643a7b42c45
-  data.tar.gz: 95e05627014f67f46f4bd9976d6895109dbbce41a48ca4cf830120b1ddbd18d4434fb08878d0acbce94fabf3b4354ed3422548c3a406f2af0bf882bdea8981df
+  metadata.gz: 3f8c7471aaba3b7df58bb4c5e2f5b6311dfd91d2e6d8fd28848b715f4f2d59a418c275a76ecdbce34c1aa5222c1a2c18198ffcd815588f81f6d319ff09e1e1f5
+  data.tar.gz: dbc206cf90277dad16b2611fd489889c229d27616c0eecbdcf9ed59e494c588b1d0e3eba31e98e8da44417c13d15c6566fe28d9cb2e1df11cc552a0553c1dca5

data/lib/committee/drivers/open_api_2.rb

@@ -181,6 +181,26 @@ module Committee::Drivers
               # therefore this should map over quite well.
               param_schema.type = [param_data["type"]]
 
+              param_schema.enum = param_data["enum"] unless param_data["enum"].nil?
+
+              # validation: string
+              param_schema.format = param_data["format"] unless param_data["format"].nil?
+              param_schema.pattern = Regexp.new(param_data["pattern"]) unless param_data["pattern"].nil?
+              param_schema.min_length = param_data["minLength"] unless param_data["minLength"].nil?
+              param_schema.max_length = param_data["maxLength"] unless param_data["maxLength"].nil?
+
+              # validation: array
+              param_schema.min_items = param_data["minItems"] unless param_data["minItems"].nil?
+              param_schema.max_items = param_data["maxItems"] unless param_data["maxItems"].nil?
+              param_schema.unique_items = param_data["uniqueItems"] unless param_data["uniqueItems"].nil?
+
+              # validation: number/integer
+              param_schema.min = param_data["minimum"] unless param_data["minimum"].nil?
+              param_schema.min_exclusive = param_data["exclusiveMinimum"] unless param_data["exclusiveMinimum"].nil?
+              param_schema.max = param_data["maximum"] unless param_data["maximum"].nil?
+              param_schema.max_exclusive = param_data["exclusiveMaximum"] unless param_data["exclusiveMaximum"].nil?
+              param_schema.multiple_of = param_data["multipleOf"] unless param_data["multipleOf"].nil?
+
               # And same idea: despite parameters not being schemas, the items
               # key (if preset) is actually a schema that defines each item of an
               # array type, so we can just reflect that directly onto our

data/lib/committee/schema_validator/open_api_3.rb

@@ -17,7 +17,7 @@ class Committee::SchemaValidator
 
       request_schema_validation(request)
 
-      @operation_object&.coerce_request_parameter(request.env["rack.request.query_hash"], header(request), validator_option) if !request.GET.nil? && !request.env["rack.request.query_hash"].empty?
+      copy_coerced_data_to_query_hash(request)
     end
 
     def response_validate(status, headers, response, test_method = false)
@@ -71,5 +71,13 @@ class Committee::SchemaValidator
           schema_validator:   self
       ).call
     end
+
+    def copy_coerced_data_to_query_hash(request)
+      return if request.env["rack.request.query_hash"].nil? || request.env["rack.request.query_hash"].empty?
+
+      request.env["rack.request.query_hash"].keys.each do |k|
+        request.env["rack.request.query_hash"][k] = request.env[validator_option.params_key][k]
+      end
+    end
   end
-end
+end

data/lib/committee/schema_validator/open_api_3/operation_wrapper.rb

@@ -20,13 +20,6 @@ module Committee
       request_operation.validate_path_params(options)
     end
 
-    def coerce_request_parameter(params, headers, validator_option)
-      options = build_openapi_parser_get_option(validator_option)
-      return unless options.coerce_value
-
-      request_operation.validate_request_parameter(params, headers, options)
-    end
-
     # @param [Boolean] strict when not content_type or status code definition, raise error
     def validate_response_params(status_code, headers, response_data, strict, check_header)
       request_body = OpenAPIParser::RequestOperation::ValidatableResponseBody.new(status_code, response_data, headers)

data/test/drivers/open_api_2_test.rb

@@ -219,6 +219,19 @@ describe Committee::Drivers::OpenAPI2::ParameterSchemaBuilder do
     assert_equal ["limit"], schema.properties.keys
     assert_equal [], schema.required
     assert_equal ["integer"], schema.properties["limit"].type
+    assert_nil schema.properties["limit"].enum
+    assert_nil schema.properties["limit"].format
+    assert_nil schema.properties["limit"].pattern
+    assert_nil schema.properties["limit"].min_length
+    assert_nil schema.properties["limit"].max_length
+    assert_nil schema.properties["limit"].min_items
+    assert_nil schema.properties["limit"].max_items
+    assert_nil schema.properties["limit"].unique_items
+    assert_nil schema.properties["limit"].min
+    assert_nil schema.properties["limit"].min_exclusive
+    assert_nil schema.properties["limit"].max
+    assert_nil schema.properties["limit"].max_exclusive
+    assert_nil schema.properties["limit"].multiple_of
   end
 
   it "reflects a required property into a schema" do
@@ -242,6 +255,9 @@ describe Committee::Drivers::OpenAPI2::ParameterSchemaBuilder do
         {
           "name" => "tags",
           "type" => "array",
+          "minItems" => 1,
+          "maxItems" => 10,
+          "uniqueItems" => true,
           "items" => {
             "type" => "string"
           }
@@ -252,9 +268,74 @@ describe Committee::Drivers::OpenAPI2::ParameterSchemaBuilder do
 
     assert_nil schema_data
     assert_equal ["array"], schema.properties["tags"].type
+    assert_equal 1, schema.properties["tags"].min_items
+    assert_equal 10, schema.properties["tags"].max_items
+    assert_equal true, schema.properties["tags"].unique_items
     assert_equal({ "type" => "string" }, schema.properties["tags"].items)
   end
 
+  it "reflects a enum property into a schema" do
+    data = {
+      "parameters" => [
+        {
+          "name" => "type",
+          "type" => "string",
+          "enum" => ["hoge", "fuga"]
+        }
+      ]
+    }
+    schema, schema_data = call(data)
+
+    assert_nil schema_data
+    assert_equal ["hoge", "fuga"], schema.properties["type"].enum
+  end
+
+  it "reflects string properties into a schema" do
+    data = {
+      "parameters" => [
+        {
+          "name" => "password",
+          "type" => "string",
+          "format" => "password",
+          "pattern" => "[a-zA-Z0-9]+",
+          "minLength" => 6,
+          "maxLength" => 30
+        }
+      ]
+    }
+    schema, schema_data = call(data)
+
+    assert_nil schema_data
+    assert_equal "password", schema.properties["password"].format
+    assert_equal Regexp.new("[a-zA-Z0-9]+"), schema.properties["password"].pattern
+    assert_equal 6, schema.properties["password"].min_length
+    assert_equal 30, schema.properties["password"].max_length
+  end
+
+  it "reflects number properties into a schema" do
+    data = {
+      "parameters" => [
+        {
+          "name" => "limit",
+          "type" => "integer",
+          "minimum" => 20,
+          "exclusiveMinimum" => true,
+          "maximum" => 100,
+          "exclusiveMaximum" => false,
+          "multipleOf" => 10
+        }
+      ]
+    }
+    schema, schema_data = call(data)
+
+    assert_nil schema_data
+    assert_equal 20, schema.properties["limit"].min
+    assert_equal true, schema.properties["limit"].min_exclusive
+    assert_equal 100, schema.properties["limit"].max
+    assert_equal false, schema.properties["limit"].max_exclusive
+    assert_equal 10, schema.properties["limit"].multiple_of
+  end
+
   it "returns schema data for a body parameter" do
     data = {
       "parameters" => [

data/test/middleware/request_validation_open_api_3_test.rb

@@ -42,6 +42,20 @@ describe Committee::Middleware::RequestValidation do
     assert_equal 200, last_response.status
   end
 
+  it "passes given a datetime and with coerce_date_times enabled on GET endpoint with request body(old behavior)" do
+    params = { "datetime_string" => "2016-04-01T16:00:00.000+09:00" }
+
+    check_parameter = lambda { |env|
+      assert_equal DateTime, env['committee.params']["datetime_string"].class
+      [200, {}, []]
+    }
+
+    @app = new_rack_app_with_lambda(check_parameter, schema: open_api_3_schema, coerce_date_times: true)
+
+    get "/get_body_test", { no_problem: true }, { input: params.to_json }
+    assert_equal 200, last_response.status
+  end
+
   it "passes given a datetime and with coerce_date_times enabled on POST endpoint" do
     params = {
         "nested_array" => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta3
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -241,8 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.