pbbuilder 0.13.1 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 723b6cc8d707629dbdc6452a4b87cc3789cf53c9a1297385d36d6f9d96754dbd
-  data.tar.gz: 385d5ef697c559167a05a3952323823d688cd6b8ce3ae8287071ad2f59094ea8
+  metadata.gz: 10736ed13e1665f1bf45095973eb464ab2bcef87f3d69fe4bb8f89e3f35e0474
+  data.tar.gz: a2a8522c756cdf99638d7aef7f3ad7ed9d009ab24b46e499f2f7e0d4a3427b5e
 SHA512:
-  metadata.gz: 22726723278482ac876dda06bde71419520b007302ea8e377f64473a1118cde6e5947d3b640e29b869743996758309c667b6d40df037582609285fdc338f5ebe
-  data.tar.gz: 2f2164afc66e60e37483fc99442ed8983843eeb77c88e01c99196199539c3957e19a77bb787f6fb12098a462f5a455f14773890f649af9c9e5b6efe88702d8ff
+  metadata.gz: 366ce4bf8ef0195f67f9961cd15b5ebc8311b3c15c192d54a5a064a33a34e9e7696a2114afab7f4734bb1e89d61769ae823a91567562741bfc4bb0e9a41a4d3d
+  data.tar.gz: 88d5bc81285ac6e48531328b03a2194b5939dd40ca8bfe003502486f7009c22bb55f1a18c2767f28153942801c7f913526d5a5c18294373a00fcffbfd6daeef4

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.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

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/pbbuilder.gemspec

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

@@ -120,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"]
@@ -197,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
@@ -205,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
@@ -215,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"]

metadata

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