kasket 3.2.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd8b1112932a3d14ed1e43ab61ad826ba02c5f0
-  data.tar.gz: 997f6891f0df65c1299a3d0da4f1e990a0c6a0fc
+  metadata.gz: e2a4548deae3c98ad894dbd54829ca55c5fcd0fa
+  data.tar.gz: 3f746fed7e8508b8d169974c9e660d35f1be92d2
 SHA512:
-  metadata.gz: 9eb57e261693839d9b4d81060fadf64737f528c8d37adcc3d3f98459e2947832dbcc3ac96379c2775cde2486731ccf5f1a3178a9ac49e376f93574154a1f7b90
-  data.tar.gz: 19c1289828483003fb8a979969aee6198ac4cbdbe47452b82cbbaa15dee26280c31f7a91559994afa4b856f960fce4411daa1ba9297bac265d6092f347173d32
+  metadata.gz: eb3b6225c51e1f02c72d9fe1af8c093ee5c6ae512ad127beae372e016b5ab08072db0020ad9059e0c1c46cb1362b12a36d78eb07da1af460e2a3e7d6e5bab291
+  data.tar.gz: d3f7df44370ca505b8c686d9a7d00534c7e6b8dd8e5d08ab30fd64080949486827239084915916d04c428cbeef01235c2189041cb450cd0756506b54bdb341ba

data/lib/kasket/configuration_mixin.rb

@@ -36,12 +36,7 @@ module Kasket
         key = attribute_value_pairs.map do |attribute, value|
           column = columns_hash[attribute.to_s]
           value = nil if value.blank?
-          quoted_value = if column
-            connection.quote(column.type_cast(value), column).downcase
-          else
-            value.to_s
-          end
-          attribute.to_s << '=' << quoted_value
+          attribute.to_s << '=' << quoted_value_for_column(value, column)
         end.join('/')
 
         if key.size > (250 - kasket_key_prefix.size) || key =~ /\s/
@@ -83,5 +78,19 @@ module Kasket
       extend DirtyMixin unless respond_to?(:kasket_dirty_methods)
       extend ReadMixin unless methods.map(&:to_sym).include?(:find_by_sql_with_kasket)
     end
+
+    private
+    def quoted_value_for_column(value, column)
+      if column
+        casted_value = if column.respond_to?(:type_cast_for_database)
+          column.type_cast_for_database(value) # Rails 4.2 and up
+        else
+          column.type_cast(value)
+        end
+        connection.quote(casted_value).downcase
+      else
+        value.to_s
+      end
+    end
   end
 end

data/lib/kasket/query_parser.rb

@@ -10,14 +10,14 @@ module Kasket
 
     def initialize(model_class)
       @model_class = model_class
-      @supported_query_pattern = /^select \* from (?:`|")#{@model_class.table_name}(?:`|") where \((.*)\)(|\s+limit 1)\s*$/i
+      @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))
     end
 
     def parse(sql)
       if match = @supported_query_pattern.match(sql)
-        where, limit = match[1], match[2]
+        where, limit = match[2], match[3]
 
         query = Hash.new
         query[:attributes] = sorted_attribute_value_pairs(where)

data/lib/kasket/relation_mixin.rb

@@ -1,9 +1,11 @@
 module Kasket
   module RelationMixin
-    def to_kasket_query(binds = [])
+    def to_kasket_query(binds = nil)
       if arel.is_a?(Arel::SelectManager)
-        arel.to_kasket_query(klass, binds)
+        arel.to_kasket_query(klass, (binds || bind_values))
       end
+    rescue TypeError # unsupported object in ast
+      return nil
     end
   end
 end

data/lib/kasket/version.rb

@@ -1,8 +1,8 @@
 module Kasket
   class Version
-    MAJOR = 3
-    MINOR = 2
-    PATCH = 0
+    MAJOR = 4
+    MINOR = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     PROTOCOL = 4
   end

data/lib/kasket/visitor.rb

@@ -5,6 +5,7 @@ module Kasket
     def initialize(model_class, binds)
       @model_class = model_class
       @binds       = binds.dup
+      super()
     end
 
     def accept(node)
@@ -107,13 +108,16 @@ module Kasket
       end
     end
 
-    # only gets used on 1.8.7
     def visit_Arel_Nodes_BindParam(x, *_)
-      @binds.shift[1]
+      visit(@binds.shift[1])
     end
 
     def visit_Array(node, *_)
-      node.map {|value| quoted(value) }
+      node.map {|value| visit(value) }
+    end
+
+    def visit_Arel_Nodes_Casted(node, *_)
+      quoted(node.val)
     end
 
     #TODO: We are actually not using this?

data/lib/kasket/write_mixin.rb

@@ -31,7 +31,7 @@ module Kasket
 
       def store_in_kasket
         if kasket_cacheable? && kasket_key
-          Kasket.cache.write(kasket_key, @attributes.dup)
+          Kasket.cache.write(kasket_key, @attributes.to_h.dup)
         end
       end
 
@@ -77,6 +77,7 @@ module Kasket
       end
 
       model_class.after_save :clear_kasket_indices
+      model_class.after_touch :clear_kasket_indices
       model_class.after_destroy :clear_kasket_indices
 
       model_class.alias_method_chain :reload, :kasket_clearing
@@ -89,4 +90,3 @@ module Kasket
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,21 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,7 +88,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="