pbbuilder 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24755dfd52ac20a000c27ed88c368ef1b09977cacffc1d185f59733474247043
-  data.tar.gz: 0dcac7ff05a509dad422976926176b921fcddcc443de24617c4218d9e5be1ada
+  metadata.gz: f4c9ff9f8ec71c8e3fee410430e9c29da1907e6e110ec6869531b52b8ec54ce5
+  data.tar.gz: 0f75e4c2fbdde5b6c33acc05dd62173b2b399d03c1030c7fd132c460d229b12b
 SHA512:
-  metadata.gz: f6aa9b3c55c5b89a85fc081a62125b7c675c22ec638fe7e29f073dcf291b87d6f0c50af69eb87371fe9c4718131b2243a230f54913f9b325e524fdbd2203107d
-  data.tar.gz: ecb4b6a1de74be30dc041e44f0859b8b6fab5a9e3b932503de02d53dc61b10c5e990ca0e8a631b25be2f7e92b80d6fbaa376f45dfe09e963d561a9c63a5e7a09
+  metadata.gz: '0191dcf320aa97316c483230dda497cc1d83c20f1aac6caa5e4ce4a8883188a949a8217344f04445ab4375b1a4bf952c49eef115af357c87c8127f1c85db3ac7'
+  data.tar.gz: 287458b4fc6db49f90a0d76e4da273861b58bfd84d49edd86f966198a16cb694319cd47fca69200d5cad5767307fbbe83b2fa8c866519056313b3d435c5e917e

data/lib/pbbuilder/collection_renderer.rb

@@ -16,13 +16,17 @@ class Pbbuilder
     end
 
     def build_rendered_collection(templates, _spacer)
-      pb.set!(field, templates.map(&:body))
+      pb_parent.set!(field, templates.map(&:body))
     end
 
     def pb
       @options[:locals].fetch(:pb)
     end
 
+    def pb_parent
+      @options[:locals].fetch(:pb_parent)
+    end
+
     def field
       @options[:locals].fetch(:field).to_s
     end

data/lib/pbbuilder/template.rb

@@ -49,13 +49,22 @@ class PbbuilderTemplate < Pbbuilder
 
         collection = options[:collection] || []
         partial = options[:partial]
-        options[:locals].merge!(pb: self)
+
+        # The way recursive rendering works is that CollectionRenderer needs to be aware of node its currently rendering and parent node,
+        # these is no need to know entire "stack" of nodes. CollectionRenderer would traverse to bottom node render that first and then go up in stack.
+
+        # CollectionRenderer uses locals[:pb] to render the partial as a protobuf message,
+        # but also needs locals[:pb_parent] to apply rendered partial to top level protobuf message.
+
+        # This logic could be found in CollectionRenderer#build_rendered_collection method that we over wrote.
+        options[:locals].merge!(pb: ::PbbuilderTemplate.new(@context, new_message_for(field)))
+        options[:locals].merge!(pb_parent: self)
         options[:locals].merge!(field: field)
 
         if options.has_key?(:layout)
           raise ::NotImplementedError, "The `:layout' option is not supported in collection rendering."
         end
-  
+
         if options.has_key?(:spacer_template)
           raise ::NotImplementedError, "The `:spacer_template' option is not supported in collection rendering."
         end

data/lib/pbbuilder.rb

@@ -162,6 +162,13 @@ class Pbbuilder
     @message
   end
 
+  def new_message_for(field)
+    descriptor = _descriptor_for_field(field)
+    ::Kernel.raise ::ArgumentError, "Unknown field #{field}" if descriptor.nil?
+
+    _new_message_from_descriptor(descriptor)
+  end
+
   private
 
   def _descriptor_for_field(field)

data/pbbuilder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "pbbuilder"
-  spec.version = "0.16.0"
+  spec.version = "0.16.1"
   spec.authors = ["Bouke van der Bijl"]
   spec.email = ["bouke@cheddar.me"]
   spec.homepage = "https://github.com/cheddar-me/pbbuilder"

data/test/pbbuilder_template_test.rb

@@ -12,12 +12,20 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     pb.extract! racer, :name
     pb.friends racer.friends, partial: "racers/racer", as: :racer
     pb.best_friend partial: "racers/racer", racer: racer.best_friend if racer.best_friend.present?
+    pb.logo partial: "asset", asset: racer.logo if racer.logo.present?
+  PBBUILDER
+
+  ASSET_PARTIAL = <<-PBBUILDER
+    pb.url asset.url
+    pb.url_2x asset.url
+    pb.url_3x asset.url
   PBBUILDER
 
   PARTIALS = {
     "_partial.pb.pbbuilder" => "pb.name name",
     "_person.pb.pbbuilder" => PERSON_PARTIAL,
     "racers/_racer.pb.pbbuilder" => RACER_PARTIAL,
+    "_asset.pb.pbbuilder" => ASSET_PARTIAL,
 
     # Ensure we find only Pbbuilder partials from within Pbbuilder templates.
     "_person.html.erb" => "Hello world!"
@@ -31,9 +39,19 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
   end
 
   test "render collections with partial as kwarg" do
-    result = render('pb.friends partial: "racers/racer", as: :racer, collection: [Racer.new(1, "Johnny Test", []), Racer.new(2, "Max Verstappen", [])]')
+    template = <<-PBBUILDER
+      more_friends = [Racer.new(4, "Johnny Brave", [], nil, API::Asset.new(url: "https://google.com/test3.svg"))]
+      friends_of_racer = [Racer.new(3, "Chris Harris", more_friends, nil, API::Asset.new(url: "https://google.com/test2.svg"))]
+      racers = [Racer.new(1, "Johnny Test", friends_of_racer, nil, API::Asset.new(url: "https://google.com/test1.svg")), Racer.new(2, "Max Verstappen", [])]
+      pb.friends partial: "racers/racer", as: :racer, collection: racers
+    PBBUILDER
+    result = render(template)
 
     assert_equal 2, result.friends.count
+    assert_nil result.logo
+    assert_equal "https://google.com/test1.svg", result.friends.first.logo.url
+    assert_equal "https://google.com/test2.svg", result.friends.first.friends.first.logo.url
+    assert_equal "https://google.com/test3.svg", result.friends.first.friends.first.friends.first.logo.url
   end
 
   test "CollectionRenderer: raises an error on a render with :layout option" do
@@ -52,14 +70,13 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     assert_equal "The `:spacer_template' option is not supported in collection rendering.", error.message
   end
 
-  test " render collections with partial as arg" do
+  test "render collections with partial as arg" do
     skip("This will be addressed in future version of a gem")
     result = render('pb.friends "racers/racer", as: :racer, collection: [Racer.new(1, "Johnny Test", []), Racer.new(2, "Max Verstappen", [])]')
 
     assert_equal 2, result.friends.count
   end
 
-
   test "partial by name with top-level locals" do
     result = render('pb.partial! "partial", name: "hello"')
     assert_equal "hello", result.name

data/test/test_helper.rb

@@ -46,6 +46,7 @@ end
 
 module API
   Person = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("pbbuildertest.Person").msgclass
+  Asset = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("pbbuildertest.Asset").msgclass
 end
 
 class << Rails
@@ -54,7 +55,7 @@ class << Rails
   end
 end
 
-class Racer < Struct.new(:id, :name, :friends, :best_friend)
+class Racer < Struct.new(:id, :name, :friends, :best_friend, :logo)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf