flyerhzm-bullet 1.5.7 → 1.5.8

data/VERSION

@@ -1 +1 @@
-1.5.7
+1.5.8

data/bullet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.5.7"
+  s.version = "1.5.8"
 
   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

@@ -31,7 +31,7 @@ module Bullet
           records = [records].flatten.compact.uniq
           return if records.empty?
           records.each do |record|
-            Bullet::Association.add_association(record, associations)
+            Bullet::Association.add_object_associations(record, associations)
           end
           Bullet::Association.add_eager_loadings(records, associations)
           origin_preload_associations(records, associations, preload_options={})
@@ -50,10 +50,12 @@ module Bullet
         alias_method :origin_find_with_associations, :find_with_associations
         def find_with_associations(options)
           records = origin_find_with_associations(options)
+          associations = merge_includes(scope(:find, :include), options[:include])
           records.each do |record|
-            Bullet::Association.add_association(record, merge_includes(scope(:find, :include), options[:include]))
+            Bullet::Association.add_object_associations(record, associations)
+            Bullet::Association.add_call_object_associations(record, associations)
           end
-          Bullet::Association.add_eager_loadings(records, merge_includes(scope(:find, :include), options[:include]))
+          Bullet::Association.add_eager_loadings(records, associations)
           records
         end
       end

data/lib/bullet/association.rb

@@ -38,7 +38,7 @@ module Bullet
         unique(unused_preload_associations[klazz])
       end
 
-      def add_association(object, associations)
+      def add_object_associations(object, associations)
         object_associations[object] ||= []
         object_associations[object] << associations
         unique(object_associations[object])

data/spec/bullet_association_spec.rb

@@ -255,12 +255,10 @@ describe Bullet::Association, 'has_many' do
    end
    
    it "should not be unused preload post => category" do
-     Post.in_category_name('first').all.each do |post|
-       post.name
-     end
+     Post.in_category_name('first').all.collect(&:name)
      Bullet::Association.should_not be_has_unpreload_associations
      Bullet::Association.check_unused_preload_associations
-     Bullet::Association.should be_has_unused_preload_associations
+     Bullet::Association.should_not be_has_unused_preload_associations
    end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flyerhzm-bullet
 version: !ruby/object:Gem::Version 
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors: 
 - Richard Huang