json_schema 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d87d815bb6c20fc65a9ad48af9265104bcf9c5c7
-  data.tar.gz: a149e736977aed85958982fd36a2a6e1274e6e3a
+  metadata.gz: 509ee330f57ccc1fc0ad812a0be82cceeeab7461
+  data.tar.gz: 7c284cc6d026a7191df85776b0c6913ea6daf23a
 SHA512:
-  metadata.gz: 9edabc7c8136900b13aee695380f0577db4f65ac9a12c79706382133f2b8c125f990fd1ebccd2a4d8965979a55816b8ee8ee4abf3e8608c783cef2184703aca9
-  data.tar.gz: 045903e56013bde3e950f5231cdfd06c3420bd2e99093aef36493eeb260de9c66d316df85e06afb8d8a8d0244ed261cd307cdeee9457d08002b1ba19e2b15ad9
+  metadata.gz: 419c0c1045a265e0cea0a32483d14cd15f7d8b7deceba263a4647b7f33450056b599cf87fb886fc24d696dda306c7c873106d92156e45175cff079ddef85bf64
+  data.tar.gz: 89df42d2dfdfcd8849dd74470634485b19d4554061bb9a4c119d92bc854d0f887ab6e04c6697f0684236eaabe5bceac97aed7d55cc05997ad95f4403ebb8fb96

data/lib/json_schema/parser.rb

@@ -70,6 +70,21 @@ module JsonSchema
       end
     end
 
+    def parse_additional_items(schema)
+      if schema.additional_items
+        # an object indicates a schema that will be used to parse any
+        # items not listed in `items`
+        if schema.additional_items.is_a?(Hash)
+          schema.additional_items = parse_data(
+            schema.additional_items,
+            schema,
+            "additionalItems"
+          )
+        end
+        # otherwise, leave as boolean
+      end
+    end
+
     def parse_additional_properties(schema)
       if schema.additional_properties
         # an object indicates a schema that will be used to parse any
@@ -308,6 +323,7 @@ module JsonSchema
       schema.path_start = validate_type(schema, [String], "pathStart")
       schema.read_only  = validate_type(schema, BOOLEAN, "readOnly")
 
+      parse_additional_items(schema)
       parse_additional_properties(schema)
       parse_all_of(schema)
       parse_any_of(schema)

data/lib/json_schema/validator.rb

@@ -249,6 +249,12 @@ module JsonSchema
           false
         else
           valid = true
+          if data.size > schema.items.count && schema.additional_items.is_a?(Schema)
+            (schema.items.count..data.count - 1).each do |i|
+              valid = strict_and valid,
+                validate_data(schema.additional_items, data[i], errors, path + [i])
+            end
+          end
           schema.items.each_with_index do |subschema, i|
             valid = strict_and valid,
               validate_data(subschema, data[i], errors, path + [i])

data/test/json_schema/parser_test.rb

@@ -70,6 +70,24 @@ describe JsonSchema::Parser do
     assert_equal ["http", "https"], schema.items[1].enum
   end
 
+  it "parses array additionalItems object validation as boolean" do
+    pointer("#/definitions/app/definitions/flags").merge!(
+      "additionalItems" => false
+    )
+    schema = parse.definitions["app"].definitions["flags"]
+    assert_equal false, schema.additional_items
+  end
+
+  it "parses array additionalItems object validation as schema" do
+    pointer("#/definitions/app/definitions/flags").merge!(
+      "additionalItems" => {
+        "type" => "boolean"
+       }
+    )
+    schema = parse.definitions["app"].definitions["flags"].additional_items
+    assert_equal ["boolean"], schema.type
+  end
+
   it "parses integer validations" do
     schema = parse.definitions["app"].definitions["id"]
     assert_equal 0, schema.min

data/test/json_schema/validator_test.rb

@@ -110,7 +110,7 @@ describe JsonSchema::Validator do
     assert validate
   end
 
