second_level_cache 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c9987992ee5a153440093cb5790b0f3d1e64d0
-  data.tar.gz: d8a274ec93948824185855cf1b8fb788aa844c34
+  metadata.gz: 468998db30f121cb2fe6759f3c7bc59beb70685f
+  data.tar.gz: efbb401b2975b3dc97a9cc639f3b1147e4c95332
 SHA512:
-  metadata.gz: 58c4cb72d3ae8a74f39ab0a0a5dc71b44ba254d51e53e120f099486bdc7fdf0204434d069ebdbe2a30f66b3c90b9840d97ec6130599e98328fc00feef305ad33
-  data.tar.gz: a32c661bbe6d71fabea69d3079a795ce9ec51315613fda3b26a1f163220c30f147b3c3c37cf843d0f113e0e2e41f5527b33aad5801af17a259f5c455e61b394a
+  metadata.gz: 2716b6392268aa3973b383994c87ba269feb5d59a420491ac3a61e334d3072c215fe9909ef242446aa7469bcd444a5262a830fb03af8b476245dce52da394a76
+  data.tar.gz: 66f5a460fd82d11a97dbc685410ea33a2de792c232aa3116eb3ccf50b36603ed4b209df16dede9fc8f3b099073396b51a895ede1cf5a1d02739a4eb6be9aa469

data/lib/second_level_cache/active_record/preloader.rb

@@ -19,7 +19,7 @@ module SecondLevelCache
             record_marshals = RecordMarshal.load_multi(records_from_cache.values)
 
             if missed_ids.empty?
-              return record_marshals
+              return SecondLevelCache::RecordRelation.new(record_marshals)
             end
 
             records_from_db = super(missed_ids)
@@ -27,7 +27,7 @@ module SecondLevelCache
               write_cache(r)
             end
 
-            records_from_db + record_marshals
+            SecondLevelCache::RecordRelation.new(records_from_db + record_marshals)
           end
 
           private

data/lib/second_level_cache/record_relation.rb

@@ -0,0 +1,17 @@
+module SecondLevelCache
+  class RecordRelation < Array
+    # A fake Array for fix ActiveRecord 5.0.1 records_for method changed bug
+    #
+    # in ActiveRecord 5.0.0 called:
+    #   records_for(slice)
+    #
+    # but 5.0.1 called:
+    #   https://github.com/rails/rails/blob/master/activerecord/lib/active_record/associations/preloader/association.rb#L118
+    #   records_for(slice).load(&block)
+    #
+    # https://github.com/rails/rails/pull/26340
+    def load(&_block)
+      self
+    end
+  end
+end

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SecondLevelCache
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.2.5'.freeze
 end

data/lib/second_level_cache.rb

@@ -1,6 +1,7 @@
 require 'active_support/all'
 require 'second_level_cache/config'
 require 'second_level_cache/record_marshal'
+require 'second_level_cache/record_relation'
 
 module SecondLevelCache
   def self.configure
@@ -29,7 +30,11 @@ module SecondLevelCache
       end
 
       def second_level_cache_enabled?
-        @second_level_cache_enabled == true
+        if defined? @second_level_cache_enabled
+          @second_level_cache_enabled == true
+        else
+          false
+        end
       end
 
       def without_second_level_cache
@@ -73,10 +78,19 @@ module SecondLevelCache
       return unless self.class.second_level_cache_enabled?
       marshal = RecordMarshal.dump(self)
       expires_in = self.class.second_level_cache_options[:expires_in]
+      expire_changed_association_uniq_keys
       SecondLevelCache.cache_store.write(second_level_cache_key, marshal, expires_in: expires_in)
     end
 
     alias update_second_level_cache write_second_level_cache
+
+    def expire_changed_association_uniq_keys
+      reflections = self.class.reflections.select { |_, reflection| reflection.belongs_to? }
+      changed_keys = reflections.map { |_, reflection| reflection.foreign_key } & previous_changes.keys
+      changed_keys.each do |key|
+        SecondLevelCache.cache_store.delete(self.class.send(:cache_uniq_key, key => previous_changes[key][0]))
+      end
+    end
   end
 end
 

data/test/has_one_association_test.rb

@@ -33,4 +33,18 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     clear_user = User.find(user.id)
     assert_equal clear_user.namespace.name, 'hooopo'
   end
+
+  def test_assign_relation
+    assert_equal @user.account, @account
+    new_account = Account.create
+    @user.account = new_account
+    assert_equal @user.account, new_account
+    assert_equal @user.reload.account, new_account
+  end
+
+  def test_belongs_to_column_change
+    assert_equal @user.account, @account
+    @account.update(user_id: @user.id + 1)
+    assert_nil @user.reload.account
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,6 +145,7 @@ files:
 - lib/second_level_cache/active_record/railtie.rb
 - lib/second_level_cache/config.rb
 - lib/second_level_cache/record_marshal.rb
+- lib/second_level_cache/record_relation.rb
 - lib/second_level_cache/version.rb
 - second_level_cache.gemspec
 - test/active_record_test_case_helper.rb