ar_cache 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56df5f788fb94d493c94dca6942c80819ae1fa1c567b9b6228020ad935c35c4f
-  data.tar.gz: 2b253f18c8174b39159f6bb0c79f298c0064a35c05ac4334719e6ca50db13a26
+  metadata.gz: 86d921c69c8ac7d8cbc0cefdb5614120a60f5663c5a2b8e3bc07a1c9c1d8d8a0
+  data.tar.gz: ced6d5cf673fb6e83070ba95e4daf6fb9d0994a93f8963de63692317c9c77081
 SHA512:
-  metadata.gz: 536189cb015607a2fd12c85f03f995ae7443b5a019e72b37526cb371a994182bad76a010c0b2f05e06be1041fee7e5bb7177ebe946155a5de73df827a66521d6
-  data.tar.gz: f65ea53cc987f2b3aed000408fd8b70da94dfc56a27f04db5e0aed33dac41ad7838aec761640cbff037fa7d733c5b538428154f6e082533051a20a8bf5740b52
+  metadata.gz: 5affbd42eed0837bc8fc40fd317eac39fa79b0e18c8e27f65eefb2873b381064539374dde7b963c1993f66068177707e72421499d7ff81b5fdc394e91261f8c3
+  data.tar.gz: 1c7f9930f0a726201afa735d208c229c01693432adc1631ea5bcd6417210ad079587c18ac9e908890e4ae4fac2307361048f017a28308c92c22d9136dd36e5ce

data/CHANGELOG.md

@@ -2,20 +2,30 @@
 
 ## main
 
+## 1.5.0 (2021-03-22 UTC)
+
+[Compare [#7cc9ec8..10f9eea](https://github.com/OuYangJinTing/ar_cache/compare/7cc9ec8..10f9eea)]:
+
+- Fix `has_one thtough:` strict loading error.
+- Fix `#detect_wrong_key`, should check `nil` value match.
+- Rename `ArCache::Configuration#index_column_max_size` => `ArCache::Configuration#column_length`
+
 ## 1.4.0 (2021-03-15 UTC)
 
-[Commit [#7cc9ec8](https://github.com/OuYangJinTing/ar_cache/commit/7cc9ec8047394bb7758e25edd3b42fa48bb88640)]:
+[Compare [#3ff0bb8..7cc9ec8](https://github.com/OuYangJinTing/ar_cache/compare/3ff0bb8..7cc9ec8)]:
 
 - Remove `ArCache::Table` `ignored_columns` configuration.
 - Fix `ActiveRecord` call `#select` write to cache data is incomplete.
 
 ## 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.
+[Compare [#4328f38..4ec14e9](https://github.com/OuYangJinTing/ar_cache/compare/4328f38..4ec14e9)]:
+
+- 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)]:
+[Compare [#eb27f99..c830907](https://github.com/OuYangJinTing/ar_cache/compare/eb27f99..c830907)]:
 
 - Remove methods: `ArCache::MockTable#enabled?`, `ArCache::MockTable#select_enabled?`, `ArCache::Table.enabled?`, `ArCache::Table.select_enabled?`, `ActiveRecord::Relation#skip_ar_cache`.
 - Rename methods: `ArCache#skip_cache? => ArCache#skip?`, `ArCache#skip_cache => ArCache#skip`, `ArCache#pre_expire? => ArCache#expire?`, `ArCache#pre_expire => ArCache#expire`.
@@ -23,9 +33,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.
+[Compare [#a15d5f5..ce5444c](https://github.com/OuYangJinTing/ar_cache/compare/a15d5f5...ce5444c)]:
+
+- Fully automatic delete cache when call delete_all/update_all method.
+- Optimize has_one(through:) cache implementation.
+- ActiveRecord::Relation#reload and ActiveRecord::Associations::Association#reload should skip read cache if associated target is already loaded.
 
 ## 1.0.0 (2021-03-02 UTC)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar_cache (1.4.0)
+    ar_cache (1.5.0)
       activerecord (>= 6.1, < 7)
 
 GEM
@@ -147,8 +147,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
-    rubocop-minitest (0.10.3)
-      rubocop (>= 0.87, < 2.0)
+    rubocop-minitest (0.11.0)
+      rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.10.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)

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

@@ -15,7 +15,7 @@ module ArCache
           end
 
           if (owner.strict_loading? || reflection.strict_loading?) && owner.validation_context.nil?
-            Base.strict_loading_violation!(owner: owner.class, reflection: reflection)
+            ::ActiveRecord::Base.strict_loading_violation!(owner: owner.class, reflection: reflection)
           end
 
           PRELOADER.preload(owner, reflection.name)

data/lib/ar_cache/active_record/model_schema.rb

@@ -10,7 +10,7 @@ module ArCache
 
         def ar_cache_table
           @ar_cache_table ||= begin
-            if abstract_class? || self == ArCache::Record
+            if abstract_class? || table_name == 'ar_cache_records'
               ArCache::MockTable
             else
               ArCache::Table.new(table_name)

data/lib/ar_cache/configuration.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 module ArCache
   class Configuration
-    singleton_class.attr_accessor :disabled, :select_disabled, :expires_in, :read_uncommitted, :index_column_max_size
+    singleton_class.attr_accessor :disabled, :select_disabled, :expires_in, :read_uncommitted, :column_length
     singleton_class.attr_reader :cache_store, :tables_options, :coder
 
     def self.configure
@@ -53,6 +53,6 @@ module ArCache
     @select_disabled = true
     @expires_in = 604_800 # 1 week
     @read_uncommitted = false
-    @index_column_max_size = 64
+    @column_length = 64
   end
 end

data/lib/ar_cache/marshal.rb

@@ -59,9 +59,9 @@ module ArCache
 
     private def detect_wrong_key(entry, where_values_hash)
       where_values_hash.detect do |k, v|
-        value = entry[k]
-        next if value.nil?
+        next unless entry.key?(k)
 
+        value = entry[k]
         if v.is_a?(Array)
           return k unless v.include?(value)
         else

data/lib/ar_cache/query.rb

@@ -66,7 +66,7 @@ module ArCache
       (@select_values - table.column_names).empty?
     end
 
-    private def order_values_cacheable?
+    private def order_values_cacheable? # rubocop:disable Metrics/CyclomaticComplexity
       return true if where_clause.single?
 
       size = relation.order_values.size
@@ -81,6 +81,7 @@ module ArCache
       when String
         @order_name, @order_desc = first_order_value.downcase.split
         return false unless table.column_names.include?(@order_name)
+        return false unless ['asc', 'desc', nil].include?(@order_desc)
 
         @order_desc = @order_desc == 'desc'
       else

data/lib/ar_cache/record.rb

@@ -5,7 +5,7 @@ module ArCache
     self.table_name = 'ar_cache_records'
 
     def self.get(table_name)
-      ArCache.skip { find_by(table_name: table_name) }
+      find_by(table_name: table_name)
     end
 
     def self.version(table)

data/lib/ar_cache/table.rb

@@ -101,14 +101,14 @@ module ArCache
       end
     end
 
-    private def custom_unique_indexes(indexes)
+    private def custom_unique_indexes(indexes, columns)
       indexes.each do |index|
-        index.each do |column|
-          column = columns.find { |c| c.name == column }
-          raise ArgumentError, "The #{name} table not found #{column.inspect} column" if column.nil?
+        index.each do |field|
+          column = columns.find { |c| c.name == field }
+          raise ArgumentError, "The #{name} table not found #{field.inspect} column" if column.nil?
 
           if column.type == :datetime
-            raise ArgumentError, "The #{column.inspect} is datetime type, ArCache do't support datetime type"
+            raise ArgumentError, "The #{field.inspect} is datetime type, ArCache do't support datetime type"
           end
         end
       end

data/lib/ar_cache/version.rb

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

data/lib/ar_cache/where_clause.rb

@@ -2,7 +2,7 @@
 
 module ArCache
   class WhereClause
-    attr_reader :klass, :table, :predicates
+    attr_reader :klass, :table, :predicates, :invalid_keys
 
     def initialize(klass, predicates)
       @klass = klass
@@ -105,7 +105,7 @@ module ArCache
 
           name = node.left.name.to_s
           value = extract_node_value(node.right)
-          next if value.respond_to?(:size) && value.size > ArCache::Configuration.index_column_max_size
+          next if value.respond_to?(:size) && value.size > ArCache::Configuration.column_length
 
           hash[name] = value
         end

data/lib/generators/ar_cache/templates/configuration.rb

@@ -14,7 +14,7 @@ ArCache.configure do |config|
   # config.coder = [YAML|JSON] # default YAML
 
   # Support the maximum length of index column value.
-  # config.index_column_max_size = Integer # default 64
+  # config.column_length = Integer # default 64
 
   # ArCache switch.
   # config.disabled = Boolean # default false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_cache
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - OuYangJinTing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord