second_level_cache 1.5.1 → 1.6.0

data/CHANGELOG.md

@@ -34,3 +34,8 @@
 -----
 * [use new marshal machanism to avoid clear assocation cache manually]
 
+1.6.0
+-----
+* [write through cache]
+* [disable SecondLevelCache for spicial model]
+* [only cache `SELECT *` query]

data/README.md

@@ -15,7 +15,7 @@ SecondLevelCache is not fully test and verify in production enviroment right now
 In your gem file:
 
 ```ruby
-gem "second_level_cache", :git => "git://github.com/csdn-dev/second_level_cache.git"
+gem "second_level_cache", "~> 1.5"
 ```
 
 ## Usage
@@ -24,7 +24,7 @@ For example, cache User objects:
 
 ```ruby
 class User < ActiveRecord::Base
-  acts_as_cached
+  acts_as_cached(:version => 1, :expires_in => 1.week)
 end
 ```
 
@@ -37,7 +37,8 @@ User.find_by_id!(1)
 User.find_by_id_and_name(1, "Hooopo")
 User.where(:status => 1).find_by_id(1)
 user.articles.find_by_id(1)
-user.articles.find(1), user.where(:status => 1).find(1)
+user.articles.find(1)
+User.where(:status => 1).find(1)
 article.user
 ```
 
@@ -45,7 +46,23 @@ Cache key:
 
 ```ruby
 user = User.find 1
-user.second_level_cache_key  # We will get the key looks like "slc/user/1"
+user.second_level_cache_key  # We will get the key looks like "slc/user/1/0"
+```
+
+Disable SecondLevelCache:
+
+```ruby
+  User.without_second_level_cache do
+    user = User.find 1
+    # ...
+  end
+```
+
+Only `SELECT *` query will be cached:
+
+```ruby
+  # this query will NOT be cached
+  User.select("id, name").find(1)
 ```
 
 Notice:

data/lib/second_level_cache/active_record/base.rb

@@ -5,8 +5,9 @@ module SecondLevelCache
       extend ActiveSupport::Concern
 
       included do
-        after_destroy :expire_second_level_cache
-        after_save :expire_second_level_cache
+        after_commit :expire_second_level_cache, :on => :destroy
+        after_commit :update_second_level_cache, :on => :update
+        after_commit :write_second_level_cache, :on => :create
 
         class << self
           alias_method_chain :update_counters, :cache
@@ -16,8 +17,9 @@ module SecondLevelCache
 
       module ClassMethods
         def update_counters_with_cache(id, counters)
-          Array(id).each{|i| expire_second_level_cache(i)}
-          update_counters_without_cache(id, counters)
+          update_counters_without_cache(id, counters).tap do
+            Array(id).each{|i| expire_second_level_cache(i)}
+          end
         end
       end
     end

data/lib/second_level_cache/active_record/finder_methods.rb

@@ -27,6 +27,7 @@ module SecondLevelCache
       #     Article.where("user_id = 1 AND ...").find(params[:id])
       def find_one_with_second_level_cache(id)
         return find_one_without_second_level_cache(id) unless second_level_cache_enabled?
+        return find_one_without_second_level_cache(id) unless select_all_column?
 
         id = id.id if ActiveRecord::Base === id
         if ::ActiveRecord::IdentityMap.enabled? && cachable? && record = from_identity_map(id)
@@ -51,6 +52,7 @@ module SecondLevelCache
       # TODO cache find_or_create_by_id
       def find_by_attributes_with_second_level_cache(match, attributes, *args)
         return find_by_attributes_without_second_level_cache(match, attributes, *args) unless second_level_cache_enabled?
+        return find_by_attributes_without_second_level_cache(match, attributes, *args) unless select_all_column?
 
         conditions = Hash[attributes.map {|a| [a, args[attributes.index(a)]]}]
 
@@ -101,6 +103,10 @@ module SecondLevelCache
         limit_value.blank? || limit_value == 1
       end
 
+      def select_all_column?
+        select_values.blank?
+      end
+
       def from_identity_map(id)
         ::ActiveRecord::IdentityMap.get(@klass, id)
       end

data/lib/second_level_cache/active_record/persistence.rb

@@ -13,18 +13,15 @@ module SecondLevelCache
       end
 
       def update_column_with_second_level_cache(name, value)
-        expire_second_level_cache
-        update_column_without_second_level_cache(name, value)
+        update_column_without_second_level_cache(name, value).tap{update_second_level_cache}
       end
 
       def reload_with_second_level_cache(options = nil)
-        expire_second_level_cache
-        reload_without_second_level_cache(options)
+        reload_without_second_level_cache(options).tap{expire_second_level_cache}
       end
 
       def touch_with_second_level_cache(name = nil)
-        expire_second_level_cache
-        touch_without_second_level_cache(name)
+        touch_without_second_level_cache(name).tap{update_second_level_cache}
       end
     end
   end

data/lib/second_level_cache/version.rb

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

data/lib/second_level_cache.rb

@@ -29,6 +29,14 @@ module SecondLevelCache
         !!@second_level_cache_enabled
       end
 
+      def without_second_level_cache
+        old, @second_level_cache_enabled = @second_level_cache_enabled, false
+
+        yield if block_given?
+      ensure
+        @second_level_cache_enabled = old
+      end
+
       def cache_store
         Config.cache_store
       end
@@ -71,6 +79,8 @@ module SecondLevelCache
         SecondLevelCache.cache_store.write(second_level_cache_key, RecordMarshal.dump(self), :expires_in => self.class.second_level_cache_options[:expires_in])
       end
     end
+
+    alias update_second_level_cache write_second_level_cache
   end
 end
 

data/test/active_record/base_test.rb

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

data/test/active_record/finder_methods_test.rb

@@ -24,4 +24,21 @@ class ActiveRecord::FinderMethodsTest < Test::Unit::TestCase
       assert_equal @user, User.where(:name => @user.name).find(@user.id)
     end
   end
+
+  def test_should_NOT_find_from_cache_when_select_speical_columns
+    @user.write_second_level_cache
+    only_id_user = User.select("id").find(@user.id)
+    assert_raise(ActiveModel::MissingAttributeError) do
+      only_id_user.name
+    end
+  end
+
+  def test_without_second_level_cache
+    @user.name = "NewName"
+    @user.write_second_level_cache
+    User.without_second_level_cache do
+      @from_db = User.find(@user.id)
+    end
+    assert_not_equal @user.name, @from_db.name
+  end
 end

data/test/active_record/model/user.rb

@@ -4,6 +4,7 @@ ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
   t.string  :email
   t.integer :books_count, :default => 0
   t.integer :images_count, :default => 0
+  t.timestamps
 end
 
 class User < ActiveRecord::Base

data/test/active_record/persistence_test.rb

@@ -13,12 +13,18 @@ class ActiveRecord::PersistenceTest < Test::Unit::TestCase
     assert_equal 1, @user.reload.books_count
   end
 
-  def test_should_clean_cache_after_touch
-    post = @topic.posts.create
-    post.body = "body"
-    post.save
-    new_topic = Topic.find @topic.id
-    assert !(new_topic.updated_at == @topic.updated_at)
+  def test_should_update_cache_after_touch
+    old_updated_time = @user.updated_at
+    @user.touch
+    assert !(old_updated_time == @user.updated_at)
+    new_user = User.find @user.id
+    assert_equal new_user, @user
+  end
+
+  def test_should_update_cache_after_update_column
+    @user.update_column :name, "new_name"
+    new_user = User.find @user.id
+    assert_equal new_user, @user
   end
 
   def test_should_return_true_if_touch_ok

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport