Merge branch 'main' into generate-cache-file-ready-for-development-env-too

Author: djmb

.github/workflows/main.yml

@@ -27,12 +27,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["3.1", "3.2", "3.3"]
-        gemfile: [ rails_7_2, rails_8_0, rails_main ]
+        ruby-version: ["3.1", "3.2", "3.3", "3.4"]
+        gemfile: [ rails_7_2, rails_8_0, rails_8_1, rails_main ]
         database: [sqlite, postgres, mysql]
         exclude:
           - ruby-version: "3.1"
             gemfile: rails_8_0
+          - ruby-version: "3.1"
+            gemfile: rails_8_1
           - ruby-version: "3.1"
             gemfile: rails_main
     services:

Appraisals

@@ -4,6 +4,14 @@ appraise "rails-7-2" do
   gem "railties", github: "rails/rails", branch: "7-2-stable"
 end
 
+appraise "rails-8-0" do
+  gem "railties", github: "rails/rails", branch: "8-0-stable"
+end
+
+appraise "rails-8-1" do
+  gem "railties", github: "rails/rails", branch: "8-1-stable"
+end
+
 appraise "rails-main" do
   gem "railties", github: "rails/rails", branch: "main"
 end

Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    solid_cache (1.0.7)
+    solid_cache (1.0.8)
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -20,22 +20,22 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -52,43 +52,43 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     builder (3.3.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crass (1.0.6)
     date (3.4.1)
     debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    drb (2.2.1)
+    drb (2.2.3)
     erubi (1.13.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     io-console (0.8.0)
     irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.9.0)
     language_server-protocol (3.17.0.3)
-    logger (1.6.2)
+    logger (1.7.0)
     loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.25.4)
+    minitest (5.25.5)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
     mysql2 (0.5.5)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.26.3)
     parser (3.3.6.0)
@@ -99,7 +99,7 @@ GEM
       date
       stringio
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.1.18)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
@@ -114,9 +114,9 @@ GEM
     rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -158,20 +158,20 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    securerandom (0.4.0)
+    securerandom (0.4.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (2.7.3-arm64-darwin)
-    sqlite3 (2.7.3-x86_64-darwin)
-    sqlite3 (2.7.3-x86_64-linux-gnu)
+    sqlite3 (2.7.4-arm64-darwin)
+    sqlite3 (2.7.4-x86_64-darwin)
+    sqlite3 (2.7.4-x86_64-linux-gnu)
     stringio (3.1.2)
     thor (1.3.2)
-    timeout (0.4.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.2)

README.md

@@ -64,7 +64,7 @@ production: &production
   databases: [production_cache1, production_cache2]
   store_options:
     <<: *default_store_options
-    max_entries: <%= 256.gigabytes %>
+    max_size: <%= 256.gigabytes %>
 ```
 
 For the full list of keys for `store_options` see [Cache configuration](#cache-configuration). Any options passed to the cache lookup will overwrite those specified here.

app/models/solid_cache/entry.rb

@@ -41,7 +41,9 @@ def read_multi(keys)
             keys.each_slice(MULTI_BATCH_SIZE).each do |keys_batch|
               query = Arel.sql(select_sql(keys_batch), *key_hashes_for(keys_batch))
 
-              results.merge!(connection.select_all(query, "SolidCache::Entry Load").cast_values(attribute_types).to_h)
+              with_connection do |connection|
+                results.merge!(connection.select_all(query, "SolidCache::Entry Load").cast_values(attribute_types).to_h)
+              end
             end
           end
         end
@@ -54,7 +56,9 @@ def delete_by_key(*keys)
       end
 
       def clear_truncate
-        connection.truncate(table_name)
+        with_connection do |connection|
+          connection.truncate(table_name)
+        end
       end
 
       def clear_delete
@@ -91,7 +95,9 @@ def add_key_hash_and_byte_size(payloads)
         end
 
         def upsert_unique_by
-          connection.supports_insert_conflict_target? ? :key_hash : nil
+          with_connection do |connection|
+            connection.supports_insert_conflict_target? ? :key_hash : nil
+          end
         end
 
         # This constructs and caches a SQL query for a given number of keys.

app/models/solid_cache/record.rb

@@ -14,14 +14,16 @@ def disable_instrumentation(&block)
       end
 
       def with_instrumenter(instrumenter, &block)
-        if connection.respond_to?(:with_instrumenter)
-          connection.with_instrumenter(instrumenter, &block)
-        else
-          begin
-            old_instrumenter, ActiveSupport::IsolatedExecutionState[:active_record_instrumenter] = ActiveSupport::IsolatedExecutionState[:active_record_instrumenter], instrumenter
-            block.call
-          ensure
-            ActiveSupport::IsolatedExecutionState[:active_record_instrumenter] = old_instrumenter
+        with_connection do |connection|
+          if connection.respond_to?(:with_instrumenter)
+            connection.with_instrumenter(instrumenter, &block)
+          else
+            begin
+              old_instrumenter, ActiveSupport::IsolatedExecutionState[:active_record_instrumenter] = ActiveSupport::IsolatedExecutionState[:active_record_instrumenter], instrumenter
+              block.call
+            ensure
+              ActiveSupport::IsolatedExecutionState[:active_record_instrumenter] = old_instrumenter
+            end
           end
         end
       end

gemfiles/rails_8_1.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "mysql2"
+gem "pg"
+gem "sprockets-rails"
+gem "appraisal"
+gem "railties", branch: "8-1-stable", git: "https://github.com/rails/rails.git"
+
+group :rubocop do
+  gem "rubocop", ">= 1.25.1", require: false
+  gem "rubocop-minitest", require: false
+  gem "rubocop-packaging", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "rubocop-md", require: false
+end
+
+gemspec path: "../"

lib/solid_cache/configuration.rb

@@ -37,7 +37,7 @@ def set_connects_to(database:, databases:, connects_to:)
           when database
             { shards: { database.to_sym => { writing: database.to_sym } } }
           when databases
-            { shards: databases.map(&:to_sym).index_with { |database| { writing: database } } }
+            { shards: Array(databases).map(&:to_sym).index_with { |database| { writing: database } } }
           when connects_to
             connects_to
           else

lib/solid_cache/engine.rb

@@ -41,7 +41,7 @@ class Engine < ::Rails::Engine
     end
 
     config.after_initialize do
-      if SolidCache.configuration.encrypt? && Record.connection.adapter_name == "PostgreSQL" && Rails::VERSION::MAJOR <= 7
+      if SolidCache.configuration.encrypt? && Record.lease_connection.adapter_name == "PostgreSQL" && Rails::VERSION::MAJOR <= 7
         raise \
           "Cannot enable encryption for Solid Cache: in Rails 7, Active Record Encryption does not support " \
           "encrypting binary columns on PostgreSQL"

lib/solid_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidCache
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end