jbuilder-schema 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b91da7438556fc92910dbf0f50ac15c54f62593985f1baacb9d1cda87c09e2e
-  data.tar.gz: bd9e173ce9473d32ca6c3a62d0af33411e76782a927c6ec6b0542a23a8f340dc
+  metadata.gz: ee4548cc207982dd75132d63f96e9396757af0b812b8649fb648cf978de0c4a7
+  data.tar.gz: fa0b95d49b9b0cb1cde94381bc0f217b08f89900d1b7f2bac72e9e3e2cd6ab41
 SHA512:
-  metadata.gz: d5be408235c5190215d78d4d5946f4bb3a28becd80ccbb3a727225efc5f9c48f48903b8ed719296b344bcbf648f9a0d9a2e93ccedf4e475e4e874ca7142b6fa0
-  data.tar.gz: 89775b8f6a5819561eb33c8e0af6847167db2de6c0f719981de6bf393e072234fd36baf763dace85e773c5cd761dc93781c81c2a7548f19811111cefa24114e6
+  metadata.gz: e7d4fd3b56407c18a94877387f92f7c53f8632f0c610a7595bb567ec380454b72de0be3c68be5f17d9ece12dc78785aabb965a9a44d078b78b2d25e043c8b93c
+  data.tar.gz: 33ed871b094e1bb4103c7e07f4ab949ca9e595fa959433f449aed6e1f81a6b6f85d29da22b4185baee392a9385fdbd20035d0d8b045801844c9d1751675b371e

data/lib/jbuilder/schema/template.rb

@@ -112,7 +112,13 @@ class Jbuilder::Schema
         @within_block = _within_block?(&block)
 
         _with_schema_overrides(schema) do
-          _attributes.merge! type: :array, items: _scope { super(collection, *args, &block) }
+          # TODO: Find a better solution
+          # Here we basically remove allOf key from items, because it's redundant, although valid.
+          # Better would be not to set it if it's not needed, but I couldn't figure how,
+          # as we have array of separate object partials hare, so each one of them would legally have allOf key.
+          items = _scope { super(collection, *args, &block) }
+          items = items[:allOf].first if items.key?(:allOf)
+          _attributes.merge! type: :array, items: items
         end
       end
     ensure
@@ -174,7 +180,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[:nullable] = true unless required.include?(attributes.key(_1))
         _1
       }
     end
@@ -191,7 +197,7 @@ class Jbuilder::Schema
       if array
         _attributes.merge! type: :array, items: ref
       else
-        _attributes.merge! type: :object, **ref
+        _attributes.merge! allOf: [ref]
       end
     end
 
@@ -236,7 +242,7 @@ class Jbuilder::Schema
     end
 
     def _set_value(key, value)
-      value = _schema(key, value) unless value.is_a?(::Hash) && value.key?(:type)
+      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
@@ -259,7 +265,8 @@ class Jbuilder::Schema
       raise NullError.build(key) if current_value.nil?
 
       value = _scope { yield self }
-      value = _object(value, _required!(value.keys)) unless value[:type] == :array || value.key?(:$ref)
+      value = _object(value, _required!(value.keys)) unless value[:type] == :array || value.key?(:allOf)
+
       _merge_values(current_value, value)
     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.5.0"
+JBUILDER_SCHEMA_VERSION = "2.6.0"

data/lib/jbuilder/schema.rb

@@ -37,7 +37,7 @@ class Jbuilder::Schema
     if paths.nil? && locals.nil?
       @renderer ||= Renderer.new("app/views")
     else
-      Renderer.new(paths, locals)
+      @renderer = Renderer.new(paths, locals)
     end
   end
   singleton_class.delegate :yaml, :json, :render, to: :renderer

metadata

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