identity_cache 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0daa9d36baa2b4c2e08dc8c29ab55274a1dbfab1d0146010720a68bfe9eff20e
-  data.tar.gz: '08708fb388587b7def00967250321904ffbfa9c071aca71f6b360ea22ec0ab8f'
+  metadata.gz: e7f8714a727af9c655659c133b31c7b5fbb43ca5e163bf5a18bfa6b55acbc74c
+  data.tar.gz: 6cb65683f29a68fde6727146daf1428af90f79fc8360b21dd51fcf291c681137
 SHA512:
-  metadata.gz: 61e4c7010330259878bb07f61a806b2b8d21d3cfbc67d07074cd9dddafd69471c6aa50ebdf880e39b9a0dba7203d0215f1336829842457ea877e3f065ce8e98e
-  data.tar.gz: e1d0f10f2a4a3ff678b4b89b60547c342ab6a0ce8f5d1623ebcdb29c227e08ee7da8234c32ed3388b745aa11f4be1989d5a554a521152bdd72ebaa9c92cc9747
+  metadata.gz: a00c855035a60e4f270e8c8f56d460049d359ac5d306924fd9b3770a58b8892674bcb036d15f0e0ddd538ef716a4261ea5924cefe4db4e6013662f06b773f2e7
+  data.tar.gz: 51a03f9a496bb30a75dc28a97dd6d0f9b17ca7b72ba01f6d9047578fbe1cef8f85705a170482aa177008ed9f4b73e054467b6d5f701a542e787e974081816cba

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/ci.yml

@@ -18,12 +18,15 @@ jobs:
           - name: 'Minimum supported'
             ruby: '3.0'
             gemfile: "Gemfile.min-supported"
+          - name: 'Latest Ruby 3'
+            ruby: '3.4'
+            gemfile: "Gemfile.latest-release"
           - name: 'Latest released & run rubocop'
-            ruby: '3.3'
+            ruby: '4.0'
             gemfile: "Gemfile.latest-release"
             rubocop: true
           - name: 'Rails edge'
-            ruby: '3.3'
+            ruby: '4.0'
             gemfile: "Gemfile.rails-edge"
             edge: true
 
@@ -70,9 +73,9 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install libmemcached-dev libmysqlclient-dev libpq-dev libsasl2-dev
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@80740b3b13bf9857e28854481ca95a84e78a2bdf # v1.284.0
       with:
         ruby-version: ${{ matrix.entry.ruby }}
         bundler-cache: true

data/.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Release
+
+on: workflow_dispatch
+
+jobs:
+  release:
+    permissions:
+      contents: write
+      id-token: write
+
+    environment: release
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - name: Install required packages
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install libmemcached-dev libmysqlclient-dev libpq-dev libsasl2-dev
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+      with:
+        bundler-cache: true
+        ruby-version: 3.4
+    - uses: rubygems/release-gem@052cc82692552de3ef2b81fd670e41d13cba8092 # v1.4.0

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 1.6.5
+
+- Improve MemCacheStoreCAS patch to properly pass serialized entries to Dalli.
+
+## 1.6.4
+
+- Patch `run_callbacks` instead of `_run_commit_callbacks` to expire cache prior to `after_commit` callbacks. (#602)
+
 ## 1.6.3
 
 - Split the `with_deferred_parent_expiration` and `with_deferred_parent_expiration`. (#578)

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/Shopify/memcached.git
-  revision: 54a89bae698896a00fd2ceeb142dada6285f73ed
+  revision: 30f5735d5db2dfd50dd885ceeb51672320b356d3
   branch: 1-0-stable-shopify
   specs:
     memcached (1.9.0)
@@ -8,21 +8,23 @@ GIT
 PATH
   remote: .
   specs:
-    identity_cache (1.6.3)
+    identity_cache (1.6.5)
       activerecord (>= 7.0)
       ar_transaction_changes (~> 1.1)
+      benchmark
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.2.0)
-      activesupport (= 7.2.0)
-    activerecord (7.2.0)
-      activemodel (= 7.2.0)
-      activesupport (= 7.2.0)
+    activemodel (8.0.2)
+      activesupport (= 8.0.2)
+    activerecord (8.0.2)
+      activemodel (= 8.0.2)
+      activesupport (= 8.0.2)
       timeout (>= 0.4.0)
-    activesupport (7.2.0)
+    activesupport (8.0.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -32,40 +34,51 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ar_transaction_changes (1.1.9)
       activerecord (>= 5.2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    byebug (11.1.3)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    byebug (12.0.0)
     cityhash (0.6.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
-    dalli (3.2.3)
-    drb (2.2.1)
-    i18n (1.14.5)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    dalli (3.2.8)
+    date (3.5.1)
+    drb (2.2.3)
+    erb (6.0.2)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    json (2.13.1)
+    language_server-protocol (3.17.0.5)
+    logger (1.7.0)
     memcached_store (2.3.4)
       activesupport (>= 6)
       memcached (~> 1.8)
-    minitest (5.25.1)
-    mocha (2.1.0)
+    minitest (5.27.0)
+    mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.6)
-    racc (1.7.3)
+    pg (1.5.9)
+    prism (1.4.0)
+    psych (5.3.1)
+      date
+      stringio
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.9.0)
-    rexml (3.3.6)
-      strscan
+    rake (13.3.0)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    regexp_parser (2.10.0)
+    rexml (3.4.2)
     rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -77,24 +90,26 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-shopify (2.9.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    securerandom (0.3.1)
+    securerandom (0.4.1)
     spy (1.0.5)
-    stackprof (0.2.26)
-    strscan (3.1.0)
-    timeout (0.4.1)
+    stackprof (0.2.27)
+    stringio (3.2.0)
+    timeout (0.4.3)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
+    uri (1.0.4)
 
 PLATFORMS
-  arm64-darwin-22
-  arm64-darwin-23
+  arm64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -109,6 +124,7 @@ DEPENDENCIES
   mysql2 (~> 0.5.3)
   pg (>= 0.18, < 2.0)
   rake (~> 13.0)
+  rdoc
   rubocop (~> 1.61.0)
   rubocop-shopify (~> 2.9.0)
   spy (~> 1.0)

data/identity_cache.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |gem|
   gem.files         = Dir.chdir(File.expand_path(__dir__)) do
     %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^test/}) }
   end
