second_level_cache 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 041a857d039324cda299622c23936f20fe9d83f9
-  data.tar.gz: 5a4ce5a3a3c1638eb74f9379d0f8421008c6b834
+SHA256:
+  metadata.gz: cf466732a8f99204779ce80418071b7132abcc8f375ca5f7e98d8c067ad55c1f
+  data.tar.gz: c800e784340496decd81ce340bdf32fb85938f50c25d5279f29ae11d292acd2c
 SHA512:
-  metadata.gz: 9444daff1fdeb5378db6ea2dc3e907744f2035dada6cb9b94bf47b88fa6894639a371438a02b2577ed41459d856c2b065240e322cbc156884abfaf8409c2b3ed
-  data.tar.gz: 1e84301c16f4129f130503e1fcc7096a19cf8213e6937cedfae1724422fc793e6246bed7f66e44fac1a757dcab2a2bb13588280abc8ac2b479ed520d5ab70171
+  metadata.gz: ba4fa6bd084ca3ed320597b4584eeafe7c4392b731a441a6981b648b660734685526f6899e2d4bacd8b46d6d64a3c0b7c75ed50e2b9002393b5cd1cb878041ac
+  data.tar.gz: d712535540abc0fdaab51fcd8e45b4f53701d2f17f4dff6c133006bba8a153a1db531544361535e62300d55bc8785aca0ffde346e60d49e0616543b03d2bd4a1

data/Gemfile

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

data/lib/second_level_cache/active_record/base.rb

@@ -4,9 +4,13 @@ module SecondLevelCache
   module ActiveRecord
     module Base
       def self.prepended(base)
-        base.after_commit :expire_second_level_cache, on: :destroy
         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
 
         class << base
           prepend ClassMethods

data/lib/second_level_cache/version.rb

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

data/test/finder_methods_test.rb

@@ -62,14 +62,14 @@ class FinderMethodsTest < ActiveSupport::TestCase
   def test_where_and_first_should_with_cache
     @user.write_second_level_cache
     assert_no_queries do
-      assert_equal @user, User.where(id: @user.id).first
+      assert_equal @user, User.unscoped.where(id: @user.id).first
     end
   end
 
   def test_where_and_last_should_with_cache
     @user.write_second_level_cache
     assert_no_queries do
-      assert_equal @user, User.where(id: @user.id).last
+      assert_equal @user, User.unscoped.where(id: @user.id).last
     end
   end
 end

data/test/model/user.rb

@@ -9,6 +9,7 @@ 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
 end
 
@@ -28,6 +29,7 @@ end
 class User < ActiveRecord::Base
   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/test_helper.rb

@@ -6,7 +6,8 @@ require "active_support/test_case"
 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.
 ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: 'SecondLevelCache is a write-through and read-through caching library inspired