second_level_cache 2.0.0.beta → 2.0.0.rc1

data/lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -5,7 +5,7 @@ module SecondLevelCache
       def fetch_by_uniq_key(value, uniq_key_name)
         return self.where(uniq_key_name => value).first unless self.second_level_cache_enabled?
         if _id = SecondLevelCache.cache_store.read(cache_uniq_key(value, uniq_key_name))
-          self.find_by_id(_id)
+          self.find(_id) rescue nil
         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

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -11,8 +11,8 @@ module SecondLevelCache
         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 find_target_without_second_level_cache unless klass.second_level_cache_enabled?
+          cache_record = klass.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

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module SecondLevelCache 
-  VERSION = "2.0.0.beta"
+  VERSION = "2.0.0.rc1"
 end

data/test/active_record/fetch_by_uniq_key_test.rb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+require 'active_record/test_helper'
+
+class ActiveRecord::FetchByUinqKeyTest < Test::Unit::TestCase
+  def setup
+    DatabaseCleaner[:active_record].start
+    @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
+  end
+
+  def test_should_query_from_db_using_primary_key
+    User.fetch_by_uniq_key(@user.name, :name)
+    $sql_logger = nil
+    User.fetch_by_uniq_key(@user.name, :name)
+    assert_equal $sql_logger.strip, 'SELECT  "users".* FROM "users"  WHERE "users"."id" = ? LIMIT 1'
+  end
+
+  def test_should_not_hit_db_using_fetch_by_uniq_key_twice
+    user = User.fetch_by_uniq_key(@user.name, :name)
+    assert_equal user, @user
+    no_connection do
+      User.fetch_by_uniq_key(@user.name, :name)
+    end
+  end
+
+  def test_should_fail_when_fetch_by_uniq_key_with_bang_method
+    assert_raise(ActiveRecord::RecordNotFound) do
+      User.fetch_by_uniq_key!(@user.name + "not_exist", :name)
+    end
+  end
+end

data/test/active_record/has_one_association_test.rb

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+require 'active_record/test_helper'
+
+class ActiveRecord::HasOneAssociationTest < Test::Unit::TestCase
+  def setup
+    @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
+    @account = @user.create_account
+  end
+
+  def test_should_fetch_account_from_cache
+    clean_user = @user.reload
+    no_connection do
+      clean_user.account
+    end
+  end
+end

data/test/active_record/model/account.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+ActiveRecord::Base.connection.create_table(:accounts, :force => true) do |t|
+  t.integer  :age
+  t.string   :site
+  t.integer  :user_id
+  t.timestamps
+end
+
+class Account < ActiveRecord::Base
+  acts_as_cached(:expires_in => 3.day)
+  belongs_to :user
+end

data/test/active_record/model/user.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
   t.text    :options
-  t.string  :name
+  t.string  :name, :unique => true
   t.string  :email
   t.integer :books_count, :default => 0
   t.integer :images_count, :default => 0
@@ -12,7 +12,7 @@ class User < ActiveRecord::Base
   CacheVersion = 3
   serialize :options, Array
   acts_as_cached(:version => CacheVersion, :expires_in => 3.day)
-
+  has_one  :account
   has_many :books
   has_many :images, :as => :imagable
 end

data/test/active_record/test_helper.rb

@@ -25,6 +25,7 @@ class Test::Unit::TestCase
 
   def teardown
     $sql_logger = nil
+    SecondLevelCache.cache_store.clear
     DatabaseCleaner[:active_record].clean
   end
 end
@@ -46,3 +47,4 @@ require 'active_record/model/book'
 require 'active_record/model/image'
 require 'active_record/model/topic'
 require 'active_record/model/post'
+require 'active_record/model/account'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -119,7 +119,10 @@ files:
 - second_level_cache.gemspec
 - test/active_record/base_test.rb
 - test/active_record/belongs_to_association_test.rb
+- test/active_record/fetch_by_uniq_key_test.rb
 - test/active_record/finder_methods_test.rb
+- test/active_record/has_one_association_test.rb
+- test/active_record/model/account.rb
 - test/active_record/model/book.rb
 - test/active_record/model/image.rb
 - test/active_record/model/post.rb
@@ -165,7 +168,10 @@ summary: ! 'SecondLevelCache is a write-through and read-through caching library
 test_files:
 - test/active_record/base_test.rb
 - test/active_record/belongs_to_association_test.rb
+- test/active_record/fetch_by_uniq_key_test.rb
 - test/active_record/finder_methods_test.rb
+- test/active_record/has_one_association_test.rb
+- test/active_record/model/account.rb
 - test/active_record/model/book.rb
 - test/active_record/model/image.rb
 - test/active_record/model/post.rb