second_level_cache 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06b57d2d883c83e10d5b5b927b1666e92a84c6b1
-  data.tar.gz: 80c99a97b2b2753f98b886a6f4d50de61e6352ba
+  metadata.gz: 3c1235017053004991468a6a2eb8661d8e9d82e7
+  data.tar.gz: db06d8212c45306ba2b895765a2aa90a30e29569
 SHA512:
-  metadata.gz: eec1e049ea36e70c0d9c707efdb1aeda373c327b6b2be1082076619373c5d6b9bc782797dedd2cec2d4c52e947363282d4f1d3f3a43d12de7f2e2b96aff418f3
-  data.tar.gz: 9dd02f79e8312da7af052282a89ddca1328209ffe5b6b68f2815fd394bd6cbd9820fc6c4d862d89009324e5ccf2c748bdbc362726cabeb304daa9c0000ccc0ac
+  metadata.gz: 467e7aba16374a978b653ca9c4236214ad33d178b10643027b4e2adc45337016b292dc212ae6ce7985d2ac2794765ba9038583decaa000183e7ef081846b6038
+  data.tar.gz: b66b78795b29cbabd3dc263c2a22f11681acf937dac404629af4d0b754e948926fea1e4730e1631a4d1b5c8069d2792b6e54d486cd2def0901c956b9cc746829

data/README.md

@@ -17,7 +17,7 @@ Write-Through: As objects are created, updated, and deleted, all of the caches a
 In your gem file:
 
 ```ruby
-gem "second_level_cache", "~> 2.1.0"
+gem "second_level_cache", "~> 2.1.1"
 ```
 
 For ActiveRecord 3:

data/lib/second_level_cache.rb

@@ -55,7 +55,7 @@ module SecondLevelCache
       end
 
       def second_level_cache_key(id)
-        "#{cache_key_prefix}/#{name.downcase}/#{id}/#{cache_version}"
+        "#{cache_key_prefix}/#{table_name.downcase}/#{id}/#{cache_version}"
       end
 
       def read_second_level_cache(id)

data/lib/second_level_cache/active_record/finder_methods.rb

@@ -1,15 +1,11 @@
 # -*- encoding : utf-8 -*-
-require 'second_level_cache/arel/wheres'
-
 module SecondLevelCache
   module ActiveRecord
     module FinderMethods
       extend ActiveSupport::Concern
 
       included do
-        class_eval do
-          alias_method_chain :find_one, :second_level_cache
-        end
+        alias_method_chain :find_one, :second_level_cache
       end
 
       # TODO find_some
@@ -28,46 +24,37 @@ module SecondLevelCache
       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 cachable?
-          if record = @klass.read_second_level_cache(id)
-            return record
-          end
-        end
-       
-        if cachable_without_conditions?
-          if record = @klass.read_second_level_cache(id)
-            return record if where_match_with_cache?(where_values, record)
+          record = @klass.read_second_level_cache(id)
+          if record
+            return record if where_values.blank? || where_values_match_cache?(record)
           end
         end
- 
+
         record = find_one_without_second_level_cache(id)
         record.write_second_level_cache
         record
       end
 
-      private
+    private
 
       def cachable?
-        where_values.blank? &&
-          limit_one? && order_values.blank? &&
-          includes_values.blank? && preload_values.blank? &&
-          readonly_value.nil? && joins_values.blank? && !@klass.locking_enabled?
-      end
-
-      def cachable_without_conditions?
         limit_one? && order_values.blank? &&
           includes_values.blank? && preload_values.blank? &&
-          readonly_value.nil? && joins_values.blank? && !@klass.locking_enabled?
+          readonly_value.nil? && joins_values.blank? && !@klass.locking_enabled? &&
+          where_values.all? { |where_value| where_value.is_a?(::Arel::Nodes::Equality) }
       end
 
-      def where_match_with_cache?(where_values, cache_record)
-        condition = SecondLevelCache::Arel::Wheres.new(where_values)
-        return false unless condition.all_equality?
-        condition.extract_pairs.all? do |pair|
-          cache_record.read_attribute(pair[:left]) == pair[:right]
+      def where_values_match_cache?(record)
+        where_values_hash.all? do |key, value|
+          if value.is_a?(Array)
+            value.include?(record.read_attribute(key))
+          else
+            record.read_attribute(key) == value
+          end
         end
       end
 

data/lib/second_level_cache/version.rb

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

data/test/model/animal.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+ActiveRecord::Base.connection.create_table(:animals, force: true) do |t|
+  t.string  :type
+  t.string  :name
+  t.timestamps
+end
+
+class Animal < ActiveRecord::Base
+  acts_as_cached
+end
+
+class Dog < Animal
+  acts_as_cached
+end

data/test/second_level_cache_test.rb

@@ -7,7 +7,7 @@ class SecondLevelCacheTest < ActiveSupport::TestCase
   end
 
   def test_should_get_cache_key
-    assert_equal "slc/user/#{@user.id}/#{User::CacheVersion}", @user.second_level_cache_key
+    assert_equal "slc/users/#{@user.id}/#{User::CacheVersion}", @user.second_level_cache_key
   end
 
   def test_should_write_and_read_cache

data/test/single_table_inheritance_test.rb

@@ -0,0 +1,36 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+class SingleTableInheritanceTest < ActiveSupport::TestCase
+  def test_superclass_find__caches_superclass_record
+    animal = Animal.create
+    assert_no_queries do
+      assert_equal animal, Animal.find(animal.id)
+    end
+  end
+
+  def test_superclass_find__caches_subclass_record
+    dog = Dog.create
+    assert_no_queries do
+      assert_equal dog, Animal.find(dog.id)
+    end
+  end
+
+  def test_subclass_find__caches_subclass_record
+    dog = Dog.create
+    dog_id = dog.id
+    assert_no_queries do
+      newdog = Dog.find(dog_id)
+      assert_equal dog, newdog
+    end
+  end
+
+  def test_subclass_find__doesnt_find_superclass_record
+    animal = Animal.create
+    assert_queries(:any) do
+      assert_raises ActiveRecord::RecordNotFound do
+        Dog.find(animal.id)
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -16,6 +16,7 @@ require 'model/image'
 require 'model/topic'
 require 'model/post'
 require 'model/account'
+require 'model/animal'
 
 DatabaseCleaner[:active_record].strategy = :truncation
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,7 +113,6 @@ files:
 - lib/second_level_cache/active_record/has_one_association.rb
 - lib/second_level_cache/active_record/persistence.rb
 - lib/second_level_cache/active_record/preloader.rb
-- lib/second_level_cache/arel/wheres.rb
 - lib/second_level_cache/config.rb
 - lib/second_level_cache/record_marshal.rb
 - lib/second_level_cache/version.rb
@@ -125,6 +124,7 @@ files:
 - test/finder_methods_test.rb
 - test/has_one_association_test.rb
 - test/model/account.rb
+- test/model/animal.rb
 - test/model/book.rb
 - test/model/image.rb
 - test/model/post.rb
@@ -136,6 +136,7 @@ files:
 - test/record_marshal_test.rb
 - test/require_test.rb
 - test/second_level_cache_test.rb
+- test/single_table_inheritance_test.rb
 - test/test_helper.rb
 homepage: https://github.com/csdn-dev/second_level_cache
 licenses: []
@@ -173,6 +174,7 @@ test_files:
 - test/finder_methods_test.rb
 - test/has_one_association_test.rb
 - test/model/account.rb
+- test/model/animal.rb
 - test/model/book.rb
 - test/model/image.rb
 - test/model/post.rb
@@ -184,4 +186,5 @@ test_files:
 - test/record_marshal_test.rb
 - test/require_test.rb
 - test/second_level_cache_test.rb
+- test/single_table_inheritance_test.rb
 - test/test_helper.rb

data/lib/second_level_cache/arel/wheres.rb

@@ -1,35 +0,0 @@
-# -*- encoding : utf-8 -*-
-module SecondLevelCache
-  module Arel
-    class Wheres
-      attr_reader :where_values
-
-      def initialize(where_values)
-        @where_values = where_values
-      end
-
-      # Determine whether all conditions is equality, for example:
-      #
-      #     Article.where("user_id = 1").where(:status => 1).find(1)
-      def all_equality?
-        where_values.all?{|where_value| where_value.is_a?(::Arel::Nodes::Equality)}
-      end
-
-      # Extract conditions to pairs, for checking whether cache match the conditions.
-      def extract_pairs
-        where_values.map do |where_value|
-          if where_value.is_a?(String)
-            left, right = where_value.split(/\s*=\s*/, 2)
-            right = right.to_i
-          else
-            left, right = where_value.left.name, where_value.right
-          end
-          {
-            :left  => left,
-            :right => right
-          }
-        end
-      end
-    end
-  end
-end