json-schema-serializer 1.7.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8520da63406ec92ce27f94214e6377eb0235fa22745c1dd9473fb597bfc2acdd
-  data.tar.gz: 36de8e40ad358955d937e2b46141c0da13e9b7cff328a26194e6e52991c1b2cc
+  metadata.gz: 301107414cad9b1f2e8845d86633a36354e32b9ca7a45bb6611a1b42c4ece2ce
+  data.tar.gz: 7d2c5f7bb39e5d59278073a779abf70979d86870009c6195f764ee37da5c6c5f
 SHA512:
-  metadata.gz: a6a9d1927d21adc4c7a499313b195e63465302018e4575a83c9095236c31df86eb1037e5d06618ad07fa0674c620c5cd2b58aad0aae2ae04884f3c0f9b6592c8
-  data.tar.gz: f3d64406270a9b00f816106611cf1327ed5eab8bd9ec5472bb577fbfda8f0ef415404563fda4fd50008441388d03f655d82c0085f9dd8b5aba95438c1d50d9f7
+  metadata.gz: 4305c335b4a52abd9631bc11fb93b7268b7d0a235939f86be68dff2f3d8569df3b7908a33e4b9b45417c5f7b7b928a28b334d8feaad91e012079c3670ee512bd
+  data.tar.gz: f7a3ac83d661e4ddd546fae884600e61c1dce9119347ed0a93e3ee574c66c38bb4647a40f0c6f84e295804b3c620864e65c549e1b38e5f69429805fcc9a675a8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.0.0
+
+- fix: Non-primitive (arrays, objects, etc.) "default" schemas and injections have strange results.
+    - If you were using a non-primitive (array, object, etc.) "default" schema with injection, it could be a breaking change!
+
 ## 1.7.0
 
 - add: `with_context!` api

data/lib/json/schema/serializer.rb

@@ -11,7 +11,7 @@ module JSON
       end
 
       def serialize(data)
-        Walker.walk(@schema, data, true, @options)
+        Walker.walk(@schema, data, true, false, @options)
       end
 
       DataWithContext = Struct.new(:data, :context, keyword_init: true)
@@ -34,11 +34,14 @@ module JSON
         class << self
           TimeWithZone = defined?(ActiveSupport::TimeWithZone) ? ActiveSupport::TimeWithZone : nil
 
-          def walk(schema, obj, required, options)
+          def walk(schema, obj, required, using_default, options)
             type = try_hash(schema, :type)
             default = try_hash(schema, :default)
             format = try_hash(schema, :format)
-            obj = default if obj.nil?
+            if obj.nil?
+              using_default = true
+              obj = default
+            end
 
             if options[:inject_key]
               inject_key = try_hash(schema, options[:inject_key])
@@ -46,8 +49,12 @@ module JSON
               if obj.instance_of?(JSON::Schema::Serializer::DataWithContext)
                 options = options.merge(inject_context: obj.context)
                 obj = obj.data
+                if obj.nil?
+                  using_default = true
+                  obj = default
+                end
               end
-              if injector
+              if injector && !using_default
                 if options[:inject_context]
                   obj =
                     if options[:inject_by_keyword]
@@ -65,7 +72,7 @@ module JSON
                 end
               end
             end
-            type_coerce(schema, detect_type(type, obj), format, obj, required, options)
+            type_coerce(schema, detect_type(type, obj), format, obj, required, using_default, options)
           end
 
           def detect_type(type, obj)
@@ -148,7 +155,7 @@ module JSON
             end
           end
 
-          def type_coerce(schema, type, format, obj, required, options)
+          def type_coerce(schema, type, format, obj, required, using_default, options)
             return nil if !required && obj.nil?
 
             case type.to_s
@@ -217,7 +224,7 @@ module JSON
               return options[:null_through] ? nil : [] if obj.nil? || !obj.respond_to?(:map)
               return options[:null_through] ? nil : [] if options[:guard_primitive_in_structure] && is_primitive?(obj)
 
-              obj.map { |item| walk(items_schema, item, true, options) }
+              obj.map { |item| walk(items_schema, item, true, using_default, options) }
             when "object"
               return nil if obj.nil? && options[:null_through]
               return options[:null_through] ? nil : {} if options[:guard_primitive_in_structure] && is_primitive?(obj)
@@ -231,7 +238,7 @@ module JSON
                 properties_schema.map do |name, property_schema|
                   input_key = input_key_transform ? input_key_transform.call(name.to_s) : name
                   output_key = output_key_transform ? output_key_transform.call(name.to_s) : name.to_s
-                  [output_key, walk(property_schema, try_hash(obj, input_key), required_schema.include?(name.to_s), options)]
+                  [output_key, walk(property_schema, try_hash(obj, input_key), required_schema.include?(name.to_s), using_default, options)]
                 end.to_h
               if additional_properties_schema
                 not_additional_keys_array = properties_schema.keys.map(&:to_s)
@@ -240,7 +247,7 @@ module JSON
                 ret.merge(
                   additional_keys.map do |name|
                     output_key = output_key_transform ? output_key_transform.call(name.to_s) : name.to_s
-                    [output_key, walk(additional_properties_schema, try_hash(obj, name), false, options)]
+                    [output_key, walk(additional_properties_schema, try_hash(obj, name), false, using_default, options)]
                   end.to_h,
                 )
               else
@@ -257,6 +264,9 @@ module JSON
             elsif obj.respond_to?(name)
               obj.send(name)
             end
+          rescue
+            p [name, obj]
+            raise
           end
 
           def is_primitive?(obj)

data/lib/json/schema/serializer/version.rb

@@ -1,7 +1,7 @@
 module JSON
   class Schema
     class Serializer
-      VERSION = "1.7.1".freeze
+      VERSION = "2.0.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema-serializer
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Narazaka
@@ -195,7 +195,7 @@ metadata:
   homepage_uri: https://github.com/Narazaka/json-schema-serializer
   source_code_uri: https://github.com/Narazaka/json-schema-serializer.git
   changelog_uri: https://github.com/Narazaka/json-schema-serializer/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/json-schema-serializer/1.7.1
+  documentation_uri: https://www.rubydoc.info/gems/json-schema-serializer/2.0.0
 post_install_message: 
 rdoc_options: []
 require_paths: