kasket 4.10.4 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a786cf4a5580eadc1ad695d662795a160dde563176371c9c0176542eadc1da6c
-  data.tar.gz: b9261e224b6aaec4327931a5d723b3fb872cca314a6a5b68681c61b357945fdc
+  metadata.gz: 52a098184223192a1d4a6cd6a92363dd5f9324b4d2c56da1fa33769402e0c602
+  data.tar.gz: 4fca1aba72b41281fb71f91a61ba18d96edb93cb60ff94924c63fe7353bd96d7
 SHA512:
-  metadata.gz: daea000b865281f12ae6fd70752f4d1418dadb00a3747452f7db9aa52230c071b8d87b23a37cd0b43a0d3a6db292c418293d25d3b97872f7a597b49b5bb81e5a
-  data.tar.gz: f3625ddb2690f619d1f93aa2bcfdff5c72dd3b0f6debe2f19646ef6fba030d206ccab0e920fed37d0869eb8532cb1cc44adbc0d7955cfe215e938327465817ea
+  metadata.gz: 4aa6be9f52ab44578929a3e66fa2ddfb71a6d935e00d13e80258fe4ec413ac69cae42666512e3711c189edf03e6e011ecd64a13d9a210449edc292aeea098680
+  data.tar.gz: 0131bde86df784810b892da100e6e5c26e40620071c6169def6f7cbb7f176775ed981c7174c2be247a1c188053b755dab6469d9cd39e51104921f57d73721f72

data/README.md

@@ -1,7 +1,7 @@
 # Kasket
 
 ### Puts a cap on your queries
-A caching layer for ActiveRecord (3.x and 4.x)
+A caching layer for ActiveRecord.
 
 Developed and used by [Zendesk](http://zendesk.com).
 
@@ -137,6 +137,20 @@ Absolutely, but Cache Money does so much more.
 * The Cache Money code is overly complex.
 * Cache Money seems abandoned.
 
+## Development
+
+Run the tests with:
+
+```
+$ rake test
+```
+
+Access a dev console running on the local test DB:
+
+```
+$ bin/console
+```
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.

data/lib/kasket/configuration_mixin.rb

@@ -101,12 +101,8 @@ module Kasket
     def kasket_quoted_value_for_column(value, column)
       if column
         conn = connection
-        casted_value =
-          case ActiveRecord::VERSION::MAJOR
-          when 3 then column.type_cast(value)
-          when 4 then column.type_cast_for_database(value)
-          else conn.type_cast_from_column(column, value)
-          end
+        type = conn.lookup_cast_type_from_column(column)
+        casted_value = conn.type_cast(type.serialize(value))
         conn.quote(casted_value).downcase
       else
         value.to_s

data/lib/kasket/read_mixin.rb

@@ -8,20 +8,13 @@ module Kasket
       end
     end
 
-    # *args can be replaced with (sql, *args) once we stop supporting Rails < 5.2
-    def find_by_sql_with_kasket(*args)
-      sql = args[0]
-
+    def find_by_sql_with_kasket(sql, binds = [], *restargs, **kwargs, &blk)
       if use_kasket?
         query = if sql.respond_to?(:to_kasket_query)
-          if ActiveRecord::VERSION::MAJOR < 5
-            sql.to_kasket_query(self, args[1])
+          if ActiveRecord::VERSION::STRING < '5.2'
+            sql.to_kasket_query(self, binds.map(&:value_for_database))
           else
-            if ActiveRecord::VERSION::STRING < '5.2'
-              sql.to_kasket_query(self, args[1].map(&:value_for_database))
-            else
-              sql.to_kasket_query(self)
-            end
+            sql.to_kasket_query(self)
           end
         else
           kasket_parser.parse(sanitize_sql(sql))
@@ -30,7 +23,7 @@ module Kasket
 
       if query && has_kasket_index_on?(query[:index])
         if query[:key].is_a?(Array)
-          find_by_sql_with_kasket_on_id_array(query[:key])
+          filter_pending_records(find_by_sql_with_kasket_on_id_array(query[:key]))
         else
           if value = Kasket.cache.read(query[:key])
             # Identified a specific edge case where memcached server returns 0x00 binary protocol response with no data
@@ -41,7 +34,7 @@ module Kasket
             # The code in this first condition of TrueClass === true  will
             # skip the kasket cache for these specific objects and go directly to SQL for retrieval.
             result_set = if value.is_a?(TrueClass)
-              find_by_sql_without_kasket(*args)
+              find_by_sql_without_kasket(sql, binds, *restargs, **kwargs, &blk)
             elsif value.is_a?(Array)
               filter_pending_records(find_by_sql_with_kasket_on_id_array(value))
             else
@@ -55,11 +48,11 @@ module Kasket
 
             ActiveSupport::Notifications.instrument('instantiation.active_record', payload) { result_set }
           else
-            store_in_kasket(query[:key], find_by_sql_without_kasket(*args))
+            store_in_kasket(query[:key], find_by_sql_without_kasket(sql, binds, *restargs, **kwargs, &blk))
           end
         end
       else
-        find_by_sql_without_kasket(*args)
+        find_by_sql_without_kasket(sql, binds, *restargs, **kwargs, &blk)
       end
     end
 

data/lib/kasket/relation_mixin.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 module Kasket
   module RelationMixin
-    # binds can be removed when support for Rails < 5 is removed
-    def to_kasket_query(binds = nil)
+    def to_kasket_query
       if arel.is_a?(Arel::SelectManager)
-        if ActiveRecord::VERSION::MAJOR < 5
-          arel.to_kasket_query(klass, (binds || bind_values))
-        elsif ActiveRecord::VERSION::STRING < '5.2'
+        if ActiveRecord::VERSION::STRING < '5.2'
           arel.to_kasket_query(klass, (@values[:where].to_h.values + Array(@values[:limit])))
         else
           arel.to_kasket_query(klass)

data/lib/kasket/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Kasket
-  VERSION = '4.10.4'
+  VERSION = '4.12.0'
   class Version
     MAJOR = Kasket::VERSION.split('.')[0]
     MINOR = Kasket::VERSION.split('.')[1]

data/lib/kasket/visitor.rb

@@ -49,7 +49,7 @@ module Kasket
 
     def visit_Arel_Nodes_SelectCore(node, *_)
       return :unsupported if node.groups.any?
-      return :unsupported if ActiveRecord::VERSION::MAJOR < 5 ? node.having : node.havings.present?
+      return :unsupported if node.havings.present?
       return :unsupported if node.set_quantifier
       return :unsupported if !node.source || node.source.empty?
       return :unsupported if node.projections.empty?
@@ -65,6 +65,14 @@ module Kasket
         return unless (column_names - projection_names).empty?
       end
 
+      # un-optimize AR 6.1 by adding a redundant And node to hit visitor below
+      if ActiveRecord::VERSION::STRING.start_with? "6.1"
+        if node.wheres.size == 1
+          n = node.wheres[0]
+          node.wheres[0] = Arel::Nodes::And.new([n]) unless n.is_a?(Arel::Nodes::And)
+        end
+      end
+
       parts = [visit(node.source)]
 
       parts += node.wheres.map {|where| visit(where) }
@@ -73,11 +81,7 @@ module Kasket
     end
 
     def visit_Arel_Nodes_Limit(node, *_)
-      if ActiveRecord::VERSION::MAJOR < 5
-        { limit: node.value.to_i }
-      else
-        { limit: visit(node.value).to_i }
-      end
+      { limit: visit(node.value).to_i }
     end
 
     def visit_Arel_Nodes_JoinSource(node, *_)
@@ -106,6 +110,8 @@ module Kasket
       [left, visit(node.right)]
     end
 
+    alias_method :visit_Arel_Nodes_HomogeneousIn, :visit_Arel_Nodes_In
+
     def visit_Arel_Nodes_Equality(node, *_)
       right =
         case node.right
@@ -134,14 +140,10 @@ module Kasket
     end
 
     def visit_Arel_Nodes_BindParam(node, *_)
-      if ActiveRecord::VERSION::MAJOR < 5
-        visit(@binds.shift[1])
+      if ActiveRecord::VERSION::STRING < '5.2'
+        visit(@binds.shift)
       else
-        if ActiveRecord::VERSION::STRING < '5.2'
-          visit(@binds.shift)
-        else
-          visit(node.value.value) unless node.value.value.nil?
-        end
+        visit(node.value.value) unless node.value.value.nil?
       end
     end
 
@@ -157,6 +159,15 @@ module Kasket
         else quoted(node.val)
         end
       end
+    else # R52: val -> value
+      def visit_Arel_Nodes_Casted(node, *_)
+        v = node.value
+        case v
+        when nil    then nil
+        when String then v
+        else quoted(v)
+        end
+      end
     end
 
     def visit_TrueClass(_node)

data/lib/kasket/write_mixin.rb

@@ -8,14 +8,14 @@ module Kasket
         end
       end
 
-      def update_counters_with_kasket_clearing(*args)
+      def update_counters_with_kasket_clearing(*args, **kwargs)
         remove_from_kasket(args[0])
-        update_counters_without_kasket_clearing(*args)
+        update_counters_without_kasket_clearing(*args, **kwargs)
       end
 
-      def transaction_with_kasket_disabled(*args)
+      def transaction_with_kasket_disabled(*args, **kwargs)
         without_kasket do
-          transaction_without_kasket_disabled(*args) { yield }
+          transaction_without_kasket_disabled(*args, **kwargs) { yield }
         end
       end
     end
@@ -41,11 +41,7 @@ module Kasket
         attribute_sets = [attributes]
 
         previous_changes = options[:previous_changes]
-        previous_changes ||= if respond_to?(:saved_changes)
-          saved_changes.transform_values(&:first)
-        else
-          previous_changes() # keep parens or rename the local var
-        end
+        previous_changes ||= saved_changes.transform_values(&:first)
         if previous_changes.present?
           old_attributes = previous_changes.each_with_object({}) do |(attribute, (old, _)), all|
             all[attribute.to_s] = old
@@ -93,23 +89,14 @@ module Kasket
         super
       end
 
-      if ActiveRecord::VERSION::MAJOR == 3
-        def update_column(column, value)
-          previous_changes = { column => [attributes[column.to_s], value] }
-          result = super
-          clear_kasket_indices(previous_changes: previous_changes)
-          result
-        end
-      else
-        def update_columns(new_attributes)
-          previous_attributes = attributes
-          previous_changes = new_attributes.each_with_object({}) do |(k, v), all|
-            all[k] = [previous_attributes[k.to_s], v]
-          end
-          result = super
-          clear_kasket_indices(previous_changes: previous_changes)
-          result
+      def update_columns(new_attributes)
+        previous_attributes = attributes
+        previous_changes = new_attributes.each_with_object({}) do |(k, v), all|
+          all[k] = [previous_attributes[k.to_s], v]
         end
+        result = super
+        clear_kasket_indices(previous_changes: previous_changes)
+        result
       end
 
       def kasket_after_commit_dummy
@@ -124,13 +111,13 @@ module Kasket
         Kasket.add_pending_record(self, _destroyed = true)
       end
 
-      def committed!(*)
+      def committed!(*args, **kwargs)
         Kasket.clear_pending_records
         kasket_after_commit if persisted? || destroyed?
         super
       end
 
-      def rolledback!(*)
+      def rolledback!(*args, **kwargs)
         Kasket.clear_pending_records
         super
       end
@@ -148,10 +135,6 @@ module Kasket
       model_class.after_destroy :kasket_after_destroy
       model_class.after_commit :kasket_after_commit_dummy
 
-      if ActiveRecord::VERSION::MAJOR == 3 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0)
-        model_class.after_touch :kasket_after_commit
-      end
-
       class << model_class
         alias_method :transaction_without_kasket_disabled, :transaction
         alias_method :transaction, :transaction_with_kasket_disabled

data/lib/kasket.rb

@@ -31,11 +31,8 @@ module Kasket
     CONFIGURATION[:default_expires_in]  = options[:default_expires_in]  if options[:default_expires_in]
 
     ActiveRecord::Base.extend(Kasket::ConfigurationMixin)
-
-    if defined?(ActiveRecord::Relation)
-      ActiveRecord::Relation.include Kasket::RelationMixin
-      Arel::SelectManager.include Kasket::SelectManagerMixin
-    end
+    ActiveRecord::Relation.include(Kasket::RelationMixin)
+    Arel::SelectManager.include(Kasket::SelectManagerMixin)
   end
 
   def self.cache_store=(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.10.4
+  version: 4.12.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 description: puts a cap on your queries
 email:
 - mick@zendesk.com
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="