second_level_cache 2.5.3 → 2.6.4

data/test/model/topic.rb

@@ -7,7 +7,7 @@ ActiveRecord::Base.connection.create_table(:topics, force: true) do |t|
   t.timestamps null: false
 end
 
-class Topic < ActiveRecord::Base
+class Topic < ApplicationRecord
   second_level_cache
 
   has_many :posts

data/test/model/user.rb

@@ -9,8 +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
+  t.timestamps null: false, precision: 6
 end
 
 ActiveRecord::Base.connection.create_table(:forked_user_links, force: true) do |t|
@@ -26,16 +25,15 @@ ActiveRecord::Base.connection.create_table(:namespaces, force: true) do |t|
   t.timestamps null: false
 end
 
-class User < ActiveRecord::Base
+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"
   store :extras, accessors: %i[tagline gender]
 
-  has_one  :account
+  has_one  :account, inverse_of: :user
   has_one  :forked_user_link, foreign_key: "forked_to_user_id"
   has_one  :forked_from_user, through: :forked_user_link
   has_many :namespaces
@@ -46,13 +44,15 @@ class User < ActiveRecord::Base
   enum status: %i[active archived]
 end
 
-class Namespace < ActiveRecord::Base
+class Namespace < ApplicationRecord
   second_level_cache version: 1, expires_in: 3.days
 
   belongs_to :user
 end
 
-class ForkedUserLink < ActiveRecord::Base
+class ForkedUserLink < ApplicationRecord
+  second_level_cache version: 1, expires_in: 1.day
+
   belongs_to :forked_from_user, class_name: "User"
   belongs_to :forked_to_user, class_name: "User"
 end

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/{preloader_test.rb → preloader_belongs_to_test.rb}

@@ -2,8 +2,8 @@
 
 require "test_helper"
 
