identity_cache 1.2.0 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 561965856845fc5d5094581d735584924eda58557edfb3831c39bce2498635aa
-  data.tar.gz: 33a85428a3b2a298076d81a79b662b742c00a25971bf453f8f57eeab7cba2681
+  metadata.gz: 0daa9d36baa2b4c2e08dc8c29ab55274a1dbfab1d0146010720a68bfe9eff20e
+  data.tar.gz: '08708fb388587b7def00967250321904ffbfa9c071aca71f6b360ea22ec0ab8f'
 SHA512:
-  metadata.gz: 6a8c691d8883acfd69f11724dfff13a3ef4858a2abd2ca658659981f1d08b36dea244100c4030b8ef5d39ac8509e639fea6cd02127e09d157be636fcc2bee77a
-  data.tar.gz: e357c3a4f02a288a5ddb3290cbd11176937821bb3c9052fb318d9139ac253650f7018a8249b2ebc9f115015a6434baf7cb1b7e76bfb0dbf1e98ee745e3e95ed7
+  metadata.gz: 61e4c7010330259878bb07f61a806b2b8d21d3cfbc67d07074cd9dddafd69471c6aa50ebdf880e39b9a0dba7203d0215f1336829842457ea877e3f065ce8e98e
+  data.tar.gz: e1d0f10f2a4a3ff678b4b89b60547c342ab6a0ce8f5d1623ebcdb29c227e08ee7da8234c32ed3388b745aa11f4be1989d5a554a521152bdd72ebaa9c92cc9747

data/.github/workflows/ci.yml

@@ -16,14 +16,14 @@ jobs:
       matrix:
         entry:
           - name: 'Minimum supported'
-            ruby: '2.5'
+            ruby: '3.0'
             gemfile: "Gemfile.min-supported"
           - name: 'Latest released & run rubocop'
-            ruby: '3.0'
+            ruby: '3.3'
             gemfile: "Gemfile.latest-release"
             rubocop: true
           - name: 'Rails edge'
-            ruby: '3.0'
+            ruby: '3.3'
             gemfile: "Gemfile.rails-edge"
             edge: true
 
@@ -69,25 +69,26 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -y install libmemcached-dev libmysqlclient-dev libpq-dev libsasl2-dev
+
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.entry.ruby }}
-    - name: Install bundler and gems
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true
+
     - name: Test with mysql
       env:
         DB: mysql2
       run: bundle exec rake test
+
     - name: Test with postgres and memcached_store
       env:
         DB: postgresql
         POSTGRES_PASSWORD: postgres
         ADAPTER: memcached
       run: bundle exec rake test
+
     - name: Run rubocop
       if: matrix.entry.rubocop
       run: bundle exec rubocop

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-*.lock
 InstalledFiles
 _yardoc
 coverage
@@ -17,3 +16,4 @@ test/version_tmp
 tmp
 .rubocop-http*
 .byebug_history
