solid_cache 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f6b8bdfea57b8ffbe60b8f525b3907c7278f4b73d07fad2506a41b0884a14c
-  data.tar.gz: b3af9a6526d97bcb9b5ac1fd313b9c9cf76551ae75e214479a10fe9b04d678d3
+  metadata.gz: d8807bd93a8e16495e40542655163d95bcfac3b9a0d96de0ccbea687899ba600
+  data.tar.gz: 15107cc9ed202a7c8cf01d962c7ec8182eed76c3677e86155f104fac07eae6b2
 SHA512:
-  metadata.gz: b6503fe5c3f9d3158ec64bc054465e48f1479236b05fd3b023f4c7050b8c2c0019a546cae0c494a91da0c7b3e9abf3cc3f8f700b2d6c9853a3832b8a726d750a
-  data.tar.gz: 38eec70ef2680b811f9f3baf42e02d5d81d72947c508f45a4ca0cd8d2c1d6d761280e5ec15261c4ca3b94fbdfe20dd1cf96a2cf871255791b41a2d11cfe8aa29
+  metadata.gz: 2c1bdc5f7ae9313d017388821a1792228b9ff59d9570cc46129f2b0127648aeda3e103b3f387758c37b4119010929f48452def1638dad43a90cb46d201db2274
+  data.tar.gz: a0352691be83a3ee2227c501235bfd7c8639ea08b717c0bcbfcf002a3901b367c142d430677afd30778cafef0918192ed4afc987b9082987524dbdc327d6e42b

data/Rakefile

@@ -36,7 +36,7 @@ end
 configs.each do |config|
   namespace :test do
     task config do
-      if config.to_s.start_with?("encrypted") && ENV["TARGET_DB"] == "postgres"
+      if config.to_s.start_with?("encrypted") && ENV["TARGET_DB"] == "postgres" && Rails::VERSION::MAJOR <= 7
         puts "Skipping encrypted tests on PostgreSQL as binary encrypted columns are not supported by Rails yet"
         next
       end

data/app/models/solid_cache/entry.rb

@@ -33,7 +33,9 @@ module SolidCache
 
       def read_multi(keys)
         without_query_cache do
-          find_by_sql([select_sql(keys), *key_hashes_for(keys)]).pluck(:key, :value).to_h
+          query = Arel.sql(select_sql(keys), *key_hashes_for(keys))
+
+          connection.select_all(query, "SolidCache::Entry Load").cast_values(attribute_types).to_h
         end
       end
 
@@ -84,13 +86,24 @@ module SolidCache
           connection.supports_insert_conflict_target? ? :key_hash : nil
         end
 
+        # This constructs and caches a SQL query for a given number of keys.
+        #
+        # The query is constructed with two bind parameters to generate an IN (...) condition,
+        # which is then replaced with the correct amount based on the number of keys. The
+        # parameters are filled later when executing the query. This is done through Active Record
+        # to ensure the field and table names are properly quoted and escaped based on the used database adapter.
+
+        # For example: The query for 4 keys will be transformed from:
+        # > SELECT "key", "value" FROM "solid_cache_entries" WHERE "key_hash" IN (1111, 2222)
+        # into:
+        # > SELECT "key", "value" FROM "solid_cache_entries" WHERE "key_hash" IN (?, ?, ?, ?)
         def select_sql(keys)
-          @get_sql ||= {}
-          @get_sql[keys.count] ||= \
-            where(key_hash: [ "1111", "2222" ])
+          @select_sql ||= {}
+          @select_sql[keys.count] ||= \
+            where(key_hash: [ 1111, 2222 ])
               .select(:key, :value)
               .to_sql
-              .gsub("1111, 2222", (["?"] * keys.count).join(", "))
+              .gsub("1111, 2222", Array.new(keys.count, "?").join(", "))
         end
 
         def key_hash_for(key)

data/lib/generators/solid_cache/install/install_generator.rb

@@ -7,10 +7,8 @@ class SolidCache::InstallGenerator < Rails::Generators::Base
                                     desc: "Skip migrations"
 
   def add_rails_cache
-    %w[development test production].each do |env_name|
-      if (env_config = Pathname(destination_root).join("config/environments/#{env_name}.rb")).exist?
-        gsub_file env_config, /(# )?config\.cache_store = (:(?!null_store).*)/, "config.cache_store = :solid_cache_store"
-      end
+    if (env_config = Pathname(destination_root).join("config/environments/production.rb")).exist?
+      gsub_file env_config, /(# )?config\.cache_store = (:.*)/, "config.cache_store = :solid_cache_store"
     end
   end
 

data/lib/generators/solid_cache/install/templates/config/solid_cache.yml.tt

@@ -1,7 +1,6 @@
 default: &default
   database: <%= ENV.fetch("DATABASE", "cache") %>
   store_options:
-    max_age: <%%= 1.week.to_i %>
     max_size: <%%= 256.megabytes %>
     namespace: <%%= Rails.env %>
 

data/lib/solid_cache/engine.rb

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

data/lib/solid_cache/store/api.rb

@@ -15,11 +15,21 @@ module SolidCache
       end
 
       def increment(name, amount = 1, options = nil)
-        adjust(name, amount, options)
+        options = merged_options(options)
+        key = normalize_key(name, options)
+
+        instrument :increment, key, amount: amount do
+          adjust(name, amount, options)
+        end
       end
 
       def decrement(name, amount = 1, options = nil)
-        adjust(name, -amount, options)
+        options = merged_options(options)
+        key = normalize_key(name, options)
+
+        instrument :decrement, key, amount: amount do
+          adjust(name, -amount, options)
+        end
       end
 
       def cleanup(options = nil)

data/lib/solid_cache/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_cache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Donal McBreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord