kasket 0.8.2 → 0.8.3

data/kasket.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kasket}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mick Staugaard", "Eric Chapweske"]
-  s.date = %q{2010-08-31}
+  s.date = %q{2010-09-02}
   s.description = %q{puts a cap on your queries}
   s.email = %q{mick@staugaard.com}
   s.extra_rdoc_files = [

data/lib/kasket/read_mixin.rb

@@ -11,10 +11,14 @@ module Kasket
       query = kasket_parser.parse(sanitize_sql(sql)) if use_kasket?
       if query && has_kasket_index_on?(query[:index])
         if query[:key].is_a?(Array)
-          find_by_sql_with_kasket_on_id_array(sql, query)
+          find_by_sql_with_kasket_on_id_array(query[:key])
         else
           if value = Kasket.cache.read(query[:key])
-            Array.wrap(value).collect { |record| instantiate(record.dup) }
+            if value.is_a?(Array)
+              find_by_sql_with_kasket_on_id_array(value)
+            else
+              Array.wrap(value).collect { |record| instantiate(record.dup) }
+            end
           else
             store_in_kasket(query[:key], find_by_sql_without_kasket(sql))
           end
@@ -24,11 +28,11 @@ module Kasket
       end
     end
 
-    def find_by_sql_with_kasket_on_id_array(sql, query)
-      key_value_map = Kasket.cache.read_multi(*query[:key])
+    def find_by_sql_with_kasket_on_id_array(keys)
+      key_value_map = Kasket.cache.read_multi(*keys)
       missing_ids = []
 
-      query[:key].each do |key|
+      keys.each do |key|
         if value = key_value_map[key]
           key_value_map[key] = instantiate(value.dup)
         else
@@ -65,4 +69,3 @@ module Kasket
 
   end
 end
-

data/lib/kasket.rb

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

data/test/read_mixin_test.rb

@@ -4,31 +4,45 @@ class ReadMixinTest < ActiveSupport::TestCase
 
   context "find by sql with kasket" do
     setup do
-      @database_results = [ { 'id' => 1, 'title' => 'Hello' } ]
-      @records = @database_results.map { |r| Post.send(:instantiate, r) }
-      Post.stubs(:find_by_sql_without_kasket).returns(@records)
+      @post_database_result = { 'id' => 1, 'title' => 'Hello' }
+      @post_records = [Post.send(:instantiate, @post_database_result)]
+      Post.stubs(:find_by_sql_without_kasket).returns(@post_records)
+
+      @comment_database_result = [{ 'id' => 1, 'body' => 'Hello' }, { 'id' => 2, 'body' => 'World' }]
+      @comment_records = @comment_database_result.map {|r| Comment.send(:instantiate, r)}
+      Comment.stubs(:find_by_sql_without_kasket).returns(@comment_records)
     end
 
     should "handle unsupported sql" do
       Kasket.cache.expects(:read).never
       Kasket.cache.expects(:write).never
-      assert_equal @records, Post.find_by_sql_with_kasket('select unsupported sql statement')
+      assert_equal @post_records, Post.find_by_sql_with_kasket('select unsupported sql statement')
     end
 
     should "read results" do
-      Kasket.cache.write("kasket-#{Kasket::Version::STRING}/posts/version=3558/id=1", @database_results.first)
-      assert_equal [ @records.first ], Post.find_by_sql('SELECT * FROM `posts` WHERE (id = 1)')
+      Kasket.cache.write("kasket-#{Kasket::Version::STRING}/posts/version=3558/id=1", @post_database_result)
+      assert_equal @post_records, Post.find_by_sql('SELECT * FROM `posts` WHERE (id = 1)')
     end
 
     should "store results in kasket" do
       Post.find_by_sql('SELECT * FROM `posts` WHERE (id = 1)')
 
-      assert_equal @database_results.first, Kasket.cache.read("kasket-#{Kasket::Version::STRING}/posts/version=3558/id=1")
+      assert_equal @post_database_result, Kasket.cache.read("kasket-#{Kasket::Version::STRING}/posts/version=3558/id=1")
+    end
+
+    should "store multiple records in cache" do
+      Comment.find_by_sql('SELECT * FROM `comments` WHERE (post_id = 1)')
+      stored_value = Kasket.cache.read("kasket-#{Kasket::Version::STRING}/comments/version=3476/post_id=1")
+      assert_equal(["kasket-#{Kasket::Version::STRING}/comments/version=3476/id=1", "kasket-#{Kasket::Version::STRING}/comments/version=3476/id=2"], stored_value)
+      assert_equal(@comment_database_result, stored_value.map {|key| Kasket.cache.read(key)})
+
+      Comment.expects(:find_by_sql_without_kasket).never
+      assert_equal(@comment_records, Comment.find_by_sql('SELECT * FROM `comments` WHERE (post_id = 1)'))
     end
 
     context "modifying results" do
       setup do
-        Kasket.cache.write("kasket-#{Kasket::Version::STRING}/posts/version=3558/id=1", @database_results.first)
+        Kasket.cache.write("kasket-#{Kasket::Version::STRING}/posts/version=3558/id=1", @post_database_result)
         @record = Post.find_by_sql('SELECT * FROM `posts` WHERE (id = 1)').first
         @record.instance_variable_get(:@attributes)['id'] = 3
       end

data/test/test_models.rb

@@ -10,6 +10,8 @@ create_model :comment do
   end
 
   belongs_to :post
+
+  has_kasket_on :post_id
 end
 
 create_model :post do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kasket
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency