second_level_cache 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0056aa765b7668e44d115f964c4fb11f1632ecf99206145c89aed0fb58f2b4d0
-  data.tar.gz: a4fb19d6ff3859c728c7d8a43f28f64bb092c89226772de31b5b22f1e57e2cf6
+  metadata.gz: 9161291526eed87047708e5128c64e2907ddf61f017dbf073831c1281b6b504d
+  data.tar.gz: 192fffc74fe056dd8bc2d8e6486f4f5de380698bfc728d65bf02853c110a9d66
 SHA512:
-  metadata.gz: 32f1cb2460325a2291d2732c2f3ec906c7c16c2c5838564df7bfa56f362c0049d37c1ef2658db6c057faf31183869bbd8d6fc4702f4056f0a8bc4d143933cc68
-  data.tar.gz: 46e242047cd4e0c1c3651dc3e7ff03028d044a96b6c4c915d994114226c5ed30c8668248b14caac8165b51a283ba6ab9455badc5c27c6f7a31468753086216c4
+  metadata.gz: 84e57628cd9eb58d52d7a4d5c23844d8e470ee599d865845287ac9fee9b0659fe7a0b563ab5f2e6d7fd3c59ffce6de543ec0ae91a36e77fd8d2c628f05cd53a1
+  data.tar.gz: 60aa90c2dfa0be0920ee121772a426c3ce209423a4c5a2c28bf61efad3ad5da14738317f40df8704e6628db9fc7a2e439619ca2bdb1d7cb2d22073d1ccded656

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+
+New version releases please visit https://github.com/hooopo/second_level_cache/releases
+
+2.6.4
+-------
+
+- Fix `undefined method klass` error for has_one through. (#123)
+
+2.6.3
+-------
+
+- Fix paranoia load error.
+
+2.6.2
+-------
+
+- Fix activerecord association cache. (#109)
+- Fix fetch_by_uniq_key cache key with prefix. (#120)
+
 2.6.1
 -------
 

data/Gemfile

@@ -3,6 +3,5 @@
 source "https://rubygems.org"
 
 gemspec
-gem "paranoia", "~> 2.4.2"
 gem "pry"
-gem "rails", "~> 6"
+gem "rails", "~> 7"

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2020 Hackershare
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,24 +1,29 @@
 # SecondLevelCache
 
 [![Gem Version](https://badge.fury.io/rb/second_level_cache.svg)](http://badge.fury.io/rb/second_level_cache)
-[![Build Status](https://travis-ci.org/hooopo/second_level_cache.svg?branch=master)](https://travis-ci.org/hooopo/second_level_cache)
+[![build](https://github.com/hooopo/second_level_cache/actions/workflows/build.yml/badge.svg)](https://github.com/hooopo/second_level_cache/actions/workflows/build.yml)
 [![Code Climate](https://codeclimate.com/github/hooopo/second_level_cache.svg)](https://codeclimate.com/github/hooopo/second_level_cache)
 
-SecondLevelCache is a write-through and read-through caching library inspired by Cache Money and cache_fu, support ActiveRecord 4.
+SecondLevelCache is a write-through and read-through caching library inspired by Cache Money and cache_fu, support ActiveRecord 4, ActiveRecord 5 and ActiveRecord 6.
 
 Read-Through: Queries by ID, like `current_user.articles.find(params[:id])`, will first look in cache store and then look in the database for the results of that query. If there is a cache miss, it will populate the cache.
 
 Write-Through: As objects are created, updated, and deleted, all of the caches are automatically kept up-to-date and coherent.
 
-
 ## Install
 
 In your gem file:
 
-ActiveRecord 5.2:
+ActiveRecord 7
+
+```ruby
+gem 'second_level_cache', '~> 2.7'
+```
+
+ActiveRecord 5.2 and 6.0:
 
 ```ruby
-gem 'second_level_cache', '~> 2.4.0'
+gem 'second_level_cache', '~> 2.6.3'
 ```
 
 ActiveRecord 5.0.x, 5.1.x:
@@ -97,9 +102,9 @@ User.select("id, name").find(1)
 
 ## Notice
 
-* SecondLevelCache cache by model name and id, so only find_one query will work.
-* Only equal conditions query WILL get cache; and SQL string query like `User.where("name = 'Hooopo'").find(1)` WILL NOT work.
-* SecondLevelCache sync cache after transaction commit:
+- SecondLevelCache cache by model name and id, so only find_one query will work.
+- Only equal conditions query WILL get cache; and SQL string query like `User.where("name = 'Hooopo'").find(1)` WILL NOT work.
+- SecondLevelCache sync cache after transaction commit:
 
 ```ruby
 # user and account's write_second_level_cache operation will invoke after the logger.
@@ -117,7 +122,7 @@ end # <- Cache write
 Rails.logger.info "info"
 ```
 
-* If you are using SecondLevelCache with database_cleaner, you should set cleaning strategy to `:truncation`:
+- If you are using SecondLevelCache with database_cleaner, you should set cleaning strategy to `:truncation`:
 
 ```ruby
 DatabaseCleaner.strategy = :truncation
@@ -133,15 +138,15 @@ config.cache_store = [:dalli_store, APP_CONFIG["memcached_host"], { namespace: "
 
 ## Tips:
 
-* When you want to clear only second level cache apart from other cache for example fragment cache in cache store,
-you can only change the `cache_key_prefix`:
+- When you want to clear only second level cache apart from other cache for example fragment cache in cache store,
+  you can only change the `cache_key_prefix` (default: `slc`):
 
 ```ruby
 SecondLevelCache.configure.cache_key_prefix = "slc1"
 ```
 
-* SecondLevelCache was added model schema digest as cache version, this means when you add/remove/change columns, the caches of this Model will expires.
-* When your want change the model cache version by manualy, just add the `version` option like this:
+- SecondLevelCache was added model schema digest as cache version, this means when you add/remove/change columns, the caches of this Model will expires.
+- When your want change the model cache version by manualy, just add the `version` option like this:
 
 ```ruby
 class User < ActiveRecord::Base
@@ -149,7 +154,7 @@ class User < ActiveRecord::Base
 end
 ```
 
-* It provides a great feature, not hits db when fetching record via unique key (not primary key).
+- It provides a great feature, not hits db when fetching record via unique key (not primary key).
 
 ```ruby
 # this will fetch from cache
@@ -160,7 +165,7 @@ post = Post.fetch_by_uniq_keys(user_id: 2, slug: "foo")
 user = User.fetch_by_uniq_keys!(nick_name: "hooopo") # this will raise `ActiveRecord::RecordNotFound` Exception when nick name not exists.
 ```
 
-* You can use Rails's [Eager Loading](http://guides.rubyonrails.org/active_record_querying.html#eager-loading-associations) feature as normal. Even better, second_level_cache will transform the `IN` query into a Rails.cache.multi_read operation. For example:
+- You can use Rails's [Eager Loading](http://guides.rubyonrails.org/active_record_querying.html#eager-loading-associations) feature as normal. Even better, second_level_cache will transform the `IN` query into a Rails.cache.multi_read operation. For example:
 
 ```ruby
 Answer.includes(:question).limit(10).order("id DESC").each{|answer| answer.question.title}
@@ -171,8 +176,8 @@ Answer Load (0.2ms)  SELECT `answers`.* FROM `answers` ORDER BY id DESC LIMIT 10
 
 ## Original design by:
 
-* [chloerei](https://github.com/chloerei)
-* [hooopo](https://github.com/hooopo)
+- [chloerei](https://github.com/chloerei)
+- [hooopo](https://github.com/hooopo)
 
 ## Contributors
 

data/lib/second_level_cache/active_record/base.rb

@@ -6,11 +6,7 @@ module SecondLevelCache
       def self.prepended(base)
         base.after_commit :update_second_level_cache, on: :update
         base.after_commit :write_second_level_cache, on: :create
-        if defined?(::Paranoia)
-          base.after_destroy :expire_second_level_cache
-        else
-          base.after_commit :expire_second_level_cache, on: :destroy
-        end
+        base.after_commit :expire_second_level_cache, on: :destroy
 
         class << base
           prepend ClassMethods

data/lib/second_level_cache/active_record/belongs_to_association.rb

@@ -6,6 +6,9 @@ module SecondLevelCache
       module BelongsToAssociation
         def find_target
           return super unless klass.second_level_cache_enabled?
+          return super if klass.default_scopes.present? || reflection.scope
+          return super if reflection.active_record_primary_key.to_s != klass.primary_key
+
           cache_record = klass.read_second_level_cache(second_level_cache_key)
           if cache_record
             return cache_record.tap { |record| set_inverse_instance(record) }

data/lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -9,10 +9,10 @@ module SecondLevelCache
 
         if obj_id
           record = begin
-                     find(obj_id)
-                   rescue StandardError
-                     nil
-                   end
+            find(obj_id)
+          rescue
+            nil
+          end
         end
         return record if record_attributes_equal_where_values?(record, where_values)
         record = where(where_values).first
@@ -42,20 +42,21 @@ module SecondLevelCache
       end
 
       private
-        def cache_uniq_key(where_values)
-          keys = where_values.collect do |k, v|
-            v = Digest::MD5.hexdigest(v) if v.respond_to?(:size) && v.size >= 32
-            [k, v].join("_")
-          end
 
-          ext_key = keys.join(",")
-          "uniq_key_#{name}_#{ext_key}"
+      def cache_uniq_key(where_values)
+        keys = where_values.collect do |k, v|
+          v = Digest::MD5.hexdigest(v) if v.respond_to?(:size) && v.size >= 32
+          [k, v].join("_")
         end
 
-        def record_attributes_equal_where_values?(record, where_values)
-          # https://api.rubyonrails.org/classes/ActiveRecord/ModelSchema/ClassMethods.html#method-i-type_for_attribute
-          where_values.all? { |k, v| record&.read_attribute(k) == type_for_attribute(k).cast(v) }
-        end
+        ext_key = keys.join(",")
+        "#{SecondLevelCache.configure.cache_key_prefix}/uniq_key_#{name}_#{ext_key}"
+      end
+
+      def record_attributes_equal_where_values?(record, where_values)
+        # https://api.rubyonrails.org/classes/ActiveRecord/ModelSchema/ClassMethods.html#method-i-type_for_attribute
+        where_values.all? { |k, v| record&.read_attribute(k) == type_for_attribute(k).cast(v) }
+      end
     end
   end
 end

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -6,12 +6,12 @@ module SecondLevelCache
       module HasOneAssociation
         def find_target
           return super unless klass.second_level_cache_enabled?
-          return super if reflection.scope
+          return super if klass.default_scopes.present? || reflection.scope
           # TODO: implement cache with has_one scope
 
           through = reflection.options[:through]
           record  = if through
-            return super unless klass.reflections[through.to_s].klass.second_level_cache_enabled?
+            return super unless owner.class.reflections[through.to_s].klass.second_level_cache_enabled?
             begin
               reflection.klass.find(owner.send(through).read_attribute(reflection.foreign_key))
             rescue StandardError

data/lib/second_level_cache/active_record/preloader/association.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module SecondLevelCache
+  module ActiveRecord
+    module Associations
+      module Preloader
+        module Association
+          # Override load_query method for add Association instance in arguments to LoaderQuery
+          # https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/associations/preloader/association.rb#L148
+          def loader_query
+            ::ActiveRecord::Associations::Preloader::Association::LoaderQuery.new(self, scope, association_key_name)
+          end
+
+          # Override load_records_for_keys for use SecondLevelCache before preload association
+          # https://github.com/rails/rails/blob/8f5b35b6107c28125b571b9842e248b13f804e5c/activerecord/lib/active_record/associations/preloader/association.rb#L7
+          module LoaderQuery
+            attr_reader :association
+
+            delegate :klass, to: :association
+
+            def initialize(association, scope, association_key_name)
+              @association = association
+              @scope = scope
+              @association_key_name = association_key_name
+            end
+
+            def reflection
+              association.send(:reflection)
+            end
+
+            def load_records_for_keys(keys, &block)
+              ids = keys.to_a
+
+              return super unless klass.second_level_cache_enabled?
+              return super unless reflection.is_a?(::ActiveRecord::Reflection::BelongsToReflection)
+              return super if klass.default_scopes.present? || reflection.scope
+              return super if association_key_name.to_s != klass.primary_key
+
+              map_cache_keys = ids.map { |id| klass.second_level_cache_key(id) }
+              records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
+              record_marshals = RecordMarshal.load_multi(records_from_cache.values, &block)
+
+              # NOTICE
+              # Rails.cache.read_multi return hash that has keys only hitted.
+              # eg. Rails.cache.read_multi(1,2,3) => {2 => hit_value, 3 => hit_value}
+              hitted_ids = record_marshals.map { |record| record.read_attribute(association_key_name).to_s }
+              missed_ids = ids.map(&:to_s) - hitted_ids
+              ActiveSupport::Notifications.instrument("preload.second_level_cache", key: association_key_name, hit: hitted_ids, miss: missed_ids)
+              return SecondLevelCache::RecordRelation.new(record_marshals) if missed_ids.empty?
+
+              records_from_db = super(missed_ids.to_set, &block)
+              records_from_db.map { |r| r.write_second_level_cache }
+
+              SecondLevelCache::RecordRelation.new(records_from_db + record_marshals)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/second_level_cache/active_record/preloader/legacy.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module SecondLevelCache
+  module ActiveRecord
+    module Associations
+      module Preloader
+        module Association
+          # For < Rails 7
+          module Legacy
+            RAILS6 = ::ActiveRecord.version >= ::Gem::Version.new("6")
+
+            def records_for(ids, &block)
+              return super unless klass.second_level_cache_enabled?
+              return super unless reflection.is_a?(::ActiveRecord::Reflection::BelongsToReflection)
+              return super if klass.default_scopes.present? || reflection.scope
+              return super if association_key_name.to_s != klass.primary_key
+
+              map_cache_keys = ids.map { |id| klass.second_level_cache_key(id) }
+              records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
+
+              record_marshals = if RAILS6
+                RecordMarshal.load_multi(records_from_cache.values) do |record|
+                  # This block is copy from:
+                  # https://github.com/rails/rails/blob/6-0-stable/activerecord/lib/active_record/associations/preloader/association.rb#L101
+                  owner = owners_by_key[convert_key(record[association_key_name])].first
+                  association = owner.association(reflection.name)
+                  association.set_inverse_instance(record)
+                end
+              else
+                RecordMarshal.load_multi(records_from_cache.values, &block)
+              end
+
+              # NOTICE
+              # Rails.cache.read_multi return hash that has keys only hitted.
+              # eg. Rails.cache.read_multi(1,2,3) => {2 => hit_value, 3 => hit_value}
+              hitted_ids = record_marshals.map { |record| record.read_attribute(association_key_name).to_s }
+              missed_ids = ids.map(&:to_s) - hitted_ids
+              ActiveSupport::Notifications.instrument("preload.second_level_cache", key: association_key_name, hit: hitted_ids, miss: missed_ids)
+              return SecondLevelCache::RecordRelation.new(record_marshals) if missed_ids.empty?
+
+              records_from_db = super(missed_ids, &block)
+              records_from_db.map { |r| write_cache(r) }
+
+              SecondLevelCache::RecordRelation.new(records_from_db + record_marshals)
+            end
+
+            private
+
+            def write_cache(record)
+              record.write_second_level_cache
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/second_level_cache/active_record.rb

@@ -8,11 +8,18 @@ require "second_level_cache/active_record/finder_methods"
 require "second_level_cache/active_record/persistence"
 require "second_level_cache/active_record/belongs_to_association"
 require "second_level_cache/active_record/has_one_association"
-require "second_level_cache/active_record/preloader"
+require "second_level_cache/active_record/preloader/association"
+require "second_level_cache/active_record/preloader/legacy"
 
 # http://api.rubyonrails.org/classes/ActiveSupport/LazyLoadHooks.html
 # ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
-ActiveSupport.on_load(:active_record) do
+ActiveSupport.on_load(:active_record, run_once: true) do
+  if Bundler.definition.dependencies.find { |x| x.name == "paranoia" }
+    require "second_level_cache/adapter/paranoia"
+    include SecondLevelCache::Adapter::Paranoia::ActiveRecord
+    SecondLevelCache::Mixin.send(:prepend, SecondLevelCache::Adapter::Paranoia::Mixin)
+  end
+
   include SecondLevelCache::Mixin
   prepend SecondLevelCache::ActiveRecord::Base
   extend SecondLevelCache::ActiveRecord::FetchByUniqKey
@@ -21,7 +28,15 @@ ActiveSupport.on_load(:active_record) do
   ActiveRecord::Associations::BelongsToAssociation.send(:prepend, SecondLevelCache::ActiveRecord::Associations::BelongsToAssociation)
   ActiveRecord::Associations::HasOneAssociation.send(:prepend, SecondLevelCache::ActiveRecord::Associations::HasOneAssociation)
   ActiveRecord::Relation.send(:prepend, SecondLevelCache::ActiveRecord::FinderMethods)
-  # Rails 5.2 has removed ActiveRecord::Associations::Preloader::BelongsTo
-  # https://github.com/rails/rails/pull/31079
-  ActiveRecord::Associations::Preloader::Association.send(:prepend, SecondLevelCache::ActiveRecord::Associations::Preloader)
+
+  # https://github.com/rails/rails/blob/6-0-stable/activerecord/lib/active_record/associations/preloader/association.rb#L117
+  if ::ActiveRecord.version < ::Gem::Version.new("7")
+    ActiveRecord::Associations::Preloader::Association.send(:prepend, SecondLevelCache::ActiveRecord::Associations::Preloader::Association::Legacy)
+  end
+
+  if ::ActiveRecord.version >= ::Gem::Version.new("7")
+    # https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/associations/preloader/association.rb#L25
+    ActiveRecord::Associations::Preloader::Association.send(:prepend, SecondLevelCache::ActiveRecord::Associations::Preloader::Association)
+    ActiveRecord::Associations::Preloader::Association::LoaderQuery.send(:prepend, SecondLevelCache::ActiveRecord::Associations::Preloader::Association::LoaderQuery)
+  end
 end

data/lib/second_level_cache/adapter/paranoia.rb

@@ -0,0 +1,25 @@
+module SecondLevelCache
+  module Adapter
+    module Paranoia
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        included do
+          after_destroy :expire_second_level_cache
+        end
+      end
+
+      module Mixin
+        extend ActiveSupport::Concern
+
+        def write_second_level_cache
+          # Avoid rewrite cache again, when record has been soft deleted
+          return if respond_to?(:deleted?) && send(:deleted?)
+          super
+        end
+
+        alias_method :update_second_level_cache, :write_second_level_cache
+      end
+    end
+  end
+end

data/lib/second_level_cache/mixin.rb

@@ -71,13 +71,12 @@ module SecondLevelCache
 
     def write_second_level_cache
       return unless klass.second_level_cache_enabled?
-      # Avoid rewrite cache again, when record has been soft deleted
-      return if respond_to?(:deleted?) && send(:deleted?)
 
       marshal = RecordMarshal.dump(self)
       expires_in = klass.second_level_cache_options[:expires_in]
       SecondLevelCache.cache_store.write(second_level_cache_key, marshal, expires_in: expires_in)
     end
-    alias update_second_level_cache write_second_level_cache
+
+    alias_method :update_second_level_cache, :write_second_level_cache
   end
 end

data/lib/second_level_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SecondLevelCache
-  VERSION = "2.6.1"
+  VERSION = "2.7.0"
 end

data/second_level_cache.gemspec

@@ -5,10 +5,10 @@ lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Hooopo"]
-  gem.email         = ["hoooopo@gmail.com"]
-  gem.description   = "Write Through and Read Through caching library inspired by CacheMoney and cache_fu, support  ActiveRecord 4."
-  gem.summary       = <<-SUMMARY
+  gem.authors = ["Hooopo"]
+  gem.email = ["hoooopo@gmail.com"]
+  gem.description = "Write Through and Read Through caching library inspired by CacheMoney and cache_fu, support  ActiveRecord 4."
+  gem.summary = <<-SUMMARY
   SecondLevelCache is a write-through and read-through caching library inspired by Cache Money and cache_fu, support only Rails3 and ActiveRecord.
 
   Read-Through: Queries by ID, like current_user.articles.find(params[:id]), will first look in cache store and then look in the database for the results of that query. If there is a cache miss, it will populate the cache.
@@ -16,23 +16,24 @@ Gem::Specification.new do |gem|
   Write-Through: As objects are created, updated, and deleted, all of the caches are automatically kept up-to-date and coherent.
   SUMMARY
 
-  gem.homepage      = "https://github.com/hooopo/second_level_cache"
+  gem.homepage = "https://github.com/hooopo/second_level_cache"
 
-  gem.files         = Dir.glob("lib/**/*.rb") + [
+  gem.files = Dir.glob("lib/**/*.rb") + [
     "README.md",
+    "LICENSE",
     "Rakefile",
     "Gemfile",
     "CHANGELOG.md",
     "second_level_cache.gemspec"
   ]
-  gem.test_files    = Dir.glob("test/**/*.rb")
-  gem.executables   = gem.files.grep(%r{^bin/})
-  gem.name          = "second_level_cache"
+  gem.test_files = Dir.glob("test/**/*.rb")
+  gem.executables = gem.files.grep(%r{^bin/})
+  gem.name = "second_level_cache"
   gem.require_paths = ["lib"]
-  gem.version       = SecondLevelCache::VERSION
+  gem.version = SecondLevelCache::VERSION
 
-  gem.add_runtime_dependency "activerecord", [">= 5.2", "< 7"]
-  gem.add_runtime_dependency "activesupport", [">= 5.2", "< 7"]
+  gem.add_runtime_dependency "activerecord", ">= 6.0"
+  gem.add_runtime_dependency "activesupport", ">= 6.0"
 
   gem.add_development_dependency "database_cleaner"
   gem.add_development_dependency "rake"

data/test/belongs_to_association_test.rb

@@ -11,7 +11,7 @@ class BelongsToAssociationTest < ActiveSupport::TestCase
     book = @user.books.create
 
     @user.write_second_level_cache
-    book.send(:clear_association_cache)
+
     assert_no_queries do
       assert_equal @user, book.user
     end

data/test/fetch_by_uniq_key_test.rb

@@ -6,15 +6,16 @@ class FetchByUinqKeyTest < ActiveSupport::TestCase
   def setup
     @user = User.create name: "hooopo", email: "hoooopo@gmail.com"
     @post = Post.create slug: "foobar", topic_id: 2
+    @cache_prefix = SecondLevelCache.configure.cache_key_prefix
   end
 
   def test_cache_uniq_key
-    assert_equal User.send(:cache_uniq_key, name: "hooopo"), "uniq_key_User_name_hooopo"
-    assert_equal User.send(:cache_uniq_key, foo: 1, bar: 2), "uniq_key_User_foo_1,bar_2"
-    assert_equal User.send(:cache_uniq_key, foo: 1, bar: nil), "uniq_key_User_foo_1,bar_"
+    assert_equal User.send(:cache_uniq_key, name: "hooopo"), "#{@cache_prefix}/uniq_key_User_name_hooopo"
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: 2), "#{@cache_prefix}/uniq_key_User_foo_1,bar_2"
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: nil), "#{@cache_prefix}/uniq_key_User_foo_1,bar_"
     long_val = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    assert_equal User.send(:cache_uniq_key, foo: 1, bar: long_val), "uniq_key_User_foo_1,bar_#{Digest::MD5.hexdigest(long_val)}"
-    assert Contribution.send(:cache_uniq_key, user_id: 1, date: Time.current.to_date), "uniq_key_Contribution_user_id_1,date_#{Time.current.to_date}"
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: long_val), "#{@cache_prefix}/uniq_key_User_foo_1,bar_#{Digest::MD5.hexdigest(long_val)}"
+    assert Contribution.send(:cache_uniq_key, user_id: 1, date: Time.current.to_date), "#{@cache_prefix}/uniq_key_Contribution_user_id_1,date_#{Time.current.to_date}"
   end
 
   def test_record_attributes_equal_where_values

data/test/has_one_association_test.rb

@@ -30,6 +30,10 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     ForkedUserLink.without_second_level_cache do
       assert_queries(1) { user.forked_from_user }
     end
+    # NoMethodError: undefined method `klass' for nil:NilClass  active_record/has_one_association.rb:14:in `find_target'
+    hotspot = Hotspot.create(summary: "summary")
+    assert_equal hotspot.persisted?, true
+    assert_nil hotspot.topic
   end
 
   def test_has_one_with_conditions

data/test/model/paranoid.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+ActiveRecord::Base.connection.create_table(:paranoids, force: true) do |t|
+  t.datetime :deleted_at
+end
+
+class Paranoid < ApplicationRecord
+  second_level_cache
+  acts_as_paranoid
+end

data/test/model/post.rb

@@ -6,7 +6,17 @@ ActiveRecord::Base.connection.create_table(:posts, force: true) do |t|
   t.integer :topic_id
 end
 
+ActiveRecord::Base.connection.create_table(:hotspots, force: true) do |t|
+  t.integer :post_id
+  t.string :summary
+end
+
 class Post < ApplicationRecord
   second_level_cache
   belongs_to :topic, touch: true
 end
+
+class Hotspot < ApplicationRecord
+  belongs_to :post, required: false
+  has_one :topic, through: :post
+end

data/test/model/user.rb

@@ -9,7 +9,6 @@ ActiveRecord::Base.connection.create_table(:users, force: true) do |t|
   t.integer :status, default: 0
   t.integer :books_count, default: 0
   t.integer :images_count, default: 0
-  t.datetime :deleted_at
   t.timestamps null: false, precision: 6
 end
 
@@ -29,7 +28,6 @@ end
 class User < ApplicationRecord
   CACHE_VERSION = 3
   second_level_cache(version: CACHE_VERSION, expires_in: 3.days)
-  acts_as_paranoid
 
   serialize :options, Array
   serialize :json_options, JSON if ::ActiveRecord::VERSION::STRING >= "4.1.0"

data/test/paranoid_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ParanoidTest < ActiveSupport::TestCase
+  def setup
+    skip unless defined?(Paranoi)
+    @paranoid = Paranoid.create
+  end
+
+  def test_should_expire_cache_when_destroy
+    skip unless defined(Paranoi)
+    @paranoid.destroy
+    assert_nil Paranoid.find_by(id: @paranoid.id)
+    assert_nil SecondLevelCache.cache_store.read(@paranoid.second_level_cache_key)
+    assert_nil User.read_second_level_cache(@paranoid.id)
+  end
+end

data/test/test_helper.rb

@@ -2,11 +2,10 @@
 
 require "bundler/setup"
 require "minitest/autorun"
-require "active_support/test_case"
+require "active_support/all"
 require "active_record_test_case_helper"
 require "database_cleaner"
 require "active_record"
-require "paranoia"
 require "pry"
 ActiveSupport.test_order = :sorted if ActiveSupport.respond_to?(:test_order=)
 # Force hook :active_record on_load event to make sure loader can work.
@@ -27,6 +26,7 @@ require "model/order_item"
 require "model/account"
 require "model/animal"
 require "model/contribution"
+require "model/paranoid" if defined?(Paranoid)
 
 DatabaseCleaner[:active_record].strategy = :truncation
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Hooopo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +104,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/second_level_cache.rb
@@ -127,7 +116,9 @@ files:
 - lib/second_level_cache/active_record/finder_methods.rb
 - lib/second_level_cache/active_record/has_one_association.rb
 - lib/second_level_cache/active_record/persistence.rb
-- lib/second_level_cache/active_record/preloader.rb
+- lib/second_level_cache/active_record/preloader/association.rb
+- lib/second_level_cache/active_record/preloader/legacy.rb
+- lib/second_level_cache/adapter/paranoia.rb
 - lib/second_level_cache/config.rb
 - lib/second_level_cache/log_subscriber.rb
 - lib/second_level_cache/mixin.rb
@@ -150,9 +141,11 @@ files:
 - test/model/image.rb
 - test/model/order.rb
 - test/model/order_item.rb
+- test/model/paranoid.rb
 - test/model/post.rb
 - test/model/topic.rb
 - test/model/user.rb
+- test/paranoid_test.rb
 - test/persistence_test.rb
 - test/polymorphic_association_test.rb
 - test/preloader_belongs_to_test.rb
@@ -167,7 +160,7 @@ files:
 homepage: https://github.com/hooopo/second_level_cache
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: 'SecondLevelCache is a write-through and read-through caching library inspired
   by Cache Money and cache_fu, support only Rails3 and ActiveRecord.  Read-Through:
@@ -192,32 +185,34 @@ summary: 'SecondLevelCache is a write-through and read-through caching library i
   is a cache miss, it will populate the cache.  Write-Through: As objects are created,
   updated, and deleted, all of the caches are automatically kept up-to-date and coherent.'
 test_files:
-- test/preloader_belongs_to_test.rb
-- test/polymorphic_association_test.rb
-- test/require_test.rb
-- test/finder_methods_test.rb
-- test/preloader_has_one_test.rb
-- test/preloader_non_integer_test.rb
+- test/active_record_test_case_helper.rb
+- test/base_test.rb
 - test/belongs_to_association_test.rb
-- test/second_level_cache_test.rb
 - test/enum_attr_test.rb
-- test/record_marshal_test.rb
-- test/preloader_has_many_test.rb
-- test/persistence_test.rb
-- test/single_table_inheritance_test.rb
-- test/model/image.rb
+- test/fetch_by_uniq_key_test.rb
+- test/finder_methods_test.rb
+- test/has_one_association_test.rb
 - test/model/account.rb
-- test/model/order_item.rb
-- test/model/contribution.rb
-- test/model/book.rb
-- test/model/topic.rb
 - test/model/animal.rb
-- test/model/order.rb
 - test/model/application_record.rb
+- test/model/book.rb
+- test/model/contribution.rb
+- test/model/image.rb
+- test/model/order.rb
+- test/model/order_item.rb
+- test/model/paranoid.rb
 - test/model/post.rb
+- test/model/topic.rb
 - test/model/user.rb
-- test/fetch_by_uniq_key_test.rb
+- test/paranoid_test.rb
+- test/persistence_test.rb
+- test/polymorphic_association_test.rb
+- test/preloader_belongs_to_test.rb
+- test/preloader_has_many_test.rb
+- test/preloader_has_one_test.rb
+- test/preloader_non_integer_test.rb
+- test/record_marshal_test.rb
+- test/require_test.rb
+- test/second_level_cache_test.rb
+- test/single_table_inheritance_test.rb
 - test/test_helper.rb
-- test/has_one_association_test.rb
-- test/base_test.rb
-- test/active_record_test_case_helper.rb

data/lib/second_level_cache/active_record/preloader.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module SecondLevelCache
-  module ActiveRecord
-    module Associations
-      module Preloader
-        RAILS6 = ::ActiveRecord.version >= ::Gem::Version.new("6")
-
-        def records_for(ids, &block)
-          return super unless klass.second_level_cache_enabled?
-          return super unless reflection.is_a?(::ActiveRecord::Reflection::BelongsToReflection)
-          return super if klass.default_scopes.present?
-
-          map_cache_keys = ids.map { |id| klass.second_level_cache_key(id) }
-          records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
-
-          record_marshals = if RAILS6
-            RecordMarshal.load_multi(records_from_cache.values) do |record|
-              # This block is copy from:
-              # https://github.com/rails/rails/blob/6-0-stable/activerecord/lib/active_record/associations/preloader/association.rb#L101
-              owner = owners_by_key[convert_key(record[association_key_name])].first
-              association = owner.association(reflection.name)
-              association.set_inverse_instance(record)
-            end
-          else
-            RecordMarshal.load_multi(records_from_cache.values, &block)
-          end
-
-          # NOTICE
-          # Rails.cache.read_multi return hash that has keys only hitted.
-          # eg. Rails.cache.read_multi(1,2,3) => {2 => hit_value, 3 => hit_value}
-          hitted_ids = record_marshals.map { |record| record.read_attribute(association_key_name).to_s }
-          missed_ids = ids.map(&:to_s) - hitted_ids
-          ActiveSupport::Notifications.instrument("preload.second_level_cache", key: association_key_name, hit: hitted_ids, miss: missed_ids)
-          return SecondLevelCache::RecordRelation.new(record_marshals) if missed_ids.empty?
-
-          records_from_db = super(missed_ids, &block)
-          records_from_db.map { |r| write_cache(r) }
-
-          SecondLevelCache::RecordRelation.new(records_from_db + record_marshals)
-        end
-
-        private
-          def write_cache(record)
-            record.write_second_level_cache
-          end
-      end
-    end
-  end
-end