json_schema 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4568a23c3abb4e52e8a572f5ef4a097b62371e9
-  data.tar.gz: 7db413d52b9c17c6ee628d3319747eadbd66011e
+  metadata.gz: bbbdc5ae870c697c8af588ae0427710ca85fc468
+  data.tar.gz: ec29bd27c6b64d12d18ae3d7369a4070fc880a9d
 SHA512:
-  metadata.gz: 9108a578bdb1e5e44f8e28358e770bfe2607d97aa23e060b57393ab5a327cac50607a53aae73ca4a56d2579b98854d754d891c37ead2f2a44b0964ec4438aefc
-  data.tar.gz: 12495587293fa18e9f18a5c7f0b640c650160bb2b4659fa472584a3dede66060cbfd26dfedee47f38b3c02f5fb1b5b13292db7d8c1651f5ea20b74a69bdd41ed
+  metadata.gz: d445398c9c67c8d887d7143625875dc1851bf847e8f11362cb6f806c9603f5d3a94611767a7df49d9c6cca27e96c8902d66446ca6bf928e38a85b35b81548fa1
+  data.tar.gz: f49c64c93f448620999b0cf743030966052d88913b15a5f588ad2869c2b20bcf98001786f67f4c4c38a0e95c0487e2be9626545719a7646eae9cbcb4d7ae7bc7

data/README.md

@@ -58,7 +58,7 @@ ruby -Ilib -Itest test/json_schema/validator_test.rb -n /anyOf/
 ## Release
 
 1. Update the version in `json_schema.gemspec` as appropriate for [semantic
-   versioning](http://semver.org).
+   versioning](http://semver.org) and add details to `CHANGELOG`.
 2. Run the `release` task:
 
     ```

data/lib/json_schema/configuration.rb

@@ -1,5 +1,6 @@
 module JsonSchema
   class Configuration
+    attr_accessor :all_of_sub_errors
     attr_reader :custom_formats
     attr_reader :validate_regex_with
 
@@ -15,6 +16,7 @@ module JsonSchema
     def reset!
       @validate_regex_with = nil
       @custom_formats = {}
+      @all_of_sub_errors = false
     end
 
     private
@@ -22,6 +24,5 @@ module JsonSchema
     def initialize
       reset!
     end
-
   end
 end

data/lib/json_schema/validator.rb

@@ -144,11 +144,28 @@ module JsonSchema
 
     def validate_all_of(schema, data, errors, path)
       return true if schema.all_of.empty?
-      valid = schema.all_of.all? do |subschema|
-        validate_data(subschema, data, errors, path)
+
+      # We've kept this feature behind a configuration flag for now because
+      # there is some performance implication to producing each sub error.
+      # Normally we can short circuit the validation after encountering only
+      # one problem, but here we have to evaluate all subschemas every time.
+      if JsonSchema.configuration.all_of_sub_errors
+        sub_errors = []
+        valid = schema.all_of.map do |subschema|
+          current_sub_errors = []
+          sub_errors << current_sub_errors
+          validate_data(subschema, data, current_sub_errors, path)
+        end.all?
+      else
+        sub_errors = nil
+        valid = schema.all_of.all? do |subschema|
+          validate_data(subschema, data, errors, path)
+        end
       end
+
       message = %{Not all subschemas of "allOf" matched.}
-      errors << ValidationError.new(schema, path, message, :all_of_failed, data: data) if !valid
+      errors << ValidationError.new(schema, path, message, :all_of_failed,
+        sub_errors: sub_errors, data: data) if !valid
       valid
     end
 

data/test/json_schema/validator_test.rb

@@ -592,6 +592,19 @@ describe JsonSchema::Validator do
   end
 
   it "validates allOf" do
+    pointer("#/definitions/app/definitions/contrived").merge!(
+      "allOf" => [
+        { "maxLength" => 30 },
+        { "minLength" => 3 }
+      ]
+    )
+    data_sample["contrived"] = "ab"
+    refute validate
+    assert_includes error_messages, %{Not all subschemas of "allOf" matched.}
+    assert_includes error_types, :all_of_failed
+  end
+
+  it "includes the failing condition when validating allOf" do
     pointer("#/definitions/app/definitions/contrived").merge!(
       "allOf" => [
         { "maxLength" => 30 },
@@ -601,7 +614,29 @@ describe JsonSchema::Validator do
     data_sample["contrived"] = "ab"
     refute validate
     assert_includes error_messages, %{At least 3 characters are required; only 2 were supplied.}
+    assert_includes error_data, "ab"
+  end
+
+  it "includes all failing conditions for allOf as sub-errors when all_of_sub_errors is true" do
+    JsonSchema.configure do |c|
+      c.all_of_sub_errors = true
+    end
+    pointer("#/definitions/app/definitions/contrived").merge!(
+      "allOf" => [
+        { "minLength" => 5 },
+        { "minLength" => 3 }
+      ]
+    )
+    data_sample["contrived"] = "ab"
+    refute validate
+    assert_includes error_messages, %{Not all subschemas of "allOf" matched.}
     assert_includes error_types, :all_of_failed
+    all_of_error = @validator.errors.find { |error| error.type == :all_of_failed }
+    sub_error_messages = all_of_error.sub_errors.map { |errors| errors.map(&:message) }
+    sub_error_types = all_of_error.sub_errors.map { |errors| errors.map(&:type) }
+    assert_includes sub_error_messages, [%{At least 3 characters are required; only 2 were supplied.}]
+    assert_includes sub_error_messages, [%{At least 5 characters are required; only 2 were supplied.}]
+    assert_equal sub_error_types, [[:min_length_failed], [:min_length_failed]]
     assert_includes error_data, "ab"
   end
 

metadata

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