second_level_cache 1.3.2 → 1.5.0

data/CHANGELOG.md

@@ -17,3 +17,14 @@
 1.3.2
 -----
 * [fix has one assciation issue]
+
+1.4.0
+-----
+* [cache has one assciation]
+
+1.4.1
+-----
+* [fix errors when belongs_to association return nil]
+
+1.5.0
+* [add cache version to quick clear cache for special model]

data/lib/second_level_cache.rb

@@ -22,6 +22,7 @@ module SecondLevelCache
         @second_level_cache_enabled = true
         @second_level_cache_options = options
         @second_level_cache_options[:expires_in] ||= 1.day
+        @second_level_cache_options[:version] ||= 0
       end
 
       def second_level_cache_enabled?
@@ -40,8 +41,12 @@ module SecondLevelCache
         Config.cache_key_prefix
       end
 
+      def cache_version
+        second_level_cache_options[:version]
+      end
+
       def second_level_cache_key(id)
-        "#{cache_key_prefix}/#{name.downcase}/#{id}"
+        "#{cache_key_prefix}/#{name.downcase}/#{id}/#{cache_version}"
       end
 
       def read_second_level_cache(id)
@@ -62,7 +67,10 @@ module SecondLevelCache
     end
 
     def write_second_level_cache
-      SecondLevelCache.cache_store.write(second_level_cache_key, self, self.class.second_level_cache_options) if self.class.second_level_cache_enabled?
+      if self.class.second_level_cache_enabled?
+        self.clear_association_cache
+        SecondLevelCache.cache_store.write(second_level_cache_key, self, :expires_in => self.class.second_level_cache_options[:expires_in])
+      end
     end
   end
 end

data/lib/second_level_cache/active_record.rb

@@ -1,11 +1,15 @@
 # -*- encoding : utf-8 -*-
 require 'second_level_cache/active_record/base'
+require 'second_level_cache/active_record/fetch_by_uniq_key'
 require 'second_level_cache/active_record/finder_methods'
 require 'second_level_cache/active_record/persistence'
 require 'second_level_cache/active_record/belongs_to_association'
+require 'second_level_cache/active_record/has_one_association'
 
 ActiveRecord::Base.send(:include, SecondLevelCache::Mixin)
 ActiveRecord::Base.send(:include, SecondLevelCache::ActiveRecord::Base)
+ActiveRecord::Base.send(:extend, SecondLevelCache::ActiveRecord::FetchByUniqKey)
 ActiveRecord::FinderMethods.send(:include, SecondLevelCache::ActiveRecord::FinderMethods)
 ActiveRecord::Base.send(:include, SecondLevelCache::ActiveRecord::Persistence)
 ActiveRecord::Associations::BelongsToAssociation.send(:include, SecondLevelCache::ActiveRecord::Associations::BelongsToAssociation)
+ActiveRecord::Associations::HasOneAssociation.send(:include, SecondLevelCache::ActiveRecord::Associations::HasOneAssociation)

data/lib/second_level_cache/active_record/base.rb

@@ -6,7 +6,7 @@ module SecondLevelCache
 
       included do
         after_destroy :expire_second_level_cache
-        after_save :write_second_level_cache
+        after_save :expire_second_level_cache
 
         class << self
           alias_method_chain :update_counters, :cache

data/lib/second_level_cache/active_record/belongs_to_association.rb

@@ -15,8 +15,11 @@ module SecondLevelCache
           cache_record = klass.read_second_level_cache(second_level_cache_key)
           return cache_record.tap{|record| set_inverse_instance(record)} if cache_record
           record = find_target_without_second_level_cache
-          record.write_second_level_cache
-          record
+
+          record.tap do |r|
+            set_inverse_instance(r)
+            r.write_second_level_cache
+          end if record
         end
 
         private

data/lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+module SecondLevelCache
+  module ActiveRecord
+    module FetchByUniqKey
+      def fetch_by_uniq_key(value, uniq_key_name)
+        if iid = SecondLevelCache.cache_store.read(cache_uniq_key(value, uniq_key_name))
+          self.find_by_id(iid)
+        else
+          record = self.where(uniq_key_name => value).first
+          record.tap{|record| SecondLevelCache.cache_store.write(cache_uniq_key(value, uniq_key_name), record.id)} if record
+        end
+      end
+
+      def fetch_by_uniq_key!(value, uniq_key_name)
+        fetch_by_uniq_key(value, uniq_key_name) || raise(::ActiveRecord::RecordNotFound)
+      end
+
+      private
+
+      def cache_uniq_key(value, uniq_key_name)
+        "uniq_key_#{self.name}_#{uniq_key_name}_#{value}"
+      end
+    end
+  end
+end

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -0,0 +1,28 @@
+# -*- encoding : utf-8 -*-
+module SecondLevelCache
+  module ActiveRecord
+    module Associations
+      module HasOneAssociation
+        extend ActiveSupport::Concern
+        included do
+          class_eval do
+            alias_method_chain :find_target, :second_level_cache
+          end
+        end
+
+        def find_target_with_second_level_cache
+          return find_target_without_second_level_cache unless association_class.second_level_cache_enabled?
+          cache_record = association_class.fetch_by_uniq_key(owner[reflection.active_record_primary_key], reflection.foreign_key)
+          return cache_record.tap{|record| set_inverse_instance(record)} if cache_record
+
+          record = find_target_without_second_level_cache
+
+          record.tap do |r|
+            set_inverse_instance(r)
+            r.write_second_level_cache
+          end if record
+        end
+      end
+    end
+  end
+end

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module SecondLevelCache 
-  VERSION = "1.3.2"
+  VERSION = "1.5.0"
 end