-  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.name          = "identity_cache"
   gem.require_paths = ["lib"]
   gem.version       = IdentityCache::VERSION
@@ -37,9 +36,11 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activerecord", ">= 7.0")
   gem.add_dependency("ar_transaction_changes", "~> 1.1")
+  gem.add_dependency("benchmark")
 
   gem.add_development_dependency("minitest", "~> 5.14")
   gem.add_development_dependency("mocha", "~> 2.0")
   gem.add_development_dependency("rake", "~> 13.0")
+  gem.add_development_dependency("rdoc")
   gem.add_development_dependency("spy", "~> 1.0")
 end

data/lib/identity_cache/mem_cache_store_cas.rb

@@ -4,6 +4,8 @@ require "dalli/cas/client" unless Dalli::VERSION > "3"
 
 module IdentityCache
   module MemCacheStoreCAS
+    Entry = ActiveSupport::Cache::Entry
+
     def cas(name, options = nil)
       options = merged_options(options)
       key = normalize_key(name, options)
@@ -12,10 +14,10 @@ module IdentityCache
         instrument(:cas, key, options) do
           @data.with do |connection|
             connection.cas(key, options[:expires_in].to_i, options) do |raw_value|
-              entry = deserialize_entry(raw_value, raw: options[:raw])
+              entry = deserialize_entry(raw_value, **options)
               value = yield entry.value
-              entry = ActiveSupport::Cache::Entry.new(value, **options)
-              options[:raw] ? entry.value.to_s : entry
+              entry = Entry.new(value, **options, version: normalize_version(name, options))
+              serialize_entry(entry, **options)
             end
           end
         end
@@ -34,7 +36,7 @@ module IdentityCache
 
           values = {}
           raw_values.each do |key, raw_value|
-            entry = deserialize_entry(raw_value.first, raw: options[:raw])
+            entry = deserialize_entry(raw_value.first, **options)
             values[keys_to_names[key]] = entry.value unless entry.expired?
           end
 
@@ -43,21 +45,12 @@ module IdentityCache
           updates.each do |name, value|
             key = normalize_key(name, options)
             cas_id = raw_values[key].last
-            entry = ActiveSupport::Cache::Entry.new(value, **options)
-            payload = options[:raw] ? entry.value.to_s : entry
+            entry = Entry.new(value, **options)
+            payload = serialize_entry(entry, **options)
             @data.with { |c| c.replace_cas(key, payload, cas_id, options[:expires_in].to_i, options) }
           end
         end
       end
     end
-
-    if ActiveSupport::Cache::MemCacheStore.instance_method(:deserialize_entry).arity == 1
-
-      private
-
-      def deserialize_entry(payload, raw: nil)
-        super(payload)
-      end
-    end
   end
 end

data/lib/identity_cache/query_api.rb

@@ -165,11 +165,20 @@ module IdentityCache
     # cache reads that happen from the ordering of callbacks. For example, if an after_commit
     # callback enqueues a background job, then we don't want it to be possible for the
     # background job to run and load data from the cache before it is invalidated.
-    def _run_commit_callbacks
-      if destroyed? || transaction_changed_attributes.present?
-        expire_cache
+    if ActiveRecord.version >= Gem::Version.new("7.1")
+      def run_callbacks(kind, type = nil)
+        if kind == :commit && (destroyed? || transaction_changed_attributes.present?)
+          expire_cache
+        end
+        super
+      end
+    else
+      def run_callbacks(kind)
+        if kind == :commit && (destroyed? || transaction_changed_attributes.present?)
+          expire_cache
+        end
+        super
       end
-      super
     end
 
     # Invalidate the cache data associated with the record. Returns `true` on success,

data/lib/identity_cache/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module IdentityCache
-  VERSION = "1.6.3"
+  VERSION = "1.6.5"
   CACHE_VERSION = 8
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Camilo Lopez
@@ -11,10 +11,9 @@ authors:
 - Tobias Lutke
 - Arthur Neves
 - Francis Bogsanyi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,6 +43,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +99,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spy
   requirement: !ruby/object:Gem::Requirement
@@ -107,8 +134,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -176,7 +205,6 @@ homepage: https://github.com/Shopify/identity_cache
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: IdentityCache lets you specify how you want to cache your model objects,
   at the model level, and adds a number of convenience methods for accessing those