second_level_cache 2.1.16 → 2.2.1

data/test/model/user.rb

@@ -1,21 +1,20 @@
-# -*- encoding : utf-8 -*-
-ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
+ActiveRecord::Base.connection.create_table(:users, force: true) do |t|
   t.text    :options
   t.text    :json_options
-  t.string  :name, :unique => true
+  t.string  :name, unique: true
   t.string  :email
-  t.integer :books_count, :default => 0
-  t.integer :images_count, :default => 0
+  t.integer :books_count, default: 0
+  t.integer :images_count, default: 0
   t.timestamps null: false
 end
 
-ActiveRecord::Base.connection.create_table(:forked_user_links, :force => true) do |t|
+ActiveRecord::Base.connection.create_table(:forked_user_links, force: true) do |t|
   t.integer :forked_to_user_id
   t.integer :forked_from_user_id
   t.timestamps null: false
 end
 
-ActiveRecord::Base.connection.create_table(:namespaces, :force => true) do |t|
+ActiveRecord::Base.connection.create_table(:namespaces, force: true) do |t|
   t.integer :user_id
   t.string  :kind
   t.string  :name
@@ -23,23 +22,21 @@ ActiveRecord::Base.connection.create_table(:namespaces, :force => true) do |t|
 end
 
 class User < ActiveRecord::Base
-  CacheVersion = 3
+  CACHE_VERSION = 3
   serialize :options, Array
-  if ::ActiveRecord::VERSION::STRING >= '4.1.0'
-    serialize :json_options, JSON
-  end
-  acts_as_cached(:version => CacheVersion, :expires_in => 3.day)
+  serialize :json_options, JSON if ::ActiveRecord::VERSION::STRING >= '4.1.0'
+  acts_as_cached(version: CACHE_VERSION, expires_in: 3.days)
   has_one  :account
   has_one  :forked_user_link, foreign_key: 'forked_to_user_id'
   has_one  :forked_from_user, through: :forked_user_link
   has_many :namespaces
   has_one  :namespace, -> { where(kind: nil) }
   has_many :books
-  has_many :images, :as => :imagable
+  has_many :images, as: :imagable
 end
 
 class Namespace < ActiveRecord::Base
-  acts_as_cached(:version => 1, :expires_in => 3.day)
+  acts_as_cached version: 1, expires_in: 3.days
 
   belongs_to :user
 end

data/test/persistence_test.rb

@@ -1,10 +1,9 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class PersistenceTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
-    @topic = Topic.create :title => "csdn"
+    @user = User.create name: 'csdn', email: 'test@csdn.com'
+    @topic = Topic.create title: 'csdn'
   end
 
   def test_should_reload_object
@@ -27,7 +26,7 @@ class PersistenceTest < ActiveSupport::TestCase
   end
 
   def test_should_update_cache_after_update_column
-    @user.update_column :name, "new_name"
+    @user.update_column :name, 'new_name'
     new_user = User.find @user.id
     assert_equal new_user, @user
   end

data/test/polymorphic_association_test.rb

@@ -1,9 +1,8 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class PolymorphicAssociationTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
+    @user = User.create name: 'csdn', email: 'test@csdn.com'
   end
 
   def test_should_get_cache_when_use_polymorphic_association

data/test/preloader_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class PreloaderTest < ActiveSupport::TestCase
@@ -17,7 +16,7 @@ class PreloaderTest < ActiveSupport::TestCase
     assert_equal topics, results.map(&:topic)
   end
 
-  def test_belongs_to_when_read_multi_missed_from_cache_AR_will_fetch_missed_records_from_db
+  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'),
@@ -29,7 +28,7 @@ class PreloaderTest < ActiveSupport::TestCase
 
     results = nil
     assert_queries(2) do
-      assert_sql(/IN\s+\(#{expired_topic.id}\)/m) do
+      assert_sql(/WHERE\s\"topics\"\.\"id\"\s=\s#{expired_topic.id}/m) do
         results = Post.includes(:topic).order('id ASC').to_a
       end
     end

data/test/record_marshal_test.rb

@@ -1,45 +1,42 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class RecordMarshalTest < ActiveSupport::TestCase
   def setup
     if ::ActiveRecord::VERSION::STRING >= '4.1.0'
-      @json_options = { "name" => 'Test', "age" => 18 }
-      @user = User.create :name => 'csdn',
-                :email => 'test@csdn.com',
-                :options => [1,2],
-                :json_options => @json_options
+      @json_options = { 'name' => 'Test', 'age' => 18 }
+      @user = User.create name: 'csdn',
+                          email: 'test@csdn.com',
+                          options: [1, 2],
+                          json_options: @json_options
     else
-      @user = User.create :name => 'csdn',
-                :email => 'test@csdn.com',
-                :options => [1,2]
+      @user = User.create name: 'csdn',
+                          email: 'test@csdn.com',
+                          options: [1, 2]
     end
   end
 
   def test_should_dump_active_record_object
     dumped = RecordMarshal.dump(@user)
     assert dumped.is_a?(Array)
-    assert_equal "User", dumped[0]
+    assert_equal 'User', dumped[0]
     assert_equal @user.attributes, dumped[1]
   end
 
-
   def test_should_load_active_record_object
     @user.write_second_level_cache
     assert_equal @user, User.read_second_level_cache(@user.id)
     assert_equal Array, User.read_second_level_cache(@user.id).options.class
     assert_equal Array, User.read_second_level_cache(@user.id).reload.options.class
     assert_equal User.read_second_level_cache(@user.id).changed?, false
-    assert_equal [1,2], User.read_second_level_cache(@user.id).options
+    assert_equal [1, 2], User.read_second_level_cache(@user.id).options
     if ::ActiveRecord::VERSION::STRING >= '4.1.0'
       result = User.read_second_level_cache(@user.id)
-      assert_equal @json_options["name"], result.json_options["name"]
+      assert_equal @json_options['name'], result.json_options['name']
       assert_equal @json_options, result.json_options
     end
     assert User.read_second_level_cache(@user.id).persisted?
   end
 
-
   def test_should_load_nil
     @user.expire_second_level_cache
     assert_nil User.read_second_level_cache(@user.id)
@@ -48,6 +45,6 @@ class RecordMarshalTest < ActiveSupport::TestCase
   def test_should_load_active_record_object_without_association_cache
     @user.books
     @user.write_second_level_cache
-    assert_empty User.read_second_level_cache(@user.id).association_cache
+    assert_equal false, User.read_second_level_cache(@user.id).association_cached?('id')
   end
 end

data/test/require_test.rb

@@ -1,12 +1,11 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 require 'active_record'
 
 class RequireTest < ActiveSupport::TestCase
   def setup
-    ActiveRecord::Relation
+    ActiveRecord::Relation.new(nil, nil, nil)
     require 'test_helper'
-    @user = User.create :name => 'Dingding Ye', :email => 'yedingding@gmail.com'
+    @user = User.create name: 'Dingding Ye', email: 'yedingding@gmail.com'
   end
 
   def test_should_find_the_user

data/test/second_level_cache_test.rb

@@ -1,13 +1,12 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class SecondLevelCacheTest < ActiveSupport::TestCase
   def setup
-    @user = User.create :name => 'csdn', :email => 'test@csdn.com'
+    @user = User.create name: 'csdn', email: 'test@csdn.com'
   end
 
   def test_should_get_cache_key
-    assert_equal "slc/users/#{@user.id}/#{User::CacheVersion}", @user.second_level_cache_key
+    assert_equal "slc/users/#{@user.id}/#{User::CACHE_VERSION}", @user.second_level_cache_key
   end
 
   def test_should_write_and_read_cache

data/test/single_table_inheritance_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class SingleTableInheritanceTest < ActiveSupport::TestCase

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'active_support/test_case'
@@ -6,7 +5,6 @@ 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'
@@ -28,16 +26,18 @@ SecondLevelCache.configure do |config|
 end
 
 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
+ActiveSupport::Cache::MemoryStore.logger = SecondLevelCache.logger
+ActiveRecord::Base.logger = SecondLevelCache.logger
+
+module ActiveSupport
+  class TestCase
+    setup do
+      SecondLevelCache.cache_store.clear
+      DatabaseCleaner.start
+    end
+
+    teardown do
+      DatabaseCleaner.clean
+    end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.16
+  version: 2.2.1
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.36.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.36.0
 description: Write Through and Read Through caching library inspired by CacheMoney
   and cache_fu, support  ActiveRecord 4.
 email:
@@ -126,7 +140,6 @@ files:
 - 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
-- lib/second_level_cache/active_record/multi_read_from_cache.rb
 - lib/second_level_cache/active_record/persistence.rb
 - lib/second_level_cache/active_record/preloader.rb
 - lib/second_level_cache/active_record/railtie.rb
@@ -144,7 +157,6 @@ files:
 - test/model/animal.rb
 - test/model/book.rb
 - test/model/image.rb
-- test/model/multi_read_from_cache_test.rb
 - test/model/post.rb
 - test/model/topic.rb
 - test/model/user.rb
@@ -174,7 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 'SecondLevelCache is a write-through and read-through caching library inspired
@@ -184,25 +197,24 @@ summary: 'SecondLevelCache is a write-through and read-through caching library i
   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/polymorphic_association_test.rb
-- test/require_test.rb
-- test/preloader_test.rb
-- test/finder_methods_test.rb
+- test/active_record_test_case_helper.rb
+- test/base_test.rb
 - test/belongs_to_association_test.rb
-- test/second_level_cache_test.rb
-- test/record_marshal_test.rb
-- test/persistence_test.rb
-- test/single_table_inheritance_test.rb
-- test/model/image.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/topic.rb
 - test/model/animal.rb
-- test/model/multi_read_from_cache_test.rb
+- test/model/book.rb
+- test/model/image.rb
 - test/model/post.rb
+- test/model/topic.rb
 - test/model/user.rb
-- test/fetch_by_uniq_key_test.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/single_table_inheritance_test.rb
 - test/test_helper.rb
-- test/has_one_association_test.rb
-- test/base_test.rb
-- test/active_record_test_case_helper.rb

data/lib/second_level_cache/active_record/multi_read_from_cache.rb

@@ -1,21 +0,0 @@
-module SecondLevelCache
-  module ActiveRecord
-    module MultiReadFromCache
-      def multi_read_from_cache(ids)
-        map_cache_keys = ids.map{|id| second_level_cache_key(id)}
-        records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
-        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}"
-
-        if missed_ids.empty?
-          RecordMarshal.load_multi(records_from_cache.values)
-        else
-          records_from_db = where(:id => missed_ids)
-          records_from_db.map{|record| record.write_second_level_cache ; record} + RecordMarshal.load_multi(records_from_cache.values)
-        end
-      end
-    end
-  end
-end

data/test/model/multi_read_from_cache_test.rb

@@ -1,19 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'test_helper'
-
-class MultiReadFromCacheTest < ActiveSupport::TestCase
-  def setup
-    @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
-    @other_user = User.create :name => 'hoooopo', :email => "hooooopo@gmail.com"
-  end
-
-  def test_multi_read_from_cache
-    result = User.multi_read_from_cache([@user.id, @other_user.id])
-    assert_equal 2, result.size
-  end
-
-  def test_multi_read_not_exist_id_from_cache
-    result = User.multi_read_from_cache([@user.id, @other_user.id + 100])
-    assert_equal 1, result.size
-  end
-end