second_level_cache 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0056aa765b7668e44d115f964c4fb11f1632ecf99206145c89aed0fb58f2b4d0
-  data.tar.gz: a4fb19d6ff3859c728c7d8a43f28f64bb092c89226772de31b5b22f1e57e2cf6
+  metadata.gz: 84fecc39005beffa957b1602ff86ace6ca5419a1215d35011034ac6c78b5e0bf
+  data.tar.gz: f0a09a62d06ef9f10a1ee4559a4aac1b8e39eaa8a86ee81ce90d67212c9c1811
 SHA512:
-  metadata.gz: 32f1cb2460325a2291d2732c2f3ec906c7c16c2c5838564df7bfa56f362c0049d37c1ef2658db6c057faf31183869bbd8d6fc4702f4056f0a8bc4d143933cc68
-  data.tar.gz: 46e242047cd4e0c1c3651dc3e7ff03028d044a96b6c4c915d994114226c5ed30c8668248b14caac8165b51a283ba6ab9455badc5c27c6f7a31468753086216c4
+  metadata.gz: 40c406b9b4181c5e1085127bbab26b71c5a47842d685521b9fa1ec43e58e529d8591c24ae675760ed2a3dcc9644dca7fcb6db12a5e651b67670af413c16addcc
+  data.tar.gz: fc5f6ee2184884f4580123550e3d3edbb113114de4f7dacad340ef8c37711e9388335fdf029a06971fefe6a666ae0ca615f2852101384f986750333c3f85b0de

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+2.6.2
+-------
+
+- Fix activerecord association cache. (#109)
+- Fix fetch_by_uniq_key cache key with prefix. (#120)
+
 2.6.1
 -------
 

data/README.md

@@ -134,7 +134,7 @@ 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`:
+you can only change the `cache_key_prefix` (default: `slc`):
 
 ```ruby
 SecondLevelCache.configure.cache_key_prefix = "slc1"

data/lib/second_level_cache/active_record.rb

@@ -12,7 +12,13 @@ require "second_level_cache/active_record/preloader"
 
 # 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.gem("paranoia") rescue false)
+    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

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

@@ -49,7 +49,7 @@ module SecondLevelCache
           end
 
           ext_key = keys.join(",")
-          "uniq_key_#{name}_#{ext_key}"
+          "#{SecondLevelCache.configure.cache_key_prefix}/uniq_key_#{name}_#{ext_key}"
         end
 
         def record_attributes_equal_where_values?(record, where_values)

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -6,7 +6,7 @@ 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]

data/lib/second_level_cache/active_record/preloader.rb

@@ -9,7 +9,8 @@ module SecondLevelCache
         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?
+          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)

data/lib/second_level_cache/adapter/paranoia.rb

@@ -0,0 +1,24 @@
+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 update_second_level_cache write_second_level_cache
+      end
+    end
+  end
+end

data/lib/second_level_cache/mixin.rb

@@ -71,8 +71,6 @@ 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]

data/lib/second_level_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SecondLevelCache
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 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/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/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,16 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ParanoidTest < ActiveSupport::TestCase
+  def setup
+    @paranoid = Paranoid.create
+  end
+
+  def test_should_expire_cache_when_destroy
+    @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

@@ -27,6 +27,7 @@ require "model/order_item"
 require "model/account"
 require "model/animal"
 require "model/contribution"
+require "model/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.6.2
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,6 +128,7 @@ files:
 - 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/adapter/paranoia.rb
 - lib/second_level_cache/config.rb
 - lib/second_level_cache/log_subscriber.rb
 - lib/second_level_cache/mixin.rb
@@ -150,9 +151,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
@@ -195,6 +198,7 @@ test_files:
 - test/preloader_belongs_to_test.rb
 - test/polymorphic_association_test.rb
 - test/require_test.rb
+- test/paranoid_test.rb
 - test/finder_methods_test.rb
 - test/preloader_has_one_test.rb
 - test/preloader_non_integer_test.rb
@@ -213,6 +217,7 @@ test_files:
 - test/model/topic.rb
 - test/model/animal.rb
 - test/model/order.rb
+- test/model/paranoid.rb
 - test/model/application_record.rb
 - test/model/post.rb
 - test/model/user.rb