committee 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac1e86868d4ca6f8b7ef27f62ec87131ba1399985f48b0e7846a5ceda6d81cc
-  data.tar.gz: a0e76eea124800b0d8d328657ffb30efc3c683bbfd47707ce9c148500fc79307
+  metadata.gz: 80e547ab72368f1c052c9ca8617977a0291855b598465baf2021a2e6724ba27e
+  data.tar.gz: cf618eb555e631ef4a6dc51b0b8bcc856b58102193eaffb84d5cd6e68f2852da
 SHA512:
-  metadata.gz: dcaa28428558ae7b9f6ce8679e826e62bdc0640228e35fb41a0998a1ccbbab4d505bc6e23ad052b907a45be6d2003152ab9803e132907a3c68b1a2fbf7fc5292
-  data.tar.gz: 0a1d640b9305e12a2ac6b7436b2971a8a1568322aa1d75a25f8ec4a25aed50229c5bd5c99e317c9c243d22099c1855ea93fbf17cc0692488a35a8f1ee03f8959
+  metadata.gz: 2db3579f4329429aac202ff34c111b0f92609de39ab6f1d1e4264910d42612d1b8c20fcdf464881f148012086e57bd0fedd3730dec76d500235764a599e0676d
+  data.tar.gz: d680e5a57f7393a64336e17a593a862bab689992d032b8ef5fabfa735d80815ee6739801602c277b851d930f296b511b19bda412555e1a8c96b4150a9f92f783

data/lib/committee/drivers/open_api_2.rb

@@ -173,6 +173,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 = 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/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 "[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" => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.