second_level_cache 2.1.0.rc2 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 06b57d2d883c83e10d5b5b927b1666e92a84c6b1
+  data.tar.gz: 80c99a97b2b2753f98b886a6f4d50de61e6352ba
+SHA512:
+  metadata.gz: eec1e049ea36e70c0d9c707efdb1aeda373c327b6b2be1082076619373c5d6b9bc782797dedd2cec2d4c52e947363282d4f1d3f3a43d12de7f2e2b96aff418f3
+  data.tar.gz: 9dd02f79e8312da7af052282a89ddca1328209ffe5b6b68f2815fd394bd6cbd9820fc6c4d862d89009324e5ccf2c748bdbc362726cabeb304daa9c0000ccc0ac

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in second_level_cache.gemspec
 gemspec
-gem 'rails', '4.1.0.rc1'
+
+gem 'rails', '~> 4.0'

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

data/lib/second_level_cache/active_record.rb

@@ -14,4 +14,4 @@ ActiveRecord::Base.send(:extend, SecondLevelCache::ActiveRecord::FetchByUniqKey)
 ActiveRecord::Base.send(:include, SecondLevelCache::ActiveRecord::Persistence)
 ActiveRecord::Associations::BelongsToAssociation.send(:include, SecondLevelCache::ActiveRecord::Associations::BelongsToAssociation)
 ActiveRecord::Associations::HasOneAssociation.send(:include, SecondLevelCache::ActiveRecord::Associations::HasOneAssociation)
-ActiveRecord::Associations::Preloader::Association.send(:include, SecondLevelCache::ActiveRecord::Associations::Preloader::Association)
+ActiveRecord::Associations::Preloader::BelongsTo.send(:include, SecondLevelCache::ActiveRecord::Associations::Preloader::BelongsTo)

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -12,7 +12,11 @@ module SecondLevelCache
 
         def find_target_with_second_level_cache
           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)
+          if reflection.options[:as]
+            cache_record = klass.fetch_by_uniq_keys({reflection.foreign_key => owner[reflection.active_record_primary_key], reflection.type => owner.class.base_class.name})
+          else
+            cache_record = klass.fetch_by_uniq_key(owner[reflection.active_record_primary_key], reflection.foreign_key)
+          end
           return cache_record.tap{|record| set_inverse_instance(record)} if cache_record
 
           record = find_target_without_second_level_cache

data/lib/second_level_cache/active_record/persistence.rb

@@ -17,7 +17,8 @@ module SecondLevelCache
       end
 
       def reload_with_second_level_cache(options = nil)
-        reload_without_second_level_cache(options).tap{expire_second_level_cache}
+        expire_second_level_cache
+        reload_without_second_level_cache(options)
       end
 
       def touch_with_second_level_cache(name = nil)

data/lib/second_level_cache/active_record/preloader.rb

@@ -3,13 +3,11 @@ module SecondLevelCache
   module ActiveRecord
     module Associations
       class Preloader
-        module Association
+        module BelongsTo
           extend ActiveSupport::Concern
 
           included do
-            class_eval do
-              alias_method_chain :records_for, :second_level_cache
-            end
+            alias_method_chain :records_for, :second_level_cache
           end
 
           def records_for_with_second_level_cache(ids)
@@ -17,9 +15,9 @@ 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 
+            # 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} 
+            # eg. Rails.cache.read_multi(1,2,3) => {2 => hit_value, 3 => hit_value}
             hitted_ids = records_from_cache.map{|key, _| key.split("/")[2].to_i}
             missed_ids = ids.map{|x| x.to_i} - hitted_ids
 
@@ -40,6 +38,6 @@ module SecondLevelCache
           end
         end
       end
-    end 
+    end
   end
 end

data/lib/second_level_cache/version.rb

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

data/second_level_cache.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |gem|
   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"
+  gem.add_development_dependency "database_cleaner", "~> 1.3.0"
 end

data/test/active_record_test_case_helper.rb

@@ -0,0 +1,120 @@
+require 'active_support/test_case'
+
+module ActiveRecordTestCaseHelper
+  def teardown
+    SQLCounter.clear_log
+  end
+
+  def assert_date_from_db(expected, actual, message = nil)
+    assert_equal expected.to_s, actual.to_s, message
+  end
+
+  def capture(stream)
+    stream = stream.to_s
+    captured_stream = Tempfile.new(stream)
+    stream_io = eval("$#{stream}")
+    origin_stream = stream_io.dup
+    stream_io.reopen(captured_stream)
+
+    yield
+
+    stream_io.rewind
+    return captured_stream.read
+  ensure
+    captured_stream.close
+    captured_stream.unlink
+    stream_io.reopen(origin_stream)
+  end
+
+  def capture_sql
+    SQLCounter.clear_log
+    yield
+    SQLCounter.log_all.dup
+  end
+
+  def assert_sql(*patterns_to_match)
+    capture_sql { yield }
+  ensure
+    failed_patterns = []
+    patterns_to_match.each do |pattern|
+      failed_patterns << pattern unless SQLCounter.log_all.any?{ |sql| pattern === sql }
+    end
+    assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map{ |p| p.inspect }.join(', ')} not found.#{SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{SQLCounter.log.join("\n")}"}"
+  end
+
+  def assert_queries(num = 1, options = {})
+    ignore_none = options.fetch(:ignore_none) { num == :any }
+    SQLCounter.clear_log
+    x = yield
+    the_log = ignore_none ? SQLCounter.log_all : SQLCounter.log
+    if num == :any
+      assert_operator the_log.size, :>=, 1, "1 or more queries expected, but none were executed."
+    else
+      mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.size == 0 ? '' : "\nQueries:\n#{the_log.join("\n")}"}"
+      assert_equal num, the_log.size, mesg
+    end
+    x
+  end
+
+  def assert_no_queries(options = {}, &block)
+    options.reverse_merge! ignore_none: true
+    assert_queries(0, options, &block)
+  end
+
+  def assert_column(model, column_name, msg=nil)
+    assert has_column?(model, column_name), msg
+  end
+
+  def assert_no_column(model, column_name, msg=nil)
+    assert_not has_column?(model, column_name), msg
+  end
+
+  def has_column?(model, column_name)
+    model.reset_column_information
+    model.column_names.include?(column_name.to_s)
+  end
+
+  class SQLCounter
+    class << self
+      attr_accessor :ignored_sql, :log, :log_all
+      def clear_log; self.log = []; self.log_all = []; end
+    end
+
+    self.clear_log
+
+    self.ignored_sql = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
+
+    # FIXME: this needs to be refactored so specific database can add their own
+    # ignored SQL, or better yet, use a different notification for the queries
+    # instead examining the SQL content.
+    oracle_ignored     = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im, /^\s*select .* from all_constraints/im, /^\s*select .* from all_tab_cols/im]
+    mysql_ignored      = [/^SHOW TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /]
+    postgresql_ignored = [/^\s*select\b.*\bfrom\b.*pg_namespace\b/im, /^\s*select tablename\b.*from pg_tables\b/im, /^\s*select\b.*\battname\b.*\bfrom\b.*\bpg_attribute\b/im, /^SHOW search_path/i]
+    sqlite3_ignored =    [/^\s*SELECT name\b.*\bFROM sqlite_master/im]
+
+    [oracle_ignored, mysql_ignored, postgresql_ignored, sqlite3_ignored].each do |db_ignored_sql|
+      ignored_sql.concat db_ignored_sql
+    end
+
+    attr_reader :ignore
+
+    def initialize(ignore = Regexp.union(self.class.ignored_sql))
+      @ignore = ignore
+    end
+
+    def call(name, start, finish, message_id, values)
+      sql = values[:sql]
+
+      # FIXME: this seems bad. we should probably have a better way to indicate
+      # the query was cached
+      return if 'CACHE' == values[:name]
+
+      self.class.log_all << sql
+      self.class.log << sql unless ignore =~ sql
+    end
+
+    ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+  end
+end
+
+ActiveSupport::TestCase.send(:include, ActiveRecordTestCaseHelper)

data/test/{active_record/base_test.rb → base_test.rb}

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

data/test/{active_record/belongs_to_association_test.rb → belongs_to_association_test.rb}

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-require 'active_record/test_helper'
+require 'test_helper'
 
-class ActiveRecord::BelongsToAssociationTest < Minitest::Test
+class BelongsToAssociationTest < ActiveSupport::TestCase
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end
@@ -11,7 +11,7 @@ class ActiveRecord::BelongsToAssociationTest < Minitest::Test
 
     @user.write_second_level_cache
     book.clear_association_cache
-    no_connection do
+    assert_no_queries do
       assert_equal @user, book.user
     end
   end

data/test/{active_record/fetch_by_uniq_key_test.rb → fetch_by_uniq_key_test.rb}

@@ -1,9 +1,8 @@
 # -*- encoding : utf-8 -*-
-require 'active_record/test_helper'
+require 'test_helper'
 
-class ActiveRecord::FetchByUinqKeyTest < Minitest::Test
+class FetchByUinqKeyTest < ActiveSupport::TestCase
   def setup
-    DatabaseCleaner[:active_record].start
     @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
     @post = Post.create :slug => "foobar", :topic_id => 2
   end
@@ -17,15 +16,16 @@ class ActiveRecord::FetchByUinqKeyTest < Minitest::Test
 
   def test_should_query_from_db_using_primary_key
     Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
-    $sql_logger = nil
-    Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
-    assert_equal $sql_logger.strip, 'SELECT  "posts".* FROM "posts"  WHERE "posts"."id" = ? LIMIT 1'
+    @post.expire_second_level_cache
+    assert_sql 'SELECT  "posts".* FROM "posts"  WHERE "posts"."id" = ? LIMIT 1' do
+      Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
+    end
   end
 
   def test_should_not_hit_db_using_fetch_by_uniq_key_twice
     post = Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
     assert_equal post, @post
-    no_connection do
+    assert_no_queries do
       Post.fetch_by_uniq_keys(:topic_id => 2, :slug => "foobar")
     end
   end
@@ -34,12 +34,12 @@ class ActiveRecord::FetchByUinqKeyTest < Minitest::Test
     assert_raises(ActiveRecord::RecordNotFound) do
       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

data/test/{active_record/finder_methods_test.rb → finder_methods_test.rb}

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-require 'active_record/test_helper'
+require 'test_helper'
 
-class ActiveRecord::FinderMethodsTest < Minitest::Test
+class FinderMethodsTest < ActiveSupport::TestCase
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end
@@ -13,14 +13,14 @@ class ActiveRecord::FinderMethodsTest < Minitest::Test
 
   def test_should_find_with_cache
     @user.write_second_level_cache
-    no_connection do
+    assert_no_queries do
       assert_equal @user, User.find(@user.id)
     end
   end
 
   def test_should_find_with_condition
     @user.write_second_level_cache
-    no_connection do
+    assert_no_queries do
       assert_equal @user, User.where(:name => @user.name).find(@user.id)
     end
   end

data/test/{active_record/has_one_association_test.rb → has_one_association_test.rb}

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

data/test/{active_record/persistence_test.rb → persistence_test.rb}

@@ -1,13 +1,18 @@
 # -*- encoding : utf-8 -*-
-require 'active_record/test_helper'
+require 'test_helper'
 
-class ActiveRecord::PersistenceTest < Minitest::Test
+class PersistenceTest < ActiveSupport::TestCase
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
     @topic = Topic.create :title => "csdn"
   end
 
   def test_should_reload_object
+    User.where(id: @user.id).update_all(email: 'different@csdn.com')
+    assert_equal 'different@csdn.com', @user.reload.email
+  end
+
+  def test_should_reload_object_associations
     User.increment_counter :books_count, @user.id
     assert_equal 0, @user.books_count
     assert_equal 1, @user.reload.books_count

data/test/{active_record/polymorphic_association_test.rb → polymorphic_association_test.rb}

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-require 'active_record/test_helper'
+require 'test_helper'
 
-class ActiveRecord::PolymorphicAssociationTest < Minitest::Test
+class PolymorphicAssociationTest < ActiveSupport::TestCase
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
   end
@@ -10,7 +10,7 @@ class ActiveRecord::PolymorphicAssociationTest < Minitest::Test
     image = @user.images.create
 
     @user.write_second_level_cache
-    no_connection do
+    assert_no_queries do
       assert_equal @user, image.imagable
     end
   end
@@ -21,4 +21,3 @@ class ActiveRecord::PolymorphicAssociationTest < Minitest::Test
     assert_equal @user, image.imagable
   end
 end
-

data/test/preloader_test.rb

@@ -0,0 +1,55 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+class PreloaderTest < ActiveSupport::TestCase
+  def test_belongs_to_preload_caches_includes
+    topics = [
+      Topic.create(title: 'title1', body: 'body1'),
+      Topic.create(title: 'title2', body: 'body2'),
+      Topic.create(title: 'title3', body: 'body3')
+    ]
+    topics.each { |topic| topic.posts.create(body: "post#{topic.id}") }
+
+    results = nil
+    assert_queries(1) do
+      results = Post.includes(:topic).order('id ASC').to_a
+    end
+    assert_equal topics, results.map(&:topic)
+  end
+
+  def test_belongs_to_when_read_multi_missed_from_cache_AR_will_fetch_missed_records_from_db
+    topics = [
+      Topic.create(title: 'title1', body: 'body1'),
+      Topic.create(title: 'title2', body: 'body2'),
+      Topic.create(title: 'title3', body: 'body3')
+    ]
+    topics.each { |topic| topic.posts.create(body: "post#{topic.id}") }
+    expired_topic = topics.first
+    expired_topic.expire_second_level_cache
+
+    results = nil
+    assert_queries(2) do
+      assert_sql(/IN\s+\(#{expired_topic.id}\)/m) do
+        results = Post.includes(:topic).order('id ASC').to_a
+      end
+    end
+
+    assert_equal topics, results.map(&:topic)
+  end
+
+  def test_has_many_preloader_returns_correct_results
+    topic = Topic.create(id: 1)
+    Post.create(id: 1)
+    post = topic.posts.create
+
+    assert_equal [post], Topic.includes(:posts).find(1).posts
+  end
+
+  def test_has_one_preloader_returns_correct_results
+    user = User.create(id: 1)
+    Account.create(id: 1)
+    account = user.create_account
+
+    assert_equal account, User.includes(:account).find(1).account
+  end
+end

data/test/record_marshal_test.rb

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

data/test/require_test.rb

@@ -2,10 +2,10 @@
 require 'test_helper'
 require 'active_record'
 
-class RequireTest < Minitest::Test
+class RequireTest < ActiveSupport::TestCase
   def setup
     ActiveRecord::Relation
-    require 'active_record/test_helper'
+    require 'test_helper'
     @user = User.create :name => 'Dingding Ye', :email => 'yedingding@gmail.com'
   end
 

data/test/{active_record/second_level_cache_test.rb → second_level_cache_test.rb}

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

data/test/test_helper.rb

@@ -1,14 +1,39 @@
 # -*- encoding : utf-8 -*-
-require 'rubygems'
 require 'bundler/setup'
-require 'second_level_cache'
 require 'minitest/autorun'
+require 'active_support/test_case'
+require 'active_record_test_case_helper'
 require 'database_cleaner'
 
-DatabaseCleaner[:active_record].strategy = :transaction
+require 'active_record'
+require 'second_level_cache'
+
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+
+require 'model/user'
+require 'model/book'
+require 'model/image'
+require 'model/topic'
+require 'model/post'
+require 'model/account'
+
+DatabaseCleaner[:active_record].strategy = :truncation
 
 SecondLevelCache.configure do |config|
   config.cache_store = ActiveSupport::Cache::MemoryStore.new
 end
 
-SecondLevelCache.logger.level = Logger::INFO
+SecondLevelCache.logger.level = Logger::ERROR
+ActiveSupport::Cache::MemoryStore.logger = SecondLevelCache::Config.logger
+ActiveRecord::Base.logger = SecondLevelCache::Config.logger
+
+class ActiveSupport::TestCase
+  setup do
+    SecondLevelCache.cache_store.clear
+    DatabaseCleaner.start
+  end
+
+  teardown do
+    DatabaseCleaner.clean
+  end
+end

metadata

@@ -1,108 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc2
-  prerelease: 6
+  version: 2.1.0
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-09-23 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: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         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
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 description: Write Through and Read Through caching library inspired by CacheMoney
   and cache_fu, support  ActiveRecord 4.
 email:
@@ -111,6 +100,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- Gemfile
+- README.md
+- Rakefile
+- lib/second_level_cache.rb
+- 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/fetch_by_uniq_key.rb
@@ -118,82 +113,75 @@ 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/active_record.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
-- lib/second_level_cache.rb
-- README.md
-- Rakefile
-- Gemfile
-- CHANGELOG.md
 - 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
-- test/active_record/model/topic.rb
-- test/active_record/model/user.rb
-- test/active_record/persistence_test.rb
-- test/active_record/polymorphic_association_test.rb
-- test/active_record/preloader_test.rb
-- test/active_record/second_level_cache_test.rb
-- test/active_record/test_helper.rb
+- test/active_record_test_case_helper.rb
+- test/base_test.rb
+- test/belongs_to_association_test.rb
+- test/fetch_by_uniq_key_test.rb
+- test/finder_methods_test.rb
+- test/has_one_association_test.rb
+- test/model/account.rb
+- test/model/book.rb
+- test/model/image.rb
+- test/model/post.rb
+- test/model/topic.rb
+- test/model/user.rb
+- test/persistence_test.rb
+- test/polymorphic_association_test.rb
+- test/preloader_test.rb
 - test/record_marshal_test.rb
 - test/require_test.rb
+- test/second_level_cache_test.rb
 - test/test_helper.rb
 homepage: https://github.com/csdn-dev/second_level_cache
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ! 'SecondLevelCache is a write-through and read-through caching library inspired
+specification_version: 4
+summary: 'SecondLevelCache is a write-through and read-through caching library inspired
   by Cache Money and cache_fu, support only Rails3 and ActiveRecord.  Read-Through:
   Queries by ID, like current_user.articles.find(params[:id]), will first look in
   cache store and then look in the database for the results of that query. If there
   is a cache miss, it will populate the cache.  Write-Through: As objects are created,
   updated, and deleted, all of the caches are automatically kept up-to-date and coherent.'
 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
-- test/active_record/model/topic.rb
-- test/active_record/model/user.rb
-- test/active_record/persistence_test.rb
-- test/active_record/polymorphic_association_test.rb
-- test/active_record/preloader_test.rb
-- test/active_record/second_level_cache_test.rb
-- test/active_record/test_helper.rb
+- test/active_record_test_case_helper.rb
+- test/base_test.rb
+- test/belongs_to_association_test.rb
+- test/fetch_by_uniq_key_test.rb
+- test/finder_methods_test.rb
+- test/has_one_association_test.rb
+- test/model/account.rb
+- test/model/book.rb
+- test/model/image.rb
+- test/model/post.rb
+- test/model/topic.rb
+- test/model/user.rb
+- test/persistence_test.rb
+- test/polymorphic_association_test.rb
+- test/preloader_test.rb
 - test/record_marshal_test.rb
 - test/require_test.rb
+- test/second_level_cache_test.rb
 - test/test_helper.rb

data/test/active_record/preloader_test.rb

@@ -1,28 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'active_record/test_helper'
-
-class ActiveRecord::PreloaderTest < Minitest::Test
-  def setup
-    DatabaseCleaner[:active_record].start
-    @topic1 = Topic.create :title => "title1", :body => "body1"
-    @topic2 = Topic.create :title => "title2", :body => "body2"
-    @topic3 = Topic.create :title => "title3", :body => "body3"
-    @post1 = @topic1.posts.create :body => "post1"
-    @post2 = @topic2.posts.create :body => "post2"
-    @post3 = @topic3.posts.create :body => "post3"
-  end
-
-  def test_preload_work_properly
-    results = Post.includes(:topic).order("id ASC").to_a
-    assert_equal results.size, 3
-    assert_equal results.first.topic, @topic1
-  end
-
-  def test_when_read_multi_missed_from_cache_AR_will_fetch_missed_records_from_db
-    @topic1.expire_second_level_cache
-    results = Post.includes(:topic).order("id ASC").to_a
-    assert_equal results.size, 3
-    assert_equal results.first.topic, @topic1
-    assert_match /IN\s+\(#{@topic1.id}\)/m, $sql_logger
-  end
-end

data/test/active_record/test_helper.rb

@@ -1,55 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-require 'active_record'
-require 'second_level_cache/active_record'
-
-def open_test_db_connect
-  ActiveRecord::Base.establish_connection(
-    :adapter => 'sqlite3',
-    :database => 'test/test.sqlite3'
-  )
-end
-open_test_db_connect
-
-def close_test_db_connect
-  ActiveRecord::Base.connection.disconnect!
-end
-
-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
-    SecondLevelCache.cache_store.clear
-    DatabaseCleaner[:active_record].clean
-  end
-end
-
-module ActiveRecord
-  module Querying
-    def find_by_sql_with_test(sql, binds = [])
-      $sql_logger ||= ""
-      $sql_logger << sql.to_sql
-      $sql_logger << "\n"
-      find_by_sql_without_test(sql, binds)
-    end
-    alias_method_chain :find_by_sql, :test
-  end
-end
-
-require 'active_record/model/user'
-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'