kasket 1.0.3 → 1.0.4

data/lib/kasket.rb

@@ -3,6 +3,7 @@ require 'active_record'
 require 'active_support'
 
 require 'kasket/active_record_patches'
+require 'kasket/version'
 
 module Kasket
   autoload :ConfigurationMixin, 'kasket/configuration_mixin'
@@ -11,13 +12,6 @@ module Kasket
 
   CONFIGURATION = {:max_collection_size => 100}
 
-  class Version
-    MAJOR = 1
-    MINOR = 0
-    PATCH = 3
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
-  end
-
   module_function
 
   def setup(options = {})

data/lib/kasket/read_mixin.rb

@@ -41,14 +41,16 @@ module Kasket
         end
       end
 
-      without_kasket do
-        find(missing_ids).each do |instance|
-          instance.store_in_kasket
-          key_value_map[instance.kasket_key] = instance
+      if missing_ids.any?
+        without_kasket do
+          find_all_by_id(missing_ids).each do |instance|
+            instance.store_in_kasket
+            key_value_map[instance.kasket_key] = instance
+          end
         end
       end
 
-      key_value_map.values
+      key_value_map.values.compact
     end
 
     protected

data/lib/kasket/version.rb

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

data/test/find_some_test.rb

@@ -3,34 +3,53 @@ require File.expand_path("helper", File.dirname(__FILE__))
 class FindSomeTest < ActiveSupport::TestCase
   fixtures :blogs, :posts
 
-  should "cache find(id, id) calls" do
-    post1 = Post.first
-    post2 = Post.last
+  def setup
+    @post1 = Post.first
+    @post2 = Post.last
+    Post.find(@post1.id, @post2.id)
+    assert Kasket.cache.read(@post1.kasket_key)
+    assert Kasket.cache.read(@post2.kasket_key)
+  end
 
-    assert_nil(Kasket.cache.read(post1.kasket_key))
-    assert_nil(Kasket.cache.read(post2.kasket_key))
+  should "use cache for find(id, id) calls" do
+    Post.connection.expects(:select_all).never
+    Post.find(@post1.id, @post2.id)
+  end
 
-    Post.find(post1.id, post2.id)
+  should "cache when found using find(id, id) calls" do
+    Kasket.cache.delete(@post1.kasket_key)
+    Kasket.cache.delete(@post2.kasket_key)
 
-    assert(Kasket.cache.read(post1.kasket_key))
-    assert(Kasket.cache.read(post2.kasket_key))
-    Post.connection.expects(:select_all).never
-    Post.find(post1.id, post2.id)
+    Post.find(@post1.id, @post2.id)
+
+    assert Kasket.cache.read(@post1.kasket_key)
+    assert Kasket.cache.read(@post2.kasket_key)
   end
 
   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(Kasket.cache.read(post1.kasket_key))
-    assert_nil(Kasket.cache.read(post2.kasket_key))
+    Kasket.cache.delete(@post2.kasket_key)
 
-    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)
+    # has to lookup post2 via db
+    Post.expects(:find_by_sql_without_kasket).returns([@post2])
+    found_posts = Post.find(@post1.id, @post2.id)
+    assert_equal [@post1, @post2].map(&:id).sort, found_posts.map(&:id).sort
 
+    # now all are cached
     Post.expects(:find_by_sql_without_kasket).never
-    found_posts = Post.find(post1.id, post2.id)
-    assert_equal([post1, post2].map(&:id).sort, found_posts.map(&:id).sort)
+    found_posts = Post.find(@post1.id, @post2.id)
+    assert_equal [@post1, @post2].map(&:id).sort, found_posts.map(&:id).sort
+  end
+
+  context "unfound" do
+    should "ignore unfound when using find_all_by_id" do
+      found_posts = Post.find_all_by_id([@post1.id, 1231232])
+      assert_equal [@post1.id], found_posts.map(&:id)
+    end
+
+    should "not ignore unfound when using find" do
+      assert_raise ActiveRecord::RecordNotFound do
+        Post.find(@post1.id, 1231232)
+      end
+    end
   end
 end

data/test/helper.rb

@@ -18,6 +18,8 @@ require 'kasket'
 
 Kasket.setup
 
+require 'shoulda'
+
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
 
@@ -58,4 +60,4 @@ module Rails
   end
 end
 
-require 'test_models'
+require 'test_models'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,6 +138,7 @@ files:
 - lib/kasket/query_parser.rb
 - lib/kasket/read_mixin.rb
 - lib/kasket/reload_association_mixin.rb
+- lib/kasket/version.rb
 - lib/kasket/write_mixin.rb
 - lib/kasket.rb
 - README.rdoc
@@ -168,6 +169,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4530626145164262218
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: