json_schema 0.1.1 → 0.1.2

data/lib/json_schema/validator.rb

@@ -32,6 +32,19 @@ module JsonSchema
 
     private
 
+    # for use with additionalProperties and strictProperties
+    def get_extra_keys(schema, data)
+      extra = data.keys - schema.properties.keys
+
+      if schema.pattern_properties
+        schema.pattern_properties.keys.each do |pattern|
+          extra -= extra.select { |k| k =~ pattern }
+        end
+      end
+
+      extra
+    end
+
     # works around &&'s "lazy" behavior
     def strict_and(valid_old, valid_new)
       valid_old && valid_new
@@ -89,29 +102,16 @@ module JsonSchema
     def validate_additional_properties(schema, data, errors, path)
       return true if schema.additional_properties == true
 
-      extra = data.keys - schema.properties.keys
-
-      if schema.pattern_properties
-        schema.pattern_properties.keys.each do |pattern|
-          extra -= extra.select { |k| k =~ pattern }
-        end
-      end
-
       # schema indicates that all properties not in `properties` should be
       # validated according to subschema
       if schema.additional_properties.is_a?(Schema)
+        extra = get_extra_keys(schema, data)
         extra.each do |key|
           validate_data(schema.additional_properties, data[key], errors, path + [key])
         end
       # boolean indicates whether additional properties are allowed
       else
-        if extra.empty?
-          true
-        else
-          message = %{Extra keys in object: #{extra.sort.join(", ")}.}
-          errors << ValidationError.new(schema, path, message)
-          false
-        end
+        validate_extra(schema, data, errors, path)
       end
     end
 
@@ -191,6 +191,17 @@ module JsonSchema
       end
     end
 
+    def validate_extra(schema, data, errors, path)
+      extra = get_extra_keys(schema, data)
+      if extra.empty?
+        true
+      else
+        message = %{Extra keys in object: #{extra.sort.join(", ")}.}
+        errors << ValidationError.new(schema, path, message)
+        false
+      end
+    end
+
     def validate_items(schema, data, errors, path)
       return true unless schema.items
       if schema.items.is_a?(Array)
@@ -398,14 +409,8 @@ module JsonSchema
     def validate_strict_properties(schema, data, errors, path)
       return true if !schema.strict_properties
 
-      missing = schema.properties.keys - data.keys
-      if missing.empty?
-        true
-      else
-        message = %{Missing required keys "#{missing.sort.join(", ")}" in object; keys are "#{data.keys.sort.join(", ")}".}
-        errors << ValidationError.new(schema, path, message)
-        false
-      end
+      strict_and validate_extra(schema, data, errors, path),
+        validate_required(schema, data, errors, path, schema.properties.keys)
     end
 
     def validate_type(schema, data, errors, path)

data/test/json_schema/validator_test.rb

@@ -307,7 +307,7 @@ describe JsonSchema::Validator do
       }
     )
     data_sample["foo"] = "bar"
-    data_sample["matches-pattern"] = "yes!"
+    data_sample["matches_pattern"] = "yes!"
     refute validate
     assert_includes error_messages, %{Extra keys in object: foo.}
   end
@@ -332,7 +332,7 @@ describe JsonSchema::Validator do
       }
     )
     data_sample["foo"] = 4
-    data_sample["matches-pattern"] = "yes!"
+    data_sample["matches_pattern"] = "yes!"
     refute validate
     assert_includes error_messages,
       %{Expected data to be of type "boolean"; value was: 4.}
@@ -418,12 +418,18 @@ describe JsonSchema::Validator do
 
   it "validates strictProperties unsuccessfully" do
     pointer("#/definitions/app").merge!(
+      "patternProperties" => {
+        "^matches" => {}
+      },
       "strictProperties" => true
     )
+    data_sample["extra_key"] = "value"
+    data_sample["matches_pattern"] = "yes!"
     refute validate
     missing = @schema.properties.keys.sort - ["name"]
     assert_includes error_messages,
-      %{Missing required keys "#{missing.join(", ")}" in object; keys are "name".}
+      %{Missing required keys "#{missing.join(", ")}" in object; keys are "extra_key, matches_pattern, name".}
+    assert_includes error_messages, %{Extra keys in object: extra_key.}
   end
 
   it "validates allOf" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: