json_schema 0.19.1 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9cb25401a147f54d711af69f8cb57b43bf59c7f8
-  data.tar.gz: cca00f70f0db5120ded3b7185b040a4ffa587683
+SHA256:
+  metadata.gz: e102114f71484ad7ec4468d6433422c08d7e9a02e20bf635fe7c9a891fce1f99
+  data.tar.gz: 63012a87275d8ee64e9465a5b7998d7db859990d9da99ee197153061e1a00c91
 SHA512:
-  metadata.gz: 04d2fc7fcbea934e479002e4cd8489ac31b9a6914fcd01a58e890cfd9f3240cafa81959f5bf81029ce3286136ff6e1439af743a48b701def0002e23f538c1ee6
-  data.tar.gz: d5659272dd75e8de991e90d1b21b447bf9262a100a64b3f46c06f437c0707fd412d74457f9d6be6a7bbfa4aea24742aa3cdbec360a0380b087b56641e03f699a
+  metadata.gz: 3e7481a34dd6f9c56684b387c200afed357dd30fca5d443a1a55ce3eb2b9b75535feb05c4682763b464b882cc1c0cf1a80255bf344e897b8b1f7892a0019225f
+  data.tar.gz: 1175aed4f46aeea66c9d8d65288f6e7a2c9f232bd1f47fdfed342b79259e08975e8b2c795d1fe75e7da563d9d5c171a3ac4b88b6e0045b6c5e965d060bcc28c0

data/lib/json_schema/attributes.rb

@@ -33,13 +33,16 @@ module JsonSchema
           # remove the reader already created by attr_accessor
           remove_method(attr)
 
-          need_dup = [Array, Hash, Set].include?(default.class)
+          if [Array, Hash, Set].include?(default.class)
+            default = default.freeze
+          end
+
           define_method(attr) do
             val = instance_variable_get(ref)
             if !val.nil?
               val
             else
-              need_dup ? default.class.new : default
+              default
             end
           end
         end

data/lib/json_schema/reference_expander.rb

@@ -71,7 +71,7 @@ module JsonSchema
       paths = @schema_paths[uri] ||= {}
       paths[schema.pointer] = schema
 
-      schema_children(schema).each do |subschema|
+      schema_children(schema) do |subschema|
         build_schema_paths(uri, subschema)
       end
 
@@ -114,7 +114,7 @@ module JsonSchema
       # correct all parent references to point back to ref_schema instead of
       # new_schema
       if ref_schema.original?
-        schema_children(ref_schema).each do |schema|
+        schema_children(ref_schema) do |schema|
           schema.parent = ref_schema
         end
       end
@@ -219,47 +219,44 @@ module JsonSchema
     end
 
     def schema_children(schema)
-      Enumerator.new do |yielder|
-        schema.all_of.each { |s| yielder << s }
-        schema.any_of.each { |s| yielder << s }
-        schema.one_of.each { |s| yielder << s }
-        schema.definitions.each { |_, s| yielder << s }
-        schema.pattern_properties.each { |_, s| yielder << s }
-        schema.properties.each { |_, s| yielder << s }
-
-        if additional = schema.additional_properties
-          if additional.is_a?(Schema)
-            yielder << additional
-          end
+      schema.all_of.each { |s| yield s }
+      schema.any_of.each { |s| yield s }
+      schema.one_of.each { |s| yield s }
+      schema.definitions.each { |_, s| yield s }
+      schema.pattern_properties.each { |_, s| yield s }
+      schema.properties.each { |_, s| yield s }
+
+      if additional = schema.additional_properties
+        if additional.is_a?(Schema)
+          yield additional
         end
+      end
 
-        if schema.not
-          yielder << schema.not
-        end
+      if schema.not
+        yield schema.not
+      end
 
-        # can either be a single schema (list validation) or multiple (tuple
-        # validation)
-        if items = schema.items
-          if items.is_a?(Array)
-            items.each { |s| yielder << s }
-          else
-            yielder << items
-          end
+      # can either be a single schema (list validation) or multiple (tuple
+      # validation)
+      if items = schema.items
+        if items.is_a?(Array)
+          items.each { |s| yield s }
+        else
+          yield items
         end
+      end
 
-        # dependencies can either be simple or "schema"; only replace the
-        # latter
-        schema.dependencies.values.
-          select { |s| s.is_a?(Schema) }.
-          each { |s| yielder << s }
-
-        # schemas contained inside hyper-schema links objects
-        if schema.links
-          schema.links.map { |l| [l.schema, l.target_schema] }.
-            flatten.
-            compact.
-            each { |s| yielder << s }
-        end
+      # dependencies can either be simple or "schema"; only replace the
+      # latter
+      schema.dependencies.
+        each_value { |s| yield s if s.is_a?(Schema) }
+
+      # schemas contained inside hyper-schema links objects
+      if schema.links
+        schema.links.each { |l|
+          yield l.schema if l.schema
+          yield l.target_schema if l.target_schema
+        }
       end
     end
 
@@ -267,19 +264,21 @@ module JsonSchema
       # prevent endless recursion
       return [] unless schema.original?
 
-      schema_children(schema).reduce([]) do |arr, subschema|
+      arr = []
+      schema_children(schema) do |subschema|
         if !subschema.expanded?
           arr += [subschema.reference]
         else
           arr += unresolved_refs(subschema)
         end
       end
+      arr
     end
 
     def traverse_schema(schema)
       add_reference(schema)
 
-      schema_children(schema).each do |subschema|
+      schema_children(schema) do |subschema|
         if subschema.reference && !subschema.expanded?
           dereference(subschema, [])
         end

data/lib/json_schema/schema.rb

@@ -264,7 +264,7 @@ module JsonSchema
 
     def pointer
       if parent
-        parent.pointer + "/" + fragment
+        (parent.pointer + "/".freeze + fragment).freeze
       else
         fragment
       end

data/test/json_schema/attribute_test.rb

@@ -26,7 +26,15 @@ describe JsonSchema::Attributes do
 
     hash = obj.copyable_default_with_object
     assert_equal({}, hash)
-    hash[:x] = 123
+    ex = if defined?(FrozenError)
+           FrozenError
+         else
+           RuntimeError
+         end
+
+    assert_raises(ex) do
+      hash[:x] = 123
+    end
 
     # This is a check to make sure that the new object is not the same object
     # as the one that we just mutated above. When assigning defaults the module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.1
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A JSON Schema V4 and Hyperschema V4 parser and validator.