json_schema 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd4983a9632b29cb79ed96ceba036d590e74719
-  data.tar.gz: 5a819846b5ef11f8be6a5e5e330be6e0de2bc5d9
+  metadata.gz: 55a7249029791e99fb8fc7ad76a76edeab610705
+  data.tar.gz: 71e49d15e5ad71b23f353bc713634763f21c2f0c
 SHA512:
-  metadata.gz: f61c5a056f07c791252e663b82973468b11b72a6dc9b7e2998c236c0bf3babe49865e8c4a081c29d9a6e79082c12c3c4e62dda67ebed2c4c5c494a95e31b2361
-  data.tar.gz: 742206a63613cc097969f0a3ef429c7c3d5cdc22305e0115e8bb9ff1d90062a5ba605474361184eea2edf058bdb1ae65997cda3a5425b42781bafaca9fd14558
+  metadata.gz: 4dd1b0c124657f130648484c90b5cce1f7f86deb01eaa6b8f1d9aec40060b4b6d52a546e33a987186b732c12b66f666f5c71391b33df98f1b7ac766becfd69c9
+  data.tar.gz: d0745914ef1acfaa8a039577a8712beb3020827237979deb836dfb59464ce6cdc3424ec9970aa9c9fa8f3c2aae595acff44d819f797e1cc18ad2a808f6315917

data/lib/json_schema/schema_error.rb

@@ -18,11 +18,12 @@ module JsonSchema
   end
 
   class ValidationError < SchemaError
-    attr_accessor :path
+    attr_accessor :path, :sub_errors
 
-    def initialize(schema, path, message, type)
+    def initialize(schema, path, message, type, sub_errors = nil)
       super(schema, message, type)
       @path = path
+      @sub_errors = sub_errors
     end
 
     def pointer

data/lib/json_schema/validator.rb

@@ -150,14 +150,22 @@ module JsonSchema
 
     def validate_any_of(schema, data, errors, path)
       return true if schema.any_of.empty?
-      valid = schema.any_of.any? do |subschema|
-        validate_data(subschema, data, [], path)
+
+      sub_errors = []
+
+      subschemata_validity = schema.any_of.map do |subschema|
+        current_sub_errors = []
+        sub_errors << current_sub_errors
+        validate_data(subschema, data, current_sub_errors, path)
       end
-      if !valid
+
+      unless subschemata_validity.any? { |valid| valid == true }
         message = %{No subschema in "anyOf" matched.}
-        errors << ValidationError.new(schema, path, message, :any_of_failed)
+        errors << ValidationError.new(schema, path, message, :any_of_failed, sub_errors)
+        return false
       end
-      valid
+
+      true
     end
 
     def validate_dependencies(schema, data, errors, path)
@@ -401,19 +409,25 @@ module JsonSchema
 
     def validate_one_of(schema, data, errors, path)
       return true if schema.one_of.empty?
+      sub_errors = []
+
       num_valid = schema.one_of.count do |subschema|
-        validate_data(subschema, data, [], path)
-      end
-      if num_valid != 1
-        message =
-          if num_valid == 0
-            %{No subschema in "oneOf" matched.}
-          else
-            %{More than one subschema in "oneOf" matched.}
-          end
-        errors << ValidationError.new(schema, path, message, :one_of_failed)
+        current_sub_errors = []
+        sub_errors << current_sub_errors
+        validate_data(subschema, data, current_sub_errors, path)
       end
-      num_valid == 1
+
+      return true if num_valid == 1
+
+      message =
+        if num_valid == 0
+          %{No subschema in "oneOf" matched.}
+        else
+          %{More than one subschema in "oneOf" matched.}
+        end
+      errors << ValidationError.new(schema, path, message, :one_of_failed, sub_errors)
+
+      false
     end
 
     def validate_not(schema, data, errors, path)

data/test/json_schema/validator_test.rb

@@ -481,19 +481,31 @@ describe JsonSchema::Validator do
     refute validate
     assert_includes error_messages, %{No subschema in "anyOf" matched.}
     assert_includes error_types, :any_of_failed
+    any_of_error = @validator.errors.find { |error| error.type == :any_of_failed }
+    sub_error_messages = any_of_error.sub_errors.map { |errors| errors.map(&:message) }
+    sub_error_types = any_of_error.sub_errors.map { |errors| errors.map(&:type) }
+    assert_includes sub_error_messages, [%{At least 5 characters are required; only 2 were supplied.}]
+    assert_includes sub_error_messages, [%{At least 3 characters are required; only 2 were supplied.}]
+    assert_equal sub_error_types, [[:min_length_failed], [:min_length_failed]]
   end
 
   it "validates oneOf" do
     pointer("#/definitions/app/definitions/contrived").merge!(
       "oneOf" => [
         { "pattern" => "^(foo|aaa)$" },
-        { "pattern" => "^(foo|zzz)$" }
+        { "pattern" => "^(foo|zzz)$" },
+        { "pattern" => "^(hell|no)$" }
       ]
     )
     data_sample["contrived"] = "foo"
     refute validate
     assert_includes error_messages, %{More than one subschema in "oneOf" matched.}
     assert_includes error_types, :one_of_failed
+    one_of_error = @validator.errors.find { |error| error.type == :one_of_failed }
+    sub_error_messages = one_of_error.sub_errors.map { |errors| errors.map(&:message) }
+    sub_error_types = one_of_error.sub_errors.map { |errors| errors.map(&:type) }
+    assert_equal sub_error_messages, [[], [], [%{foo does not match /^(hell|no)$/.}]]
+    assert_equal sub_error_types, [[], [], [:pattern_failed]]
   end
 
   it "validates not" do
@@ -745,11 +757,11 @@ describe JsonSchema::Validator do
   end
 
   def error_messages
-    @validator.errors.map { |e| e.message }
+    @validator.errors.map(&:message)
   end
 
   def error_types
-    @validator.errors.map { |e| e.type }
+    @validator.errors.map(&:type)
   end
 
   def pointer(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest