bullet 2.3.0 → 2.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (2.3.0)
+    bullet (2.3.1)
       uniform_notifier (~> 1.0.0)
 
 GEM
@@ -104,7 +104,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.32)
-    uniform_notifier (1.0.1)
+    uniform_notifier (1.0.2)
 
 PLATFORMS
   ruby

data/README.textile

@@ -1,4 +1,4 @@
-h1. Bullet
+h1. Bullet !https://gemnasium.com/flyerhzm/bullet.png?travis(Dependency Status)!:https://gemnasium.com/flyerhzm/bullet
 
 !https://secure.travis-ci.org/flyerhzm/bullet.png!:http://travis-ci.org/flyerhzm/bullet
 

data/lib/bullet/detector/association.rb

@@ -20,29 +20,29 @@ module Bullet
         end
 
         def add_object_associations(object, associations)
-          object_associations.add(object.ar_key, associations)
+          object_associations.add(object.ar_key, associations) if object.id
         end
 
         def add_call_object_associations(object, associations)
-          if object.id
-            call_object_associations.add(object.ar_key, associations)
-          end
+          call_object_associations.add(object.ar_key, associations) if object.id
         end
 
         def add_possible_objects(object_or_objects)
           if object_or_objects.is_a? Array
             object_or_objects.each { |object| possible_objects.add object.ar_key }
+          elsif object_or_objects.is_a? ::ActiveRecord::Base
+            possible_objects.add object_or_objects.ar_key if object_or_objects.id
           else
-            possible_objects.add object_or_objects.ar_key
+            # do nothing
           end
         end
 
         def add_impossible_object(object)
-          impossible_objects.add object.ar_key
+          impossible_objects.add object.ar_key if object.id
         end
 
         def add_eager_loadings(objects, associations)
-          object_ar_keys = Array(objects).map(&:ar_key)
+          object_ar_keys = objects.map(&:ar_key)
 
           to_add = nil
           to_merge, to_delete = [], []

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end
 

data/spec/bullet/detector/association_spec.rb

@@ -47,6 +47,10 @@ module Bullet
           Association.send(:possible_objects).should be_include(@post1.ar_key)
           Association.send(:possible_objects).should be_include(@post2.ar_key)
         end
+
+        it "should not raise error if object is nil" do
+          lambda { Association.add_possible_objects(nil) }.should_not raise_error
+        end
       end
 
       context ".add_impossible_object" do
@@ -70,7 +74,7 @@ module Bullet
         end
 
         it "should merge objects, associations pair for existing eager_loadings" do
-          Association.add_eager_loadings(@post1, :association1)
+          Association.add_eager_loadings([@post1], :association1)
           Association.add_eager_loadings([@post1, @post2], :association2)
           Association.send(:eager_loadings).should be_include([@post1.ar_key], :association1)
           Association.send(:eager_loadings).should be_include([@post1.ar_key], :association2)
@@ -79,7 +83,7 @@ module Bullet
 
         it "should delete objects, associations pair for existing eager_loadings" do
           Association.add_eager_loadings([@post1, @post2], :association1)
-          Association.add_eager_loadings(@post1, :association2)
+          Association.add_eager_loadings([@post1], :association2)
           Association.send(:eager_loadings).should be_include([@post1.ar_key], :association1)
           Association.send(:eager_loadings).should be_include([@post1.ar_key], :association2)
           Association.send(:eager_loadings).should be_include([@post2.ar_key], :association1)

data/spec/bullet/detector/unused_eager_association_spec.rb

@@ -12,13 +12,13 @@ module Bullet
         end
 
         it "should get call associations if object and association are both in eager_loadings and call_object_associations" do
-          UnusedEagerAssociation.add_eager_loadings(@post, :association)
+          UnusedEagerAssociation.add_eager_loadings([@post], :association)
           UnusedEagerAssociation.add_call_object_associations(@post, :association)
           UnusedEagerAssociation.send(:call_associations, @post.ar_key, Set.new([:association])).should == [:association]
         end
 
         it "should not get call associations if not exist in call_object_associations" do
-          UnusedEagerAssociation.add_eager_loadings(@post, :association)
+          UnusedEagerAssociation.add_eager_loadings([@post], :association)
           UnusedEagerAssociation.send(:call_associations, @post.ar_key, Set.new([:association])).should be_empty
         end
       end
@@ -29,7 +29,7 @@ module Bullet
         end
 
         it "should return empty if associations exist in call_association" do
-          UnusedEagerAssociation.add_eager_loadings(@post, :association)
+          UnusedEagerAssociation.add_eager_loadings([@post], :association)
           UnusedEagerAssociation.add_call_object_associations(@post, :association)
           UnusedEagerAssociation.send(:diff_object_association, @post.ar_key, Set.new([:association])).should be_empty
         end
@@ -50,7 +50,7 @@ module Bullet
         it "should not create notification if object_association_diff is empty" do
           UnusedEagerAssociation.clear
           UnusedEagerAssociation.add_object_associations(@post, :association)
-          UnusedEagerAssociation.add_eager_loadings(@post, :association)
+          UnusedEagerAssociation.add_eager_loadings([@post], :association)
           UnusedEagerAssociation.add_call_object_associations(@post, :association)
           UnusedEagerAssociation.send(:diff_object_association, @post.ar_key, Set.new([:association])).should be_empty
           UnusedEagerAssociation.should_not_receive(:create_notification).with("Post", [:association])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &70204227570640 !ruby/object:Gem::Requirement
+  requirement: &70233469813360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204227570640
+  version_requirements: *70233469813360
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2125983168310894132
+      hash: 3928584312604954980
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: