jbuilder-schema 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d21f87d24f37c97ea05dfcdef1688249098d973c62bfec84a98495ae6c57976f
-  data.tar.gz: c13ab2aeb505785a8915547ce0cf84c7987e0dc0def4e2b20ce5a47be92749d8
+  metadata.gz: 7b91da7438556fc92910dbf0f50ac15c54f62593985f1baacb9d1cda87c09e2e
+  data.tar.gz: bd9e173ce9473d32ca6c3a62d0af33411e76782a927c6ec6b0542a23a8f340dc
 SHA512:
-  metadata.gz: 2aef6970a39b78310a23e6dbbe441ef64ddb03133968cedec87e0e97ecf8b8b83a1a1842d27ff29aa378f8d751963d041233794a1579bc6ecb722e218f0e3cf2
-  data.tar.gz: '028fb5e6a97b3a714365c1bcdf94b1f584710839685e81f7c4dd2bc514a68fcccbbcf046ddcc890559573f65696407c02023e8321f642861df3ae9d6b6419b91'
+  metadata.gz: d5be408235c5190215d78d4d5946f4bb3a28becd80ccbb3a727225efc5f9c48f48903b8ed719296b344bcbf648f9a0d9a2e93ccedf4e475e4e874ca7142b6fa0
+  data.tar.gz: 89775b8f6a5819561eb33c8e0af6847167db2de6c0f719981de6bf393e072234fd36baf763dace85e773c5cd761dc93781c81c2a7548f19811111cefa24114e6

data/lib/jbuilder/schema/template.rb

@@ -2,6 +2,7 @@
 
 require "jbuilder/jbuilder_template"
 require "active_support/inflections"
+require "method_source"
 
 class Jbuilder::Schema
   class Template < ::JbuilderTemplate
@@ -52,6 +53,7 @@ class Jbuilder::Schema
       @configuration = Configuration.new(**options)
       super(context)
       @ignore_nil = false
+      @within_block = false
     end
 
     class TargetWrapper
@@ -65,7 +67,7 @@ class Jbuilder::Schema
       def to_s
         @object
       end
-      alias unwrap_target! to_s
+      alias_method :unwrap_target!, :to_s
     end
 
     def target!
@@ -73,11 +75,6 @@ class Jbuilder::Schema
     end
 
     def schema!
-      # TODO: Not sure why it was like that, when it was meant to be used,
-      # but that seems to fix the problem with disappearance of root properties
-      # https://github.com/bullet-train-co/jbuilder-schema/issues/46
-      # if ([@attributes] + @attributes.each_value.grep(::Hash)).any? { _1[:type] == :array && _1.key?(:items) }
-
       if [@attributes, *@attributes.first].select { |a| a.is_a?(::Hash) && a[:type] == :array && a.key?(:items) }.any?
         @attributes
       else
@@ -87,6 +84,7 @@ class Jbuilder::Schema
 
     def set!(key, value = BLANK, *args, schema: nil, **options, &block)
       old_configuration, @configuration = @configuration, Configuration.build(**schema) if schema&.dig(:object)
+      @within_block = _within_block?(&block)
 
       _with_schema_overrides(key => schema) do
         keys = args.presence || _extract_possible_keys(value)
@@ -102,6 +100,7 @@ class Jbuilder::Schema
       end
     ensure
       @configuration = old_configuration if old_configuration
+      @within_block = false
     end
 
     alias_method :method_missing, :set! # TODO: Remove once Jbuilder passes keyword arguments along to `set!` in its `method_missing`.
@@ -110,10 +109,14 @@ class Jbuilder::Schema
       if _partial_options?(options)
         partial!(collection: collection, **options)
       else
+        @within_block = _within_block?(&block)
+
         _with_schema_overrides(schema) do
           _attributes.merge! type: :array, items: _scope { super(collection, *args, &block) }
         end
       end
+    ensure
+      @within_block = false
     end
 
     def extract!(object, *attributes, schema: nil)
@@ -128,7 +131,12 @@ class Jbuilder::Schema
         local = options.except(:partial, :as, :collection, :cached, :schema).first
         as = options[:as] || ((local.is_a?(::Array) && local.size == 2 && local.first.is_a?(::Symbol) && local.last.is_a?(::Object)) ? local.first.to_s : nil)
 
-        _set_ref(as&.to_s || partial || model, array: collection&.any?)
+        if @within_block || collection.present?
+          _set_ref(as&.to_s || partial || model, array: collection&.any?)
+        else
+          json = ::Jbuilder::Schema.renderer.original_render partial: model || partial, locals: options
+          json.each { |key, value| set!(key, value) }
+        end
       end
     end
 
@@ -254,5 +262,15 @@ class Jbuilder::Schema
       value = _object(value, _required!(value.keys)) unless value[:type] == :array || value.key?(:$ref)
       _merge_values(current_value, value)
     end
+
+    def _within_block?(&block)
+      block.present? && _one_line?(block.source)
+    end
+
+    def _one_line?(text)
+      text = text.gsub("{", " do\n").gsub("}", "\nend").tr(";", "\n")
+      lines = text.lines[1..-2].reject { |line| line.strip.empty? || line.strip.start_with?("#") }
+      lines.size == 1
+    end
   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.4.0"
+JBUILDER_SCHEMA_VERSION = "2.5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder-schema
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Yuri Sidorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate JSON Schema from Jbuilder files
 email:
 - hey@yurisidorov.com