jbuilder-schema 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ece2220807094bf6da825da24512a4dabd0ce985aa935a16e9247c0e5d4c70e
-  data.tar.gz: f04dc67915f12690c7eca1efc2357f915351584061a6b0ece6598326606b0bbf
+  metadata.gz: d3b0ea78dca91b88897944b81769f35798117c891702c585c6197a18c141736a
+  data.tar.gz: 668c8e606e9a52392114fb94dfe73f333ab7831dba7fd21c602fbcad1ee37c0c
 SHA512:
-  metadata.gz: eb350992a61f92fbaee952b0167369caf119fd2d3f2695f647e1d774974e461e01e6a9cd1b7d5d4da2c19abe0658f8a74b601bedeff7d4e78de8365a6c61b02b
-  data.tar.gz: c9582ca4c80ba75106468c8b806cc443be3ee54a630afaa786524d249a4ef8d8bc5eeaef1f1beebb2b00c32e739cfe23be7734695cfff04a51f95de326a7fbd4
+  metadata.gz: 7277d58ee426c5635adbbae4b1f8e2b68fc0b16aa6ab42653d1e7dc7ebb62c3f13e3917e767b57ee723f82d52043064db415690e18207820fa6036584b9b4faa
+  data.tar.gz: 1c8b45fcf22dd2a219fd22c3483c4d68fa05d0f519fa66eb5593a1476fe73e98bc2a0cb3f07635933890bb297d0183d5451c152d1e10a567b3797ad1deaff9f6

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
@@ -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.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder-schema
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Yuri Sidorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder