pbbuilder 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4a4d405e3fe428fa8de8ba8609f62211a0224d76fe13bc32d7caf2a07e089c
-  data.tar.gz: 35cf4c2ed96cbb643dfb22db3de4d6ff035cc420f78806489d329b42fd14f88e
+  metadata.gz: 4ece867edfd6c367638386b6ff729160fc48869e95da675c27dcf863e114bb0f
+  data.tar.gz: 2ca090784cbbd677cb428f7aefe74acf350e06331f234fba62fc65266284cd46
 SHA512:
-  metadata.gz: 5aa3d1b2e64745042fdc1e828ee295d9e14c9891ab3a826d7af64563451b31e2dff28b744419cbb54db31e564dff5e960a2270ab98f480baeca4aeee71373e5e
-  data.tar.gz: 26d816822376f1857cd517c81ac88df26f2cf52cc0aa82dc602249e67f33a446bd8c10aec1cff544638484cb58c03121f15145af7f4ea3af05c13d45f770e29d
+  metadata.gz: 8a0128aef94081281e0c8430aa4779864c5571f1d3a4e9d7d4af9f12134fce29fdea37464228b4b21cd4739c06cf8f971d8bb4d4084038acea78cbcfc7f5783b
+  data.tar.gz: 92a957df036ae419b6734747d503fa348462156aa369c707d270125a1d17b3fc107b92905550a594415d6c514664da066be4fcc46be27c391d532939e3f55182

data/CHANGELOG.md

@@ -3,6 +3,14 @@ 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.13.2 2023.02.3
+### Fixed
+- 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.
+
+## 0.13.1 2023.01.24
+### Added
+- #merge! to support boolean values
+
 ## 0.13.0 2023.01.18
 ### Added
 - #merge! method added for PbbuilderTemplate class

data/lib/pbbuilder/template.rb

@@ -108,11 +108,22 @@ class PbbuilderTemplate < Pbbuilder
   # @param key string
   # @params options hash
   #
-  # @return string
+  # @return string contents of a cache
   def _write_fragment_cache(key, options = nil)
-    @context.controller.instrument_fragment_cache :_write_fragment, key do
+    @context.controller.instrument_fragment_cache :write_fragment, key do
       yield.tap do |value|
-        ::Rails.cache.write(key, value, options)
+        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.
+          #
+          # @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
+          value
+        end
       end
     end
   end

data/lib/pbbuilder.rb

@@ -111,11 +111,11 @@ class Pbbuilder
   #
   # @param object [Hash]
   def merge!(object)
-    ::Kernel.raise ::MergeError.build(target!, object) unless object.class == ::Hash
+    ::Kernel.raise Pbbuilder::MergeError.build(target!, object) unless object.class == ::Hash
 
     object.each_key do |key|
-      if object[key].empty?
-        ::Kernel.raise ::MergeError.build(target!, object)
+      if object[key].respond_to?(:empty?) && object[key].empty?
+        ::Kernel.raise Pbbuilder::MergeError.build(target!, object)
       end
 
       if object[key].class == ::String
@@ -124,6 +124,9 @@ class Pbbuilder
       elsif object[key].class == ::Array
         # pb.tags ['test', 'ok']
         @message[key.to_s].replace object[key]
+      elsif object[key].class == ::TrueClass || object[key].class == ::FalseClass
+        # pb.boolean true || false
+        @message[key.to_s] = object[key]
       elsif ( obj = object[key]).class == ::Hash
         # pb.field_name do
         #    pb.tags ["ok", "cool"]

data/pbbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "pbbuilder"
-  spec.version = "0.13.0"
+  spec.version = "0.13.2"
   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

@@ -85,6 +85,11 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     assert_equal("suslik", result.name)
   end
 
+  test "boolean support in merge! method" do
+    assert(render('pb.merge! "boolean_me" => true').boolean_me)
+    refute(render('pb.merge! "boolean_me" => false').boolean_me)
+  end
+
   test "support for merge! method in a block" do
     result = render(<<-PBBUILDER)
       pb.best_friend do
@@ -115,10 +120,10 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
     result = nil
 
     assert_nothing_raised do
-      result = render(<<-JBUILDER)
+      result = render(<<-PBBUILDER)
         pb.name "suslik"
         pb.cache! "nothing" do; end
-      JBUILDER
+      PBBUILDER
     end
 
     assert_equal "suslik", result["name"]
@@ -192,7 +197,7 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
   end
 
   test "conditional object fragment caching" do
-    render(<<-JBUILDER)
+    render(<<-PBBUILDER)
       pb.cache_if! true, "cache-key" do
         pb.name "Hit"
       end
@@ -200,9 +205,9 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
       pb.cache_if! false, "cache-key" do
         pb.last_name "Hit"
       end
-    JBUILDER
+    PBBUILDER
 
-    result = render(<<-JBUILDER)
+    result = render(<<-PBBUILDER)
       pb.cache_if! true, "cache-key" do
         pb.name "Miss"
       end
@@ -210,7 +215,7 @@ class PbbuilderTemplateTest < ActiveSupport::TestCase
       pb.cache_if! false, "cache-key" do
         pb.last_name "Miss"
       end
-    JBUILDER
+    PBBUILDER
 
     assert_equal "Hit", result["name"]
     assert_equal "Miss", result["last_name"]

data/test/test_helper.rb

@@ -22,13 +22,14 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("pbbuilder.proto", syntax: :proto3) do
     add_message "pbbuildertest.Person" do
       optional :name, :string, 1
-      optional :last_name, :string, 8
       repeated :friends, :message, 2, "pbbuildertest.Person"
       optional :best_friend, :message, 3, "pbbuildertest.Person"
       repeated :nicknames, :string, 4
       optional :field_mask, :message, 5, "google.protobuf.FieldMask"
       map :favourite_foods, :string, :string, 6
       repeated :tags, :string, 7
+      optional :last_name, :string, 8
+      optional :boolean_me, :bool, 9
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pbbuilder
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Bouke van der Bijl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf