pbbuilder 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89f023f27d95d8d11cdf454148ef955b0234b6d7e59f40e30859e09c02761cb
-  data.tar.gz: 108693d16d963bc46ad96d3f79ed4b8078f8efc9c3a7f798c32b7bdd5cc98e73
+  metadata.gz: dc165db83a23b9c5bf32a6921b3cd959171083d48f7a6887df8c524f9920d574
+  data.tar.gz: 7d3631f19dea340592918300b66e6d024889fe2c18776c729d4bebdb9424ad4b
 SHA512:
-  metadata.gz: aa478fc7fad5954801385b731b7fc77296d732e8f13a6bc5688417dfdeb247a7135f3ecbce14f88abc441a87cbc6ad669d3f5547b917f80bfddfbac7e0b2c9a8
-  data.tar.gz: 2fe79ab3cfde6b908907d55eaf37054cb0b530f4e98dbf44d732bef82c46054f0efd4c6ba3a05827915cc855f9cc70a671adc2316c691edd5147ababec573ec6
+  metadata.gz: ad453cd1f12f8a71f05b98c5d60e34837848f1c4bdbe403d41a407762b980d5f47c6dc16925b01f2927fef427cb82b5a4b23801102fa7a46d280adf1245afe2f
+  data.tar.gz: 1b0bb8019d473e1a433e3009ece6976d7a42992e00d207290106fef8a7de3fd16de5c49caaf6dc23a39aab5cdd6369caae06f62b34def0f431e6c16361210e03

data/CHANGELOG.md

@@ -3,6 +3,10 @@ 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.15.1
+### Fixed
+- #merge! method to handle repeated unintialized message object
+
 ## 0.15.0
 ### Changed
 - #merge! method was refactored to accomodate caching for all data types (especially those that are :repeated)

data/lib/pbbuilder.rb

@@ -157,6 +157,11 @@ class Pbbuilder
 
           object[key].each do |k, v|
             if object[key][k].respond_to?(:to_hash)
+              if @message[key.to_s][k.to_s].nil?
+                descriptor = @message[key.to_s].class.descriptor.lookup(k.to_s)
+                @message[key.to_s][k.to_s] = _new_message_from_descriptor(descriptor)
+              end
+
               _scope(@message[key.to_s][k.to_s]) { self.merge!(object[key][k]) }
             elsif object[key][k].respond_to?(:to_ary)
               @message[key.to_s][k.to_s].replace object[key][k]

data/pbbuilder.gemspec

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

@@ -116,6 +116,38 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     }
   end
 
+  test "caching a message object" do
+    template = <<-PBBUILDER
+      pb.cache! "some-random-key-again" do
+        pb.best_friend do
+          pb.name "Max Verstappen"
+          pb.logo do
+            pb.url('https://google.com/image.jpg')
+            pb.url_2x('https://google.com/image.jpg')
+            pb.url_3x('https://google.com/image.jpg')
+          end
+        end
+        pb.logo do
+          pb.url('https://google.com/image.jpg')
+          pb.url_2x('https://google.com/image.jpg')
+          pb.url_3x('https://google.com/image.jpg')
+        end
+      end
+    PBBUILDER
+
+    assert_nothing_raised { render(template) }
+
+    result = render('pb.cache! "some-random-key-again" do; end ')
+
+    assert_equal('https://google.com/image.jpg', result.logo.url)
+    assert_equal('https://google.com/image.jpg', result.logo.url_2x)
+    assert_equal('https://google.com/image.jpg', result.logo.url_3x)
+
+    assert_equal('https://google.com/image.jpg', result.best_friend.logo.url)
+    assert_equal('https://google.com/image.jpg', result.best_friend.logo.url_2x)
+    assert_equal('https://google.com/image.jpg', result.best_friend.logo.url_3x)
+  end
+
   test "empty fragment caching" do
     render 'pb.cache! "nothing" do; end'
 

data/test/test_helper.rb

@@ -33,6 +33,13 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       repeated :tags, :string, 7
       optional :last_name, :string, 8
       optional :boolean_me, :bool, 9
+      optional :logo, :message, 10, "pbbuildertest.Asset"
+    end
+
+    add_message "pbbuildertest.Asset" do
+      optional :url, :string, 1
+      optional :url_2x, :string, 2
+      optional :url_3x, :string, 3
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf