kasket 4.6.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a81925a9561dbeb413c751be411178db3ca412f1
-  data.tar.gz: 32e1620ff89925cc429d4c9f8e8bfdc95e34208e
+SHA256:
+  metadata.gz: 75e9005963ca629245005b0c9a2a9d94cb9023fac9cc12327045e25eaca547e0
+  data.tar.gz: e7aec95609b6918646f3b2b420d5af038ef171888ac98cdea4c0fb16cf6ce086
 SHA512:
-  metadata.gz: c57079f331c15b58809288a45c123ff8e044763c81f0e170a9706305fcb0ea6d7f0fd336566815bf99e843d4193e9dbc1b6d96ad4543317e4fb6d79a89eece28
-  data.tar.gz: d8a5b52ce07b72b361727649697a8a1187c55fe790dbbf82b7b358897cf942fe64456ce89959a9849f9f941f99b854e2a2b41931c178890ddf4d1bae9c06e8aa
+  metadata.gz: f19bd6ca3a60073c738907e20052d461cdcc0139a1c300765ed3b029022107d7c477b6a5e6437bb34d73de5d8e2c6050eac3e6834ec6c7f27c3e7e1e5a0fa200
+  data.tar.gz: effe82d0f1620cc7742407a46054b558675ac061050af22313daccdc52dc30204c5ae02c67f91aeea64ce07f4c687d2a6eb699c132a0914284d2554cec0d014b

data/README.md

@@ -1,4 +1,4 @@
-# Kasket [![Build Status](https://secure.travis-ci.org/zendesk/kasket.svg)](http://travis-ci.org/zendesk/kasket)
+# Kasket [![Build status](https://circleci.com/gh/zendesk/kasket.svg?style=svg)](https://circleci.com/gh/zendesk/kasket)
 
 ### Puts a cap on your queries
 A caching layer for ActiveRecord (3.x and 4.x)

data/lib/kasket/configuration_mixin.rb

@@ -37,7 +37,7 @@ module Kasket
       else
         key = attribute_value_pairs.map do |attribute, value|
           column = columns_hash[attribute.to_s]
-          value = nil if value.blank?
+          value = nil if value.blank? && value != false
           "#{attribute}=#{kasket_quoted_value_for_column(value, column)}"
         end.join('/')
 

data/lib/kasket/query_parser.rb

@@ -6,8 +6,8 @@ module Kasket
     # SELECT * FROM `users` WHERE (`users`.`id` = 2) LIMIT 1
     # 'SELECT * FROM \'posts\' WHERE (\'posts\'.\'id\' = 574019247) '
 
-    AND = /\s+AND\s+/i
-    VALUE = /'?(\d+|\?|(?:(?:[^']|''|\\')*))'?/ # Matches: 123, ?, '123', '12''3'
+    AND = /\s+AND\s+/i.freeze
+    VALUE = /'?(\d+|\?|(?:(?:[^']|''|\\')*))'?/.freeze # Matches: 123, ?, '123', '12''3'
 
     def initialize(model_class)
       @model_class = model_class

data/lib/kasket/read_mixin.rb

@@ -8,6 +8,7 @@ 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]
 
@@ -16,7 +17,11 @@ module Kasket
           if ActiveRecord::VERSION::MAJOR < 5
             sql.to_kasket_query(self, args[1])
           else
-            sql.to_kasket_query(self, args[1].map(&:value_for_database))
+            if ActiveRecord::VERSION::STRING < '5.2'
+              sql.to_kasket_query(self, args[1].map(&:value_for_database))
+            else
+              sql.to_kasket_query(self)
+            end
           end
         else
           kasket_parser.parse(sanitize_sql(sql))
@@ -28,11 +33,27 @@ module Kasket
           find_by_sql_with_kasket_on_id_array(query[:key])
         else
           if value = Kasket.cache.read(query[:key])
-            if value.is_a?(Array)
+            # Identified a specific edge case where memcached server returns 0x00 binary protocol response with no data
+            # when the node is being rebooted which causes the Dalli memcached client to return a TrueClass object instead of nil
+            # see: https://github.com/petergoldstein/dalli/blob/31dabf19d3dd94b348a00a59fe5a7b8fa80ce3ad/lib/dalli/server.rb#L520
+            # and: https://github.com/petergoldstein/dalli/issues/390
+            #
+            # 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)
+            elsif value.is_a?(Array)
               filter_pending_records(find_by_sql_with_kasket_on_id_array(value))
             else
               filter_pending_records(Array.wrap(value).collect { |record| instantiate(record.dup) })
             end
+
+            payload = {
+              record_count: result_set.length,
+              class_name: to_s
+            }
+
+            ActiveSupport::Notifications.instrument('instantiation.active_record', payload) { result_set }
           else
             store_in_kasket(query[:key], find_by_sql_without_kasket(*args))
           end
@@ -43,11 +64,23 @@ module Kasket
     end
 
     def find_by_sql_with_kasket_on_id_array(keys)
-      key_attributes_map = Kasket.cache.read_multi(*keys)
-
-      found_keys, missing_keys = keys.partition {|k| key_attributes_map[k] }
-      found_keys.each {|k| key_attributes_map[k] = instantiate(key_attributes_map[k].dup) }
-      key_attributes_map.merge!(missing_records_from_db(missing_keys))
+      begin
+        key_attributes_map = Kasket.cache.read_multi(*keys)
+      rescue RuntimeError => e
+        # Elasticache Memcached has a bug where it returns a 0x00 binary protocol response with no data
+        # during a reboot, causing the Dalli memcached client to throw a RuntimeError during a multi get
+        # (https://github.com/petergoldstein/dalli/blob/v2.7.7/lib/dalli/server.rb#L148).
+        # Fall back to the database when this happens.
+        if e.message == "multi_response has completed"
+          key_attributes_map = missing_records_from_db(keys)
+        else
+          raise
+        end
+      else
+        found_keys, missing_keys = keys.partition {|k| key_attributes_map[k] }
+        found_keys.each {|k| key_attributes_map[k] = instantiate(key_attributes_map[k].dup) }
+        key_attributes_map.merge!(missing_records_from_db(missing_keys))
+      end
 
       key_attributes_map.values.compact
     end
