second_level_cache 2.3.3 → 2.4.0

data/test/base_test.rb

@@ -1,17 +1,19 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class BaseTest < 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_update_cache_when_update_attributes
-    @user.update_attributes name: 'change'
+    @user.update_attributes name: "change"
     assert_equal @user.name, User.read_second_level_cache(@user.id).name
   end
 
   def test_should_update_cache_when_update_attribute
-    @user.update_attribute :name, 'change'
+    @user.update_attribute :name, "change"
     assert_equal @user.name, User.read_second_level_cache(@user.id).name
   end
 

data/test/belongs_to_association_test.rb

@@ -1,8 +1,10 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class BelongsToAssociationTest < 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_belongs_to_association

data/test/enum_attr_test.rb

@@ -1,13 +1,15 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class EnumAttrTest < 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_enum_attr
     @user.archived!
-    assert_equal 'archived', @user.status
-    assert_equal 'archived', User.find(@user.id).status
+    assert_equal "archived", @user.status
+    assert_equal "archived", User.find(@user.id).status
   end
 end

data/test/fetch_by_uniq_key_test.rb

@@ -1,42 +1,44 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class FetchByUinqKeyTest < ActiveSupport::TestCase
   def setup
-    @user = User.create name: 'hooopo', email: 'hoooopo@gmail.com'
-    @post = Post.create slug: 'foobar', topic_id: 2
+    @user = User.create name: "hooopo", email: "hoooopo@gmail.com"
+    @post = Post.create slug: "foobar", topic_id: 2
   end
 
   def test_cache_uniq_key
-    assert_equal User.send(:cache_uniq_key, name: 'hooopo'), 'uniq_key_User_name_hooopo'
-    assert_equal User.send(:cache_uniq_key, foo: 1, bar: 2), 'uniq_key_User_foo_1,bar_2'
-    assert_equal User.send(:cache_uniq_key, foo: 1, bar: nil), 'uniq_key_User_foo_1,bar_'
-    long_val = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+    assert_equal User.send(:cache_uniq_key, name: "hooopo"), "uniq_key_User_name_hooopo"
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: 2), "uniq_key_User_foo_1,bar_2"
+    assert_equal User.send(:cache_uniq_key, foo: 1, bar: nil), "uniq_key_User_foo_1,bar_"
+    long_val = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
     assert_equal User.send(:cache_uniq_key, foo: 1, bar: long_val), "uniq_key_User_foo_1,bar_#{Digest::MD5.hexdigest(long_val)}"
   end
 
   def test_should_query_from_db_using_primary_key
-    Post.fetch_by_uniq_keys(topic_id: 2, slug: 'foobar')
+    Post.fetch_by_uniq_keys(topic_id: 2, slug: "foobar")
     @post.expire_second_level_cache
     assert_sql(/SELECT\s+"posts".* FROM "posts"\s+WHERE "posts"."id" = \? LIMIT ?/) do
-      Post.fetch_by_uniq_keys(topic_id: 2, slug: 'foobar')
+      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')
+    post = Post.fetch_by_uniq_keys(topic_id: 2, slug: "foobar")
     assert_equal post, @post
     assert_no_queries do
-      Post.fetch_by_uniq_keys(topic_id: 2, slug: 'foobar')
+      Post.fetch_by_uniq_keys(topic_id: 2, slug: "foobar")
     end
   end
 
   def test_should_fail_when_fetch_by_uniq_key_with_bang_method
     assert_raises(ActiveRecord::RecordNotFound) do
-      Post.fetch_by_uniq_keys!(topic_id: 2, slug: 'foobar1')
+      Post.fetch_by_uniq_keys!(topic_id: 2, slug: "foobar1")
     end
 
     assert_raises(ActiveRecord::RecordNotFound) do
-      User.fetch_by_uniq_key!('xxxxx', :name)
+      User.fetch_by_uniq_key!("xxxxx", :name)
     end
   end
 

data/test/finder_methods_test.rb

@@ -1,8 +1,10 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class FinderMethodsTest < 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_find_without_cache
@@ -34,14 +36,14 @@ class FinderMethodsTest < ActiveSupport::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)
+    only_id_user = User.select("id").find(@user.id)
     assert_raises(ActiveModel::MissingAttributeError) do
       only_id_user.name
     end
   end
 
   def test_without_second_level_cache
-    @user.name = 'NewName'
+    @user.name = "NewName"
     @user.write_second_level_cache
     User.without_second_level_cache do
       @from_db = User.find(@user.id)

data/test/has_one_association_test.rb

@@ -1,8 +1,10 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class HasOneAssociationTest < ActiveSupport::TestCase
   def setup
-    @user = User.create name: 'hooopo', email: 'hoooopo@gmail.com'
+    @user = User.create name: "hooopo", email: "hoooopo@gmail.com"
     @account = @user.create_account
   end
 
@@ -14,7 +16,7 @@ class HasOneAssociationTest < ActiveSupport::TestCase
   end
 
   def test_should_fetch_has_one_through
-    user = User.create name: 'hooopo', email: 'hoooopo@gmail.com', forked_from_user: @user
+    user = User.create name: "hooopo", email: "hoooopo@gmail.com", forked_from_user: @user
     clean_user = user.reload
     assert_equal User, clean_user.forked_from_user.class
     assert_equal @user.id, user.forked_from_user.id
@@ -25,13 +27,13 @@ class HasOneAssociationTest < ActiveSupport::TestCase
   end
 
   def test_has_one_with_conditions
-    user = User.create name: 'hooopo', email: 'hoooopo@gmail.com'
-    Namespace.create(user_id: user.id, name: 'ruby-china', kind: 'group')
-    user.create_namespace(name: 'hooopo')
-    Namespace.create(user_id: user.id, name: 'rails', kind: 'group')
+    user = User.create name: "hooopo", email: "hoooopo@gmail.com"
+    Namespace.create(user_id: user.id, name: "ruby-china", kind: "group")
+    user.create_namespace(name: "hooopo")
+    Namespace.create(user_id: user.id, name: "rails", kind: "group")
     assert_not_equal user.namespace, nil
     clear_user = User.find(user.id)
-    assert_equal clear_user.namespace.name, 'hooopo'
+    assert_equal clear_user.namespace.name, "hooopo"
   end
 
   def test_assign_relation

data/test/model/account.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:accounts, force: true) do |t|
   t.integer :age
   t.string :site

data/test/model/animal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:animals, force: true) do |t|
   t.string  :type
   t.string  :name

data/test/model/book.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:books, force: true) do |t|
   t.string  :title
   t.string  :body

data/test/model/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:images, force: true) do |t|
   t.string  :url
   t.string  :imagable_type

data/test/model/order.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:orders, force: true, id: :uuid) do |t|
   t.text :body
   t.string :title

data/test/model/order_item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:order_items, force: true, id: :uuid) do |t|
   t.text :body
   t.string :slug

data/test/model/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:posts, force: true) do |t|
   t.text :body
   t.string :slug

data/test/model/topic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:topics, force: true) do |t|
   t.string  :title
   t.text :body

data/test/model/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Base.connection.create_table(:users, force: true) do |t|
   t.text    :options
   t.text    :json_options
@@ -28,11 +30,11 @@ class User < ActiveRecord::Base
   second_level_cache(version: CACHE_VERSION, expires_in: 3.days)
 
   serialize :options, Array
-  serialize :json_options, JSON if ::ActiveRecord::VERSION::STRING >= '4.1.0'
+  serialize :json_options, JSON if ::ActiveRecord::VERSION::STRING >= "4.1.0"
   store :extras, accessors: %i[tagline gender]
 
   has_one  :account
-  has_one  :forked_user_link, foreign_key: 'forked_to_user_id'
+  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) }
@@ -49,6 +51,6 @@ class Namespace < ActiveRecord::Base
 end
 
 class ForkedUserLink < ActiveRecord::Base
-  belongs_to :forked_from_user, class_name: 'User'
-  belongs_to :forked_to_user, class_name: 'User'
+  belongs_to :forked_from_user, class_name: "User"
+  belongs_to :forked_to_user, class_name: "User"
 end

data/test/persistence_test.rb

@@ -1,14 +1,16 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+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
-    User.where(id: @user.id).update_all(email: 'different@csdn.com')
-    assert_equal 'different@csdn.com', @user.reload.email
+    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
@@ -26,31 +28,31 @@ 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
 
   def test_should_update_cache_after_update_columns
-    @user.update_columns name: 'new_name1'
+    @user.update_columns name: "new_name1"
     new_user = User.find @user.id
     assert_equal new_user, @user
   end
 
   def test_should_update_cache_after_update_attribute
-    @user.update_attribute :name, 'new_name'
+    @user.update_attribute :name, "new_name"
     new_user = User.find @user.id
     assert_equal new_user, @user
   end
 
   def test_should_update_cache_after_update
-    @user.update name: 'new_name'
+    @user.update name: "new_name"
     new_user = User.find @user.id
     assert_equal new_user, @user
   end
 
   def test_should_update_cache_after_update!
-    @user.update! name: 'new_name'
+    @user.update! name: "new_name"
     new_user = User.find @user.id
     assert_equal new_user, @user
   end

data/test/polymorphic_association_test.rb

@@ -1,8 +1,10 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+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_non_integer_test.rb

@@ -1,26 +1,28 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+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')
+      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
+      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')
+      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
@@ -28,8 +30,9 @@ class PreloaderNonIntegerTest < ActiveSupport::TestCase
 
     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
+      assert_sql(/WHERE\s\"orders\"\.\"id\" = ?/m) do
+        results = OrderItem.includes(:order).order("id ASC").to_a
+        assert_equal expired_order, results.first.order
       end
     end
 
@@ -37,11 +40,11 @@ class PreloaderNonIntegerTest < ActiveSupport::TestCase
   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')
+    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
+    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

data/test/preloader_test.rb

@@ -1,26 +1,28 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+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')
+      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
+      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')
+      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
@@ -28,8 +30,9 @@ class PreloaderTest < ActiveSupport::TestCase
 
     results = nil
     assert_queries(2) do
-      assert_sql(/WHERE\s\"topics\"\.\"id\"\s=\s#{expired_topic.id}/m) do
-        results = Post.includes(:topic).order('id ASC').to_a
+      assert_sql(/WHERE\s\"topics\"\.\"id\"\s=\s?/m) do
+        results = Post.includes(:topic).order("id ASC").to_a
+        assert_equal expired_topic, results.first.topic
       end
     end