kasket 0.7.8 → 0.8.0

data/.gitignore

@@ -17,7 +17,6 @@ tmtags
 coverage
 rdoc
 pkg
-*.gemspec
 
 ## PROJECT::SPECIFIC
 test/debug.log

data/Rakefile

@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+
 require 'rubygems'
 require 'rake'
 require 'lib/kasket'

data/lib/kasket.rb

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

data/lib/kasket/configuration_mixin.rb

@@ -30,17 +30,21 @@ module Kasket
     end
 
     def kasket_key_for(attribute_value_pairs)
-      key = attribute_value_pairs.map do |attribute, value|
-        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/
-        key = Digest::MD5.hexdigest(key)
+      if attribute_value_pairs.size == 1 && attribute_value_pairs[0][0] == :id && attribute_value_pairs[0][1].is_a?(Array)
+        attribute_value_pairs[0][1].map {|id| kasket_key_for_id(id)}
+      else
+        key = attribute_value_pairs.map do |attribute, value|
+          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/
+          key = Digest::MD5.hexdigest(key)
+        end
+
+        kasket_key_prefix + key
       end
-
-      kasket_key_prefix + key
     end
 
     def kasket_key_for_id(id)

data/lib/kasket/query_parser.rb

@@ -12,7 +12,7 @@ module Kasket
       @model_class = model_class
       @supported_query_pattern = /^select \* from (?:`|")#{@model_class.table_name}(?:`|") where \((.*)\)(|\s+limit 1)\s*$/i
       @table_and_column_pattern = /(?:(?:`|")?#{@model_class.table_name}(?:`|")?\.)?(?:`|")?(\w+)(?:`|")?/ # Matches: `users`.id, `users`.`id`, users.id, id
-      @key_eq_value_pattern = /^[\(\s]*#{@table_and_column_pattern}\s+=\s+#{VALUE}[\)\s]*$/ # Matches: KEY = VALUE, (KEY = VALUE), ()(KEY = VALUE))
+      @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)
@@ -39,10 +39,19 @@ module Kasket
       def parse_condition(conditions = '', *values)
         values = values.dup
         conditions.split(AND).inject([]) do |pairs, condition|
-          matched, column_name, sql_value = *(@key_eq_value_pattern.match(condition))
+          matched, column_name, operator, sql_value = *(@key_eq_value_pattern.match(condition))
           if matched
-            value = sql_value == '?' ? values.shift : sql_value
-            pairs << [column_name.to_sym, value.gsub(/''|\\'/, "'")]
+            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
+            else
+              value = sql_value == '?' ? values.shift : sql_value
+              pairs << [column_name.to_sym, value.gsub(/''|\\'/, "'")]
+            end
           else
             return nil
           end

data/lib/kasket/read_mixin.rb

@@ -8,20 +8,44 @@ module Kasket
     end
 
     def find_by_sql_with_kasket(sql)
-      sql = sanitize_sql(sql)
-      query = kasket_parser.parse(sql) if use_kasket?
+      query = kasket_parser.parse(sanitize_sql(sql)) if use_kasket?
       if query && has_kasket_index_on?(query[:index])
-
-        if value = Rails.cache.read(query[:key])
-          Array.wrap(value).collect { |record| instantiate(record.dup) }
+        if query[:key].is_a?(Array)
+          find_by_sql_with_kasket_on_id_array(sql, query)
         else
-          store_in_kasket(query[:key], find_by_sql_without_kasket(sql))
+          if value = Rails.cache.read(query[:key])
+            Array.wrap(value).collect { |record| instantiate(record.dup) }
+          else
+            store_in_kasket(query[:key], find_by_sql_without_kasket(sql))
+          end
         end
       else
         find_by_sql_without_kasket(sql)
       end
     end
 
+    def find_by_sql_with_kasket_on_id_array(sql, query)
+      key_value_map = Rails.cache.read_multi(*query[:key])
+      missing_ids = []
+
+      key_value_map.each do |key, value|
+        if value.nil?
+          missing_ids << key.split('=').last.to_i
+        else
+          key_value_map[key] = instantiate(value.dup)
+        end
+      end
+
+      without_kasket do
+        find(missing_ids).each do |instance|
+          instance.store_in_kasket
+          key_value_map[instance.kasket_key] = instance
+        end
+      end
+
+      key_value_map.values
+    end
+
     protected
 
       def store_in_kasket(key, records)
@@ -33,7 +57,8 @@ module Kasket
             Rails.cache.write(key, record.instance_variable_get(:@attributes).dup)
             key
           end
-          Rails.cache.write(key, keys)
+
+          Rails.cache.write(key, keys) if key.is_a?(String)
         end
         records
       end

data/test/find_some_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/helper'
 class FindSomeTest < ActiveSupport::TestCase
   fixtures :blogs, :posts
 
-  should_eventually "cache find(id, id) calls" do
+  should "cache find(id, id) calls" do
     post1 = Post.first
     post2 = Post.last
 
@@ -18,14 +18,14 @@ class FindSomeTest < ActiveSupport::TestCase
     Post.find(post1.id, post2.id)
   end
 
-  should_eventually "only lookup the records that are not in the cache" do
+  should "only lookup the records that are not in the cache" do
     post1 = Post.first
     post2 = Post.last
     assert_equal(post1, Post.find(post1.id))
     assert(Rails.cache.read(post1.kasket_key))
     assert_nil(Rails.cache.read(post2.kasket_key))
 
-    Post.expects(:find_by_sql_without_kasket).with("SELECT * FROM \'posts\' WHERE (\'posts\'.\'id\' IN (#{post1.id},#{post2.id})) ").returns([post2])
+    Post.expects(:find_by_sql_without_kasket).with("SELECT * FROM \"posts\" WHERE (\"posts\".\"id\" = #{post2.id}) ").returns([post2])
     found_posts = Post.find(post1.id, post2.id)
     assert_equal([post1, post2].map(&:id).sort, found_posts.map(&:id).sort)
 
@@ -33,13 +33,4 @@ class FindSomeTest < ActiveSupport::TestCase
     found_posts = Post.find(post1.id, post2.id)
     assert_equal([post1, post2].map(&:id).sort, found_posts.map(&:id).sort)
   end
-
-  should_eventually "cache on index other than primary key" do
-    blog = blogs(:a_blog)
-    posts = Post.find_all_by_blog_id(blog.id)
-
-    Post.expects(:find_by_sql_without_kasket).never
-
-    assert_equal(posts, Post.find_all_by_blog_id(blog.id))
-  end
 end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'ruby-debug'
 require 'test/unit'
 require 'mocha'
 require 'shoulda'

data/test/parser_test.rb

@@ -25,6 +25,16 @@ class ParserTest < ActiveSupport::TestCase
       assert @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`id` = 2) LIMIT 1')
     end
 
+    should "support IN queries on id" do
+      parsed_query = @parser.parse('SELECT * FROM `posts` WHERE (`posts`.`id` IN (1,2,3))')
+      assert(parsed_query)
+      assert_equal([[:id, ['1', '2', '3']]], parsed_query[:attributes])
+    end
+
+    should "not support IN queries on other attributes" do
+      assert(!@parser.parse('SELECT * FROM `posts` WHERE (`posts`.`hest` IN (1,2,3))'))
+    end
+
     should "support vaguely formatted queries" do
       assert @parser.parse('SELECT * FROM "posts" WHERE (title = red AND blog_id = big)')
     end
@@ -66,11 +76,6 @@ class ParserTest < ActiveSupport::TestCase
       should "include the OR operator" do
         assert !@parser.parse('SELECT * FROM `posts` WHERE (title = red OR blog_id = big) LIMIT 2')
       end
-
-      should "include the IN operator" do
-        assert !@parser.parse('SELECT * FROM `posts` WHERE (id IN (1,2,3))')
-      end
-
     end
 
     context "key generation" do
@@ -84,6 +89,13 @@ class ParserTest < ActiveSupport::TestCase
         assert_match(/id=1\/title='title'$/, @parser.parse("SELECT * FROM `posts` WHERE (id = 1 AND title = 'title')")[:key])
       end
 
+      should "generate multiple keys on IN queries" do
+        keys = @parser.parse('SELECT * FROM `posts` WHERE (id IN (1,2))')[:key]
+        assert_instance_of(Array, keys)
+        assert_match(/id=1$/, keys[0])
+        assert_match(/id=2$/, keys[1])
+      end
+
       context "when limit 1" do
         should "add /first to the key if the index does not include id" do
           assert_match(/title='a'\/first$/, @parser.parse("SELECT * FROM `posts` WHERE (title = 'a') LIMIT 1")[:key])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kasket
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
   - 8
-  version: 0.7.8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -36,9 +39,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -50,9 +55,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -62,9 +69,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -74,9 +83,11 @@ dependencies:
   name: temping
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -129,23 +140,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A write back caching layer on active record