+gemfiles/*.lock

data/.rubocop.yml

@@ -2,7 +2,6 @@ inherit_gem:
   rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
   NewCops: disable
 
 Layout/BeginEndAlignment:

data/.ruby-version

@@ -0,0 +1 @@
+3.3.4

data/CHANGELOG.md

@@ -1,18 +1,99 @@
 # Identity Cache Changelog
 
+## Unreleased
+
+## 1.6.3
+
+- Split the `with_deferred_parent_expiration` and `with_deferred_parent_expiration`. (#578)
+
+## 1.6.2
+
+- Support deferred expiry of associations and attributes. Add a rake task to create test database. (#577)
+
+## 1.6.1
+
+- Fix deprecation warnings on Active Record 7.2. (#575)
+
+## 1.6.0
+
+- Introduce `.with_deferred_parent_expiration`, which takes a block and avoids duplicate parent cache expiry. (#569)
+
+## 1.5.6
+
+- Minor performance improvements on association read
+
+## 1.5.5
+
+- Minor performance improvements on association read
+
+
+## 1.5.4
+
+- Make `prefetch_associations` work as expected on associations that have been partially prefetched
+
+## 1.5.3
+
+- No longer call `should_use_cache?` on embedded/prefetched associations when reading values
+
+## 1.5.2
+
+- Add missing `should_use_cache?` to `fetch_multi` methods.
+
+## 1.5.1
+
+- Fix parent cache invalidation for custom foreign key associations
+
+## 1.5.0
+
+- Require Active Record 7+
+- Require Ruby 3+
+- Improve compatibility with Active Record 7.1.
+
+## 1.4.1
+
+### Fixes
+
+- Fix `fetch_multi_by` bug for queries having a single field with distinct values. (#536)
+
+## 1.4.0
+
+### Features
+
+- Add `fetch_multi_by` support for composite-key indexes. (#534)
+
+## 1.3.1
+
+### Fixes
+
+- Remove N+1 queries from embedded associations when using `fetch` while `should_use_cache` is false. (#531)
+
+## 1.3.0
+
+### Features
+
+- Return meaningful value from `expire_cache` indicating whenever it succeeded or failed in the process. (#523)
+
+### Fixes
+
+- Expire parents cache when when calling `expire_cache`. (#523)
+- Avoid creating too many shapes on Ruby 3.2+. (#526)
+
 ## 1.2.0
 
 ### Fixes
+
 - Fix mem_cache_store adapter with pool_size (#489)
 - Fix dalli deprecation warning about requiring 'dalli/cas/client' (#511)
 - Make transitionary method IdentityCache.with_fetch_read_only_records thread-safe (#503)
 
 ### Features
+
 - Add support for fill lock with lock wait to avoid thundering herd problem (#373)
 
 ## 1.1.0
 
 ### Fixes
+
 - Fix double debug logging of cache hits and misses (#474)
 - Fix a Rails 6.1 deprecation warning for Rails 7.0 compatibility (#482)
 - Recursively install parent expiry hooks when expiring parent caches (#476)
@@ -24,10 +105,12 @@
 - Fix fetch `has_many` embedded association on record after adding to it (#449)
 
 ### Features
+
 - Support multiple databases and transactional tests in `IdentityCache.should_use_cache?` (#293)
 - Add support for the default `MemCacheStore` from `ActiveSupport` (#465)
 
 ### Breaking Changes
+
 - Drop ruby 2.4 support, since it is no longer supported upstream (#468)
 
 ## 1.0.1
@@ -99,7 +182,7 @@
 - Remove support for 3.2
 - Fix N+1 from fetching embedded ids on a cache miss
 - Raise when trying to cache a through association. Previously it wouldn't be invalidated properly.
-- Raise if a class method is called on a scope.  Previously the scope was ignored.
+- Raise if a class method is called on a scope. Previously the scope was ignored.
 - Raise if a class method is called on a subclass of one that included IdentityCache. This never worked properly.
 - Fix cache_belongs_to on polymorphic assocations.
 - Fetching a cache_belongs_to association no longer loads the belongs_to association
@@ -160,7 +243,6 @@
 
 ## 0.0.5
 
-
 ## 0.0.4
 
 - Fix: only marshal attributes, embedded associations and normalized association IDs

data/Gemfile

@@ -3,15 +3,15 @@
 source "https://rubygems.org"
 gemspec
 
-gem "rubocop", "~> 1.5"
+gem "rubocop", "~> 1.61.0"
 
 gem "rubocop-shopify", "~> 2.9.0", require: false
 
 gem "mysql2", "~> 0.5.3", platform: :mri
 gem "pg", ">= 0.18", "< 2.0", platform: :mri
-gem "memcached", "~> 1.8.0", platform: :mri
-gem "memcached_store", "~> 1.0.0", platform: :mri
-gem "dalli", "~> 2.7.11"
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify", platform: :mri
+gem "memcached_store", "~> 2.3.2", platform: :mri
+gem "dalli", "~> 3.2.3"
 gem "cityhash", "~> 0.6.0", platform: :mri
 
 gem "byebug", platform: :mri

data/Gemfile.lock

@@ -0,0 +1,118 @@
+GIT
+  remote: https://github.com/Shopify/memcached.git
+  revision: 54a89bae698896a00fd2ceeb142dada6285f73ed
+  branch: 1-0-stable-shopify
+  specs:
+    memcached (1.9.0)
+
+PATH
+  remote: .
+  specs:
+    identity_cache (1.6.3)
+      activerecord (>= 7.0)
+      ar_transaction_changes (~> 1.1)
+
+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)
+      timeout (>= 0.4.0)
+    activesupport (7.2.0)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    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)
+    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.0)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.0)
+    memcached_store (2.3.4)
+      activesupport (>= 6)
+      memcached (~> 1.8)
+    minitest (5.25.1)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
+    mysql2 (0.5.6)
+    parallel (1.24.0)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
+    pg (1.5.6)
+    racc (1.7.3)
+    rainbow (3.1.1)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.3.6)
+      strscan
+    rubocop (1.61.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      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-shopify (2.9.0)
+      rubocop (~> 1.33)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    securerandom (0.3.1)
+    spy (1.0.5)
+    stackprof (0.2.26)
+    strscan (3.1.0)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+
+PLATFORMS
+  arm64-darwin-22
+  arm64-darwin-23
+  x86_64-linux
+
+DEPENDENCIES
+  byebug
+  cityhash (~> 0.6.0)
+  dalli (~> 3.2.3)
+  identity_cache!
+  memcached!
+  memcached_store (~> 2.3.2)
+  minitest (~> 5.14)
+  mocha (~> 2.0)
+  mysql2 (~> 0.5.3)
+  pg (>= 0.18, < 2.0)
+  rake (~> 13.0)
+  rubocop (~> 1.61.0)
+  rubocop-shopify (~> 2.9.0)
+  spy (~> 1.0)
+  stackprof
+
+BUNDLED WITH
+   2.4.22

data/README.md

@@ -101,7 +101,15 @@ product = Product.fetch_by_handle(handle)
 # Fetch multiple products by providing an array of index values.
 products = Product.fetch_multi_by_handle(handles)
 
+# Fetch a single product by providing composite attributes.
 products = Product.fetch_by_vendor_and_product_type(vendor, product_type)
+
+# Fetch multiple products by providing an array of composite attributes.
+products = Product.fetch_multi_by_vendor_and_product_type([
+  [vendor_1, product_type_1],
+  [vendor_2, product_type_2],
+  # ...
+])
 ```
 
 This gives you a lot of freedom to use your objects the way you want to, and doesn't get in your way. This does keep an independent cache copy in Memcached so you might want to watch the number of different caches that are being added.
@@ -254,11 +262,26 @@ Cache keys include a version number by default, specified in `IdentityCache::CAC
 
 ## Caveats
 
-A word of warning. If an `after_commit` fails before the cache expiry `after_commit` the cache will not be expired and you will be left with stale data.
-
-Since everything is being marshalled and unmarshalled from Memcached changing Ruby or Rails versions could mean your objects cannot be unmarshalled from Memcached. There are a number of ways to get around this such as namespacing keys when you upgrade or rescuing marshal load errors and treating it as a cache miss. Just something to be aware of if you are using IdentityCache and upgrade Ruby or Rails.
-
-IdentityCache is also very much _opt-in_ by deliberate design. This means IdentityCache does not mess with the way normal Rails associations work, and including it in a model won't change any clients of that model until you switch them to use `fetch` instead of `find`. This is because there is no way IdentityCache is ever going to be 100% consistent. Processes die, exceptions happen, and network blips occur, which means there is a chance that some database transaction might commit but the corresponding memcached cache invalidation operation does not make it. This means that you need to think carefully about when you use `fetch` and when you use `find`. For example, at Shopify, we never use any `fetch`ers on the path which moves money around, because IdentityCache could simply be wrong, and we want to charge people the right amount of money. We do however use the fetchers on performance critical paths where absolute correctness isn't the most important thing, and this is what IdentityCache is intended for.
+IdentityCache is never going to be 100% consistent, since cache invalidations can be lost. As such, it was intentionally designed to be _opt-in_, so it is only used where cache inconsistency is tolerated. This means IdentityCache does not mess with the way normal Rails associations work, and including it in a model won't change any clients of that model until you switch them to use `fetch` instead of `find`. This means that you need to think carefully about when you use `fetch` and when you use `find`.
+
+Expected sources of lost cache invalidations include:
+* Database write performed that doesn't trigger an after_commit callback
+* Process/system getting killed or crashing between the database commit and cache invalidation
+* Network unavailability, including transient failures, preventing the delivery of the cache invalidation
+* Memcached unavailability or failure preventing the processing of the cache invalidation request
+* Memcached flush / restart could remove a cache invalidation that would normally interrupt a cache fill that started when the cache key was absent. E.g.
+  1. cache key absent (not just invalidated)
+  2. process 1 reads cache key
+  3. process 1 starts reading from the database
+  4. process 2 writes to the database
+  5. process 2 writes a cache invalidation marker to cache key
+  6. memcached flush
+  7. process 1 uses an `ADD` operation, which succeeds in filling the cache with the now stale data
+* Rollout of cache namespace changes (e.g. from upgrading IdentityCache, adding columns, cached associations or from application changes to IdentityCache.cache_namespace) can result in cache fills to the new namespace that aren't invalidated by cache invalidations from a process still using the old namespace
+
+Cache expiration is meant to be used to help the system recover, but it only works if the application avoids using the cache data as a transaction to write data. IdentityCache avoids loading cached data from its methods during an open transaction, but can't prevent cache data that was loaded before the transaction was opened from being used in a transaction. IdentityCache won't help with scaling write traffic, it was intended for scaling database queries from read-only requests.
+
+IdentityCache also caches the absence of database values (e.g. to avoid performance problems when it is destroyed), so lost cache invalidations can also result in that value continuing to remain absent. As such, avoid sending the id of an uncommitted database record to another process (e.g. queuing it to a background job), since that could result in an attempt to read the record by its id before it has been created. A cache invalidation will still be attempted when the record is created, but that could be lost.
 
 ## Notes
 

data/Rakefile

@@ -9,14 +9,82 @@ require "rdoc/task"
 desc("Default: run tests and style checks.")
 task(default: [:test, :rubocop])
 
-desc("Test the identity_cache plugin.")
-Rake::TestTask.new(:test) do |t|
-  t.libs << "lib"
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-  t.verbose = true
+namespace :test do
+  desc "Test the identity_cache plugin with default Gemfile"
+  Rake::TestTask.new(:default) do |t|
+    t.libs << "lib"
+    t.libs << "test"
+    t.pattern = "test/**/*_test.rb"
+    t.verbose = true
+  end
+
+  desc "Test the identity_cache plugin with minimum supported dependencies"
+  task :min_supported do
+    gemfile = File.expand_path("gemfiles/Gemfile.min-supported", __dir__)
+    ENV["BUNDLE_GEMFILE"] = gemfile
+
+    puts "\nInstalling dependencies for #{gemfile}..."
+    Bundler.with_unbundled_env do
+      system("bundle install --gemfile #{gemfile}") || abort("Bundle install failed")
+    end
+
+    puts "Running tests with #{gemfile}..."
+    Rake::TestTask.new(:run_min_supported) do |t|
+      t.libs << "lib"
+      t.libs << "test"
+      t.pattern = "test/**/*_test.rb"
+      t.verbose = true
+    end
+    Rake::Task["run_min_supported"].invoke
+  end
+
+  desc "Test the identity_cache plugin with latest released dependencies"
+  task :latest_release do
+    gemfile = File.expand_path("gemfiles/Gemfile.latest-release", __dir__)
+    ENV["BUNDLE_GEMFILE"] = gemfile
+
+    puts "\nInstalling dependencies for #{gemfile}..."
+    Bundler.with_unbundled_env do
+      system("bundle install --gemfile #{gemfile}") || abort("Bundle install failed")
+    end
+
+    puts "Running tests with #{gemfile}..."
+    Rake::TestTask.new(:run_latest_release) do |t|
+      t.libs << "lib"
+      t.libs << "test"
+      t.pattern = "test/**/*_test.rb"
+      t.verbose = true
+    end
+    Rake::Task["run_latest_release"].invoke
+  end
+
+  desc "Test the identity_cache plugin with rails edge dependencies"
+  task :rails_edge do
+    gemfile = File.expand_path("gemfiles/Gemfile.rails-edge", __dir__)
+    ENV["BUNDLE_GEMFILE"] = gemfile
+
+    puts "\nInstalling dependencies for #{gemfile}..."
+    Bundler.with_unbundled_env do
+      system("bundle install --gemfile #{gemfile}") || abort("Bundle install failed")
+    end
+
+    puts "Running tests with #{gemfile}..."
+    Rake::TestTask.new(:run_rails_edge) do |t|
+      t.libs << "lib"
+      t.libs << "test"
+      t.pattern = "test/**/*_test.rb"
+      t.verbose = true
+    end
+    Rake::Task["run_rails_edge"].invoke
+  end
 end
 