@@ -76,7 +109,7 @@ module Kasket
       if records.size == 1
         records.first.store_in_kasket(key)
       elsif records.empty?
-        ActiveRecord::Base.logger.info("[KASKET] would have stored an empty resultset") if ActiveRecord::Base.logger
+        ActiveRecord::Base.logger.debug("[KASKET] would have stored an empty resultset") if ActiveRecord::Base.logger
       elsif records.size <= Kasket::CONFIGURATION[:max_collection_size]
         if records.all?(&:kasket_cacheable?)
           instance_keys = records.map(&:store_in_kasket)

data/lib/kasket/relation_mixin.rb

@@ -1,16 +1,19 @@
 # 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)
       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'
+          arel.to_kasket_query(klass, (@values[:where].to_h.values + Array(@values[:limit])))
         else
-          arel.to_kasket_query(klass, (@values[:where].binds.map(&:value_for_database) + Array(@values[:limit])))
+          arel.to_kasket_query(klass)
         end
       end
     rescue TypeError # unsupported object in ast
-      return nil
+      nil
     end
   end
 end

data/lib/kasket/select_manager_mixin.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 module Kasket
   module SelectManagerMixin
+    # binds can be removed once we stop supporting Rails < 5.2
     def to_kasket_query(klass, binds = [])
       begin
         query = Kasket::Visitor.new(klass, binds).accept(ast)

data/lib/kasket/version.rb

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

data/lib/kasket/visitor.rb

@@ -3,6 +3,7 @@ require 'arel'
 
 module Kasket
   class Visitor < Arel::Visitors::Visitor
+    # binds can be removed once we stop supporting Rails < 5.2
     def initialize(model_class, binds)
       @model_class = model_class
       @binds       = binds.dup
@@ -75,6 +76,7 @@ module Kasket
     def visit_Arel_Nodes_JoinSource(node, *_)
       return :unsupported if !node.left || node.right.any?
       return :unsupported unless node.left.is_a?(Arel::Table)
+
       visit(node.left)
     end
 
@@ -85,6 +87,7 @@ module Kasket
     def visit_Arel_Nodes_And(node, *_)
       attributes = node.children.map { |child| visit(child) }
       return :unsupported if attributes.include?(:unsupported)
+
       attributes.sort! { |pair1, pair2| pair1[0].to_s <=> pair2[0].to_s }
       { attributes: attributes }
     end
@@ -112,18 +115,26 @@ module Kasket
     end
 
     def literal(node, *_)
-      if node == '?'
-        @binds.shift.last.to_s
+      if ActiveRecord::VERSION::STRING < '5.2'
+        if node == '?'
+          @binds.shift.last.to_s
+        else
+          node.to_s
+        end
       else
         node.to_s
       end
     end
 
-    def visit_Arel_Nodes_BindParam(_x, *_)
+    def visit_Arel_Nodes_BindParam(node, *_)
       if ActiveRecord::VERSION::MAJOR < 5
         visit(@binds.shift[1])
       else
-        visit(@binds.shift)
+        if ActiveRecord::VERSION::STRING < '5.2'
+          visit(@binds.shift)
+        else
+          visit(node.value.value) unless node.value.value.nil?
+        end
       end
     end
 
@@ -131,11 +142,13 @@ module Kasket
       node.map {|value| visit(value) }
     end
 
-    def visit_Arel_Nodes_Casted(node, *_)
-      case node.val
-      when nil    then nil
-      when String then node.val
-      else quoted(node.val)
+    if ActiveRecord::VERSION::STRING < '5.2'
+      def visit_Arel_Nodes_Casted(node, *_)
+        case node.val
+        when nil    then nil
+        when String then node.val
+        else quoted(node.val)
+        end
       end
     end
 

data/lib/kasket.rb

@@ -17,8 +17,8 @@ module Kasket
 
   CONFIGURATION = { # rubocop:disable Style/MutableConstant
     max_collection_size: 100,
-    write_through:       false,
-    default_expires_in:  nil
+    write_through: false,
+    default_expires_in: nil
   }
 
   module_function
@@ -33,8 +33,8 @@ module Kasket
     ActiveRecord::Base.extend(Kasket::ConfigurationMixin)
 
     if defined?(ActiveRecord::Relation)
-      ActiveRecord::Relation.send(:include, Kasket::RelationMixin)
-      Arel::SelectManager.send(:include, Kasket::SelectManagerMixin)
+      ActiveRecord::Relation.include Kasket::RelationMixin
+      Arel::SelectManager.include Kasket::SelectManagerMixin
     end
   end
 
@@ -42,10 +42,15 @@ module Kasket
     @cache_store = ActiveSupport::Cache.lookup_store(options)
   end
 
-  def self.cache
+  def self.cache_store
     @cache_store ||= Rails.cache
   end
 
+  # Alias cache_store to cache
+  class << self
+    alias_method :cache, :cache_store
+  end
+
   # Keys are the records being saved.
   # Values are either the saved record, or nil if the record has been destroyed.
   def self.pending_records

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.9.1
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,22 +17,22 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,7 +74,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,7 +88,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,7 +102,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,7 +116,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-rg
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,7 +130,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -173,15 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A write back caching layer on active record