bullet 1.7.5 → 1.7.6

data/VERSION

@@ -1 +1 @@
-1.7.5
+1.7.6

data/bullet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullet}
-  s.version = "1.7.5"
+  s.version = "1.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-02-12}
+  s.date = %q{2010-03-07}
   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 = [
@@ -44,11 +44,11 @@ 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/bullet/association_for_chris_spec.rb",
-     "spec/bullet/association_for_peschkaj_spec.rb",
-     "spec/bullet/association_spec.rb",
+    "spec/spec_helper.rb",
      "spec/bullet/counter_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/bullet/association_spec.rb",
+     "spec/bullet/association_for_chris_spec.rb",
+     "spec/bullet/association_for_peschkaj_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bullet/active_record.rb

@@ -94,6 +94,15 @@ module Bullet
           result
         end
       end
+      
+      ::ActiveRecord::Associations::HasManyThroughAssociation.class_eval do
+        alias_method :origin_has_cached_counter?, :has_cached_counter?
+        def has_cached_counter?
+          result = origin_has_cached_counter?
+          Bullet::Counter.add_counter_cache(@owner, @reflection.name) unless result
+          result
+        end
+      end
     end
   end
 end

data/spec/bullet/association_for_chris_spec.rb

@@ -2,93 +2,95 @@ 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
+describe Bullet::Association do
 
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :locations do |t|
-        t.column :name, :string
-      end
+  describe "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 :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
+        create_table :deals do |t|
+          t.column :name, :string
+          t.column :hotel_id, :integer
+        end
       end
     end
-  end
 
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
+    def teardown_db
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.drop_table(table)
+      end
     end
-  end
 
-  class Location < ActiveRecord::Base
-    has_many :hotels
-  end
+    class Location < ActiveRecord::Base
+      has_many :hotels
+    end
   
-  class Hotel < ActiveRecord::Base
-    belongs_to :location
-    has_many :deals
-  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
+    class Deal < ActiveRecord::Base
+      belongs_to :hotel
+      has_one :location, :through => :hotel
+    end
 
-  before(:all) do
-    setup_db
+    before(:all) do
+      setup_db
     
-    location1 = Location.create(:name => "location1")
-    location2 = Location.create(:name => "location2")
+      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")
+      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
+      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
+    after(:all) do
+      teardown_db
+    end
 
-  before(:each) do
-    Bullet::Association.start_request
-  end
+    before(:each) do
+      Bullet::Association.start_request
+    end
 
-  after(:each) do
-    Bullet::Association.end_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
+    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
-    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
+    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
-    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
+    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
-    Bullet::Association.should_not be_has_unused_preload_associations
   end
 end

data/spec/bullet/association_for_peschkaj_spec.rb

@@ -2,83 +2,85 @@ 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/20
-describe Bullet::Association, 'for peschkaj' do
+describe Bullet::Association do
+  
+  describe "for peschkaj" do
+    def setup_db
+      ActiveRecord::Schema.define(:version => 1) do
+        create_table :categories do |t|
+          t.column :name, :string
+        end
 
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :categories do |t|
-        t.column :name, :string
-      end
+        create_table :submissions do |t|
+          t.column :name, :string
+          t.column :category_id, :integer
+          t.column :user_id, :integer
+        end
 
-      create_table :submissions do |t|
-        t.column :name, :string
-        t.column :category_id, :integer
-        t.column :user_id, :integer
+        create_table :users do |t|
+          t.column :name, :string
+          t.column :category_id, :integer
+        end
       end
+    end
 
-      create_table :users do |t|
-        t.column :name, :string
-        t.column :category_id, :integer
+    def teardown_db
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.drop_table(table)
       end
     end
-  end
 
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
+    class Category < ActiveRecord::Base
+      has_many :submissions
+      has_many :users
     end
-  end
-
-  class Category < ActiveRecord::Base
-    has_many :submissions
-    has_many :users
-  end
   
-  class Submission < ActiveRecord::Base
-    belongs_to :category
-    belongs_to :user
-  end
+    class Submission < ActiveRecord::Base
+      belongs_to :category
+      belongs_to :user
+    end
   
-  class User < ActiveRecord::Base
-    has_one :submission
-    belongs_to :category
-  end
+    class User < ActiveRecord::Base
+      has_one :submission
+      belongs_to :category
+    end
 
-  before(:all) do
-    setup_db
+    before(:all) do
+      setup_db
     
-    category1 = Category.create(:name => "category1")
-    category2 = Category.create(:name => "category2")
+      category1 = Category.create(:name => "category1")
+      category2 = Category.create(:name => "category2")
     
-    user1 = User.create(:name => 'user1', :category => category1)
-    user2 = User.create(:name => 'user2', :category => category1)
+      user1 = User.create(:name => 'user1', :category => category1)
+      user2 = User.create(:name => 'user2', :category => category1)
     
-    submission1 = category1.submissions.create(:name => "submission1", :user => user1)
-    submission2 = category1.submissions.create(:name => "submission2", :user => user2)
-    submission3 = category2.submissions.create(:name => "submission3", :user => user1)
-    submission4 = category2.submissions.create(:name => "submission4", :user => user2)
-  end
+      submission1 = category1.submissions.create(:name => "submission1", :user => user1)
+      submission2 = category1.submissions.create(:name => "submission2", :user => user2)
+      submission3 = category2.submissions.create(:name => "submission3", :user => user1)
+      submission4 = category2.submissions.create(:name => "submission4", :user => user2)
+    end
 
-  after(:all) do
-    teardown_db
-  end
+    after(:all) do
+      teardown_db
+    end
 
-  before(:each) do
-    Bullet::Association.start_request
-  end
+    before(:each) do
+      Bullet::Association.start_request
+    end
 
-  after(:each) do
-    Bullet::Association.end_request
-  end
+    after(:each) do
+      Bullet::Association.end_request
+    end
   
-  it "should not detect unused preload associations" do
-    category = Category.find_by_name('category1', :include => {:submissions => :user}, :order => "id DESC")
-    category.submissions.map do |submission|
-      submission.name
-      submission.user.name
+    it "should not detect unused preload associations" do
+      category = Category.find_by_name('category1', :include => {:submissions => :user}, :order => "id DESC")
+      category.submissions.map do |submission|
+        submission.name
+        submission.user.name
+      end
+      Bullet::Association.check_unused_preload_associations
+      Bullet::Association.should_not be_unused_preload_associations_for(Category, :submissions)
+      Bullet::Association.should_not be_unused_preload_associations_for(Submission, :user)
     end
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_unused_preload_associations_for(Category, :submissions)
-    Bullet::Association.should_not be_unused_preload_associations_for(Submission, :user)
   end
 end

data/spec/bullet/association_spec.rb

@@ -706,26 +706,26 @@ describe Bullet::Association, 'has_many :as' do
     user3 = User.create(:name => 'third')
     user4 = User.create(:name => 'fourth')
 
-    pet1 = User.create(:name => "dog")
-    pet2 = User.create(:name => "dog")
-    pet3 = User.create(:name => "cat")
-    pet4 = User.create(:name => "cat")
-
-    user1.votes << Vote.create(:vote => 10)
-    user1.votes << Vote.create(:vote => 20)
-    user2.votes << Vote.create(:vote => 10)
-    user2.votes << Vote.create(:vote => 20)
-    user3.votes << Vote.create(:vote => 10)
-    user3.votes << Vote.create(:vote => 20)
-    user4.votes << Vote.create(:vote => 10)
-    user4.votes << Vote.create(:vote => 20)
+    pet1 = user1.pets.create(:name => "dog")
+    pet2 = user1.pets.create(:name => "dog")
+    pet3 = user2.pets.create(:name => "cat")
+    pet4 = user2.pets.create(:name => "cat")
+
+    user1.votes.create(:vote => 10)
+    user1.votes.create(:vote => 20)
+    user2.votes.create(:vote => 10)
+    user2.votes.create(:vote => 20)
+    user3.votes.create(:vote => 10)
+    user3.votes.create(:vote => 20)
+    user4.votes.create(:vote => 10)
+    user4.votes.create(:vote => 20)
 
     news1 = News.create(:name => 'first')
     news2 = News.create(:name => 'second')
-    news1.votes << Vote.create(:vote => 10)
-    news1.votes << Vote.create(:vote => 20)
-    news2.votes << Vote.create(:vote => 10)
-    news2.votes << Vote.create(:vote => 20)
+    news1.votes.create(:vote => 10)
+    news1.votes.create(:vote => 20)
+    news2.votes.create(:vote => 10)
+    news2.votes.create(:vote => 20)
   end
 
   after(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bullet
 version: !ruby/object:Gem::Version 
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 +08:00
+date: 2010-03-07 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -72,8 +72,8 @@ 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_spec.rb
 - spec/bullet/association_for_chris_spec.rb
 - spec/bullet/association_for_peschkaj_spec.rb
-- spec/bullet/association_spec.rb
-- spec/bullet/counter_spec.rb
-- spec/spec_helper.rb