jbuilder-schema 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b0ea78dca91b88897944b81769f35798117c891702c585c6197a18c141736a
-  data.tar.gz: 668c8e606e9a52392114fb94dfe73f333ab7831dba7fd21c602fbcad1ee37c0c
+  metadata.gz: 2534728d0a4ed22be0dab3a5a0cf3cd931e1e6c51047560ee7274ff32c90b865
+  data.tar.gz: cd91c940a4cafa9a06fbd7de5f3465e83f1be3689a7cae790ec25f9a7f9025bf
 SHA512:
-  metadata.gz: 7277d58ee426c5635adbbae4b1f8e2b68fc0b16aa6ab42653d1e7dc7ebb62c3f13e3917e767b57ee723f82d52043064db415690e18207820fa6036584b9b4faa
-  data.tar.gz: 1c8b45fcf22dd2a219fd22c3483c4d68fa05d0f519fa66eb5593a1476fe73e98bc2a0cb3f07635933890bb297d0183d5451c152d1e10a567b3797ad1deaff9f6
+  metadata.gz: 21b0034721c19d01f9f78c5159cea70744284827b58716466f31fcf1c351ef5a6741ac0b72b201f2667c304d99552f998911fd8e35df4733abe276ee2a2e8cba
+  data.tar.gz: d20f3cdd98c8684921bf4bd40f3df30c764e0cada317a3b7a6949bbde5db230b162fd9452d2d365c2548c4441d6fee81540c47d41f5c5117f4fe626e10f0db38

data/lib/jbuilder/schema/template.rb

@@ -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
 

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.4"
+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.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Yuri Sidorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-16 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: []