jbuilder-schema 2.6.3 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ece2220807094bf6da825da24512a4dabd0ce985aa935a16e9247c0e5d4c70e
-  data.tar.gz: f04dc67915f12690c7eca1efc2357f915351584061a6b0ece6598326606b0bbf
+  metadata.gz: 2534728d0a4ed22be0dab3a5a0cf3cd931e1e6c51047560ee7274ff32c90b865
+  data.tar.gz: cd91c940a4cafa9a06fbd7de5f3465e83f1be3689a7cae790ec25f9a7f9025bf
 SHA512:
-  metadata.gz: eb350992a61f92fbaee952b0167369caf119fd2d3f2695f647e1d774974e461e01e6a9cd1b7d5d4da2c19abe0658f8a74b601bedeff7d4e78de8365a6c61b02b
-  data.tar.gz: c9582ca4c80ba75106468c8b806cc443be3ee54a630afaa786524d249a4ef8d8bc5eeaef1f1beebb2b00c32e739cfe23be7734695cfff04a51f95de326a7fbd4
+  metadata.gz: 21b0034721c19d01f9f78c5159cea70744284827b58716466f31fcf1c351ef5a6741ac0b72b201f2667c304d99552f998911fd8e35df4733abe276ee2a2e8cba
+  data.tar.gz: d20f3cdd98c8684921bf4bd40f3df30c764e0cada317a3b7a6949bbde5db230b162fd9452d2d365c2548c4441d6fee81540c47d41f5c5117f4fe626e10f0db38

data/lib/jbuilder/schema/template.rb

@@ -63,7 +63,7 @@ class Jbuilder::Schema
 
       # Rails 7.1 calls `to_s` on our `target!` (the return value from our templates).
       # To get around that and let our inner Hash through, we add this override.
-      # `unwrap_target!` is added for backwardscompatibility so we get the inner Hash on Rails < 7.1.
+      # `unwrap_target!` is added for backwards compatibility so we get the inner Hash on Rails < 7.1.
       def to_s
         @object
       end
@@ -183,7 +183,7 @@ class Jbuilder::Schema
 
     def _nullify_non_required_types(attributes, required)
       attributes.transform_values! {
-        _1[:type] = [_1[:type], "null"] unless required.include?(attributes.key(_1))
+        _1[:type] = [_1[:type], "null"] if _1[:type].present? && !required.include?(attributes.key(_1))
         _1
       }
     end
@@ -200,7 +200,7 @@ class Jbuilder::Schema
       if array
         _attributes.merge! type: :array, items: ref
       else
-        _attributes.merge! allOf: [ref]
+        _attributes.merge! type: :object, allOf: [ref]
       end
     end
 
@@ -257,7 +257,6 @@ class Jbuilder::Schema
       when :array
         _schema(key, value, within_array: true)
       when :object
-        value = value.attributes if value.is_a?(::ActiveRecord::Base)
         {
           type: type,
           properties: _set_properties(key, value)
@@ -267,12 +266,6 @@ class Jbuilder::Schema
       end
     end
 
-    def _set_properties(key, value)
-      value.each_with_object({}) do |(attr_name, attr_value), properties|
-        properties[attr_name] = _schema("#{key}.#{attr_name}", attr_value)
-      end
-    end
-
     def _primitive_type(value)
       case value
       when ::Hash, ::Struct, ::OpenStruct, ::ActiveRecord::Base then :object
@@ -286,11 +279,22 @@ class Jbuilder::Schema
     end
 
     def _set_value(key, value)
+      value = _value(value)
       value = _schema(key, value) unless value.is_a?(::Hash) && (value.key?(:type) || value.key?(:allOf)) # rubocop:disable Style/UnlessLogicalOperators
       _set_description(key, value)
       super
     end
 
+    def _set_properties(key, value)
+      _value(value).each_with_object({}) do |(attr_name, attr_value), properties|
+        properties[attr_name] = _schema("#{key}.#{attr_name}", attr_value)
+      end
+    end
+
+    def _value(value)
+      value.respond_to?(:attributes) ? value.attributes : value
+    end
+
     def _required!(keys)
       presence_validated_attributes = @configuration.object&.class.try(:validators).to_a.flat_map { _1.attributes if _1.is_a?(::ActiveRecord::Validations::PresenceValidator) }
       keys & [_key(:id), *presence_validated_attributes.flat_map { [_key(_1), _key("#{_1}_id")] }]

data/lib/jbuilder/schema/version.rb

@@ -1,4 +1,4 @@
 # We can't use the standard `Jbuilder::Schema::VERSION =` because
 # `Jbuilder` isn't a regular module namespace, but a class …which also loads Active Support.
 # So we use trickery, and assign the proper version once `jbuilder/schema.rb` is loaded.
-JBUILDER_SCHEMA_VERSION = "2.6.3"
+JBUILDER_SCHEMA_VERSION = "2.6.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder-schema
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.5
 platform: ruby
 authors:
 - Yuri Sidorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
 description: Generate JSON Schema from Jbuilder files
 email:
-- hey@yurisidorov.com
+- git@yurisidorov.com
 executables: []
 extensions: []
 extra_rdoc_files: []