ar_cache 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01b3342ccad3bf06ce4438f714f00ffc467efc32f58809ab940163ebaf440d7
-  data.tar.gz: 453c9232cbc03dee8572b1133972f01d6dd1c2501df0c9279a32a5e4243ebeb0
+  metadata.gz: 1771642ffaabd7ea8a7fc41c1ffc3cef4be12bbeaaca3ef40aa40c2f01ea291a
+  data.tar.gz: 4b3513827e1f33d3823e0345de4e266b0312e014d1d50fbdedf52eafaa97a02c
 SHA512:
-  metadata.gz: 7d6a3bb90d4ac0eb3384650fd17fbed43be74da2ca0a57b55c9d19b9c68722b2d23785fd42e00cbdec8a4563cc10c6c44ac7609a8b4a09d9b4a813f47c3f2ae1
-  data.tar.gz: 2105bf0e6e89c3d438f30b43bef1dd64b66b511968fec5c393068043ddb52ee833762f0508a4a84d25940ddac36c686c8b5fd4e6ef73d75802de878645ac265b
+  metadata.gz: c80c2bdc655f64409c1f9263415ed8fbd70aa71cb851275a7c31d8f9a459d51d46ee2fb0707c14839a37418c076e4251c55226adf7bf9aaef233d1b89faef7d0
+  data.tar.gz: 2ad58b8a624d9e3fe559be94076b1593b54fc2f52d5f88a111d31d2c5223d4fdba6ddb9f562270fe92af99199c1aeda624e3cbfb8c97701b2b3e17f2559c184a

data/CHANGELOG.md

@@ -2,7 +2,12 @@
 
 ## main
 