data/test/active_record/base_test.rb

@@ -6,19 +6,14 @@ class ActiveRecord::BaseTest < Test::Unit::TestCase
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end
 
-  def test_should_have_cache_when_create
-    no_connection do
-      assert_not_nil User.read_second_level_cache(@user.id)
-      assert_equal @user, User.find(@user.id)
-    end
-  end
-
-  def test_should_update_cache_when_update
+  def test_should_expire_cache_when_update_attributes
     @user.update_attributes :name => 'change'
+    assert_nil User.read_second_level_cache(@user.id)
+  end
 
-    no_connection do
-      assert_equal 'change', User.find(@user.id).name
-    end
+  def test_should_expire_cache_when_update_attribute
+    @user.update_attribute :name, 'change'
+    assert_nil Post.read_second_level_cache(@user.id)
   end
 
   def test_should_expire_cache_when_destroy

data/test/active_record/belongs_to_association_test.rb

@@ -9,6 +9,8 @@ class ActiveRecord::BelongsToAssociationTest < Test::Unit::TestCase
   def test_should_get_cache_when_use_belongs_to_association
     book = @user.books.create
 
+    @user.write_second_level_cache
+    book.clear_association_cache
     no_connection do
       assert_equal @user, book.user
     end

data/test/active_record/finder_methods_test.rb

@@ -12,12 +12,14 @@ class ActiveRecord::FinderMethodsTest < Test::Unit::TestCase
   end
 
   def test_should_find_with_cache
+    @user.write_second_level_cache
     no_connection do
       assert_equal @user, User.find(@user.id)
     end
   end
 
   def test_should_find_with_condition
+    @user.write_second_level_cache
     no_connection do
       assert_equal @user, User.where(:name => @user.name).find(@user.id)
     end

data/test/active_record/model/user.rb

@@ -7,7 +7,8 @@ ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
 end
 
 class User < ActiveRecord::Base
-  acts_as_cached
+  CacheVersion = 3
+  acts_as_cached(:version => CacheVersion, :expires_in => 3.day)
 
   has_many :books
   has_many :images, :as => :imagable

data/test/active_record/polymorphic_association_test.rb

@@ -9,6 +9,8 @@ class ActiveRecord::PolymorphicAssociationTest < Test::Unit::TestCase
   def test_should_get_cache_when_use_polymorphic_association
     image = @user.images.create
 
+    @user.write_second_level_cache
+    image.clear_association_cache
     no_connection do
       assert_equal @user, image.imagable
     end

data/test/active_record/second_level_cache_test.rb

@@ -7,14 +7,13 @@ class ActiveRecord::SecondLevelCacheTest < Test::Unit::TestCase
   end
 
   def test_should_get_cache_key
-    assert_equal "slc/user/#{@user.id}", @user.second_level_cache_key
+    assert_equal "slc/user/#{@user.id}/#{User::CacheVersion}", @user.second_level_cache_key
   end
 
   def test_should_write_and_read_cache
+    @user.write_second_level_cache
     assert_not_nil User.read_second_level_cache(@user.id)
     @user.expire_second_level_cache
     assert_nil User.read_second_level_cache(@user.id)
-    @user.write_second_level_cache
-    assert_not_nil User.read_second_level_cache(@user.id)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,7 +93,9 @@ files:
 - lib/second_level_cache/active_record.rb
 - lib/second_level_cache/active_record/base.rb
 - lib/second_level_cache/active_record/belongs_to_association.rb
+- lib/second_level_cache/active_record/fetch_by_uniq_key.rb
 - lib/second_level_cache/active_record/finder_methods.rb
+- lib/second_level_cache/active_record/has_one_association.rb
 - lib/second_level_cache/active_record/persistence.rb
 - lib/second_level_cache/arel/wheres.rb
 - lib/second_level_cache/config.rb
@@ -125,12 +127,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -453317869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -453317869
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24