json_schema 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf8900a129a96f214a53b4af5a0e0699133f0e1
-  data.tar.gz: c914c0583a0f0d883d8409132cd2a28b2478f97f
+  metadata.gz: 635babaf9176db9c16a7564e0cdb8804ba209201
+  data.tar.gz: c866943726dbe55237d5c7931793d5ecf149945a
 SHA512:
-  metadata.gz: 60aa779de4b3f0f7a6b706f8196d62789cde70b445bb52b860706cd22eb4da981a2836f13b4c505b6bb53509707a574dc8c02b5c490bf2c78be836aef42d2fa7
-  data.tar.gz: 788739556222ff63a2f3a3b1cf94bac833dbdcfa6224cd8f243bf86a15b7bba81c69930d0e01567abbf1a4a42e7a06eb5eb1745c67349f1c64a6e77dfad72860
+  metadata.gz: 5caf545cbf4684cad41d64fc889d5c167f2e4f3980b91014a7367fef4f070a4fd5b77b138f80f12f34b3d62fbae11bd0890a67d1a490228db59a4cccf9b1a263
+  data.tar.gz: ff16d212597fbeab145f40023052e1e792014cd78c7ebafc65bd75af7c505879622a65cbbe037037ff287ceb3274288da603f6afcf21c79eb5628a4dd398ee8f

data/lib/json_schema/attributes.rb

@@ -25,23 +25,21 @@ module JsonSchema
       def attr_copyable(attr, options = {})
         attr_accessor(attr)
 
+        ref = :"@#{attr}"
         # Usually the default being assigned here is nil.
-        self.copyable_attrs["@#{attr}".to_sym] = options[:default]
+        self.copyable_attrs[ref] = options[:default]
 
         if default = options[:default]
           # remove the reader already created by attr_accessor
           remove_method(attr)
 
+          need_dup = [Array, Hash, Set].include?(default.class)
           define_method(attr) do
-            val = instance_variable_get(:"@#{attr}")
+            val = instance_variable_get(ref)
             if !val.nil?
               val
             else
-              if [Array, Hash, Set].include?(default.class)
-                default.dup
-              else
-                default
-              end
+              need_dup ? default.class.new : default
             end
           end
         end

data/lib/json_schema/validator.rb

@@ -172,22 +172,17 @@ module JsonSchema
     def validate_any_of(schema, data, errors, path)
       return true if schema.any_of.empty?
 
-      sub_errors = []
-
-      subschemata_validity = schema.any_of.map do |subschema|
+      sub_errors = schema.any_of.map do |subschema|
         current_sub_errors = []
-        sub_errors << current_sub_errors
-        validate_data(subschema, data, current_sub_errors, path)
+        return true if validate_data(subschema, data, current_sub_errors, path)
+        current_sub_errors
       end
 
-      unless subschemata_validity.any? { |valid| valid == true }
-        message = %{No subschema in "anyOf" matched.}
-        errors << ValidationError.new(schema, path, message, :any_of_failed,
-          sub_errors: sub_errors, data: data)
-        return false
-      end
+      message = %{No subschema in "anyOf" matched.}
+      errors << ValidationError.new(schema, path, message, :any_of_failed,
+        sub_errors: sub_errors, data: data)
 
-      true
+      false
     end
 
     def validate_dependencies(schema, data, errors, path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator