kasket 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e08086b85cd83c48b921c9ecc8ea4699831d1f96
-  data.tar.gz: 9aa1ba1f4777aaac0a9a7043aff17910448c3c0e
+  metadata.gz: 93f38ae32096f6d38c40ec8e071aefbea80ba2bb
+  data.tar.gz: 2124e3dd8e4db113864df757f1b68fc531b0f5f0
 SHA512:
-  metadata.gz: 2cfcbb81078feba7b513eb161d5c1a7f4a9144261360c4a33f4263163ee2ffabee35f7638dc374f7cdedcf78f9770441d5dad95f7b578363919e990ce8f63583
-  data.tar.gz: 05c0e405329c695da87f967b7d30b14834f3f543a7a6b8d04b9ca6fb8758e6eb30dbf0918a22b037a051e478484bfb86f230c44aea43f588eeb9ea20687f8ad3
+  metadata.gz: 338d55dfd6a71fc39457ab48dfcf9701dec02692973246d4b68cd15ffff6724e3446d0f394e298ece70e009a380c177e19f4d4143d854e9d16a1b0405b54ff90
+  data.tar.gz: fac78ac0b241f55c017cc1300b1cc6d675883312262a3cee5d6edd189eaa609d25d9f12f71856318585fc15163c258798129f30b1194ce1ac4de7371275096a9

data/lib/kasket/configuration_mixin.rb

@@ -89,8 +89,11 @@ module Kasket
 
     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
+        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

data/lib/kasket/read_mixin.rb

@@ -3,7 +3,8 @@ module Kasket
 
     def self.extended(base)
       class << base
-        alias_method_chain :find_by_sql, :kasket
+        alias_method :find_by_sql_without_kasket, :find_by_sql
+        alias_method :find_by_sql, :find_by_sql_with_kasket
       end
     end
 
@@ -12,7 +13,11 @@ module Kasket
 
       if use_kasket?
         if sql.respond_to?(:to_kasket_query)
-          query = sql.to_kasket_query(self, args[1])
+          if ActiveRecord::VERSION::MAJOR < 5
+            query = sql.to_kasket_query(self, args[1])
+          else
+            query = sql.to_kasket_query(self, args[1].map(&:value_for_database))
+          end
         else
           query = kasket_parser.parse(sanitize_sql(sql))
         end

data/lib/kasket/relation_mixin.rb

@@ -2,7 +2,11 @@ module Kasket
   module RelationMixin
     def to_kasket_query(binds = nil)
       if arel.is_a?(Arel::SelectManager)
-        arel.to_kasket_query(klass, (binds || bind_values))
+       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/version.rb

@@ -1,8 +1,9 @@
 module Kasket
+  VERSION = '4.3.0'
   class Version
-    MAJOR = 4
-    MINOR = 2
-    PATCH = 1
+    MAJOR = Kasket::VERSION.split('.')[0]
+    MINOR = Kasket::VERSION.split('.')[1]
+    PATCH = Kasket::VERSION.split('.')[2]
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     PROTOCOL = 4
   end

data/lib/kasket/visitor.rb

@@ -45,7 +45,7 @@ module Kasket
 
     def visit_Arel_Nodes_SelectCore(node, *_)
       return :unsupported if node.groups.any?
-      return :unsupported if node.having
+      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
@@ -62,7 +62,11 @@ module Kasket
     end
 
     def visit_Arel_Nodes_Limit(node, *_)
-      {:limit => node.value.to_i}
+     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, *_)
@@ -109,7 +113,11 @@ module Kasket
     end
 
     def visit_Arel_Nodes_BindParam(x, *_)
-      visit(@binds.shift[1])
+      if ActiveRecord::VERSION::MAJOR < 5
+        visit(@binds.shift[1])
+      else
+        visit(@binds.shift)
+      end
     end
 
     def visit_Array(node, *_)
@@ -120,9 +128,8 @@ module Kasket
       quoted(node.val)
     end
 
-    #TODO: We are actually not using this?
     def quoted(node)
-      @model_class.connection.quote(node, self.last_column)
+      @model_class.connection.quote(node)
     end
 
     alias :visit_String                :literal

data/lib/kasket/write_mixin.rb

@@ -129,8 +129,11 @@ module Kasket
       end
 
       class << model_class
-        alias_method_chain :transaction, :kasket_disabled
-        alias_method_chain :update_counters, :kasket_clearing
+        alias_method :transaction_without_kasket_disabled, :transaction
+        alias_method :transaction, :transaction_with_kasket_disabled
+
+        alias_method :update_counters_without_kasket_clearing, :update_counters
+        alias_method :update_counters, :update_counters_with_kasket_clearing
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-02-18 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.3'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,7 +102,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-rg
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,7 +116,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,7 +130,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test_after_commit
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="