second_level_cache 2.1.0.rc1 → 2.1.0.rc2

data/README.md

@@ -134,10 +134,11 @@ end
 
 ```ruby
 # this will fetch from cache
-user = User.fetch_by_uniq_key("hooopo", :nick_name)
+user = User.fetch_by_uniq_keys(nick_name: "hooopo")
+post = Post.fetch_by_uniq_keys(user_id: 2, slug: "foo")
 
 # this also fetch from cache
-user = User.fetch_by_uniq_key!("hooopo", :nick_name) # this will raise `ActiveRecord::RecordNotFound` Exception when nick name not exists.
+user = User.fetch_by_uniq_keys!(nick_name: "hooopo") # this will raise `ActiveRecord::RecordNotFound` Exception when nick name not exists.
 ```
 
 * You can use Rails's [Eager Loading](http://guides.rubyonrails.org/active_record_querying.html#eager-loading-associations) feature as normal. Even better, second_level_cache will transform the `IN` query into a Rails.cache.multi_read operation. For example:

data/lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -2,24 +2,38 @@
 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 _id = SecondLevelCache.cache_store.read(cache_uniq_key(value, uniq_key_name))
+      def fetch_by_uniq_keys(where_values)
+        cache_key = cache_uniq_key(where_values)
+        if _id = SecondLevelCache.cache_store.read(cache_key)
           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
+          record = self.where(where_values).first
+          record.tap{|record| SecondLevelCache.cache_store.write(cache_key, record.id)} if record
         end
       end
+      
+      def fetch_by_uniq_keys!(where_values)
+        fetch_by_uniq_keys(where_values) || raise(::ActiveRecord::RecordNotFound)
+      end
+      
+      def fetch_by_uniq_key(value, uniq_key_name)
+        # puts "[Deprecated] will remove in the future, use fetch_by_uniq_keys method instead."
+        fetch_by_uniq_keys(uniq_key_name => value)
+      end
 
       def fetch_by_uniq_key!(value, uniq_key_name)
+        # puts "[Deprecated] will remove in the future, use fetch_by_uniq_keys! method instead."
         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}"
+      
+      def cache_uniq_key(where_values)
+        ext_key = where_values.collect { |k,v|
+          v = Digest::MD5.hexdigest(v) if v.size >= 32
+          [k,v].join("_")
+        }.join(",")
+        "uniq_key_#{self.name}_#{ext_key}"
       end
     end
   end

data/lib/second_level_cache/version.rb

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

data/second_level_cache.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "activesupport", ["> 4.0.0", "< 5.0"]
 
-  gem.add_development_dependency "activerecord", ["> 4.0.0", "< 5.0"]
+  gem.add_runtime_dependency "activerecord", ["> 4.0.0", "< 5.0"]
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "database_cleaner", "~> 1.2.0"

data/test/active_record/fetch_by_uniq_key_test.rb

@@ -5,26 +5,43 @@ class ActiveRecord::FetchByUinqKeyTest < Minitest::Test
   def setup
     DatabaseCleaner[:active_record].start
     @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
+    @post = Post.create :slug => "foobar", :topic_id => 2
+  end
+
+  def test_cache_uniq_key
+    assert_equal User.send(:cache_uniq_key, { :name => "hooopo" } ), "uniq_key_User_name_hooopo"
+    assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => 2 } ), "uniq_key_User_foo_1,bar_2"
+    long_val = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    assert_equal User.send(:cache_uniq_key, { :foo => 1, :bar => long_val } ), "uniq_key_User_foo_1,bar_#{Digest::MD5.hexdigest(long_val)}"
   end
 
   def test_should_query_from_db_using_primary_key
-    User.fetch_by_uniq_key(@user.name, :name)
+    Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
     $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'
+    Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
+    assert_equal $sql_logger.strip, 'SELECT  "posts".* FROM "posts"  WHERE "posts"."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
+    post = Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
+    assert_equal post, @post
     no_connection do
-      User.fetch_by_uniq_key(@user.name, :name)
+      Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
     end
   end
 
   def test_should_fail_when_fetch_by_uniq_key_with_bang_method
     assert_raises(ActiveRecord::RecordNotFound) do
-      User.fetch_by_uniq_key!(@user.name + "not_exist", :name)
+      Post.fetch_by_uniq_keys!(:topic_id => 2, :slug => "foobar1")
     end
+    
+    assert_raises(ActiveRecord::RecordNotFound) do
+      User.fetch_by_uniq_key!("xxxxx", :name)
+    end
+  end
+  
+  def test_should_work_with_fetch_by_uniq_key
+    user = User.fetch_by_uniq_key(@user.name, :name)
+    assert_equal user, @user
   end
 end

data/test/active_record/model/post.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 ActiveRecord::Base.connection.create_table(:posts, :force => true) do |t|
   t.text  :body
+  t.string :slug
   t.integer :topic_id
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.1.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,7 +44,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false