bullet 1.7.1 → 1.7.2

data/README.textile

@@ -168,6 +168,8 @@ after(:each)
 end
 </code></pre>
 
+Don't forget enabling bullet in test environment.
+
 ****************************************************************************
 
 h2. Links

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.2

data/bullet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.7.1"
+  s.version = "1.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-26}
   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 = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/bullet/notification.rb",
      "lib/bulletware.rb",
      "rails/init.rb",
+     "spec/bullet/association_for_chris_spec.rb",
      "spec/bullet/association_spec.rb",
      "spec/bullet/counter_spec.rb",
      "spec/spec.opts",
@@ -42,9 +43,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A plugin to kill N+1 queries and unused eager loading}
   s.test_files = [
-    "spec/spec_helper.rb",
+    "spec/bullet/association_for_chris_spec.rb",
+     "spec/bullet/association_spec.rb",
      "spec/bullet/counter_spec.rb",
-     "spec/bullet/association_spec.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bullet/action_controller.rb

@@ -26,8 +26,6 @@ module Bullet
           def process(request, response, method = :perform_action, *arguments)
             Bullet.start_request
             response = origin_process(request, response, method = :perform_action, *arguments)
-            puts response.body
-            puts response.headers
             
             if Bullet.notification?
               if response.headers["type"] and response.headers["type"].include? 'text/html' and response.body =~ %r{<html.*</html>}m

data/spec/bullet/association_for_chris_spec.rb

@@ -0,0 +1,94 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+# This test is just used for http://github.com/flyerhzm/bullet/issues/#issue/14
+describe Bullet::Association, 'for chris' do
+
+  def setup_db
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :locations do |t|
+        t.column :name, :string
+      end
+
+      create_table :hotels do |t|
+        t.column :name, :string
+        t.column :location_id, :integer
+      end
+
+      create_table :deals do |t|
+        t.column :name, :string
+        t.column :hotel_id, :integer
+      end
+    end
+  end
+
+  def teardown_db
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
+  end
+
+  class Location < ActiveRecord::Base
+    has_many :hotels
+  end
+  
+  class Hotel < ActiveRecord::Base
+    belongs_to :location
+    has_many :deals
+  end
+  
+  class Deal < ActiveRecord::Base
+    belongs_to :hotel
+    has_one :location, :through => :hotel
+  end
+
+  before(:all) do
+    setup_db
+    
+    location1 = Location.create(:name => "location1")
+    location2 = Location.create(:name => "location2")
+    
+    hotel1 = location1.hotels.create(:name => "hotel1")
+    hotel2 = location1.hotels.create(:name => "hotel2")
+    hotel3 = location2.hotels.create(:name => "hotel3")
+    hotel4 = location2.hotels.create(:name => "hotel4")
+    
+    deal1 = hotel1.deals.create(:name => "deal1")
+    deal2 = hotel2.deals.create(:name => "deal2")
+    deal3 = hotel3.deals.create(:name => "deal3")
+    deal4 = hotel4.deals.create(:name => "deal4")
+  end
+
+  after(:all) do
+    teardown_db
+  end
+
+  before(:each) do
+    Bullet::Association.start_request
+  end
+
+  after(:each) do
+    Bullet::Association.end_request
+  end
+  
+  it "should detect unpreload association from deal to hotel" do
+    Deal.find(:all).each do |deal|
+      deal.hotel.location.name
+    end
+    Bullet::Association.should be_detecting_unpreloaded_association_for(Deal, :hotel)
+  end
+  
+  it "should detect unpreload association from hotel to location" do
+    Deal.find(:all, :include => :hotel).each do |deal|
+      deal.hotel.location.name
+    end
+    Bullet::Association.should be_detecting_unpreloaded_association_for(Hotel, :location)
+  end
+  
+  it "should not detect unpreload association" do
+    Deal.find(:all, :include => {:hotel => :location}).each do |deal|
+      deal.hotel.location.name
+    end
+    Bullet::Association.should_not be_has_unused_preload_associations
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bullet
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +08:00
+date: 2009-11-26 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - lib/bullet/notification.rb
 - lib/bulletware.rb
 - rails/init.rb
+- spec/bullet/association_for_chris_spec.rb
 - spec/bullet/association_spec.rb
 - spec/bullet/counter_spec.rb
 - spec/spec.opts
@@ -70,6 +71,7 @@ signing_key:
 specification_version: 3
 summary: A plugin to kill N+1 queries and unused eager loading
 test_files: 
-- spec/spec_helper.rb
-- spec/bullet/counter_spec.rb
+- spec/bullet/association_for_chris_spec.rb
 - spec/bullet/association_spec.rb
+- spec/bullet/counter_spec.rb
+- spec/spec_helper.rb