+desc "Run default tests"
+task test: ["test:default"]
+
+desc "Run all tests (default, min_supported, latest_release, rails_edge)"
+task test_all: ["test:default", "test:min_supported", "test:latest_release", "test:rails_edge"]
+
 task :rubocop do
   require "rubocop/rake_task"
   RuboCop::RakeTask.new
@@ -47,3 +115,27 @@ namespace :profile do
     ruby "./performance/profile.rb"
   end
 end
+
+namespace :db do
+  desc "Create the identity_cache_test database"
+  task :create do
+    require "mysql2"
+
+    config = {
+      host: ENV.fetch("MYSQL_HOST") || "localhost",
+      port: ENV.fetch("MYSQL_PORT") || 1037,
+      username: ENV.fetch("MYSQL_USER") || "root",
+      password: ENV.fetch("MYSQL_PASSWORD") || "",
+    }
+
+    begin
+      client = Mysql2::Client.new(config)
+      client.query("CREATE DATABASE IF NOT EXISTS identity_cache_test")
+      puts "Database 'identity_cache_test' created successfully. host: #{config[:host]}, port: #{config[:port]}"
+    rescue Mysql2::Error => e
+      puts "Error creating database: #{e.message}"
+    ensure
+      client&.close
+    end
+  end
+end

