Merge branch 'disable_slc'

Author: hooopo

lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -3,6 +3,7 @@ module SecondLevelCache
   module ActiveRecord
     module FetchByUniqKey
       def fetch_by_uniq_key(value, uniq_key_name)
+        return self.where(uniq_key_name => value).first unless self.second_level_cache_enabled?
         if iid = SecondLevelCache.cache_store.read(cache_uniq_key(value, uniq_key_name))
           self.find_by_id(iid)
         else

lib/second_level_cache/record_marshal.rb

@@ -12,7 +12,7 @@ class << self
     def dump(record)
       [
        record.class.name,
-       record.instance_variable_get(:@attributes)
+       record.attributes
       ]
     end
 

test/active_record/model/user.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
+  t.text    :options
   t.string  :name
   t.string  :email
   t.integer :books_count, :default => 0
@@ -9,6 +10,7 @@
 
 class User < ActiveRecord::Base
   CacheVersion = 3
+  serialize :options, Array
   acts_as_cached(:version => CacheVersion, :expires_in => 3.day)
 
   has_many :books