pbbuilder 0.17.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe95820bf0015825b24715abe48a568f865affb04ec6c3db6261f33cd3e19829
-  data.tar.gz: 0de697e6e0970a49cf599cb764e1941e019b1b6e0dddcc86c862c070a34ec904
+  metadata.gz: 1ea3598ad1ed31172d0b3154c6968649f63073f23de0d94abf191a07dbdbf4e0
+  data.tar.gz: 7285883ae069eeff4f1860eb9b4c4a727585e6762b3bfd974ce1fb9e51928086
 SHA512:
-  metadata.gz: fa06d08bee0e966095491d7b1d0956ff5c0f9a5d305fe66308c98883ddbe3c424d60b62ebf846fe25d2e7ec86181baf0666ec0d638648117188d1b17e3185784
-  data.tar.gz: dac52c94458493380247cba47db06e61ad29590ff8b09b51abbe870aca8381f553870c16604b8079653488c0acc76fa87bfa54cb6a652e3c9fd0538e09ed85d8
+  metadata.gz: e051d79882379fb30f3f0b4bab503e6591034d1cc16639918d685a0ef19e6f7cc42ea224954bf755db739f6a2b2c2c86a8c7666e23065ce337aafb862486b4f6
+  data.tar.gz: 90f2266161a9a101fd4b67afb71130a009b17ec9a5139dc583db18d02a1a32a2bd7730f1ea872c3d4b77a4d64f953b1a34e72cb35f845dc6a879f117f7c3c5ec

data/.github/workflows/test.yml

@@ -14,21 +14,12 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["3.0", "3.1", "3.2", "3.3"]
-
-        gemfile: [ "rails_6_1", "rails_7_0"]
+        gemfile: [ "rails_6_1", "rails_7_0", "rails_7_2"]
+        exclude:
+          - ruby: "3.0"
+            gemfile: "rails_7_2"
         experimental: [false]
 
-        #include:
-        #  - ruby: '2.7'
-        #    gemfile: rails_head
-        #    experimental: true
-        #  - ruby: '3.0'
-        #    gemfile: rails_head
-        #    experimental: true
-        #  - ruby: '3.1'
-        #    gemfile: rails_head
-        #    experimental: true
-
     steps:
       - uses: actions/checkout@v3
 

data/Appraisals

@@ -6,6 +6,6 @@ appraise "rails-7-0" do
   gem "rails", "~> 7.0.0"
 end
 
-appraise "rails-7-1" do
-  gem "rails", "~> 7.1.0"
-end
+appraise "rails-7-2" do
+  gem "rails", "~> 7.2.0"
+end

data/CHANGELOG.md

@@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.
 
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.19.0
+### Added
+- Add support for rails 7.2, but leave out rails 7.1 support. This is because ActionView has a breaking bug in 7.1 that renders the template back as a string
+instead of an object, like we need for Pbbuilder https://github.com/rails/rails/pull/51023
+
+## 0.18.0
+### Added
+- Allow literal assignment of protos to fields
+
 ## 0.17.0
 ### Changed
 - Instead of appending to repeated enum message, we're replacing it to avoid issues in case output will be rendered twice

data/Gemfile

@@ -7,5 +7,3 @@ gemspec
 
 gem "rake"
 gem "appraisal"
-
-gem "ruby-lsp"

data/README.md

@@ -1,17 +1,19 @@
 # Pbbuilder
