second_level_cache 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb263a78785d298fbaccbcb46bb71250f021e66d69f0cf5c89f9d1cd97651c50
-  data.tar.gz: f861c5fc32002720f2e83b30444ad3f2ac368427406a1c832ca4ba0f5620da89
+  metadata.gz: 57109a059ebed4c9d448fa28e474f19eef4ebf7b67e4ebbd728f2be852b61480
+  data.tar.gz: '049303d75a982adf35dfea344af63577dd9df1c09a28613bb4dec4332ef95de4'
 SHA512:
-  metadata.gz: 9cacc9218aed1c33fd4470c8fa6a5bf21a7e89c22da09f522594e6ab5fb4830a168a7c930c0e3b4470086ac0193e1a906ca27f6543d0cba44fe1b2e9c6cc02f5
-  data.tar.gz: df2b8f074ce143b141d8fb34d4f5799da505c1e72fdda03dbeaa7284cfd10d9074ca87b93481ba2cafe9df7d578ef40fb11e4afa2a172d351cfcdabc77e7efc4
+  metadata.gz: 553a34ea48e7b3100ae819282c354ee0eb51e2d609b7c090bf477035b975a0e497158ca6f4b282add76c882fa7e94277fb39486aaf4e45c35c9e98088a2bbb34
+  data.tar.gz: 28a7f7ea7f32467e92097824559fbaebaf3d9dd0fe49443d7779e666cce3270f3378c8e77dae91bffbc5248c8fadd10f00a08ebbbe390641fa9e42007b917ba5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.5.3
+-------
+
+- Fix `fetch_by_uniq_keys` method that cache incorrect when A record modified uniq key and B reocrd used old uniq key of A record (#96)
+
 2.5.2
 -------
 

data/lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -6,19 +6,22 @@ module SecondLevelCache
       def fetch_by_uniq_keys(where_values)
         cache_key = cache_uniq_key(where_values)
         obj_id = SecondLevelCache.cache_store.read(cache_key)
+
         if obj_id
-          begin
-            return find(obj_id)
-          rescue StandardError
-            return nil
-          end
+          record = begin
+                     find(obj_id)
+                   rescue StandardError
+                     nil
+                   end
         end
-
+        return record if compare_record_attributes_with_where_values(record, where_values)
         record = where(where_values).first
-        return nil unless record
-
-        record.tap do |r|
-          SecondLevelCache.cache_store.write(cache_key, r.id)
+        if record
+          SecondLevelCache.cache_store.write(cache_key, record.id)
+          return record
+        else
+          SecondLevelCache.cache_store.delete(cache_key)
+          return nil
         end
       end
 
@@ -42,13 +45,30 @@ module SecondLevelCache
 
       def cache_uniq_key(where_values)
         keys = where_values.collect do |k, v|
-          v = Digest::MD5.hexdigest(v) if v && v.size >= 32
+          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}"
       end
+
+      def compare_record_attributes_with_where_values(record, where_values)
+        return false unless record
+        where_values.all? do |k, v|
+          attribute_value = record.read_attribute(k)
+          attribute_value == case attribute_value
+                             when String
+                               v.to_s
+                             when Numeric
+                               v.to_f
+                             when Date
+                               v.to_date
+                             else # Maybe NilClass/?
+                               v
+                             end
+        end
+      end
     end
   end
 end

data/lib/second_level_cache/version.rb

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

data/test/active_record_test_case_helper.rb

@@ -76,6 +76,16 @@ module ActiveRecordTestCaseHelper
     model.column_names.include?(column_name.to_s)
   end
 
+  def savepoint
+    if ActiveRecord::Base.connection.supports_savepoints?
+      ActiveRecord::Base.connection.begin_transaction(joinable: false)
+      yield
+      ActiveRecord::Base.connection.rollback_transaction
+    else
+      yield
+    end
+  end
+
   class SQLCounter
     class << self
       attr_accessor :ignored_sql, :log, :log_all

data/test/fetch_by_uniq_key_test.rb

@@ -14,6 +14,18 @@ class FetchByUinqKeyTest < ActiveSupport::TestCase
     assert_equal User.send(:cache_uniq_key, foo: 1, bar: nil), "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}"
+  end
+
+  def test_compare_record_attributes_with_where_values
+    book = Book.new(title: "foobar")
+    assert Book.send(:compare_record_attributes_with_where_values, book, title: :foobar)
+    book.discount_percentage = 60.00
+    assert Book.send(:compare_record_attributes_with_where_values, book, discount_percentage: "60")
+    book.publish_date = Time.current.to_date
+    assert Book.send(:compare_record_attributes_with_where_values, book, publish_date: Time.current.to_date.to_s)
+    book.title = nil
+    assert Book.send(:compare_record_attributes_with_where_values, book, title: nil)
   end
 
   def test_should_query_from_db_using_primary_key
@@ -51,4 +63,31 @@ class FetchByUinqKeyTest < ActiveSupport::TestCase
     user = User.fetch_by_uniq_key(@user.name, :name)
     assert_equal user, @user
   end
+
+  def test_should_return_correct_when_destroy_old_record_and_create_same_new_record
+    savepoint do
+      uniq_key = { email: "#{Time.now.to_i}@foobar.com" }
+      old_user = User.create(uniq_key)
+      new_user = old_user.deep_dup
+      assert_equal old_user, User.fetch_by_uniq_keys(uniq_key)
+      old_user.destroy
+
+      # Dirty id cache should be removed
+      assert_queries(2) { assert_nil User.fetch_by_uniq_keys(uniq_key) }
+      assert_queries(1) { assert_nil User.fetch_by_uniq_keys(uniq_key) }
+
+      new_user.save
+      assert_equal new_user, User.fetch_by_uniq_keys(uniq_key)
+    end
+  end
+
+  def test_should_return_correct_when_old_record_modify_uniq_key_and_new_record_use_same_uniq_key
+    savepoint do
+      uniq_key = { email: @user.email }
+      assert_equal @user, User.fetch_by_uniq_keys(uniq_key)
+      @user.update_attribute(:email, "#{Time.now.to_i}@foobar.com")
+      new_user = User.create(uniq_key)
+      assert_equal new_user, User.fetch_by_uniq_keys(uniq_key)
+    end
+  end
 end

data/test/model/book.rb

@@ -4,7 +4,9 @@ ActiveRecord::Base.connection.create_table(:books, force: true) do |t|
   t.string  :title
   t.string  :body
   t.integer :user_id
+  t.decimal :discount_percentage, precision: 5, scale: 2
   t.integer :images_count, default: 0
+  t.date    :publish_date
 end
 
 class Book < ActiveRecord::Base

data/test/model/contribution.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+ActiveRecord::Base.connection.create_table(:contributions, force: true) do |t|
+  t.integer :user_id
+  t.text    :data
+  t.date    :date
+end
+
+class Contribution < ActiveRecord::Base
+  second_level_cache
+
+  validates_uniqueness_of :user_id, scope: :date, if: -> { user_id_changed? || date_changed? }
+  belongs_to :user
+end

data/test/test_helper.rb

@@ -25,6 +25,7 @@ require "model/order"
 require "model/order_item"
 require "model/account"
 require "model/animal"
+require "model/contribution"
 
 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.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -144,6 +144,7 @@ files:
 - test/model/account.rb
 - test/model/animal.rb
 - test/model/book.rb
+- test/model/contribution.rb
 - test/model/image.rb
 - test/model/order.rb
 - test/model/order_item.rb
@@ -201,6 +202,7 @@ test_files:
 - test/model/image.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