json_schema 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74070c11982417365297631d11c3b51befca70ef
-  data.tar.gz: 6a058b821110127e4205bed95bf8753b56a6bfe9
+  metadata.gz: c1033f10897ed2983a37fcaec049ced9da6348fa
+  data.tar.gz: f02430273ad024f1fca2de84555d0d922b9c193e
 SHA512:
-  metadata.gz: 186f9cf65a896ca14b456f4d690e1d95ea2dd3fedc2777fa13988f1efd5bc91b35c267b9c8db412c7fcadd909539e0402b0d5901cc650fe18a4f74a1b944cdb2
-  data.tar.gz: e9274430be6b9cf1b284b47634d0c7b0bf79c995c93584c39f91e7c9bce9fef8e1f13dc27bccf8275120ca3554e00145238217dbfa60339f69a7042c986986ce
+  metadata.gz: b65e70751cce8c9526237494fd5e2996a75c36759a81533bd377329ada10949f23d05d372f03e4d8045b53658181e0faf33a6760f1728e1d9cf3f9df3dcacd57
+  data.tar.gz: d71350a50a87d62f09d8ea4665c912597d3ed3c723bc62248c468ad238eb53b8748c4f52754b98ff1050845e176b1e0e104eaaabbe1bec12326dbe75bcf0b0f3

data/lib/json_schema/validator.rb

@@ -506,7 +506,8 @@ module JsonSchema
       if valid_types.any? { |t| data.is_a?(t) }
         true
       else
-        message = %{#{data.inspect} is not #{ErrorFormatter.to_list(schema.type)}.}
+        key = find_parent(schema)
+        message = %{For '#{key}', #{data.inspect} is not #{ErrorFormatter.to_list(schema.type)}.}
         errors << ValidationError.new(schema, path, message, :invalid_type)
         false
       end
@@ -523,6 +524,25 @@ module JsonSchema
       end
     end
 
+    def find_parent(schema)
+      fragment = schema.fragment
+      key = if fragment =~ /patternProperties/
+              split_pointer = schema.pointer.split("/")
+              idx = split_pointer.index("patternProperties")
+
+              # this join mimics the fragment format below in that it's
+              # parent + key
+              if idx - 2 >= 0
+                parts = split_pointer[(idx - 2)..(idx - 1)]
+              end
+
+              # protect against a `nil` that could occur if
+              # `patternProperties` has no parent
+              parts ? parts.compact.join("/") : nil
+            end
+      key || fragment
+    end
+    
     EMAIL_PATTERN = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]+$/i
 
     HOSTNAME_PATTERN = /^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/

data/test/json_schema/validator_test.rb

@@ -40,7 +40,7 @@ describe JsonSchema::Validator do
     )
     @data_sample = 4
     refute validate
-    assert_includes error_messages, %{4 is not an object.}
+    assert_includes error_messages, %{For 'definitions/app', 4 is not an object.}
     assert_includes error_types, :invalid_type
   end
 
@@ -50,7 +50,7 @@ describe JsonSchema::Validator do
     )
     @data_sample = 4
     refute validate
-    assert_includes error_messages, %{4 is not a string.}
+    assert_includes error_messages, %{For 'definitions/app', 4 is not a string.}
     assert_includes error_types, :invalid_type
 
     pointer("#/definitions/app").merge!(
@@ -58,7 +58,7 @@ describe JsonSchema::Validator do
     )
     @data_sample = 4
     refute validate
-    assert_includes error_messages, %{4 is not a string or null.}
+    assert_includes error_messages, %{For 'definitions/app', 4 is not a string or null.}
     assert_includes error_types, :invalid_type
 
     pointer("#/definitions/app").merge!(
@@ -66,7 +66,7 @@ describe JsonSchema::Validator do
     )
     @data_sample = 4
     refute validate
-    assert_includes error_messages, %{4 is not an object, null, or string.}
+    assert_includes error_messages, %{For 'definitions/app', 4 is not an object, null, or string.}
     assert_includes error_types, :invalid_type
   end
 
@@ -382,7 +382,7 @@ describe JsonSchema::Validator do
     data_sample["foo"] = 4
     data_sample["matches_pattern"] = "yes!"
     refute validate
-    assert_includes error_messages, %{4 is not a boolean.}
+    assert_includes error_messages, %{For 'additionalProperties', 4 is not a boolean.}
     assert_includes error_types, :invalid_type
   end
 
@@ -446,7 +446,15 @@ describe JsonSchema::Validator do
       "KEY" => 456
     }
     refute validate
-    assert_includes error_messages, %{456 is not a null or string.}
+    assert_includes error_messages, %{For 'definitions/config_vars', 456 is not a null or string.}
+    assert_includes error_types, :invalid_type
+  end
+
+  it "validates patternProperties with missing parent" do
+    data_sample["S_0"] = 123
+
+    refute validate_parentless_pattern
+    assert_includes error_messages, %{For 'patternProperties/^S_', 123 is not a string.}
     assert_includes error_types, :invalid_type
   end
 
@@ -802,6 +810,22 @@ describe JsonSchema::Validator do
     JsonPointer.evaluate(schema_sample, path)
   end
 
+  def validate_parentless_pattern
+    schema = {
+      "$schema" => "http://json-schema.org/draft-04/hyper-schema",
+      "patternProperties" => {
+        "^S_" => {
+          "type" => [
+            "string"
+          ]
+        }
+      }
+    }
+    schema = JsonSchema.parse!(schema)
+    @validator = JsonSchema::Validator.new(schema)
+    @validator.validate(data_sample)
+  end
+
   def schema_sample
     @schema_sample ||= DataScaffold.schema_sample
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator