json_schemer 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac13fecc37f430b393d875cd262bf5186974b42573f50b8e8b5d90298e41916f
-  data.tar.gz: 388e7eeda51e99d0454c3832f04f342b69102982d7b559bc37c92ab312332c67
+  metadata.gz: 6849b76f5d056da509ff2cf6961f8727d84fd00e4f0dd8c8e843cb4efaa5dbb1
+  data.tar.gz: 28a1573883545ffe2cf48cf5d80f0ea76c357556d9373e286a92d545f3f50afe
 SHA512:
-  metadata.gz: 9372627c0131ecfcf88904050f0b85e1fa7e3f3ca1152ce20be7750146e0804b59d199540a560f04df6d912aba02229016432d9c2015008804f7cbe8b949034d
-  data.tar.gz: d9ea545392112f48393d78508ef383e807ffe34c041018bf461cfce51b46f638a57b3c8fd8b498beb8f3d4a1573cfc6719b16e4231d47639e7cc21e6d607d981
+  metadata.gz: 19a38974481d9f13512bb9d2df317b0529cd25171e298019eeb6ab216e535b1c4ab15f196f8ab94b86825818df87d2b5d5498dc92077658a3920e30398d44003
+  data.tar.gz: 0bbebb72912b7ce4686699941b4ade4f734f1b728cb94a20a8a320f4b23a0950d047b7068ebcdc61ee81304e534989eb91113ed35e378a6f49426444e15b0517

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.8)
+    json_schemer (0.2.9)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -28,4 +28,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/lib/json_schemer/schema/base.rb

@@ -4,15 +4,16 @@ module JSONSchemer
     class Base
       include Format
 
-      Instance = Struct.new(:data, :data_pointer, :schema, :schema_pointer, :parent_uri) do
+      Instance = Struct.new(:data, :data_pointer, :schema, :schema_pointer, :parent_uri, :insert_property_defaults) do
         def merge(
           data: self.data,
           data_pointer: self.data_pointer,
           schema: self.schema,
           schema_pointer: self.schema_pointer,
-          parent_uri: self.parent_uri
+          parent_uri: self.parent_uri,
+          insert_property_defaults: self.insert_property_defaults
         )
-          self.class.new(data, data_pointer, schema, schema_pointer, parent_uri)
+          self.class.new(data, data_pointer, schema, schema_pointer, parent_uri, insert_property_defaults)
         end
       end
 
@@ -46,11 +47,11 @@ module JSONSchemer
       end
 
       def valid?(data)
-        valid_instance?(Instance.new(data, '', root, '', nil))
+        valid_instance?(Instance.new(data, '', root, '', nil, !!@insert_property_defaults))
       end
 
       def validate(data)
-        validate_instance(Instance.new(data, '', root, '', nil))
+        validate_instance(Instance.new(data, '', root, '', nil, !!@insert_property_defaults))
       end
 
     protected
@@ -115,20 +116,35 @@ module JSONSchemer
 
         if all_of
           all_of.each_with_index do |subschema, index|
-            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/allOf/#{index}"), &block)
+            subinstance = instance.merge(
+              schema: subschema,
+              schema_pointer: "#{instance.schema_pointer}/allOf/#{index}",
+              insert_property_defaults: false
+            )
+            validate_instance(subinstance, &block)
           end
         end
 
         if any_of
           subschemas = any_of.lazy.with_index.map do |subschema, index|
-            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/anyOf/#{index}"))
+            subinstance = instance.merge(
+              schema: subschema,
+              schema_pointer: "#{instance.schema_pointer}/anyOf/#{index}",
+              insert_property_defaults: false
+            )
+            validate_instance(subinstance)
           end
           subschemas.each { |subschema| subschema.each(&block) } unless subschemas.any?(&:none?)
         end
 
         if one_of
           subschemas = one_of.map.with_index do |subschema, index|
-            validate_instance(instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/oneOf/#{index}"))
+            subinstance = instance.merge(
+              schema: subschema,
+              schema_pointer: "#{instance.schema_pointer}/oneOf/#{index}",
+              insert_property_defaults: false
+            )
+            validate_instance(subinstance)
           end
           valid_subschema_count = subschemas.count(&:none?)
           if valid_subschema_count > 1
@@ -139,11 +155,15 @@ module JSONSchemer
         end
 
         unless not_schema.nil?
-          subinstance = instance.merge(schema: not_schema, schema_pointer: "#{instance.schema_pointer}/not")
+          subinstance = instance.merge(
+            schema: not_schema,
+            schema_pointer: "#{instance.schema_pointer}/not",
+            insert_property_defaults: false
+          )
           yield error(subinstance, 'not') if valid_instance?(subinstance)
         end
 
-        if if_schema && valid_instance?(instance.merge(schema: if_schema))
+        if if_schema && valid_instance?(instance.merge(schema: if_schema, insert_property_defaults: false))
           validate_instance(instance.merge(schema: then_schema, schema_pointer: "#{instance.schema_pointer}/then"), &block) unless then_schema.nil?
         elsif if_schema
           validate_instance(instance.merge(schema: else_schema, schema_pointer: "#{instance.schema_pointer}/else"), &block) unless else_schema.nil?
@@ -179,10 +199,6 @@ module JSONSchemer
         !!@format
       end
 
-      def insert_property_defaults?
-        !!@insert_property_defaults
-      end
-
       def custom_format?(format)
         !!(formats && formats.key?(format))
       end
@@ -195,7 +211,6 @@ module JSONSchemer
         JSONSchemer.schema(
           schema,
           format: format?,
-          insert_property_defaults: insert_property_defaults?,
           formats: formats,
           keywords: keywords,
           ref_resolver: ref_resolver
@@ -250,27 +265,32 @@ module JSONSchemer
       end
 
       def validate_ref(instance, ref, &block)
-        ref_uri = join_uri(instance.parent_uri, ref)
-
-        if valid_json_pointer?(ref_uri.fragment)
-          ref_pointer = Hana::Pointer.new(URI.decode_www_form_component(ref_uri.fragment))
-          if ref.start_with?('#')
+        if ref.start_with?('#')
+          schema_pointer = ref.slice(1..-1)
+          if valid_json_pointer?(schema_pointer)
+            ref_pointer = Hana::Pointer.new(URI.decode_www_form_component(schema_pointer))
             subinstance = instance.merge(
               schema: ref_pointer.eval(root),
-              schema_pointer: ref_uri.fragment,
-              parent_uri: (pointer_uri(root, ref_pointer) || ref_uri)
+              schema_pointer: schema_pointer,
+              parent_uri: (pointer_uri(root, ref_pointer) || instance.parent_uri)
             )
             validate_instance(subinstance, &block)
-          else
-            ref_root = resolve_ref(ref_uri)
-            ref_object = child(ref_root)
-            subinstance = instance.merge(
-              schema: ref_pointer.eval(ref_root),
-              schema_pointer: ref_uri.fragment,
-              parent_uri: (pointer_uri(ref_root, ref_pointer) || ref_uri)
-            )
-            ref_object.validate_instance(subinstance, &block)
+            return
           end
+        end
+
+        ref_uri = join_uri(instance.parent_uri, ref)
+
+        if valid_json_pointer?(ref_uri.fragment)
+          ref_pointer = Hana::Pointer.new(URI.decode_www_form_component(ref_uri.fragment))
+          ref_root = resolve_ref(ref_uri)
+          ref_object = child(ref_root)
+          subinstance = instance.merge(
+            schema: ref_pointer.eval(ref_root),
+            schema_pointer: ref_uri.fragment,
+            parent_uri: (pointer_uri(ref_root, ref_pointer) || ref_uri)
+          )
+          ref_object.validate_instance(subinstance, &block)
         elsif id = ids[ref_uri.to_s]
           subinstance = instance.merge(
             schema: id.fetch(:schema),
@@ -467,7 +487,7 @@ module JSONSchemer
         dependencies = schema['dependencies']
         property_names = schema['propertyNames']
 
-        if insert_property_defaults? && properties
+        if instance.insert_property_defaults && properties
           properties.each do |property, property_schema|
             if !data.key?(property) && property_schema.is_a?(Hash) && property_schema.key?('default')
               data[property] = property_schema.fetch('default').clone

data/lib/json_schemer/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module JSONSchemer
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -382,7 +382,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: JSON Schema validator. Supports drafts 4, 6, and 7.