-  it "validates items with tuple successfully with additionalItems" do
+  it "validates items with tuple with additionalItems boolean successfully" do
     pointer("#/definitions/app/definitions/flags").merge!(
       "additionalItems" => true,
       "items" => [
@@ -122,6 +122,89 @@ describe JsonSchema::Validator do
     assert validate
   end
 
+  it "validates items with tuple with additionalItems boolean unsuccessfully" do
+    pointer("#/definitions/app/definitions/flags").merge!(
+      "additionalItems" => false,
+      "items" => [
+        { "enum" => ["bamboo", "cedar"] },
+        { "enum" => ["http", "https"] }
+      ]
+    )
+    data_sample["flags"] = ["cedar", "https", "websockets"]
+    refute validate
+    assert_includes error_messages, %{No more than 2 items are allowed; 3 were supplied.}
+    assert_includes error_types, :max_items_failed
+    assert_includes error_data, ["cedar", "https", "websockets"]
+  end
+
+  it "validates items with tuple with additionalItems schema successfully" do
+    pointer("#/definitions/app/definitions/flags").merge!(
+      "additionalItems" => { "enum" => [ "foo", "websockets" ] },
+      "items" => [
+        { "enum" => ["bamboo", "cedar"] },
+        { "enum" => ["http", "https"] }
+      ]
+    )
+    data_sample["flags"] = ["cedar", "https", "websockets"]
+    assert validate
+  end
+
+  it "validates items with tuple with additionalItems schema unsuccessfully for non-conforming additional item" do
+    pointer("#/definitions/app/definitions/flags").merge!(
+      "additionalItems" => { "enum" => [ "foo", "bar" ] },
+      "items" => [
+        { "enum" => ["bamboo", "cedar"] },
+        { "enum" => ["http", "https"] }
+      ]
+    )
+    data_sample["flags"] = ["cedar", "https", "websockets"]
+    refute validate
+    assert_includes error_messages,
+      %{websockets is not a member of ["foo", "bar"].}
+    assert_includes error_types, :invalid_type
+    assert_includes error_data, "websockets"
+  end
+
+  it "validates items with tuple with additionalItems schema unsuccessfully with multiple failures" do
+    pointer("#/definitions/app/definitions/flags").merge!(
+      "additionalItems" => { "enum" => [ "foo", "bar" ] },
+      "items" => [
+        { "enum" => ["bamboo", "cedar"] },
+        { "enum" => ["http", "https"] }
+      ]
+    )
+    data_sample["flags"] = ["cedar", "https", "websockets", "1337"]
+    refute validate
+    assert_includes error_messages,
+      %{websockets is not a member of ["foo", "bar"].}
+    assert_includes error_types, :invalid_type
+    assert_includes error_data, "websockets"
+    assert_includes error_messages,
+      %{1337 is not a member of ["foo", "bar"].}
+    assert_includes error_types, :invalid_type
+    assert_includes error_data, "1337"
+  end
+
+  it "validates items with tuple with additionalItems schema unsuccessfully with non-conforming items and additional items" do
+    pointer("#/definitions/app/definitions/flags").merge!(
+      "additionalItems" => { "enum" => [ "foo", "bar" ] },
+      "items" => [
+        { "enum" => ["bamboo", "cedar"] },
+        { "enum" => ["http", "https"] }
+      ]
+    )
+    data_sample["flags"] = ["cedar", "1337", "websockets"]
+    refute validate
+    assert_includes error_messages,
+      %{websockets is not a member of ["foo", "bar"].}
+    assert_includes error_types, :invalid_type
+    assert_includes error_data, "websockets"
+    assert_includes error_messages,
+      %{1337 is not a member of ["http", "https"].}
+    assert_includes error_types, :invalid_type
+    assert_includes error_data, "1337"
+  end
+
   it "validates items with tuple unsuccessfully for not enough items" do
     pointer("#/definitions/app/definitions/flags").merge!(
       "items" => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator