kasket 0.7.7 → 0.7.8

data/lib/kasket.rb

@@ -14,7 +14,7 @@ module Kasket
   class Version
     MAJOR = 0
     MINOR = 7
-    PATCH = 7
+    PATCH = 8
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 

data/lib/kasket/configuration_mixin.rb

@@ -31,11 +31,9 @@ module Kasket
 
     def kasket_key_for(attribute_value_pairs)
       key = attribute_value_pairs.map do |attribute, value|
-        if (column = columns_hash[attribute.to_s]) && column.number?
-          value = convert_number_column_value(value)
-        end
-
-        attribute.to_s + '=' + connection.quote(value, column)
+        column = columns_hash[attribute.to_s]
+        value = nil if value.blank?
+        attribute.to_s + '=' + connection.quote(column.type_cast(value), column)
       end.join('/')
 
       if key.size > (250 - kasket_key_prefix.size) || key =~ /\s/
@@ -45,18 +43,6 @@ module Kasket
       kasket_key_prefix + key
     end
 
-    def convert_number_column_value(value)
-      if value == false
-        0
-      elsif value == true
-        1
-      elsif value.is_a?(String) && value.blank?
-        nil
-      else
-        value
-      end
-    end
-
     def kasket_key_for_id(id)
       kasket_key_for([['id', id]])
     end

data/test/parser_test.rb

@@ -9,11 +9,11 @@ class ParserTest < ActiveSupport::TestCase
     end
 
     should "extract conditions" do
-      assert_equal [[:color, "red"], [:size, "big"]], @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`color` = red AND `posts`.`size` = big)')[:attributes]
+      assert_equal [[:blog_id, "big"], [:title, "red"]], @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`title` = red AND `posts`.`blog_id` = big)')[:attributes]
     end
 
     should "extract required index" do
-      assert_equal [:color, :size], @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`color` = red AND `posts`.`size` = big)')[:index]
+      assert_equal [:blog_id, :title], @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`title` = red AND `posts`.`blog_id` = big)')[:index]
     end
 
     should "only support queries against its model's table" do
@@ -26,7 +26,7 @@ class ParserTest < ActiveSupport::TestCase
     end
 
     should "support vaguely formatted queries" do
-      assert @parser.parse('SELECT * FROM "posts" WHERE (color = red AND size = big)')
+      assert @parser.parse('SELECT * FROM "posts" WHERE (title = red AND blog_id = big)')
     end
 
     context "extract options" do
@@ -44,27 +44,27 @@ class ParserTest < ActiveSupport::TestCase
     context "unsupported queries" do
 
       should "include advanced limits" do
-        assert !@parser.parse('SELECT * FROM `posts` WHERE (color = red AND size = big) LIMIT 2')
+        assert !@parser.parse('SELECT * FROM `posts` WHERE (title = red AND blog_id = big) LIMIT 2')
       end
 
       should "include joins" do
-        assert !@parser.parse('SELECT * FROM `posts`, `trees` JOIN ON apple.tree_id = tree.id WHERE (color = red)')
+        assert !@parser.parse('SELECT * FROM `posts`, `trees` JOIN ON apple.tree_id = tree.id WHERE (title = red)')
       end
 
       should "include specific selects" do
-        assert !@parser.parse('SELECT id FROM `posts` WHERE (color = red)')
+        assert !@parser.parse('SELECT id FROM `posts` WHERE (title = red)')
       end
 
       should "include offset" do
-        assert !@parser.parse('SELECT * FROM `posts` WHERE (color = red) LIMIT 1 OFFSET 2')
+        assert !@parser.parse('SELECT * FROM `posts` WHERE (title = red) LIMIT 1 OFFSET 2')
       end
 
       should "include order" do
-        assert !@parser.parse('SELECT * FROM `posts` WHERE (color = red) ORDER DESC')
+        assert !@parser.parse('SELECT * FROM `posts` WHERE (title = red) ORDER DESC')
       end
 
       should "include the OR operator" do
-        assert !@parser.parse('SELECT * FROM `posts` WHERE (color = red OR size = big) LIMIT 2')
+        assert !@parser.parse('SELECT * FROM `posts` WHERE (title = red OR blog_id = big) LIMIT 2')
       end
 
       should "include the IN operator" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 7
-  version: 0.7.7
+  - 8
+  version: 0.7.8
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -07:00
+date: 2010-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency