second_level_cache 2.0.0 → 2.1.0.rc1

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in second_level_cache.gemspec
 gemspec
+gem 'rails', '4.1.0.rc1'

data/README.md

@@ -79,7 +79,7 @@ Only `SELECT *` query will be cached:
 User.select("id, name").find(1)
 ```
 
-Notice:
+## Notice
 
 * SecondLevelCache cache by model name and id, so only find_one query will work.
 * Only equal conditions query WILL get cache; and SQL string query like `User.where("name = 'Hooopo'").find(1)` WILL NOT work.
@@ -101,6 +101,12 @@ end # <- Cache write
 Rails.logger.info "info"
 ```
 
+* If you are using SecondLevelCache with database_cleaner, you should set cleaning strategy to `:truncation`:
+
+```ruby
+DatabaseCleaner.strategy = :truncation
+```
+
 ## Configure
 
 In production env, we recommend to use [Dalli](https://github.com/mperham/dalli) as Rails cache store.

data/lib/second_level_cache/active_record/preloader.rb

@@ -17,12 +17,11 @@ module SecondLevelCache
 
             map_cache_keys = ids.map{|id| klass.second_level_cache_key(id)}
             records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
-
             # NOTICE 
             # Rails.cache.read_multi return hash that has keys only hitted.
             # eg. Rails.cache.read_multi(1,2,3) => {2 => hit_value, 3 => hit_value} 
-            hitted_ids = records_from_cache.map{|key, _| key.split("/")[2]}
-            missed_ids = ids - hitted_ids
+            hitted_ids = records_from_cache.map{|key, _| key.split("/")[2].to_i}
+            missed_ids = ids.map{|x| x.to_i} - hitted_ids
 
             ::SecondLevelCache::Config.logger.info "missed ids -> #{missed_ids.inspect} | hitted ids -> #{hitted_ids.inspect}"
 

data/lib/second_level_cache/version.rb

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

data/second_level_cache.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SecondLevelCache::VERSION
 
-  gem.add_runtime_dependency "activesupport", ["~> 4.0.0.beta1"]
+  gem.add_runtime_dependency "activesupport", ["> 4.0.0", "< 5.0"]
 
-  gem.add_development_dependency "activerecord", ["~> 4.0.0.beta1"]
+  gem.add_development_dependency "activerecord", ["> 4.0.0", "< 5.0"]
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "database_cleaner", "~> 1.0.0.RC1"
+  gem.add_development_dependency "database_cleaner", "~> 1.2.0"
 end

data/test/active_record/base_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::BaseTest < Test::Unit::TestCase
+class ActiveRecord::BaseTest < Minitest::Test
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end

data/test/active_record/belongs_to_association_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::BelongsToAssociationTest < Test::Unit::TestCase
+class ActiveRecord::BelongsToAssociationTest < Minitest::Test
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end

data/test/active_record/fetch_by_uniq_key_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::FetchByUinqKeyTest < Test::Unit::TestCase
+class ActiveRecord::FetchByUinqKeyTest < Minitest::Test
   def setup
     DatabaseCleaner[:active_record].start
     @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
@@ -23,7 +23,7 @@ class ActiveRecord::FetchByUinqKeyTest < Test::Unit::TestCase
   end
 
   def test_should_fail_when_fetch_by_uniq_key_with_bang_method
-    assert_raise(ActiveRecord::RecordNotFound) do
+    assert_raises(ActiveRecord::RecordNotFound) do
       User.fetch_by_uniq_key!(@user.name + "not_exist", :name)
     end
   end

data/test/active_record/finder_methods_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::FinderMethodsTest < Test::Unit::TestCase
+class ActiveRecord::FinderMethodsTest < Minitest::Test
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end
@@ -28,7 +28,7 @@ class ActiveRecord::FinderMethodsTest < Test::Unit::TestCase
   def test_should_NOT_find_from_cache_when_select_speical_columns
     @user.write_second_level_cache
     only_id_user = User.select("id").find(@user.id)
-    assert_raise(ActiveModel::MissingAttributeError) do
+    assert_raises(ActiveModel::MissingAttributeError) do
       only_id_user.name
     end
   end
@@ -39,6 +39,6 @@ class ActiveRecord::FinderMethodsTest < Test::Unit::TestCase
     User.without_second_level_cache do
       @from_db = User.find(@user.id)
     end
-    assert_not_equal @user.name, @from_db.name
+    refute_equal @user.name, @from_db.name
   end
 end

data/test/active_record/has_one_association_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::HasOneAssociationTest < Test::Unit::TestCase
+class ActiveRecord::HasOneAssociationTest < Minitest::Test
   def setup
     @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
     @account = @user.create_account

data/test/active_record/persistence_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::PersistenceTest < Test::Unit::TestCase
+class ActiveRecord::PersistenceTest < Minitest::Test
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
     @topic = Topic.create :title => "csdn"

data/test/active_record/polymorphic_association_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::PolymorphicAssociationTest < Test::Unit::TestCase
+class ActiveRecord::PolymorphicAssociationTest < Minitest::Test
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end

data/test/active_record/preloader_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::PreloaderTest < Test::Unit::TestCase
+class ActiveRecord::PreloaderTest < Minitest::Test
   def setup
     DatabaseCleaner[:active_record].start
     @topic1 = Topic.create :title => "title1", :body => "body1"

data/test/active_record/second_level_cache_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class ActiveRecord::SecondLevelCacheTest < Test::Unit::TestCase
+class ActiveRecord::SecondLevelCacheTest < Minitest::Test
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end
@@ -12,7 +12,7 @@ class ActiveRecord::SecondLevelCacheTest < Test::Unit::TestCase
 
   def test_should_write_and_read_cache
     @user.write_second_level_cache
-    assert_not_nil User.read_second_level_cache(@user.id)
+    refute_nil User.read_second_level_cache(@user.id)
     @user.expire_second_level_cache
     assert_nil User.read_second_level_cache(@user.id)
   end

data/test/active_record/test_helper.rb

@@ -15,13 +15,18 @@ def close_test_db_connect
   ActiveRecord::Base.connection.disconnect!
 end
 
-class Test::Unit::TestCase
+class Minitest::Test
   def no_connection
     close_test_db_connect
     assert_nothing_raised { yield }
   ensure
     open_test_db_connect
   end
+  
+  
+  def assert_nothing_raised(*)
+    yield
+  end
 
   def teardown
     $sql_logger = nil

data/test/record_marshal_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'active_record/test_helper'
 
-class RecordMarshalTest < Test::Unit::TestCase
+class RecordMarshalTest < Minitest::Test
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end

data/test/require_test.rb

@@ -2,7 +2,7 @@
 require 'test_helper'
 require 'active_record'
 
-class RequireTest < Test::Unit::TestCase
+class RequireTest < Minitest::Test
   def setup
     ActiveRecord::Relation
     require 'active_record/test_helper'

data/test/test_helper.rb

@@ -2,7 +2,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'second_level_cache'
-require 'test/unit'
+require 'minitest/autorun'
 require 'database_cleaner'
 
 DatabaseCleaner[:active_record].strategy = :transaction

metadata

@@ -1,48 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +94,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.RC1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +102,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.RC1
+        version: 1.2.0
 description: Write Through and Read Through caching library inspired by CacheMoney
   and cache_fu, support  ActiveRecord 4.
 email:
@@ -151,12 +163,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! 'SecondLevelCache is a write-through and read-through caching library inspired
@@ -185,4 +197,3 @@ test_files:
 - test/record_marshal_test.rb
 - test/require_test.rb
 - test/test_helper.rb
-has_rdoc: