flyerhzm-bullet 1.5.3 → 1.5.4

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/bullet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]

data/lib/bullet/active_record.rb

@@ -12,8 +12,10 @@ module Bullet
             if records 
               if records.size > 1
                 Bullet::Association.add_possible_objects(records)
+                Bullet::Counter.add_possible_objects(records)
               elsif records.size == 1
                 Bullet::Association.add_impossible_object(records.first)
+                Bullet::Counter.add_impossible_object(records)
               end
             end
 

data/lib/bullet/counter.rb

@@ -8,6 +8,8 @@ module Bullet
 
       def end_request
         @@klazz_associations = nil
+        @@possible_objects = nil
+        @@impossible_objects = nil
       end
 
       def need_counter_caches?
@@ -36,10 +38,26 @@ module Bullet
       
       def add_counter_cache(object, associations)
         klazz = object.class
-        klazz_associations[klazz] ||= []
-        klazz_associations[klazz] << associations
-        klazz_associations[klazz].flatten!
-        klazz_associations[klazz].uniq!
+        if (!possible_objects[klazz].nil? and possible_objects[klazz].include?(object)) and
+           (impossible_objects[klazz].nil? or !impossible_objects[klazz].include?(object))
+          klazz_associations[klazz] ||= []
+          klazz_associations[klazz] << associations
+          unique(klazz_associations[klazz])
+        end
+      end
+
+      def add_possible_objects(objects)
+        klazz= objects.first.class
+        possible_objects[klazz] ||= []
+        possible_objects[klazz] << objects
+        unique(possible_objects[klazz])
+      end
+
+      def add_impossible_object(object)
+        klazz = object.class
+        impossible_objects[klazz] ||= []
+        impossible_objects[klazz] << object
+        impossible_objects[klazz].uniq!
       end
       
       private
@@ -53,6 +71,11 @@ module Bullet
           end
           messages
         end
+        
+        def unique(array)
+          array.flatten!
+          array.uniq!
+        end
 
         def call_stack_messages
           []
@@ -61,6 +84,14 @@ module Bullet
         def klazz_associations
           @@klazz_associations ||= {}
         end
+
+        def possible_objects
+          @@possible_objects ||= {}
+        end
+
+        def impossible_objects
+          @@impossible_objects ||= {}
+        end
     end
   end
 end

data/spec/bullet_counter_spec.rb

@@ -60,12 +60,17 @@ describe Bullet::Counter do
     end
     Bullet::Counter.should be_need_counter_caches
   end
+  
+  it "should not need coounter cache with only one object" do
+    Country.first.cities.size
+    Bullet::Counter.should_not be_need_counter_caches
+  end
 
   it "should not need counter cache with part of cities" do
     Country.all.each do |country|
       country.cities(:conditions => ["name = ?", 'first']).size
     end
-    Bullet::Counter.should_not be_need_counter_cache
+    Bullet::Counter.should_not be_need_counter_caches
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flyerhzm-bullet
 version: !ruby/object:Gem::Version 
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors: 
 - Richard Huang
@@ -42,7 +42,6 @@ files:
 - tasks/bullet_tasks.rake
 has_rdoc: false
 homepage: http://github.com/flyerhzm/bullet
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -63,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A plugin to kill N+1 queries and unused eager loading