kasket 4.9.1 → 4.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e9005963ca629245005b0c9a2a9d94cb9023fac9cc12327045e25eaca547e0
-  data.tar.gz: e7aec95609b6918646f3b2b420d5af038ef171888ac98cdea4c0fb16cf6ce086
+  metadata.gz: a786cf4a5580eadc1ad695d662795a160dde563176371c9c0176542eadc1da6c
+  data.tar.gz: b9261e224b6aaec4327931a5d723b3fb872cca314a6a5b68681c61b357945fdc
 SHA512:
-  metadata.gz: f19bd6ca3a60073c738907e20052d461cdcc0139a1c300765ed3b029022107d7c477b6a5e6437bb34d73de5d8e2c6050eac3e6834ec6c7f27c3e7e1e5a0fa200
-  data.tar.gz: effe82d0f1620cc7742407a46054b558675ac061050af22313daccdc52dc30204c5ae02c67f91aeea64ce07f4c687d2a6eb699c132a0914284d2554cec0d014b
+  metadata.gz: daea000b865281f12ae6fd70752f4d1418dadb00a3747452f7db9aa52230c071b8d87b23a37cd0b43a0d3a6db292c418293d25d3b97872f7a597b49b5bb81e5a
+  data.tar.gz: f3625ddb2690f619d1f93aa2bcfdff5c72dd3b0f6debe2f19646ef6fba030d206ccab0e920fed37d0869eb8532cb1cc44adbc0d7955cfe215e938327465817ea

data/README.md

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

data/lib/kasket/query_parser.rb

@@ -12,26 +12,43 @@ module Kasket
     def initialize(model_class)
       @model_class = model_class
 
-      @supported_query_pattern = /^select\s+((?:`|")#{@model_class.table_name}(?:`|")\.)?\* from (?:`|")#{@model_class.table_name}(?:`|") where (.*?)(|\s+limit 1)\s*$/i
+      @supported_query_pattern = /^select\s+(.+?)\s+from (?:`|")#{@model_class.table_name}(?:`|") where (.*?)(|\s+limit 1)\s*$/i
 
+      @star_pattern = /^((`|")#{@model_class.table_name}\2\.)?\*$/
       # Matches: `users`.id, `users`.`id`, users.id, id
       @table_and_column_pattern = /(?:(?:`|")?#{@model_class.table_name}(?:`|")?\.)?(?:`|")?([a-zA-Z]\w*)(?:`|")?/
       # Matches: KEY = VALUE, (KEY = VALUE), ()(KEY = VALUE))
       @key_eq_value_pattern = /^[\(\s]*#{@table_and_column_pattern}\s+(=|IN)\s+#{VALUE}[\)\s]*$/
     end
 
+    ##
+    # Parses a SQL query to produce a kasket query
+    #
+    # @param sql [String] the sql query to parse
+    # @return [Hash|nil] the kasket query, or nil if the sql query is not supported
     def parse(sql)
       if match = @supported_query_pattern.match(sql)
+        select = match[1]
+        unless @star_pattern.match? select
+          # If we're not selecting all columns using star, then ensure all columns are selected explicitly
+          select_columns = select.split(/\s*,\s*/).map do |s|
+            break unless column_match = @table_and_column_pattern.match(s)
+
+            column_match[1]
+          end.uniq
+          columns = @model_class.column_names
+          return unless columns.size == select_columns.size && (columns - select_columns).empty?
+        end
         where = match[2]
         limit = match[3]
 
         query = {}
         query[:attributes] = sorted_attribute_value_pairs(where)
-        return nil if query[:attributes].nil?
+        return if query[:attributes].nil?
 
-        if query[:attributes].size > 1 && query[:attributes].map(&:last).any? {|a| a.is_a?(Array)}
+        if query[:attributes].size > 1 && query[:attributes].map(&:last).any?(Array)
           # this is a query with IN conditions AND other conditions
-          return nil
+          return
         end
 
         query[:index] = query[:attributes].map(&:first)

data/lib/kasket/read_mixin.rb

@@ -64,23 +64,11 @@ module Kasket
     end
 
     def find_by_sql_with_kasket_on_id_array(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 = 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))
 
       key_attributes_map.values.compact
     end

data/lib/kasket/version.rb

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

data/lib/kasket/visitor.rb

@@ -52,11 +52,18 @@ module Kasket
       return :unsupported if ActiveRecord::VERSION::MAJOR < 5 ? node.having : node.havings.present?
       return :unsupported if node.set_quantifier
       return :unsupported if !node.source || node.source.empty?
-      return :unsupported if node.projections.size != 1
+      return :unsupported if node.projections.empty?
 
       select = node.projections[0]
       select = select.name if select.respond_to?(:name)
-      return :unsupported if select != '*'
+      if select != '*'
+        # If we're not selecting all columns using star, then ensure all columns are selected explicitly
+        column_names = @model_class.column_names
+        return :unsupported unless node.projections.size == column_names.size
+
+        projection_names = node.projections.map { |p| p.name if p.respond_to?(:name) }.compact
+        return unless (column_names - projection_names).empty?
+      end
 
       parts = [visit(node.source)]
 

data/lib/kasket/write_mixin.rb

@@ -40,7 +40,12 @@ module Kasket
       def kasket_keys(options = {})
         attribute_sets = [attributes]
 
-        previous_changes = options[:previous_changes] || previous_changes()
+        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
         if previous_changes.present?
           old_attributes = previous_changes.each_with_object({}) do |(attribute, (old, _)), all|
             all[attribute.to_s] = old

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.9.1
+  version: 4.10.4
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,118 +31,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: bump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-rg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: puts a cap on your queries
 email:
 - mick@zendesk.com
@@ -180,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A write back caching layer on active record