json_schema 0.0.20 → 0.1.0

data/lib/json_schema/parser.rb

@@ -278,6 +278,7 @@ module JsonSchema
       schema.pattern_properties = validate_type(schema, [Hash], "patternProperties") || {}
       schema.properties         = validate_type(schema, [Hash], "properties") || {}
       schema.required           = validate_type(schema, [Array], "required")
+      schema.strict_properties  = validate_type(schema, BOOLEAN, "strictProperties")
 
       # validation: string
       schema.format     = validate_type(schema, [String], "format")

data/lib/json_schema/schema.rb

@@ -153,6 +153,8 @@ module JsonSchema
     attr_copyable :pattern_properties
     attr_copyable :properties
     attr_copyable :required
+    # warning: strictProperties is technically V5 spec (but I needed it now)
+    attr_copyable :strict_properties
 
     # validation: string
     attr_copyable :format
@@ -182,6 +184,7 @@ module JsonSchema
     attr_reader_default :min_exclusive, false
     attr_reader_default :pattern_properties, {}
     attr_reader_default :properties, {}
+    attr_reader_default :strict_properties, false
     attr_reader_default :type, []
 
     # allow booleans to be access with question mark
@@ -221,8 +224,8 @@ module JsonSchema
     def inspect_schema
       if reference
         str = reference.to_s
-        str += " [EXPANDED]" if expanded?
-        str += " [CLONE]" if !original?
+        str += expanded? ? " [EXPANDED]" : " [COLLAPSED]"
+        str += original? ? " [ORIGINAL]" : " [CLONE]"
         str
       else
         hash = {}

data/lib/json_schema/validator.rb

@@ -72,6 +72,7 @@ module JsonSchema
         valid = strict_and valid, validate_pattern_properties(schema, data, errors, path)
         valid = strict_and valid, validate_properties(schema, data, errors, path)
         valid = strict_and valid, validate_required(schema, data, errors, path, schema.required)
+        valid = strict_and valid, validate_strict_properties(schema, data, errors, path)
       end
 
       # validation: string
@@ -388,6 +389,19 @@ module JsonSchema
       end
     end
 
+    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
+    end
+
     def validate_type(schema, data, errors, path)
       return true if schema.type.empty?
       valid_types = schema.type.map { |t| TYPE_MAP[t] }.flatten.compact

data/test/json_schema/parser_test.rb

@@ -122,6 +122,14 @@ describe JsonSchema::Parser do
     assert_equal ["null", "string"], property[1].type
   end
 
+  it "parses the strictProperties object validation" do
+    pointer("#/definitions/app").merge!(
+      "strictProperties" => true
+    )
+    schema = parse.definitions["app"]
+    assert_equal true, schema.strict_properties
+  end
+
   # couldn't think of any non-contrived examples to work with here
   it "parses the basic set of schema validations" do
     schema = parse.definitions["app"].definitions["contrived"]

data/test/json_schema/validator_test.rb

@@ -401,6 +401,23 @@ describe JsonSchema::Validator do
       %{Missing required keys "name" in object; keys are "".}
   end
 
+  it "validates strictProperties successfully" do
+    pointer("#/definitions/app").merge!(
+      "strictProperties" => false
+    )
+    assert validate
+  end
+
+  it "validates strictProperties unsuccessfully" do
+    pointer("#/definitions/app").merge!(
+      "strictProperties" => true
+    )
+    refute validate
+    missing = @schema.properties.keys.sort - ["name"]
+    assert_includes error_messages,
+      %{Missing required keys "#{missing.join(", ")}" in object; keys are "name".}
+  end
+
   it "validates allOf" do
     pointer("#/definitions/app/definitions/contrived").merge!(
       "allOf" => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: