jbuilder-schema 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475aa6226a8439f15059d59b79e0e2b0fad03e725c75f462be7aea3b070f5b27
-  data.tar.gz: c93e583024e7ad2af6208b3913f7e1c74b8166740c3ca3c3d2a4b8d4105ed2a6
+  metadata.gz: 2aea259ba4965ec62874b56ab4267ddc2f4cd2967babe536726397c53599c922
+  data.tar.gz: 71c9f200fb4cc481055ec0790e514b9a46108a6ae4cb0c0aad1ed09eba5f384e
 SHA512:
-  metadata.gz: e286e0531d82ba6b3031925b0a82bd70b66e11497a086bd90abe47aeceff1d6c5d8438b82e98f632058a3953a16c1355638143732a97ef2bc36235071ff92270
-  data.tar.gz: ea53e46e9a812b5345a4df0ff92df7fa91c2263de5e636c5afac16becad88febf445fdd0ee37d062a270a0b80f341c69e6302c1a53c2108cded1b1089374cd5f
+  metadata.gz: d0ac95a76f5630daad73debfd74f6056dd3e6b4f30e4075779a41306585d211c918d16140de6f32b01a60db3303ac21e1ccdf8c52b9ea4292e32c38a134e1e21
+  data.tar.gz: d88181a3d13d3748cfca995bbcc9de741bb9d5ecf98bd34af452b499aaeae2c0a6c44c5fc57ea88ee3892a2b6c2579f65a3310f1b59a83805067422ea20956c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbuilder-schema (2.0.2)
+    jbuilder-schema (2.0.4)
       jbuilder
       rails (>= 5.0.0)
 
@@ -89,8 +89,11 @@ GEM
     loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
@@ -101,7 +104,7 @@ GEM
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.0)
       timeout
     net-smtp (0.3.3)
       net-protocol
@@ -112,7 +115,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.4)
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -168,7 +171,7 @@ GEM
       rubocop (= 1.32.0)
       rubocop-performance (= 1.14.3)
     thor (1.2.1)
-    timeout (0.3.0)
+    timeout (0.3.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)

data/lib/jbuilder/schema/renderer.rb

@@ -18,8 +18,10 @@ class Jbuilder::Schema::Renderer
   end
 
   def render(object = nil, title: nil, description: nil, assigns: nil, **options)
-    partial_path = object.respond_to?(:to_partial_path_for_jbuilder_schema) ? object.to_partial_path_for_jbuilder_schema : object.to_partial_path
-    options.merge! partial: partial_path, object: object if object
+    if object
+      partial_path = object.respond_to?(:to_partial_path_for_jbuilder_schema) ? object.to_partial_path_for_jbuilder_schema : object.to_partial_path
+      options.merge! partial: partial_path, object: object
+    end
 
     options[:locals] ||= {}
     options[:locals].merge! @default_locals if @default_locals

data/lib/jbuilder/schema/template.rb

@@ -10,7 +10,7 @@ class Jbuilder::Schema
 
     class Handler < ::JbuilderHandler
       def self.call(template, source = nil)
-        super.sub("JbuilderTemplate.new(self", "Jbuilder::Schema::Template.new(self, **__jbuilder_schema_options").sub("target!", "schema!")
+        super.sub("JbuilderTemplate.new(self", "Jbuilder::Schema::Template.build(self, local_assigns")
       end
     end
 
@@ -18,6 +18,14 @@ class Jbuilder::Schema
       ::ActionView::Template.register_template_handler :jbuilder, ::Jbuilder::Schema::Template::Handler
     end
 
+    def self.build(view_context, local_assigns)
+      if (options = local_assigns[:__jbuilder_schema_options])
+        new(view_context, **options)
+      else
+        ::JbuilderTemplate.new(view_context)
+      end
+    end
+
     ModelScope = ::Struct.new(:model, :title, :description, keyword_init: true) do
       def initialize(**)
         super
@@ -49,6 +57,10 @@ class Jbuilder::Schema
       @ignore_nil = false
     end
 
+    def target!
+      schema!
+    end
+
     def schema!
       {type: type}.merge(type == :object ? _object(**attributes.merge) : attributes)
     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.0.2"
+JBUILDER_SCHEMA_VERSION = "2.0.4"

data/lib/jbuilder/schema.rb

@@ -4,7 +4,7 @@ require "active_support/core_ext/module/delegation"
 require "jbuilder/schema/version"
 
 class Jbuilder::Schema
-  VERSION = "2.0.2" # TODO Fix this. It's throwing errors when including the Ruby gem in downstream projects.
+  VERSION = "2.0.3" # TODO Fix this. It's throwing errors when including the Ruby gem in downstream projects.
 
   module IgnoreSchemaMeta
     ::Jbuilder.prepend self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder-schema
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Yuri Sidorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Generate JSON Schema from Jbuilder files