data/dev.yml

@@ -1,18 +1,14 @@
 name: identity-cache
 
 up:
-  - homebrew:
-    - mysql-client@5.7:
-        or:        [mysql@5.7]
-        conflicts: [mysql-connector-c, mysql, mysql-client]
-  - ruby: 2.7.2
-  - isogun
+  - ruby
   - bundler
-
-env:
-  RAILGUN_HOST: identity-cache.railgun
-  MYSQL_HOST: identity-cache.railgun
-  MEMCACHED_HOST: identity-cache.railgun
+  - memcached
+  - mysql
+  - custom:
+      name: create database identity_cache_test
+      met?: mysql -u root -h 127.0.0.1 -P 1037 -e "SHOW DATABASES;" | grep identity_cache_test
+      meet: bundle exec rake db:create
 
 commands:
   test:
@@ -20,7 +16,7 @@ commands:
       optional:
         argument: file
         optional: args...
-    desc: 'Run tests'
+    desc: "Run tests"
     run: |
       if [[ $# -eq 0 ]]; then
         bundle exec rake test
@@ -28,22 +24,26 @@ commands:
         bundle exec ruby -I test "$@"
       fi
 
+  test-all:
+    desc: "Run tests for all gemfiles (default, min_supported, latest_release, rails_edge)"
+    run: bundle exec rake test_all
+
   style:
-    desc: 'Run rubocop checks'
+    desc: "Run rubocop checks"
     run: bundle exec rubocop "$@"
 
   check:
-    desc: 'Run tests and style checks'
+    desc: "Run tests and style checks"
     run: bundle exec rake test && bundle exec rubocop
 
   benchmark-cpu:
-    desc: 'Run the identity cache CPU benchmark'
+    desc: "Run the identity cache CPU benchmark"
     run: bundle exec rake benchmark:cpu
 
   profile:
-    desc: 'Profile IDC code'
+    desc: "Profile IDC code"
     run: bundle exec rake profile:run
 
   update-serialization-format:
-    desc: 'Update serialization format test fixture'
+    desc: "Update serialization format test fixture"
     run: bundle exec rake update_serialization_format

data/gemfiles/Gemfile.latest-release

@@ -8,6 +8,7 @@ gem "activerecord"
 gem "activesupport"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify"
 gem "memcached_store"
 gem "dalli"
 gem "cityhash"

data/gemfiles/Gemfile.min-supported

@@ -3,10 +3,10 @@ gemspec path: ".."
 
 gem "ar_transaction_changes", "~> 1.1.0"
 
-gem "activerecord", "~> 5.2.0"
-gem "mysql2", "~> 0.4.4"
-gem "pg", "~> 0.18.0"
-gem "memcached", "~> 1.8.0"
-gem "memcached_store", "~> 1.0.0"
+gem "activerecord", "~> 7.0.0"
+gem "mysql2", "~> 0.5"
+gem "pg", "~> 1.1"
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify"
+gem "memcached_store", "~> 2.3.2"
 gem "dalli", "~> 2.7.11"
 gem "cityhash", "~> 0.6.0"

data/gemfiles/Gemfile.rails-edge

@@ -5,6 +5,7 @@ gem "activerecord", github: "rails/rails", branch: "main"
 gem "activesupport", github: "rails/rails", branch: "main"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify"
 gem "memcached_store"
 gem "dalli"
 gem "cityhash"

data/identity_cache.gemspec

@@ -31,15 +31,15 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = IdentityCache::VERSION
 
-  gem.required_ruby_version = ">= 2.5.0"
+  gem.required_ruby_version = ">= 3.0.0"
 
   gem.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  gem.add_dependency("activerecord", ">= 5.2")
+  gem.add_dependency("activerecord", ">= 7.0")
   gem.add_dependency("ar_transaction_changes", "~> 1.1")
 
   gem.add_development_dependency("minitest", "~> 5.14")
-  gem.add_development_dependency("mocha", "~> 1.12")
+  gem.add_development_dependency("mocha", "~> 2.0")
   gem.add_development_dependency("rake", "~> 13.0")
   gem.add_development_dependency("spy", "~> 1.0")
 end

data/lib/identity_cache/belongs_to_caching.rb

@@ -14,7 +14,7 @@ module IdentityCache
         ensure_base_model
 
         unless (reflection = reflect_on_association(association))
-          raise AssociationError, "Association named '#{association}' was not found on #{self.class}"
+          raise AssociationError, "Association named '#{association}' was not found on #{self}"
         end
 
         if reflection.scope