kasket 4.4.3 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba85f36144f05d60bbebcba8a11ff48b930d29cf
-  data.tar.gz: a0ac4b0539ecf1c19f700ec08318a17ea5f01c6f
+  metadata.gz: 5e93590bf7fe78f25a1d988db077414a374e0a93
+  data.tar.gz: cd462545f88c3a6e1721b9be75fee8e1c6ec6905
 SHA512:
-  metadata.gz: a25702c95434941d087060eb6c6cab9dd3843701efe293709cdd69de9c6a0ef2d11c9f194a69e9d4c4f703f3e3e1f2ede9970bb58cee42baa8db4b39aee43458
-  data.tar.gz: c68f3966ba94bc372ce16d7e2fd8996ed009ff362f49355181cdf471764b387d373cf540dda854531bd568de2115978b37f54b75a3252ba73b74dce2af46b606
+  metadata.gz: de430ca6f3a4ee7c0846c7f398cd01592dd7f8dad5972822f9d201f075a11d7c4b6648ab5a2c54afdf2dd5de2a7b4370462f1b7bf78eb855cdb7528e9698f15a
+  data.tar.gz: bb2894c5baad7af7865cb206c7293eee9534d5acd4a20022f360c125aeb55d58fcf630c05828090d6b9c31bb0891f878003f212e5f609055dd0b727329c6b6c9

data/lib/kasket.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_record'
 require 'active_support'
 
@@ -14,7 +15,7 @@ module Kasket
   autoload :SelectManagerMixin,     'kasket/select_manager_mixin'
   autoload :RelationMixin,          'kasket/relation_mixin'
 
-  CONFIGURATION = {:max_collection_size => 100, :write_through => false}
+  CONFIGURATION = { max_collection_size: 100, write_through: false } # rubocop:disable Style/MutableConstant
 
   module_function
 

data/lib/kasket/configuration_mixin.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
 require 'active_support'
 require "digest/md5"
 
 module Kasket
-
   module ConfigurationMixin
-
-    def without_kasket(&block)
+    def without_kasket
       old_value = Thread.current[:kasket_disabled] || false
       Thread.current[:kasket_disabled] = true
       yield
@@ -22,7 +21,10 @@ module Kasket
     end
 
     def kasket_key_prefix
-      @kasket_key_prefix ||= "kasket-#{Kasket::Version::PROTOCOL}/#{kasket_activerecord_version}/#{table_name}/version=#{column_names.join.sum}/"
+      @kasket_key_prefix ||= begin
+        column_hash = column_names.join.sum
+        "kasket-#{Kasket::Version::PROTOCOL}/#{kasket_activerecord_version}/#{table_name}/version=#{column_hash}/"
+      end
     end
 
     def kasket_activerecord_version
@@ -36,7 +38,7 @@ module Kasket
         key = attribute_value_pairs.map do |attribute, value|
           column = columns_hash[attribute.to_s]
           value = nil if value.blank?
-          attribute.to_s << '=' << quoted_value_for_column(value, column)
+          "#{attribute}=#{quoted_value_for_column(value, column)}"
         end.join('/')
 
         if key.size > (250 - kasket_key_prefix.size) || key =~ /\s/
@@ -65,12 +67,14 @@ module Kasket
       kasket_indices.include?(sorted_attributes)
     end
 
-    def has_kasket(options = {})
+    def has_kasket
       has_kasket_on :id
     end
 
     def has_kasket_on(*args)
       attributes = args.sort_by!(&:to_s)
+
+      # enforce id index
       if attributes != [:id] && !has_kasket_index_on?([:id])
         has_kasket_on(:id)
       end
@@ -93,14 +97,14 @@ module Kasket
 
     def quoted_value_for_column(value, column)
       if column
-        casted_value = case
-        when connection.respond_to?(:type_cast_from_column)
-          connection.type_cast_from_column(column, value)
-        when column.respond_to?(:type_cast_for_database)
-          column.type_cast_for_database(value) # Rails 4.2
-        else
-          column.type_cast(value)
-        end
+        casted_value =
+          if connection.respond_to?(:type_cast_from_column)
+            connection.type_cast_from_column(column, value)
+          elsif column.respond_to?(:type_cast_for_database)
+            column.type_cast_for_database(value) # Rails 4.2
+          else
+            column.type_cast(value)
+          end
         connection.quote(casted_value).downcase
       else
         value.to_s

data/lib/kasket/dirty_mixin.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 module Kasket
   module DirtyMixin
     def kasket_dirty_methods(*method_names)
       method_names.each do |method|
         without = "without_kasket_update_#{method}"
-        return if method_defined? without
+        break if method_defined? without
 
         alias_method without, method
         define_method method do |*args, &block|

data/lib/kasket/query_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Kasket
   class QueryParser
     # Examples:
@@ -10,16 +11,21 @@ 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
-      @table_and_column_pattern = /(?:(?:`|")?#{@model_class.table_name}(?:`|")?\.)?(?:`|")?([a-zA-Z]\w*)(?:`|")?/ # Matches: `users`.id, `users`.`id`, users.id, id
-      @key_eq_value_pattern = /^[\(\s]*#{@table_and_column_pattern}\s+(=|IN)\s+#{VALUE}[\)\s]*$/ # Matches: KEY = VALUE, (KEY = VALUE), ()(KEY = VALUE))
+
+      # 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
 
     def parse(sql)
       if match = @supported_query_pattern.match(sql)
-        where, limit = match[2], match[3]
+        where = match[2]
+        limit = match[3]
 
-        query = Hash.new
+        query = {}
         query[:attributes] = sorted_attribute_value_pairs(where)
         return nil if query[:attributes].nil?
 
@@ -38,33 +44,32 @@ module Kasket
 
     private
 
-      def sorted_attribute_value_pairs(conditions)
-        if attributes = parse_condition(conditions)
-          attributes.sort { |pair1, pair2| pair1[0].to_s <=> pair2[0].to_s }
-        end
+    def sorted_attribute_value_pairs(conditions)
+      if attributes = parse_condition(conditions)
+        attributes.sort { |pair1, pair2| pair1[0].to_s <=> pair2[0].to_s }
       end
+    end
 
-      def parse_condition(conditions = '', *values)
-        values = values.dup
-        conditions.split(AND).inject([]) do |pairs, condition|
-          matched, column_name, operator, sql_value = *(@key_eq_value_pattern.match(condition))
-          if matched
-            if operator == 'IN'
-              if column_name == 'id'
-                values = sql_value[1..(-2)].split(',').map(&:strip)
-                pairs << [column_name.to_sym, values]
-              else
-                return nil
-              end
+    def parse_condition(conditions = '', *values)
+      values = values.dup
+      conditions.split(AND).inject([]) do |pairs, condition|
+        matched, column_name, operator, sql_value = *@key_eq_value_pattern.match(condition)
+        if matched
+          if operator == 'IN'
+            if column_name == 'id'
+              values = sql_value[1..-2].split(',').map(&:strip)
+              pairs << [column_name.to_sym, values]
             else
-              value = sql_value == '?' ? values.shift : sql_value
-              pairs << [column_name.to_sym, value.gsub(/''|\\'/, "'")]
+              return nil
             end
           else
-            return nil
+            value = sql_value == '?' ? values.shift : sql_value
+            pairs << [column_name.to_sym, value.gsub(/''|\\'/, "'")]
           end
+        else
+          return nil
         end
       end
-
+    end
   end
 end

data/lib/kasket/read_mixin.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 module Kasket
   module ReadMixin
-
     def self.extended(base)
       class << base
         alias_method :find_by_sql_without_kasket, :find_by_sql
@@ -12,14 +12,14 @@ module Kasket
       sql = args[0]
 
       if use_kasket?
-        if sql.respond_to?(:to_kasket_query)
+        query = if sql.respond_to?(:to_kasket_query)
           if ActiveRecord::VERSION::MAJOR < 5
-            query = sql.to_kasket_query(self, args[1])
+            sql.to_kasket_query(self, args[1])
           else
-            query = sql.to_kasket_query(self, args[1].map(&:value_for_database))
+            sql.to_kasket_query(self, args[1].map(&:value_for_database))
           end
         else
-          query = kasket_parser.parse(sanitize_sql(sql))
+          kasket_parser.parse(sanitize_sql(sql))
         end
       end
 
@@ -45,8 +45,8 @@ module Kasket
     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) }
+      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
@@ -65,11 +65,11 @@ module Kasket
     def missing_records_from_db(missing_keys)
       return {} if missing_keys.empty?
 
-      id_key_map = Hash[missing_keys.map{|key| [key.split('=').last.to_i, key] }]
+      id_key_map = Hash[missing_keys.map {|key| [key.split('=').last.to_i, key] }]
 
-      found = without_kasket { where(:id => id_key_map.keys).to_a }
+      found = without_kasket { where(id: id_key_map.keys).to_a }
       found.each(&:store_in_kasket)
-      Hash[found.map{|record| [id_key_map[record.id], record] }]
+      Hash[found.map {|record| [id_key_map[record.id], record] }]
     end
 
     def store_in_kasket(key, records)

data/lib/kasket/relation_mixin.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 module Kasket
   module RelationMixin
     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))
-       else
-         arel.to_kasket_query(klass, (@values[:where].binds.map(&:value_for_database) + Array(@values[:limit])))
-       end
+        if ActiveRecord::VERSION::MAJOR < 5
+          arel.to_kasket_query(klass, (binds || bind_values))
+        else
+          arel.to_kasket_query(klass, (@values[:where].binds.map(&:value_for_database) + Array(@values[:limit])))
+        end
       end
     rescue TypeError # unsupported object in ast
       return nil

data/lib/kasket/select_manager_mixin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Kasket
   module SelectManagerMixin
     def to_kasket_query(klass, binds = [])
@@ -17,7 +18,7 @@ module Kasket
         # return nil if !query[:index].include?(:id)
       end
 
-      if query[:index].size > 1 && query[:attributes].any? { |attribute, value| value.is_a?(Array) }
+      if query[:index].size > 1 && query[:attributes].any? { |_attribute, value| value.is_a?(Array) }
         return nil
       end
 

data/lib/kasket/version.rb

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

data/lib/kasket/visitor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'arel'
 
 module Kasket
@@ -13,6 +14,8 @@ module Kasket
       super
     end
 
+    private
+
     def last_column=(col)
       Thread.current[:arel_visitors_to_sql_last_column] = col
     end
@@ -29,7 +32,7 @@ module Kasket
       return :unsupported if node.with
       return :unsupported if node.offset
       return :unsupported if node.lock
-      return :unsupported if node.orders.any?
+      return :unsupported if ordered?(node)
       return :unsupported if node.cores.size != 1
 
       query = visit_Arel_Nodes_SelectCore(node.cores[0])
@@ -45,9 +48,9 @@ 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 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.source || node.source.empty?
       return :unsupported if node.projections.size != 1
 
       select = node.projections[0]
@@ -62,28 +65,28 @@ 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
+      if ActiveRecord::VERSION::MAJOR < 5
+        { limit: node.value.to_i }
+      else
+        { limit: visit(node.value).to_i }
+      end
     end
 
     def visit_Arel_Nodes_JoinSource(node, *_)
       return :unsupported if !node.left || node.right.any?
-      return :unsupported if !node.left.is_a?(Arel::Table)
+      return :unsupported unless node.left.is_a?(Arel::Table)
       visit(node.left)
     end
 
     def visit_Arel_Table(node, *_)
-      {:from => node.name}
+      { from: node.name }
     end
 
     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 }
+      { attributes: attributes }
     end
 
     def visit_Arel_Nodes_In(node, *_)
@@ -94,12 +97,12 @@ module Kasket
     end
 
     def visit_Arel_Nodes_Equality(node, *_)
-      right = case node.right
-      when false then 0 # This should probably be removed when Rails 3.2 is not supported anymore
-      when nil   then nil
-      else
-        visit(node.right)
-      end
+      right =
+        case node.right
+        when false then 0 # This should probably be removed when Rails 3.2 is not supported anymore
+        when nil   then nil
+        else visit(node.right)
+        end
       [visit(node.left), right]
     end
 
@@ -110,14 +113,13 @@ module Kasket
 
     def literal(node, *_)
       if node == '?'
-        column, value = @binds.shift
-        value.to_s
+        @binds.shift.last.to_s
       else
         node.to_s
       end
     end
 
-    def visit_Arel_Nodes_BindParam(x, *_)
+    def visit_Arel_Nodes_BindParam(_x, *_)
       if ActiveRecord::VERSION::MAJOR < 5
         visit(@binds.shift[1])
       else
@@ -133,11 +135,11 @@ module Kasket
       quoted(node.val) unless node.val.nil?
     end
 
-    def visit_TrueClass(node)
+    def visit_TrueClass(_node)
       1
     end
 
-    def visit_FalseClass(node)
+    def visit_FalseClass(_node)
       0
     end
 
@@ -145,8 +147,13 @@ module Kasket
       @model_class.connection.quote(node)
     end
 
-    alias :visit_String                :literal
-    alias :visit_Fixnum                :literal
-    alias :visit_Arel_Nodes_SqlLiteral :literal
+    # any non `id asc` ordering
+    def ordered?(node)
+      !node.orders.all? { |o| o.is_a?(Arel::Nodes::Ascending) && o.expr.name == "id" }
+    end
+
+    alias_method :visit_String, :literal
+    alias_method :visit_Fixnum, :literal
+    alias_method :visit_Arel_Nodes_SqlLiteral, :literal
   end
 end

data/lib/kasket/write_mixin.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 module Kasket
   module WriteMixin
-
     module ClassMethods
       def remove_from_kasket(ids)
         Array(ids).each do |id|
@@ -38,20 +38,25 @@ module Kasket
       end
 
       def kasket_keys(options = {})
-        attribute_sets = [attributes.symbolize_keys]
+        attribute_sets = [attributes]
 
         previous_changes = options[:previous_changes] || previous_changes()
         if previous_changes.present?
-          old_attributes = Hash[*previous_changes.map { |attribute, values| [attribute, values[0]] }.flatten].symbolize_keys
+          old_attributes = previous_changes.each_with_object({}) do |(attribute, (old, _)), all|
+            all[attribute.to_s] = old
+          end
           attribute_sets << old_attributes.reverse_merge(attribute_sets[0])
+          attribute_sets << attribute_sets[0].merge(old_attributes)
         end
 
         keys = []
         self.class.kasket_indices.each do |index|
-          keys += attribute_sets.map do |attribute_set|
-            key = self.class.kasket_key_for(index.map { |attribute| [attribute, attribute_set[attribute]]})
-            index.include?(:id) ? key : [key, key + '/first']
-          end
+          keys.concat(
+            attribute_sets.map do |attribute_set|
+              key = self.class.kasket_key_for(index.map { |attribute| [attribute, attribute_set[attribute.to_s]] })
+              index.include?(:id) ? key : [key, key + '/first']
+            end
+          )
         end
 
         keys.flatten!
@@ -85,7 +90,7 @@ module Kasket
 
       if ActiveRecord::VERSION::MAJOR == 3
         def update_column(column, value)
-          previous_changes = {column => [attributes[column.to_s], value]}
+          previous_changes = { column => [attributes[column.to_s], value] }
           result = super
           clear_kasket_indices(previous_changes: previous_changes)
           result
@@ -93,7 +98,9 @@ module Kasket
       else
         def update_columns(new_attributes)
           previous_attributes = attributes
-          previous_changes = new_attributes.each_with_object({}) { |(k, v), all| all[k] = [previous_attributes[k.to_s], v] }
+          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
@@ -109,7 +116,7 @@ module Kasket
       end
 
       def kasket_after_destroy
-        Kasket.add_pending_record(self, destroyed = true)
+        Kasket.add_pending_record(self, _destroyed = true)
       end
 
       def committed!(*)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.4.4
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="