-class PreloaderTest < ActiveSupport::TestCase
-  def test_belongs_to_preload_caches_includes
+class PreloaderBelongsToTest < ActiveSupport::TestCase
+  def test_preload_caches_includes
     topics = [
       Topic.create(title: "title1", body: "body1"),
       Topic.create(title: "title2", body: "body2"),
@@ -18,7 +18,7 @@ class PreloaderTest < ActiveSupport::TestCase
     assert_equal topics, results.map(&:topic)
   end
 
-  def test_belongs_to_when_read_multi_missed_from_cache_ar_will_fetch_missed_records_from_db
+  def test_when_read_multi_missed_from_cache_ar_will_fetch_missed_records_from_db
     topics = [
       Topic.create(title: "title1", body: "body1"),
       Topic.create(title: "title2", body: "body2"),
@@ -39,19 +39,21 @@ class PreloaderTest < ActiveSupport::TestCase
     assert_equal topics, results.map(&:topic)
   end
 
-  def test_has_many_preloader_returns_correct_results
-    topic = Topic.create(id: 1)
-    Post.create(id: 1)
-    post = topic.posts.create
-
-    assert_equal [post], Topic.includes(:posts).find(1).posts
+  def test_preloader_caches_includes_tried_set_inverse_instance
+    user_id = Time.current.to_i
+    Account.create(site: "foobar", user_id: user_id)
+    User.create(id: user_id, name: "foobar", email: "foobar@test.com")
+    accounts = Account.includes(:user)
+    assert_equal accounts.first.object_id, accounts.first.user.account.object_id
   end
 
-  def test_has_one_preloader_returns_correct_results
-    user = User.create(id: 1)
-    Account.create(id: 1)
-    account = user.create_account
-
-    assert_equal account, User.includes(:account).find(1).account
+  def test_preloader_from_db_when_exists_scope
+    user = User.create
+    book = user.books.create
+    image = book.images.create
+    book.toggle!(:normal)
+    assert_queries(:any) do
+      assert_nil Image.includes(:imagable).where(id: image.id).first.imagable
+    end
   end
 end

data/test/preloader_has_many_test.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class PreloaderHasManyTest < ActiveSupport::TestCase
+  def test_preloader_returns_correct_records
+    topic = Topic.create(id: 1)
+    Post.create(id: 1)
+    post = topic.posts.create
+
+    assert_equal [post], Topic.includes(:posts).find(1).posts
+  end
+end

data/test/preloader_has_one_test.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class PreloaderHasOneTest < ActiveSupport::TestCase
+  # def test_preload_caches_includes
+  #   users = User.create([
+  #                         { name: "foobar1", email: "foobar1@test.com" },
+  #                         { name: "foobar2", email: "foobar2@test.com" },
+  #                         { name: "foobar3", email: "foobar3@test.com" }
+  #                       ])
+  #   namespaces = users.map { |user| user.create_namespace(name: user.name) }
+
+  #   assert_queries(2) { User.includes(:namespace).order(id: :asc).to_a }  # Write cache
+  #   assert_queries(1) do
+  #     assert_equal namespaces, User.includes(:namespace).order(id: :asc).map(&:namespace)
+  #   end
+  # end
+
+  # def test_when_read_multi_missed_from_cache_should_will_fetch_missed_records_from_db
+  #   users = User.create([
+  #                         { name: "foobar1", email: "foobar1@test.com" },
+  #                         { name: "foobar2", email: "foobar2@test.com" },
+  #                         { name: "foobar3", email: "foobar3@test.com" }
+  #                       ])
+  #   namespaces = users.map { |user| user.create_namespace(name: user.name) }
+  #   assert_queries(2) { User.includes(:namespace).order(id: :asc).to_a }  # Write cache
+  #   expired_namespace = namespaces.first
+  #   expired_namespace.expire_second_level_cache
+
+  #   assert_queries(2) do
+  #     assert_sql(/WHERE\s\"namespaces\".\"kind\"\sIS\sNULL\sAND\s\"namespaces\"\.\"user_id\"\s=\s?/m) do
+  #       results = User.includes(:namespace).order(id: :asc).to_a
+  #       assert_equal namespaces, results.map(&:namespace)
+  #       assert_equal expired_namespace, results.first.namespace
+  #     end
+  #   end
+  # end
+
+  # def test_preloader_returns_correct_records_after_modify
+  #   user = User.create(name: "foobar", email: "foobar@test.com")
+
+  #   old_namespace = user.create_namespace(name: "old")
+  #   assert_queries(2) { User.includes(:namespace).order(id: :asc).to_a }  # Write cache
+  #   assert_queries(1) do
+  #     assert_equal old_namespace, User.includes(:namespace).first.namespace
+  #   end
+
+  #   new_namespace = user.create_namespace(name: "new")
+  #   assert_queries(2) { User.includes(:namespace).order(id: :asc).to_a }  # Write cache
+  #   assert_queries(1) do
+  #     assert_equal new_namespace, User.includes(:namespace).first.namespace
+  #   end
+  # end
+
+  # def test_preloader_caches_includes_tried_set_inverse_instance
+  #   User.create(name: "foobar", email: "foobar@test.com").create_account(site: "foobar")
+  #   users = User.includes(:account)
+  #   assert_equal users.first.object_id, users.first.account.user.object_id
+  # end
+
+  def test_has_one_preloader_returns_correct_results
+    user = User.create(id: 1)
+    Account.create(id: 1)
+    account = user.create_account
+
+    assert_equal account, User.includes(:account).find(1).account
+  end
+end

data/test/record_marshal_test.rb

@@ -25,7 +25,7 @@ class RecordMarshalTest < ActiveSupport::TestCase
     dumped = RecordMarshal.dump(@user)
     assert dumped.is_a?(Array)
     assert_equal "User", dumped[0]
-    assert_equal @user.attributes, dumped[1]
+    assert_equal dumped[1], ActiveRecord::Base.connection.select_all(User.where(id: @user.id)).first
   end
 
   def test_should_load_active_record_object

data/test/test_helper.rb

@@ -6,7 +6,6 @@ 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.
@@ -16,6 +15,7 @@ require "second_level_cache"
 
 ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 
+require "model/application_record"
 require "model/user"
 require "model/book"
 require "model/image"
@@ -26,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
 
@@ -33,10 +34,6 @@ SecondLevelCache.configure do |config|
   config.cache_store = ActiveSupport::Cache::MemoryStore.new
 end
 
-SecondLevelCache.logger.level = Logger::ERROR
-ActiveSupport::Cache::MemoryStore.logger = SecondLevelCache.logger
-ActiveRecord::Base.logger = SecondLevelCache.logger
-
 module ActiveSupport
   class TestCase
     setup do

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Hooopo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -51,19 +51,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,19 +93,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: '1.4'
 description: Write Through and Read Through caching library inspired by CacheMoney
   and cache_fu, support  ActiveRecord 4.
 email:
@@ -128,7 +128,9 @@ 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
 - lib/second_level_cache/record_marshal.rb
 - lib/second_level_cache/record_relation.rb
@@ -143,18 +145,23 @@ files:
 - test/has_one_association_test.rb
 - test/model/account.rb
 - test/model/animal.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/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/preloader_test.rb
 - test/record_marshal_test.rb
 - test/require_test.rb
 - test/second_level_cache_test.rb
@@ -163,7 +170,7 @@ files:
 homepage: https://github.com/hooopo/second_level_cache
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,8 +185,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.1.2
+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:
@@ -188,15 +195,18 @@ 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/preloader_test.rb
+- test/paranoid_test.rb
 - test/finder_methods_test.rb
+- test/preloader_has_one_test.rb
 - test/preloader_non_integer_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
@@ -207,6 +217,8 @@ 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
 - test/fetch_by_uniq_key_test.rb