second_level_cache 1.5.0 → 1.5.1

data/CHANGELOG.md

@@ -27,4 +27,10 @@
 * [fix errors when belongs_to association return nil]
 
 1.5.0
+-----
 * [add cache version to quick clear cache for special model]
+
+1.5.1
+-----
+* [use new marshal machanism to avoid clear assocation cache manually]
+

data/lib/second_level_cache/record_marshal.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+module RecordMarshal
+  class << self
+    # dump ActiveRecord instace with only attributes.
+    # ["User",
+    #  {"id"=>30,
+    #  "email"=>"dddssddd@gmail.com",
+    #  "created_at"=>2012-07-25 18:25:57 UTC
+    #  }
+    # ]
+
+    def dump(record)
+      [
+       record.class.name,
+       record.instance_variable_get(:@attributes)
+      ]
+    end
+
+    # load a cached record
+    def load(serialized)
+      return unless serialized
+      record = serialized[0].constantize.allocate
+      record.init_with('attributes' => serialized[1])
+      record
+    end
+  end
+end

data/lib/second_level_cache/version.rb

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

data/lib/second_level_cache.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_support/all'
 require 'second_level_cache/config'
-require 'second_level_cache/marshal'
+require 'second_level_cache/record_marshal'
 
 module SecondLevelCache
   def self.configure
@@ -50,7 +50,7 @@ module SecondLevelCache
       end
 
       def read_second_level_cache(id)
-        SecondLevelCache.cache_store.read(second_level_cache_key(id)) if self.second_level_cache_enabled?
+        RecordMarshal.load(SecondLevelCache.cache_store.read(second_level_cache_key(id))) if self.second_level_cache_enabled?
       end
 
       def expire_second_level_cache(id)
@@ -68,8 +68,7 @@ module SecondLevelCache
 
     def write_second_level_cache
       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])
+        SecondLevelCache.cache_store.write(second_level_cache_key, RecordMarshal.dump(self), :expires_in => self.class.second_level_cache_options[:expires_in])
       end
     end
   end

data/test/active_record/polymorphic_association_test.rb

@@ -10,7 +10,6 @@ class ActiveRecord::PolymorphicAssociationTest < Test::Unit::TestCase
     image = @user.images.create
 
     @user.write_second_level_cache
-    image.clear_association_cache
     no_connection do
       assert_equal @user, image.imagable
     end
@@ -18,7 +17,6 @@ class ActiveRecord::PolymorphicAssociationTest < Test::Unit::TestCase
 
   def test_should_write_polymorphic_association_cache
     image = @user.images.create
-    @user.expire_second_level_cache
     assert_nil User.read_second_level_cache(@user.id)
     assert_equal @user, image.imagable
   end

data/test/record_marshal_test.rb

@@ -0,0 +1,33 @@
+# -*- encoding : utf-8 -*-
+require 'active_record/test_helper'
+
+class RecordMarshalTest < Test::Unit::TestCase
+  def setup
+    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
+  end
+
+  def test_should_dump_active_record_object
+    dumped = RecordMarshal.dump(@user)
+    assert dumped.is_a?(Array)
+    assert_equal "User", dumped[0]
+    assert_equal @user.attributes, dumped[1]
+  end
+
+
+  def test_should_load_active_record_object
+    @user.write_second_level_cache
+    assert_equal @user, User.read_second_level_cache(@user.id)
+  end
+
+
+  def test_should_load_nil
+    @user.expire_second_level_cache
+    assert_nil User.read_second_level_cache(@user.id)
+  end
+
+  def test_should_load_active_record_object_without_association_cache
+    @user.books
+    @user.write_second_level_cache
+    assert_empty User.read_second_level_cache(@user.id).association_cache
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,7 +99,7 @@ files:
 - lib/second_level_cache/active_record/persistence.rb
 - lib/second_level_cache/arel/wheres.rb
 - lib/second_level_cache/config.rb
-- lib/second_level_cache/marshal.rb
+- lib/second_level_cache/record_marshal.rb
 - lib/second_level_cache/version.rb
 - second_level_cache.gemspec
 - test/active_record/base_test.rb
@@ -114,6 +114,7 @@ files:
 - test/active_record/polymorphic_association_test.rb
 - test/active_record/second_level_cache_test.rb
 - test/active_record/test_helper.rb
+- test/record_marshal_test.rb
 - test/test_helper.rb
 homepage: https://github.com/csdn-dev/second_level_cache
 licenses: []
@@ -127,18 +128,12 @@ 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

data/lib/second_level_cache/marshal.rb

@@ -1,16 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Marshal
-  class << self
-    def load_with_constantize(value)
-      begin
-        Marshal.load_without_constantize value
-      rescue ArgumentError => e
-        _, class_name = *(/undefined class\/module (\w+)/.match(e.message))
-        raise if !class_name
-        class_name.constantize
-        Marshal.load value
-      end
-    end
-    alias_method_chain :load, :constantize
-  end
-end