second_level_cache 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ca8ef3f66bcc6dcc76e93958357d577a63a4769
-  data.tar.gz: f90a4c724367d36589712a31df03723c2f4b7248
+  metadata.gz: 9fd6197c452055e9009c07da895d21ea853b132b
+  data.tar.gz: a0d81043575caa9d6093c9dd51fe1e84d2bff1f7
 SHA512:
-  metadata.gz: 2a544566618c8643153d1bbd7c764878323b67e731cded7b1a0419866f8be54564a4fc8bcfb4c6a6511aa6ee54ad3e7824fc0887206463aed2146d075bb18fd8
-  data.tar.gz: c94834042b2d630e6a3281af8cfedac728d9e4e7f76df5bd6230b577eb2669451391881bb732c42416c15ee1eeee8aff162abe4f9186d401bc28913fef98747d
+  metadata.gz: a439c2b62f440b2d4d7cb9344a586273cca00d4858f5d1a417393639ff89afbc58875b305a08e69be31d7397b44406f8a033ee43b9d6572c071b7ff3a7fd161c
+  data.tar.gz: 3088fdd16e92a72769dab464d413cd4e788038818bf655b3a785addc6751d39a3cc0210b0799eb58f484bcf28e8f0421f7c04e9e9361e124ea7d60750eed791e

data/lib/second_level_cache/active_record/preloader.rb

@@ -11,10 +11,10 @@ module SecondLevelCache
             # 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].to_i }
-            missed_ids = ids.map(&:to_i) - hitted_ids
+            hitted_ids = records_from_cache.map { |key, _| key.split('/')[2] }
+            missed_ids = ids.map(&:to_s) - hitted_ids
 
-            ::SecondLevelCache.logger.info "missed ids -> #{missed_ids.inspect} | hitted ids -> #{hitted_ids.inspect}"
+            ::SecondLevelCache.logger.info "missed ids -> #{missed_ids.join(',')} | hitted ids -> #{hitted_ids.join(',')}"
 
             record_marshals = RecordMarshal.load_multi(records_from_cache.values)
 

data/lib/second_level_cache/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SecondLevelCache
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.3.2'.freeze
 end

data/second_level_cache.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   Write-Through: As objects are created, updated, and deleted, all of the caches are automatically kept up-to-date and coherent.
   SUMMARY
 
-  gem.homepage      = 'https://github.com/csdn-dev/second_level_cache'
+  gem.homepage      = 'https://github.com/hooopo/second_level_cache'
 
   gem.files         = Dir.glob('lib/**/*.rb') + [
     'README.md',

data/test/model/order.rb

@@ -0,0 +1,12 @@
+ActiveRecord::Base.connection.create_table(:orders, force: true, id: :uuid) do |t|
+  t.text :body
+  t.string :title
+
+  t.timestamps null: false
+end
+
+class Order < ActiveRecord::Base
+  second_level_cache
+
+  has_many :order_items
+end

data/test/model/order_item.rb

@@ -0,0 +1,10 @@
+ActiveRecord::Base.connection.create_table(:order_items, force: true, id: :uuid) do |t|
+  t.text :body
+  t.string :slug
+  t.string :order_id
+end
+
+class OrderItem < ActiveRecord::Base
+  second_level_cache
+  belongs_to :order, touch: true
+end

data/test/model/user.rb

@@ -29,7 +29,7 @@ class User < ActiveRecord::Base
 
   serialize :options, Array
   serialize :json_options, JSON if ::ActiveRecord::VERSION::STRING >= '4.1.0'
-  store :extras, accessors: [:tagline, :gender]
+  store :extras, accessors: %i[tagline gender]
 
   has_one  :account
   has_one  :forked_user_link, foreign_key: 'forked_to_user_id'
@@ -39,7 +39,7 @@ class User < ActiveRecord::Base
   has_many :books
   has_many :images, as: :imagable
 
-  enum status: [:active, :archived]
+  enum status: %i[active archived]
 end
 
 class Namespace < ActiveRecord::Base

data/test/persistence_test.rb

@@ -20,7 +20,7 @@ class PersistenceTest < ActiveSupport::TestCase
   def test_should_update_cache_after_touch
     old_updated_time = @user.updated_at
     @user.touch
-    assert !(old_updated_time == @user.updated_at)
+    assert old_updated_time != @user.updated_at
     new_user = User.find @user.id
     assert_equal new_user, @user
   end

data/test/preloader_non_integer_test.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+
+class PreloaderNonIntegerTest < ActiveSupport::TestCase
+  def test_belongs_to_preload_caches_includes_uuid
+    orders = [
+      Order.create(id: '15944214-e4df-4e46-8d56-1f5864a0b90c', title: 'title1', body: 'body1'),
+      Order.create(id: '25944214-e4df-4e46-8d56-1f5864a0b90c', title: 'title2', body: 'body2'),
+      Order.create(id: '35944214-e4df-4e46-8d56-1f5864a0b90c', title: 'title3', body: 'body3')
+    ]
+    orders.each_with_index { |order, i| order.order_items.create(body: "order_item#{order.id}", id: "1#{i}944214-e4df-4e46-8d56-1f5864a0b90c") }
+
+    results = nil
+    assert_queries(1) do
+      results = OrderItem.includes(:order).order('id ASC').to_a
+    end
+    assert_equal orders, results.map(&:order)
+  end
+
+  def test_belongs_to_when_read_multi_missed_from_cache_ar_will_fetch_missed_records_from_db_uuid
+    orders = [
+      Order.create(id: '15944214-e4df-4e46-8d56-1f5864a0b90c', title: 'title1', body: 'body1'),
+      Order.create(id: '25944214-e4df-4e46-8d56-1f5864a0b90c', title: 'title2', body: 'body2'),
+      Order.create(id: '35944214-e4df-4e46-8d56-1f5864a0b90c', title: 'title3', body: 'body3')
+    ]
+    orders.each_with_index { |order, i| order.order_items.create(body: "order_item#{order.id}", id: "1#{i}944214-e4df-4e46-8d56-1f5864a0b90c") }
+    expired_order = orders.first
+    expired_order.expire_second_level_cache
+
+    results = nil
+    assert_queries(2) do
+      assert_sql(/WHERE\s\"orders\"\.\"id\"\s=\s'#{expired_order.id}'/m) do
+        results = OrderItem.includes(:order).order('id ASC').to_a
+      end
+    end
+
+    assert_equal orders, results.map(&:order)
+  end
+
+  def test_has_many_preloader_returns_correct_results
+    order = Order.create(id: '15944214-e4df-4e46-8d56-1f5864a0b90c')
+    OrderItem.create(id: '11944214-e4df-4e46-8d56-1f5864a0b90c')
+    order_item = order.order_items.create(id: '12944214-e4df-4e46-8d56-1f5864a0b90c')
+
+    assert_equal [order_item], Order.includes(:order_items).find('15944214-e4df-4e46-8d56-1f5864a0b90c').order_items
+  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/test_helper.rb

@@ -18,6 +18,8 @@ require 'model/book'
 require 'model/image'
 require 'model/topic'
 require 'model/post'
+require 'model/order'
+require 'model/order_item'
 require 'model/account'
 require 'model/animal'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -159,18 +159,21 @@ files:
 - test/model/animal.rb
 - test/model/book.rb
 - test/model/image.rb
+- test/model/order.rb
+- test/model/order_item.rb
 - test/model/post.rb
 - test/model/topic.rb
 - test/model/user.rb
 - test/persistence_test.rb
 - test/polymorphic_association_test.rb
+- test/preloader_non_integer_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
-homepage: https://github.com/csdn-dev/second_level_cache
+homepage: https://github.com/hooopo/second_level_cache
 licenses: []
 metadata: {}
 post_install_message: 
@@ -210,11 +213,14 @@ test_files:
 - test/model/animal.rb
 - test/model/book.rb
 - test/model/image.rb
+- test/model/order.rb
+- test/model/order_item.rb
 - test/model/post.rb
 - test/model/topic.rb
 - test/model/user.rb
 - test/persistence_test.rb
 - test/polymorphic_association_test.rb
+- test/preloader_non_integer_test.rb
 - test/preloader_test.rb
 - test/record_marshal_test.rb
 - test/require_test.rb