flyerhzm-bullet 1.5.6 → 1.5.7

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

data/bullet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.5.6"
+  s.version = "1.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-22}
   s.description = %q{The Bullet plugin is designed to help you increase your application's performance by reducing the number of queries it makes. It will watch your queries while you develop your application and notify you when you should add eager loading (N+1 queries) or when you're using eager loading that isn't necessary.}
   s.email = %q{flyerhzm@gmail.com}
   s.extra_rdoc_files = [

data/lib/bullet/active_record.rb

@@ -45,6 +45,17 @@ module Bullet
           Bullet::Association.define_association(self, reflection.name)
           origin_collection_reader_method(reflection, association_proxy_class)
         end
+      
+        # add include in named_scope
+        alias_method :origin_find_with_associations, :find_with_associations
+        def find_with_associations(options)
+          records = origin_find_with_associations(options)
+          records.each do |record|
+            Bullet::Association.add_association(record, merge_includes(scope(:find, :include), options[:include]))
+          end
+          Bullet::Association.add_eager_loadings(records, merge_includes(scope(:find, :include), options[:include]))
+          records
+        end
       end
 
       ::ActiveRecord::Associations::AssociationCollection.class_eval do

data/spec/bullet_association_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 describe Bullet::Association, 'has_many' do
   def setup_db
@@ -40,6 +40,11 @@ describe Bullet::Association, 'has_many' do
   class Post < ActiveRecord::Base
     belongs_to :category
     has_many :comments
+
+    named_scope :preload_posts, lambda { {:include => :comments} }
+    named_scope :in_category_name, lambda { |name|
+      { :conditions => ['categories.name = ?', name], :include => :category }
+    }
   end
   
   class Entry < ActiveRecord::Base
@@ -241,6 +246,40 @@ describe Bullet::Association, 'has_many' do
     end
   end
 
+  context "named_scope for_category_name" do
+   it "should detect preload with post => category" do
+     Post.in_category_name('first').all.each do |post|
+       post.category.name
+     end
+     Bullet::Association.should_not be_has_unpreload_associations
+   end
+   
+   it "should not be unused preload post => category" do
+     Post.in_category_name('first').all.each do |post|
+       post.name
+     end
+     Bullet::Association.should_not be_has_unpreload_associations
+     Bullet::Association.check_unused_preload_associations
+     Bullet::Association.should be_has_unused_preload_associations
+   end
+  end
+
+  context "named_scope preload_posts" do
+    it "should no preload post => comments with named_scope" do
+      Post.preload_posts.each do |post|
+        post.comments.collect(&:name)
+      end
+      Bullet::Association.should_not be_has_unpreload_associations
+    end
+
+    it "should unused preload with named_scope" do
+      Post.preload_posts.collect(&:name)
+      Bullet::Association.should_not be_has_unpreload_associations
+      Bullet::Association.check_unused_preload_associations
+      Bullet::Association.should be_has_unused_preload_associations
+    end
+  end
+
   context "no unused" do
     it "should no unused only display only one post => comment" do
       Post.find(:all, :include => :comments).each do |post|

data/spec/bullet_counter_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 describe Bullet::Counter do
   def setup_db

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flyerhzm-bullet
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: []