-PBBuilder generates [Protobuf](https://developers.google.com/protocol-buffers) Messages with a simple DSL similar to [JBuilder](https://rubygems.org/gems/jbuilder) gem.
+PBBuilder generates [Protobuf](https://developers.google.com/protocol-buffers) Messages with a simple DSL similar to the [JBuilder](https://rubygems.org/gems/jbuilder) gem.
 
 
-At least Rails 6.1 is required.
+At least Rails 6.1 is required and rails 7.1 is currently not supported.
+There currently is a regression in ActionView (the part of Rails which renders) that forces rendered objects into strings, but for Pbbuilder we need the raw objects.
+This is only present in Rails 7.1, and a fix is released in Rails 7.2. https://github.com/rails/rails/pull/51023
 
 ## Compatibility with jBuilder
 We don't aim to have 100% compitability and coverage with jbuilder gem, but we closely follow jbuilder's API design to maintain familiarity.
 
 | | Jbuilder | Pbbuilder |
 |---|---|---|
-|  set! | ✅ | ✅ |
-|  cache! | ✅ | ✅ |
-|  cache_if! | ✅ | ✅ |
+| set! | ✅ | ✅ |
+| cache! | ✅ | ✅ |
+| cache_if! | ✅ | ✅ |
 | cache_root! | ✅|  |
 | fragment cache | ✅| ✅ |
 | extract! | ✅ | ✅ |
@@ -20,7 +22,7 @@ We don't aim to have 100% compitability and coverage with jbuilder gem, but we c
 | array! | ✅ |  |
 | .call | ✅ |  |
 
-Due to protobuf message implementation, there is absolutely no need to implement support for `deep_format_keys!`, `key_format!`, `key_format`, `deep_format_keys`, `ignore_nil!`, `ignore_nil!`, `nil`. So those would never be added.
+Due to the protobuf message implementation, there is absolutely no need to implement support for `deep_format_keys!`, `key_format!`, `key_format`, `deep_format_keys`, `ignore_nil!`, `ignore_nil!`, `nil`. So those would never be added.
 
 ## Usage
 The main difference is that it can use introspection to figure out what kind of protobuf message it needs to create.
@@ -56,7 +58,7 @@ pb.phone_number account.phone_number
 pb.tag account.tag
 ```
 
-could be rewritten to a shorter version with a use of `extract!`.
+can be rewritten to a shorter version with the use of `extract!`.
 ```
 pb.extract! account, :id, :phone_number, :tag
 ```
@@ -75,7 +77,7 @@ Using partial while passing a variable to it
 pb.account partial: "account", account: @account
 ```
 
-Here is way to use partials with collection while passing a variable to it
+Here is a way to use partials with a collection while passing a variable to it
 
 ```
 pb.accounts @accounts, partial: "account", as: account
@@ -91,7 +93,7 @@ pb.friends partial: "racers/racer", as: :racer, collection: @racers
 pb.friends "racers/racer", as: :racer, collection: @racers
 ```
 
-And there are other ways, that don't use Collection Renderer (not very effective probably)
+And there are other ways, that don't use CollectionRenderer
 ```ruby
 pb.partial! @racer, racer: Racer.new(123, "Chris Harris", friends)
 ```
@@ -100,7 +102,7 @@ pb.friends @friends, partial: "racers/racer", as: :racer
 ```
 
 ### Caching
-it uses Rails.cache and works like caching in HTML templates:
+It uses Rails.cache and works like caching in HTML templates:
 
 ```
 pb.cache! "cache-key", expires_in: 10.minutes do
@@ -116,7 +118,7 @@ pb.cache_if! !admin?, "cache-key", expires_in: 10.minutes do
 end
 ```
 
-Fragment caching currently works through ActionView::CollectionRenderer and can be used only with the following syntax:
+Fragment caching currently works through ActionView::CollectionRenderer and can only be used with the following syntax:
 
 ```ruby
 pb.friends partial: "racers/racer", as: :racer, collection: @racers, cached: true
@@ -146,10 +148,14 @@ $ gem install pbbuilder
 
 When debugging, make sure to prepend `::Kernel` to any calls such as `puts` as otherwise the code will think you're trying to add another attribute into protobuf object.
 
-In case, you're looking to use breakpoints for debugging purposes - it's better to use `pry`. Just make sure to [change pbbuilder superclass from `ProxyObject/BasicObject` to `Object`](lib/pbbuilder/pbbuilder.rb).
+In case you're looking to use breakpoints (for debugging purposes via `binding.pry` for instance), let Pbbuilder inherit from `Object` instead of `BasicObject`]
+Seen in:
+[Pbbuilder](lib/pbbuilder/pbbuilder.rb)
+[Errors](lib/pbbuilder/errors.rb)
 
 ## Testing
-Running `bundle exec appraisal rake test` locally will run entire testsuit with all version of rails. To run tests only for certain rails version do the following `bundle exec appraisal rails-7-0 rake test`
+Running `bundle exec appraisal rake test` locally will run the entire testsuit with all versions of rails.
+To run tests only for a certain rails version do the following `bundle exec appraisal rails-7-0 rake test`
 
 To run only one tests from file - use `m` utility. Like this:
 `bundle exec appraisal rails-7-0 m test/pbbuilder_template_test.rb:182`

data/Rakefile

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -11,10 +10,28 @@ if !ENV["APPRAISAL_INITIALIZED"] && !ENV["CI"]
 else
   Rake::TestTask.new(:test) do |t|
     t.libs << "test"
-    t.pattern = "test/**/*_test.rb"
-    t.verbose = false
-    t.warning = false
+    t.libs << "lib"
+
+    # Running specific tests with line numbers, like with rails test, is not supported by default in rake.
+    # By setting the TESTOPS env var we can however specify the name of a single test with underscores instead of spaces.
+    # So run your single test by calling for ex:
+    #
+    # rake test /Users/sebastian/projects/cheddar/rails-twirp/test/ping_controller_test.rb "uncaught errors should bubble up to the test"
+
+    file_name = ARGV[1]
+    test_name = ARGV[2]&.tr(" ", "_")
+
+    ENV["TESTOPTS"] = "--verbose"
+
+    t.test_files = if file_name
+      if test_name
+        ENV["TESTOPTS"] += " --name=test_#{test_name}"
+      end
+      [file_name]
+    else
+      FileList["test/**/*_test.rb"]
+    end
   end
 
   task default: :test
-end
+end

data/gemfiles/rails_6_1.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "appraisal"
-gem "ruby-lsp"
 gem "rails", "~> 6.1.0"
 
 gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "appraisal"
-gem "ruby-lsp"
 gem "rails", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_7_1.gemfile → rails_7_2.gemfile}

@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "appraisal"
-gem "ruby-lsp"
-gem "rails", "~> 7.1.0"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

data/lib/pbbuilder/errors.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require 'pbbuilder'
-
-class Pbbuilder
+class Pbbuilder < BasicObject
   class MergeError < ::StandardError
     def self.build(current_value, updates)
       message = "Can't merge #{updates.inspect} into #{current_value.inspect}"
       self.new(message)
     end
   end
-end
+end

data/lib/pbbuilder/template.rb

@@ -17,6 +17,7 @@ class PbbuilderTemplate < Pbbuilder
   end
 
   # Render a partial. Can be called as:
+  #
   # pb.partial! "name/of_partial", argument: 123
   # pb.partial! "name/of_partial", locals: {argument: 123}
   # pb.partial! partial: "name/of_partial", argument: 123
@@ -30,7 +31,7 @@ class PbbuilderTemplate < Pbbuilder
     end
   end
 
-  # Set the value in the message field.
+  # Sets the value in the message field.
   #
   # @example
   #  pb.friends @friends, partial: "friend", as: :friend
@@ -39,31 +40,30 @@ class PbbuilderTemplate < Pbbuilder
   #  pb.friends "racers/racer", as: :racer, collection: [Racer.new(1, "Johnny Test", []), Racer.new(2, "Max Verstappen", [])]
 
   def set!(field, *args, **kwargs, &block)
-    # If partial options are being passed, we render a submessage with a partial
+    # If any partial options are being passed, we render a submessage with a partial
     if kwargs.has_key?(:partial)
       if args.one? && kwargs.has_key?(:as)
-        # example syntax that should end up here:
+        # Example syntax that should end up here:
         #   pb.friends @friends, partial: "friend", as: :friend
         # Call set! on the super class, passing in a block that renders a partial for every element
         super(field, *args) do |element|
           _set_inline_partial(element, kwargs)
         end
       elsif kwargs.has_key?(:collection) && kwargs.has_key?(:as)
-        # example syntax that should end up here:
+        # Example syntax that should end up here:
         #   pb.friends partial: "racers/racer", as: :racer, collection: [Racer.new(1, "Johnny Test", []), Racer.new(2, "Max Verstappen", [])]
 
         _render_collection_with_options(field, kwargs[:collection], kwargs)
       else
-        # # example syntax that should end up here:
+        # Example syntax that should end up here:
         # pb.best_friend partial: "person", person: @best_friend
-
         super(field, *args) do
           _render_partial_with_options(kwargs)
         end
       end
     else
       if args.one? && kwargs.has_key?(:collection) && kwargs.has_key?(:as)
-        # example syntax that should end up here:
+        # Example syntax that should end up here:
         #   pb.friends "racers/racer", as: :racer, collection: [Racer.new(1, "Johnny Test", []), Racer.new(2, "Max Verstappen", [])]
         _render_collection_with_options(field, kwargs[:collection], kwargs.merge(partial: args.first))
       else
@@ -72,7 +72,7 @@ class PbbuilderTemplate < Pbbuilder
     end
   end
 
-  # Caches fragment of message. Can be called like the following:
+  # Caches a fragment of a message with a given cache key. Can be called like the following:
   # 'pb.cache! "cache-key" do; end'
   # 'pb.cache! "cache-key", expire_in: 1.min do; end'
   #
@@ -107,16 +107,16 @@ class PbbuilderTemplate < Pbbuilder
 
   private
 
-  # Uses ActionView::CollectionRenderer to render collection effectively and to use rails built in fragment caching support.
+  # Uses ActionView::CollectionRenderer to render the collection effectively and to use rails' built-in fragment caching support.
   #
-  # The way recursive rendering works is that the CollectionRenderer needs to be aware of the node its currently rendering and parent node.
-  # There is no need to know the entire "stack" of nodes. ActionView::CollectionRenderer would traverse to bottom node render it first and then go one leve up in stack,
-  # rince and repeat until entire stack is rendered.
+  # The way recursive rendering works is that the CollectionRenderer needs to be aware of the node it's currently rendering and it's parent node.
+  # There is no need to know the entire "stack" of nodes. ActionView::CollectionRenderer will traverse to the bottom node, render it first and then go one level up in the stack.
+  # Rinse and repeat until the entire stack is rendered.
 
   # CollectionRenderer uses locals[:pb] to render the partial as a protobuf message,
   # but also needs locals[:pb_parent] to apply the rendered partial to the top level protobuf message.
 
-  # This logic can be found in CollectionRenderer#build_rendered_collection method that we overwrote.
+  # This logic can be found in the CollectionRenderer#build_rendered_collection method that we overwrote.
   def _render_collection_with_options(field, collection, options)
     partial = options[:partial]
 
@@ -128,15 +128,15 @@ class PbbuilderTemplate < Pbbuilder
     options[:locals].merge!(field: field)
 
     if options.has_key?(:layout)
-      raise ::NotImplementedError, "The `:layout' option is not supported in collection rendering."
+      ::Kernel.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."
+      ::Kernel.raise ::NotImplementedError, "The `:spacer_template' option is not supported in collection rendering."
     end
 
     CollectionRenderer
-      .new(@context.lookup_context, options) { |&block| _scope(message[field.to_s],&block) }
+      .new(@context.lookup_context, options) { |&block| _scope(message[field.to_s], &block) }
       .render_collection_with_partial(collection, partial, @context, nil)
   end
 
@@ -172,10 +172,9 @@ class PbbuilderTemplate < Pbbuilder
         begin
           ::Rails.cache.write(key, value, options)
         rescue ::SystemCallError
-          # In case ActiveSupport::Cache::FileStore in Rails is used as a cache,
-          # File.atomic_write can have a race condition and fail to rename temporary
-          # file. We're attempting to recover from that, by catching this specific
-          # error and returning a value.
+          # In case `ActiveSupport::Cache::FileStore` in Rails is used as a cache,
+          # `File.atomic_write` can have a race condition and fails to rename temporary file.
+          # We're attempting to recover from that by catching this specific error and returning a value.
           #
           # @see https://github.com/rails/rails/pull/44151
           # @see https://github.com/rails/rails/blob/main/activesupport/lib/active_support/core_ext/file/atomic.rb#L50

data/lib/pbbuilder.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "pbbuilder/pbbuilder"
-require 'pbbuilder/errors'
+require "pbbuilder/errors"
 require "pbbuilder/protobuf_extension"
 require "pbbuilder/railtie" if defined?(Rails)
 
-
-# Pbbuilder makes it easy to create a protobuf message using the builder pattern
+# Pbbuilder makes it easy to create a protobuf message using the builder pattern.
 # It is heavily inspired by jbuilder
 #
 # Given this example message definition:
@@ -15,8 +13,10 @@ require "pbbuilder/railtie" if defined?(Rails)
 #   repeated Person friends = 2;
 # }
 #
-# You could use Pbbuilder as follows:
+# You can use Pbbuilder as follows:
+#
 # person = RPC::Person.new
+#
 # Pbbuilder.new(person) do |pb|
 #   pb.name "Hello"
 #   pb.friends [1, 2, 3] do |number|
@@ -29,7 +29,7 @@ require "pbbuilder/railtie" if defined?(Rails)
 # It basically works exactly like jbuilder. The main difference is that it can use introspection to figure out what kind
 # of protobuf message it needs to create.
 
-class Pbbuilder
+class Pbbuilder < BasicObject
   def initialize(message)
     @message = message
 
@@ -48,11 +48,15 @@ class Pbbuilder
     !!_descriptor_for_field(field)
   end
 
+  # When calling for ex: response.drivers, where response is a Google::Protobuf object, 'drivers' is not a method on that. These
+  # methods (or messages in our case) get added here. This is of course based on what kind of message it is. Singular, an array
+  # (repeated) etc. with their arguments.
   def set!(field, *args, &block)
     name = field.to_s
     descriptor = _descriptor_for_field(name)
-    ::Kernel.raise ::ArgumentError, "Unknown field #{name}" if descriptor.nil?
+    ::Kernel.raise ::ArgumentError, "Unknown field: #{name}" if descriptor.nil?
 
+    # An block is used to pass on it's children
     if ::Kernel.block_given?
       ::Kernel.raise ::ArgumentError, "can't pass block to non-message field" unless descriptor.type == :message
 
@@ -66,9 +70,11 @@ class Pbbuilder
         # example syntax that should end up here:
         #   pb.field { pb.name "hello" }
         ::Kernel.raise ::ArgumentError, "wrong number of arguments (expected 0)" unless args.empty?
+
         message = (@message[name] ||= _new_message_from_descriptor(descriptor))
         _scope(message, &block)
       end
+    # No block given, but with 1 argument
     elsif args.length == 1
       arg = args.first
       if descriptor.label == :repeated
@@ -82,20 +88,31 @@ class Pbbuilder
 
           @message[name].replace arg.to_ary
         elsif arg.respond_to?(:to_ary) && descriptor.type.eql?(:message)
-          # example syntax that should end up here:
-          #   pb.friends [Person.new(name: "Johnny Test"), Person.new(name: "Max Verstappen")]
-
-          args.flatten.each {|obj| @message[name].push descriptor.subtype.msgclass.new(obj)}
+          # pb.friends [Person.new(name: "Johnny Test"), Person.new(name: "Max Verstappen")]
+          #
+          # Accepts both objects that can be to_hash-translated into keyword arguments
+          # for creating a nested proto message object and actual proto message objects
+          # which can be assigned "as is". With "as-is" assignment the proto message can be stored
+          # in memory and reused
+          nested_messages = arg.map do |arg_member_message_or_hash|
+            # If the arg passed already is a proto message and is the same as the
+            # field expects - just use it as-is
+            if arg_member_message_or_hash.is_a?(descriptor.subtype.msgclass)
+              arg_member_message_or_hash
+            else
+              descriptor.subtype.msgclass.new(arg_member_message_or_hash)
+            end
+          end
+          @message[name].replace(nested_messages)
         else
           # example syntax that should end up here:
           #   pb.fields "one"
-
           @message[name].replace [arg]
         end
       else
         # example syntax that should end up here:
         #   pb.field "value"
-        
+
         @message[name] = arg
       end
     else
@@ -117,6 +134,8 @@ class Pbbuilder
     end
   end
 
+  # Shorthand command for getting a few attributes from an object.
+  #     pb.extract! racer, :name, :id, :age
   def extract!(element, *args)
     args.each { |arg| @message[arg.to_s] = element.send(arg) }
   end
@@ -170,6 +189,7 @@ class Pbbuilder
     @message
   end
 
+  # @param field string
   def new_message_for(field)
     descriptor = _descriptor_for_field(field)
     ::Kernel.raise ::ArgumentError, "Unknown field #{field}" if descriptor.nil?
@@ -179,11 +199,14 @@ class Pbbuilder
 
   private
 
+  # Lookup the field name (or 'attribute' name, for ex "best_friend") on the Google descriptor (Google::Protobuf::Descriptor) of our
+  # message object.
+  # @param field string
   def _descriptor_for_field(field)
     @message.class.descriptor.lookup(field.to_s)
   end
 
-  # Appends protobuf message with existing @message object
+  # Appends protobuf objects to our 'repeated' attribute. This can create a list of items to a repeated field.
   #
   # @param name string
   # @param descriptor Google::Protobuf::FieldDescriptor
@@ -199,7 +222,8 @@ class Pbbuilder
     @message[name].push(*elements)
   end
 
-  # Yields an Protobuf object in a scope of message and provided values.
+  # Yields a Protobuf object in the scope of message and provided values.
+  # This will 'assign' the field values as it were to the message attributes.
   #
   # @param message Google::Protobuf::(field_type)
   def _scope(message)
@@ -211,7 +235,7 @@ class Pbbuilder
     @message = old_message
   end
 
-  # Build up empty protobuf message based on descriptor
+  # Builds up an empty protobuf message based on the given descriptor.
   #
   # @param descriptor Google::Protobuf::FieldDescriptor
   def _new_message_from_descriptor(descriptor)
@@ -222,4 +246,4 @@ class Pbbuilder
     message_class = message_descriptor.msgclass
     message_class.new
   end
-end
+end

data/pbbuilder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "pbbuilder"
-  spec.version = "0.17.0"
+  spec.version = "0.19.0"
   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

@@ -57,7 +57,7 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
   test "collection partial with fragment caching enabled" do
     template = <<-PBBUILDER
       racers = [Racer.new(1, "Johnny Test", [], nil, API::Asset.new(url: "https://google.com/test1.svg")), Racer.new(2, "Max Verstappen", [])]
-      pb.friends partial: "racers/racer", as: :racer, collection: racers, cached: true
+      pb.friends partial: "racers/racer", collection: racers, cached: true, as: :racer
     PBBUILDER
     result = render(template)
 
@@ -83,7 +83,7 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
   end
 
   test "render collections with partial as arg" do
-    skip("This will be addressed in future version of a gem")
+    skip("This will be addressed in a future version of this 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

data/test/pbbuilder_test.rb

@@ -30,6 +30,23 @@ class PbbuilderTest < ActiveSupport::TestCase
     assert_equal "Eggs", person.favourite_foods["Breakfast"]
   end
 
+  test "allows assignment of prefab nested proto messages" do
+    max_proto = API::Person.new(name: "Max Verstappen")
+    james_proto = API::Person.new(name: "James Hunt")
+    friend_protos = [max_proto, james_proto]
+
+    person = Pbbuilder.new(API::Person.new) do |pb|
+      pb.name "Niki Lauda"
+      pb.friends friend_protos
+      pb.best_friend james_proto
+    end.target!
+
+    assert_equal "Niki Lauda", person.name
+    assert_equal "Max Verstappen", person.friends[0].name
+    assert_equal "James Hunt", person.friends[1].name
+    assert_equal "James Hunt", person.best_friend.name
+  end
+
   test "replaces the repeated field's value with the last one set" do
     person = Pbbuilder.new(API::Person.new) do |pb|
       pb.field_mask do
@@ -45,7 +62,7 @@ class PbbuilderTest < ActiveSupport::TestCase
 
     assert_equal(["ok", "that's"], p.field_mask.paths)
   end
-  
+
   test "sets the last value of the repeated field to be the only value" do
     person = Pbbuilder.new(API::Person.new) do |pb|
       pb.field_mask do

data/test/test_helper.rb

@@ -55,10 +55,16 @@ class << Rails
   end
 end
 
+Pbbuilder::CollectionRenderer.collection_cache = Rails.cache
+
 class Racer < Struct.new(:id, :name, :friends, :best_friend, :logo)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
 
+  def cache_key
+    "racer-#{id}"
+  end
+
   # Fragment caching needs to know, if record could be persisted. We set it to false, this is a default in ActiveModel::API.
   def persisted?
     false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -89,13 +89,12 @@ files:
 - gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7.gemfile
 - gemfiles/rails_7_0.gemfile
-- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
 - gemfiles/rails_head.gemfile
 - lib/pbbuilder.rb
 - lib/pbbuilder/collection_renderer.rb
 - lib/pbbuilder/errors.rb
 - lib/pbbuilder/handler.rb
-- lib/pbbuilder/pbbuilder.rb
 - lib/pbbuilder/protobuf_extension.rb
 - lib/pbbuilder/railtie.rb
 - lib/pbbuilder/template.rb
@@ -123,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Generate Protobuf Messages with a simple DSL similar to JBuilder

data/lib/pbbuilder/pbbuilder.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-Pbbuilder = Class.new(begin
-    require 'active_support/proxy_object'
-    ActiveSupport::ProxyObject
-rescue LoadError
-    require 'active_support/basic_object'
-    ActiveSupport::BasicObject
-end)