-## 1.2.0 (2021-03-12)
+## 1.3.0 (2021-03-13 UTC)
+
+- [Commit [#4ec14e9](https://github.com/OuYangJinTing/ar_cache/commit/4ec14e9e762abb57a8ff18aa8c93a514db49c552)]: 
+Optimize association cache, only cacheable association use ArCache query now.
+
+## 1.2.0 (2021-03-12 UTC)
 
 [Commit [#c830907](https://github.com/OuYangJinTing/ar_cache/commit/c830907595b7d1d46a2f29204ee6051ecc3ff30c)]:
 
@@ -10,12 +15,12 @@
 - Rename methods: `ArCache#skip_cache? => ArCache#skip?`, `ArCache#skip_cache => ArCache#skip`, `ArCache#pre_expire? => ArCache#expire?`, `ArCache#pre_expire => ArCache#expire`.
 - Now, `ArCache#skip` method only skip read cache, but still try delete cache.
 
-## 1.1.0 (2021-03-11)
+## 1.1.0 (2021-03-10 UTC)
 
 - [Commit [#92965d2](https://github.com/OuYangJinTing/ar_cache/commit/92965d26e130da9a13bd52ea31f3f668851f6f12)] Fully automatic delete cache when call delete_all/update_all method.
 - [Commit [#231cfd3](https://github.com/OuYangJinTing/ar_cache/commit/231cfd35c2c197bf41628f4f914ba39fb8debd81)] Optimize has_one(through:) cache implementation.
 - [Commit [#ce5444c](https://github.com/OuYangJinTing/ar_cache/commit/ce5444c8c4ec0a61bec5e07d694295d3cc5decf8)]  ActiveRecord::Relation#reload and ActiveRecord::Associations::Association#reload should skip read cache if associated target is already loaded.
 
-## 1.0.0 (2021-03-02)
+## 1.0.0 (2021-03-02 UTC)
 
 - Initial version.

data/Gemfile.lock

@@ -1,66 +1,66 @@
 PATH
   remote: .
   specs:
-    ar_cache (1.2.0)
+    ar_cache (1.3.0)
       activerecord (>= 6.1, < 7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    actioncable (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailbox (6.1.3)
+      actionpack (= 6.1.3)
+      activejob (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.1)
-      actionpack (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionmailer (6.1.3)
+      actionpack (= 6.1.3)
+      actionview (= 6.1.3)
+      activejob (= 6.1.3)
+      activesupport (= 6.1.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.1)
-      actionview (= 6.1.1)
-      activesupport (= 6.1.1)
+    actionpack (6.1.3)
+      actionview (= 6.1.3)
+      activesupport (= 6.1.3)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.1)
-      actionpack (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    actiontext (6.1.3)
+      actionpack (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
       nokogiri (>= 1.8.5)
-    actionview (6.1.1)
-      activesupport (= 6.1.1)
+    actionview (6.1.3)
+      activesupport (= 6.1.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.1)
-      activesupport (= 6.1.1)
+    activejob (6.1.3)
+      activesupport (= 6.1.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activerecord (6.1.1)
-      activemodel (= 6.1.1)
-      activesupport (= 6.1.1)
-    activestorage (6.1.1)
-      actionpack (= 6.1.1)
-      activejob (= 6.1.1)
-      activerecord (= 6.1.1)
-      activesupport (= 6.1.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activestorage (6.1.3)
+      actionpack (= 6.1.3)
+      activejob (= 6.1.3)
+      activerecord (= 6.1.3)
+      activesupport (= 6.1.3)
       marcel (~> 0.3.1)
       mimemagic (~> 0.3.2)
-    activesupport (6.1.1)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -71,11 +71,16 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     crass (1.0.6)
-    database_cleaner (1.8.5)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     erubi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.7)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     loofah (2.9.0)
       crass (~> 1.0.2)
@@ -87,43 +92,43 @@ GEM
     method_source (1.0.0)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    minitest (5.14.3)
-    nio4r (2.5.4)
-    nokogiri (1.11.1-x86_64-linux)
+    minitest (5.14.4)
+    nio4r (2.5.7)
+    nokogiri (1.11.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.1)
-      actioncable (= 6.1.1)
-      actionmailbox (= 6.1.1)
-      actionmailer (= 6.1.1)
-      actionpack (= 6.1.1)
-      actiontext (= 6.1.1)
-      actionview (= 6.1.1)
-      activejob (= 6.1.1)
-      activemodel (= 6.1.1)
-      activerecord (= 6.1.1)
-      activestorage (= 6.1.1)
-      activesupport (= 6.1.1)
+    rails (6.1.3)
+      actioncable (= 6.1.3)
+      actionmailbox (= 6.1.3)
+      actionmailer (= 6.1.3)
+      actionpack (= 6.1.3)
+      actiontext (= 6.1.3)
+      actionview (= 6.1.3)
+      activejob (= 6.1.3)
+      activemodel (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.1)
+      railties (= 6.1.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
+    railties (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
@@ -144,7 +149,7 @@ GEM
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.3)
       rubocop (>= 0.87, < 2.0)
-    rubocop-performance (1.9.2)
+    rubocop-performance (1.10.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)

data/lib/ar_cache.rb

@@ -18,7 +18,7 @@ require 'ar_cache/active_record'
 require_relative './generators/ar_cache/install_generator' if defined?(Rails)
 
 module ArCache
-  PRELOADER = ::ActiveRecord::Associations::Preloader.new
+  @cache_reflection = {}
 
   class << self
     delegate :configure, to: Configuration
@@ -28,10 +28,14 @@ module ArCache
     end
 
     def skip
-      Thread.current[:ar_cache_skip] = true
-      yield
-    ensure
-      Thread.current[:ar_cache_skip] = false
+      return yield if skip?
+
+      begin
+        Thread.current[:ar_cache_skip] = true
+        yield
+      ensure
+        Thread.current[:ar_cache_skip] = false
+      end
     end
 
     def expire?
@@ -39,10 +43,18 @@ module ArCache
     end
 
     def expire
-      Thread.current[:ar_cache_expire] = true
-      yield
-    ensure
-      Thread.current[:ar_cache_expire] = false
+      return yield if expire?
+
+      begin
+        Thread.current[:ar_cache_expire] = true
+        yield
+      ensure
+        Thread.current[:ar_cache_expire] = false
+      end
+    end
+
+    def cache_reflection?(reflection)
+      @cache_reflection.fetch(reflection) { @cache_reflection[reflection] = yield }
     end
   end
 end

data/lib/ar_cache/active_record.rb

@@ -6,8 +6,6 @@ require 'ar_cache/active_record/core'
 require 'ar_cache/active_record/persistence'
 require 'ar_cache/active_record/insert_all'
 require 'ar_cache/active_record/associations/association'
-require 'ar_cache/active_record/associations/singular_association'
-require 'ar_cache/active_record/associations/has_one_through_association'
 require 'ar_cache/active_record/connection_adapters/abstract/transaction'
 require 'ar_cache/active_record/connection_adapters/abstract/database_statements'
 
@@ -26,8 +24,6 @@ ActiveSupport.on_load(:active_record, run_once: true) do
   ActiveRecord::Relation.prepend(ArCache::ActiveRecord::Relation)
 
   ActiveRecord::Associations::Association.prepend(ArCache::ActiveRecord::Associations::Association)
-  ActiveRecord::Associations::SingularAssociation.prepend(ArCache::ActiveRecord::Associations::SingularAssociation)
-  ActiveRecord::Associations::HasOneThroughAssociation.prepend(ArCache::ActiveRecord::Associations::HasOneThroughAssociation)
 
   ActiveRecord::ConnectionAdapters::NullTransaction.prepend(ArCache::ActiveRecord::ConnectionAdapters::NullTransaction)
   ActiveRecord::ConnectionAdapters::RealTransaction.prepend(ArCache::ActiveRecord::ConnectionAdapters::Transaction)

data/lib/ar_cache/active_record/associations/association.rb

@@ -4,9 +4,32 @@ module ArCache
   module ActiveRecord
     module Associations
       module Association
+        PRELOADER = ::ActiveRecord::Associations::Preloader.new
+
         def reload(...)
           loaded? ? ArCache.skip { super } : super
         end
+
+        # TODO: Implement CollectionAssociation cache
+        private def find_target # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+          return super if ArCache.skip? || reflection.collection?
+          return super unless ArCache.cache_reflection?(reflection) do
+            if reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
+              ArCache::Query.new(owner.association(through_reflection.name).scope).exec_queries_cacheable? &&
+              ArCache::Query.new(through_reflection.klass.new.association(reflection.source_reflection_name).scope)
+                            .exec_queries_cacheable?
+            else
+              ArCache::Query.new(scope).exec_queries_cacheable?
+            end
+          end
+
+          if (owner.strict_loading? || reflection.strict_loading?) && owner.validation_context.nil?
+            ::ActiveRecord::Base.strict_loading_violation!(owner: owner.class, reflection: reflection)
+          end
+
+          PRELOADER.preload(owner, reflection.name)
+          Array.wrap(owner.association(reflection.name).target)
+        end
       end
     end
   end

data/lib/ar_cache/query.rb

@@ -39,7 +39,7 @@ module ArCache
       records
     end
 
-    private def exec_queries_cacheable? # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+    def exec_queries_cacheable? # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       return false if relation.klass.ar_cache_table.disabled?
       return false if relation.skip_query_cache_value
       return false if relation.lock_value

data/lib/ar_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArCache
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/lib/ar_cache/where_clause.rb

@@ -24,8 +24,8 @@ module ArCache
         count = 0
 
         bool = index.all? do |column|
-          where_values_hash[column].tap do |value|
-            if value.is_a?(Array)
+          where_values_hash.key?(column).tap do
+            if where_values_hash[column].is_a?(Array)
               @multi_values_key = column
               count += 1
             end
@@ -52,7 +52,7 @@ module ArCache
       @cache_hash = {}
       multi_values_key = @multi_values_key || @index.first
 
-      Array(where_values_hash[multi_values_key]).each do |v|
+      Array.wrap(where_values_hash[multi_values_key]).each do |v|
         @cache_hash[table.cache_key(where_values_hash, @index, multi_values_key, v)] = v
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_cache
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - OuYangJinTing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,8 +58,6 @@ files:
 - lib/ar_cache.rb
 - lib/ar_cache/active_record.rb
 - lib/ar_cache/active_record/associations/association.rb
-- lib/ar_cache/active_record/associations/has_one_through_association.rb
-- lib/ar_cache/active_record/associations/singular_association.rb
 - lib/ar_cache/active_record/connection_adapters/abstract/database_statements.rb
 - lib/ar_cache/active_record/connection_adapters/abstract/transaction.rb
 - lib/ar_cache/active_record/core.rb

data/lib/ar_cache/active_record/associations/has_one_through_association.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module ArCache
-  module ActiveRecord
-    module Associations
-      module HasOneThroughAssociation
-        private def find_target # rubocop:disable Metrics/CyclomaticComplexity
-          return super if ArCache.skip?
-          return super if reflection.klass.ar_cache_table.disabled?
-          return super if reflection.through_reflection.klass.ar_cache_table.disabled?
-
-          if (owner.strict_loading? || reflection.strict_loading?) && owner.validation_context.nil?
-            Base.strict_loading_violation!(owner: owner.class, reflection: reflection)
-          end
-
-          ArCache::PRELOADER.preload(owner, reflection.name)
-          owner.send(reflection.name)
-        rescue StandardError
-          super
-        end
-      end
-    end
-  end
-end

data/lib/ar_cache/active_record/associations/singular_association.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module ArCache
-  module ActiveRecord
-    module Associations
-      module SingularAssociation
-        private def skip_statement_cache?(...)
-          return super if ArCache.skip?
-
-          # Polymorphic associations do not support computing the class, so can't judge ArCache status.
-          # But SingularAssociation query usually can hit the unique index, so here return true directly.
-          return true if is_a?(::ActiveRecord::Associations::BelongsToPolymorphicAssociation)
-          return true unless reflection.klass.ar_cache_table.disabled?
-
-          super
-        end
-      end
-    end
-  end
-end