second_level_cache 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c1235017053004991468a6a2eb8661d8e9d82e7
-  data.tar.gz: db06d8212c45306ba2b895765a2aa90a30e29569
+  metadata.gz: fb07072700dce834842d9754944d53a7979dee6e
+  data.tar.gz: af6487f82394c38724fb9b7dd5b74bcfab99c461
 SHA512:
-  metadata.gz: 467e7aba16374a978b653ca9c4236214ad33d178b10643027b4e2adc45337016b292dc212ae6ce7985d2ac2794765ba9038583decaa000183e7ef081846b6038
-  data.tar.gz: b66b78795b29cbabd3dc263c2a22f11681acf937dac404629af4d0b754e948926fea1e4730e1631a4d1b5c8069d2792b6e54d486cd2def0901c956b9cc746829
+  metadata.gz: 6c3c0b7fee0c8d0a3438293a9f2ce74162ef64a42efa52022cb68a71ef8c84c7b54b371c1563f6a5a2022c64621db43905d709ea995537d2ae262798bc004809
+  data.tar.gz: ad86ef72719f22ea78ba9c20e968d06ce8de57b9969aca6f4a2ac937edb6511892cceb80407623bb7131f9c2c4421d7528c99703d982dfab2a7d6e0722344361

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.1"
+gem "second_level_cache", "~> 2.1.2"
 ```
 
 For ActiveRecord 3:

data/lib/second_level_cache/active_record/base.rb

@@ -12,8 +12,8 @@ module SecondLevelCache
         class << self
           alias_method_chain :update_counters, :cache
         end
-      end
 
+      end
 
       module ClassMethods
         def update_counters_with_cache(id, counters)

data/lib/second_level_cache/active_record/core.rb

@@ -0,0 +1,22 @@
+# -*- encoding : utf-8 -*-
+module SecondLevelCache
+  module ActiveRecord
+    module Core
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          alias_method_chain :find, :cache
+        end
+
+      end
+
+      module ClassMethods
+        def find_with_cache(*ids)
+          return all.find(ids.first) if ids.size == 1 && ids.first.is_a?(Fixnum)
+          find_without_cache(*ids)
+        end
+      end
+    end
+  end
+end

data/lib/second_level_cache/active_record/persistence.rb

@@ -21,8 +21,8 @@ module SecondLevelCache
         reload_without_second_level_cache(options)
       end
 
-      def touch_with_second_level_cache(name = nil)
-        touch_without_second_level_cache(name).tap{update_second_level_cache}
+      def touch_with_second_level_cache(*names)
+        touch_without_second_level_cache(*names).tap{update_second_level_cache}
       end
     end
   end

data/lib/second_level_cache/active_record.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 require 'second_level_cache/active_record/base'
+require 'second_level_cache/active_record/core'
 require 'second_level_cache/active_record/fetch_by_uniq_key'
 require 'second_level_cache/active_record/finder_methods'
 require 'second_level_cache/active_record/persistence'

data/lib/second_level_cache/record_marshal.rb

@@ -19,9 +19,7 @@ module RecordMarshal
     # load a cached record
     def load(serialized)
       return unless serialized
-      record = serialized[0].constantize.allocate
-      record.init_with('attributes' => serialized[1])
-      record
+      serialized[0].constantize.instantiate(serialized[1])
     end
 
     def load_multi(serializeds)

data/lib/second_level_cache/version.rb

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

data/lib/second_level_cache.rb

@@ -24,6 +24,7 @@ module SecondLevelCache
         @second_level_cache_options[:expires_in] ||= 1.week
         @second_level_cache_options[:version] ||= 0
         relation.class.send :include, SecondLevelCache::ActiveRecord::FinderMethods
+        include SecondLevelCache::ActiveRecord::Core if /^4\.2\./.match(::ActiveRecord.version.version)
       end
 
       def second_level_cache_enabled?

data/test/base_test.rb

@@ -22,10 +22,10 @@ class BaseTest < ActiveSupport::TestCase
   end
 
   def test_should_expire_cache_when_update_counters
-    assert_equal @user.books_count, 0
+    assert_equal 0, @user.books_count
     @user.books.create
     assert_nil User.read_second_level_cache(@user.id)
     user = User.find(@user.id)
-    assert_equal user.books_count, @user.books_count + 1
+    assert_equal 1, user.books_count
   end
 end

data/test/fetch_by_uniq_key_test.rb

@@ -17,7 +17,7 @@ class FetchByUinqKeyTest < ActiveSupport::TestCase
   def test_should_query_from_db_using_primary_key
     Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
     @post.expire_second_level_cache
-    assert_sql 'SELECT  "posts".* FROM "posts"  WHERE "posts"."id" = ? LIMIT 1' do
+    assert_sql(/SELECT\s+"posts".* FROM "posts"\s+WHERE "posts"."id" = \? LIMIT 1/) do
       Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
     end
   end

data/test/model/account.rb

@@ -1,12 +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
+ActiveRecord::Base.connection.create_table(:accounts, force: true) do |t|
+  t.integer :age
+  t.string :site
+  t.integer :user_id
+  t.timestamps null: false
 end
 
 class Account < ActiveRecord::Base
-  acts_as_cached(:expires_in => 3.day)
+  acts_as_cached(expires_in: 3.day)
   belongs_to :user
-end
+end

data/test/model/animal.rb

@@ -2,7 +2,7 @@
 ActiveRecord::Base.connection.create_table(:animals, force: true) do |t|
   t.string  :type
   t.string  :name
-  t.timestamps
+  t.timestamps null: false
 end
 
 class Animal < ActiveRecord::Base

data/test/model/topic.rb

@@ -3,7 +3,7 @@ ActiveRecord::Base.connection.create_table(:topics, :force => true) do |t|
   t.string  :title
   t.text  :body
 
-  t.timestamps
+  t.timestamps null: false
 end
 
 class Topic < ActiveRecord::Base

data/test/model/user.rb

@@ -5,7 +5,7 @@ ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
   t.string  :email
   t.integer :books_count, :default => 0
   t.integer :images_count, :default => 0
-  t.timestamps
+  t.timestamps null: false
 end
 
 class User < ActiveRecord::Base

data/test/test_helper.rb

@@ -4,8 +4,11 @@ require 'minitest/autorun'
 require 'active_support/test_case'
 require 'active_record_test_case_helper'
 require 'database_cleaner'
-
 require 'active_record'
+
+ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
+ActiveSupport.test_order = :sorted if ActiveSupport.respond_to?(:test_order=)
+
 require 'second_level_cache'
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,7 @@ files:
 - lib/second_level_cache/active_record.rb
 - lib/second_level_cache/active_record/base.rb
 - lib/second_level_cache/active_record/belongs_to_association.rb
+- lib/second_level_cache/active_record/core.rb
 - lib/second_level_cache/active_record/fetch_by_uniq_key.rb
 - lib/second_level_cache/active_record/finder_methods.rb
 - lib/second_level_cache/active_record/has_one_association.rb