bullet 2.0.0.beta.2 → 2.1.0

data/spec/bullet/association_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
-describe Bullet::Association, 'has_many' do
+describe Bullet::Detector::Association, 'has_many' do
 
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
@@ -75,7 +75,7 @@ describe Bullet::Association, 'has_many' do
     has_many :posts
     belongs_to :newspaper
   end
-  
+
   class Newspaper < ActiveRecord::Base
     has_many :writers, :class_name => "BaseUser"
   end
@@ -85,7 +85,7 @@ describe Bullet::Association, 'has_many' do
 
   before(:all) do
     setup_db
-    
+
     newspaper1 = Newspaper.create(:name => "First Newspaper")
     newspaper2 = Newspaper.create(:name => "Second Newspaper")
 
@@ -121,15 +121,14 @@ describe Bullet::Association, 'has_many' do
   end
 
   before(:each) do
-    Bullet::Association.start_request
+    Bullet.start_request
   end
 
   after(:each) do
-    Bullet::Association.end_request
+    Bullet.end_request
   end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "for unused cases" do
+  context "for unused cases" do
     #If you have the same record created twice with different includes
     #  the hash value get's accumulated includes, which leads to false Unused eager loading
     #it "should not incorrectly mark associations as unused when multiple object instances" do
@@ -159,14 +158,13 @@ describe Bullet::Association, 'has_many' do
       comments_with_author = Comment.includes(:author)
       comment_collection = comments_with_author.limit(2)
       comment_collection.collect { |com| com.author.name }
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_unused_preload_associations_for(Comment, :author)
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_unused_preload_associations_for(Comment, :author)
     end
-  # end
+  end
 
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "comments => posts => category" do
+  context "comments => posts => category" do
 
     # this happens because the post isn't a possible object even though the writer is access through the post
     # which leads to an 1+N queries
@@ -174,7 +172,7 @@ describe Bullet::Association, 'has_many' do
       Comment.includes([:author, :post]).where(["base_users.id = ?", BaseUser.first]).each do |com|
         com.post.writer.name
       end
-      Bullet::Association.should be_detecting_unpreloaded_association_for(Post, :writer)
+      Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Post, :writer)
     end
 
     # this happens because the comment doesn't break down the hash into keys
@@ -183,17 +181,17 @@ describe Bullet::Association, 'has_many' do
       comments = Comment.includes([:author, {:post => :writer}]).where(["base_users.id = ?", BaseUser.first]).each do |com|
         com.post.writer.name
       end
-      Bullet::Association.should_not be_detecting_unpreloaded_association_for(Comment, :post)
-      Bullet::Association.should be_completely_preloading_associations
+      Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Comment, :post)
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should detect preload of post => writer" do
       comments = Comment.includes([:author, {:post => :writer}]).where(["base_users.id = ?", BaseUser.first]).each do |com|
         com.post.writer.name
       end
-      Bullet::Association.should be_creating_object_association_for(comments.first, :author)
-      Bullet::Association.should_not be_detecting_unpreloaded_association_for(Post, :writer)
-      Bullet::Association.should be_completely_preloading_associations
+      Bullet::Detector::Association.should be_creating_object_association_for(comments.first, :author)
+      Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Post, :writer)
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     # To flyerhzm: This does not detect that newspaper is unpreloaded. The association is
@@ -202,7 +200,7 @@ describe Bullet::Association, 'has_many' do
       comments = Comment.all(:include => {:post => :writer}, :conditions => "posts.name like '%first%'").each do |com|
         com.post.writer.newspaper.name
       end
-      Bullet::Association.should be_detecting_unpreloaded_association_for(Writer, :newspaper)
+      Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Writer, :newspaper)
     end
 
     # when we attempt to access category, there is an infinite overflow because load_target is hijacked leading to
@@ -214,63 +212,66 @@ describe Bullet::Association, 'has_many' do
         end
       }.should_not raise_error(SystemStackError)
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "post => comments" do
+  context "post => comments" do
+  #
+  ### FIXME: Please double check semantic equivalence with original
     it "should detect preload with post => comments" do
       Post.includes(:comments).each do |post|
         post.comments.collect(&:name)
       end
-      Bullet::Association.should_not be_has_unpreload_associations
+      # Bullet::Detector::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should detect no preload post => comments" do
       Post.all.each do |post|
         post.comments.collect(&:name)
       end
-      Bullet::Association.should be_has_unpreload_associations
+      # Bullet::Detector::Association.should be_has_unpreload_associations
+      Bullet::Detector::Association.should_not be_completely_preloading_associations
     end
 
     it "should detect unused preload post => comments for post" do
       Post.includes(:comments).collect(&:name)
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should be_has_unused_preload_associations
     end
 
     it "should detect no unused preload post => comments for post" do
       Post.all.collect(&:name)
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
 
     it "should detect no unused preload post => comments for comment" do
       Post.all.each do |post|
         post.comments.collect(&:name)
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      Bullet::Association.end_request
-      Bullet::Association.start_request
+      Bullet.end_request
+      Bullet.start_request
 
       Post.all.each do |post|
         post.comments.collect(&:name)
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "category => posts => comments" do
+  context "category => posts => comments" do
     it "should detect preload with category => posts => comments" do
       Category.includes({:posts => :comments}).each do |category|
         category.posts.each do |post|
           post.comments.collect(&:name)
         end
       end
-      Bullet::Association.should_not be_has_unpreload_associations
+      # Bullet::Detector::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should detect preload category => posts, but no post => comments" do
@@ -279,7 +280,8 @@ describe Bullet::Association, 'has_many' do
           post.comments.collect(&:name)
         end
       end
-      Bullet::Association.should be_has_unpreload_associations
+      # Bullet::Detector::Association.should be_has_unpreload_associations
+      Bullet::Detector::Association.should_not be_completely_preloading_associations
     end
 
     it "should detect no preload category => posts => comments" do
@@ -288,21 +290,22 @@ describe Bullet::Association, 'has_many' do
           post.comments.collect(&:name)
         end
       end
-      Bullet::Association.should be_has_unpreload_associations
+      # Bullet::Detector::Association.should be_has_unpreload_associations
+      Bullet::Detector::Association.should_not be_completely_preloading_associations
     end
 
     it "should detect unused preload with category => posts => comments" do
       Category.includes({:posts => :comments}).collect(&:name)
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should be_has_unused_preload_associations
     end
 
     it "should detect unused preload with post => commnets, no category => posts" do
       Category.includes({:posts => :comments}).each do |category|
         category.posts.collect(&:name)
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should be_has_unused_preload_associations
     end
 
     it "should no detect preload with category => posts => comments" do
@@ -311,19 +314,18 @@ describe Bullet::Association, 'has_many' do
           post.comments.collect(&:name)
         end
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "category => posts, category => entries" do
+  context "category => posts, category => entries" do
     it "should detect preload with category => [posts, entries]" do
       Category.includes([:posts, :entries]).each do |category|
         category.posts.collect(&:name)
         category.entries.collect(&:name)
       end
-      Bullet::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should detect preload with category => posts, but no category => entries" do
@@ -331,7 +333,7 @@ describe Bullet::Association, 'has_many' do
         category.posts.collect(&:name)
         category.entries.collect(&:name)
       end
-      Bullet::Association.should be_has_unpreload_associations
+      Bullet::Detector::Association.should_not be_completely_preloading_associations
     end
 
     it "should detect no preload with category => [posts, entries]" do
@@ -339,21 +341,21 @@ describe Bullet::Association, 'has_many' do
         category.posts.collect(&:name)
         category.entries.collect(&:name)
       end
-      Bullet::Association.should be_has_unpreload_associations
+      Bullet::Detector::Association.should_not be_completely_preloading_associations
     end
 
     it "should detect unused with category => [posts, entries]" do
       Category.includes([:posts, :entries]).collect(&:name)
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should be_has_unused_preload_associations
     end
 
     it "should detect unused preload with category => entries, but no category => posts" do
       Category.includes([:posts, :entries]).each do |category|
         category.posts.collect(&:name)
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should be_has_unused_preload_associations
     end
 
     it "should detect no unused preload" do
@@ -361,62 +363,58 @@ describe Bullet::Association, 'has_many' do
         category.posts.collect(&:name)
         category.entries.collect(&:name)
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "no preload" do
+  context "no preload" do
     it "should no preload only display only one post => comment" do
       Post.includes(:comments).each do |post|
         post.comments.first.name
       end
-      Bullet::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should no preload only one post => commnets" do
       Post.first.comments.collect(&:name)
-      Bullet::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "scope for_category_name" do
+  context "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
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should not be unused preload post => category" do
       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_not be_has_unused_preload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "scope preload_posts" do
+  context "scope preload_posts" do
     it "should no preload post => comments with scope" do
       Post.preload_posts.each do |post|
         post.comments.collect(&:name)
       end
-      Bullet::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should unused preload with 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
+      Bullet::Detector::Association.should be_completely_preloading_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should be_has_unused_preload_associations
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "no unused" do
+  context "no unused" do
     it "should no unused only display only one post => comment" do
       Post.includes(:comments).each do |post|
         i = 0
@@ -428,63 +426,62 @@ describe Bullet::Association, 'has_many' do
           end
         end
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
-  # end
+  end
 
-  # FIXME: setup and teardown are not inherited by context
-  # context "belongs_to" do
+  context "belongs_to" do
     it "should preload comments => post" do
       Comment.all.each do |comment|
         comment.post.name
       end
-      Bullet::Association.should be_has_unpreload_associations
+      Bullet::Detector::Association.should_not be_completely_preloading_associations
     end
 
     it "should no preload comment => post" do
       Comment.first.post.name
-      Bullet::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should no preload comments => post" do
       Comment.includes(:post).each do |comment|
         comment.post.name
       end
-      Bullet::Association.should_not be_has_unpreload_associations
+      Bullet::Detector::Association.should be_completely_preloading_associations
     end
 
     it "should detect no unused preload comments => post" do
       Comment.all.collect(&:name)
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
 
     it "should detect unused preload comments => post" do
       Comment.includes(:post).collect(&:name)
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should be_has_unused_preload_associations
     end
 
     it "should dectect no unused preload comments => post" do
       Comment.all.each do |comment|
         comment.post.name
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
 
     it "should dectect no unused preload comments => post" do
       Comment.includes(:post).each do |comment|
         comment.post.name
       end
-      Bullet::Association.check_unused_preload_associations
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
-  # end
+  end
 end
 
-describe Bullet::Association, 'has_and_belongs_to_many' do
+describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
 
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
@@ -534,41 +531,41 @@ describe Bullet::Association, 'has_and_belongs_to_many' do
   end
 
   before(:each) do
-    Bullet::Association.start_request
+    Bullet.start_request
   end
 
   after(:each) do
-    Bullet::Association.end_request
+    Bullet.end_request
   end
 
   it "should detect unpreload associations" do
     Student.all.each do |student|
       student.teachers.collect(&:name)
     end
-    Bullet::Association.should be_has_unpreload_associations
+    Bullet::Detector::Association.should_not be_completely_preloading_associations
   end
 
   it "should detect no unpreload associations" do
     Student.includes(:teachers).each do |student|
       student.teachers.collect(&:name)
     end
-    Bullet::Association.should_not be_has_unpreload_associations
+    Bullet::Detector::Association.should be_completely_preloading_associations
   end
 
   it "should detect unused preload associations" do
     Student.includes(:teachers).collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should be_has_unused_preload_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should be_has_unused_preload_associations
   end
 
   it "should detect no unused preload associations" do
     Student.all.collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should_not be_has_unused_preload_associations
   end
 end
 
-describe Bullet::Association, 'has_many :through' do
+describe Bullet::Detector::Association, 'has_many :through' do
 
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
@@ -625,194 +622,43 @@ describe Bullet::Association, 'has_many :through' do
   end
 
   before(:each) do
-    Bullet::Association.start_request
+    Bullet.start_request
   end
 
   after(:each) do
-    Bullet::Association.end_request
+    Bullet.end_request
   end
 
   it "should detect unpreload associations" do
     Firm.all.each do |firm|
       firm.clients.collect(&:name)
     end
-    Bullet::Association.should be_has_unpreload_associations
+    Bullet::Detector::Association.should_not be_completely_preloading_associations
   end
 
   it "should detect no unpreload associations" do
     Firm.includes(:clients).each do |firm|
       firm.clients.collect(&:name)
     end
-    Bullet::Association.should_not be_has_unpreload_associations
+    Bullet::Detector::Association.should be_completely_preloading_associations
   end
 
   it "should detect no unused preload associations" do
     Firm.all.collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should_not be_has_unused_preload_associations
   end
 
   it "should detect unused preload associations" do
     Firm.includes(:clients).collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should be_has_unused_preload_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should be_has_unused_preload_associations
   end
 end
 
-describe Bullet::Association, 'has_many :as' do
-
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :votes do |t|
-        t.column :vote, :integer
-        t.references :voteable, :polymorphic => true
-      end
-
-      create_table :users do |t|
-        t.column :name, :string
-      end
-
-      create_table :pets do |t|
-        t.column :name, :string
-        t.column :user_id, :integer
-      end
-
-      create_table :news do |t|
-        t.column :name, :string
-      end
-    end
-  end
-
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-
-  class Vote < ActiveRecord::Base
-    belongs_to :voteable, :polymorphic => true
-  end
-
-  class User < ActiveRecord::Base
-    has_many :votes, :as => :voteable
-    has_many :pets
-  end
-
-  class Pet < ActiveRecord::Base
-    belongs_to :user
-  end
-
-  class News < ActiveRecord::Base
-    has_many :votes, :as => :voteable
-  end
 
-  before(:all) do
-    setup_db
-    user1 = User.create(:name => 'first')
-    user2 = User.create(:name => 'second')
-    user3 = User.create(:name => 'third')
-    user4 = User.create(:name => 'fourth')
-
-    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.create(:vote => 10)
-    news1.votes.create(:vote => 20)
-    news2.votes.create(:vote => 10)
-    news2.votes.create(:vote => 20)
-  end
-
-  after(:all) do
-    teardown_db
-  end
-
-  before(:each) do
-    Bullet::Association.start_request
-  end
-
-  after(:each) do
-    Bullet::Association.end_request
-  end
-
-  # this happens only when a polymorphic association is included along with another table which is being referenced in the query
-  it "should not have unused preloaded associations with conditions" do
-    all_users = User.includes(:pets)
-    users_with_ten_votes = User.includes(:votes).where(["votes.vote = ?", 10])
-    users_without_ten_votes = User.where(["users.id not in (?)", users_with_ten_votes.collect(&:id)])
-    puts all_users.to_sql
-    all_users.each { |t| t.pets.collect(&:name) }
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_unused_preload_associations_for(User, :pets)
-    Bullet::Association.should_not be_unused_preload_associations_for(User, :votes)
-  end
-
-  it "should detect unpreload associations" do
-    User.all.each do |user|
-      user.votes.collect(&:vote)
-    end
-    Bullet::Association.should be_has_unpreload_associations
-  end
-
-  it "should detect no unpreload associations" do
-    User.includes(:votes).each do |user|
-      user.votes.collect(&:vote)
-    end
-    Bullet::Association.should_not be_has_unpreload_associations
-  end
-
-  it "should detect unpreload associations with voteable" do
-    Vote.all.each do |vote|
-      vote.voteable.name
-    end
-    Bullet::Association.should be_has_unpreload_associations
-  end
-
-  it "should detect no unpreload associations with voteable" do
-    Vote.includes(:voteable).each do |vote|
-      vote.voteable.name
-    end
-    Bullet::Association.should_not be_has_unpreload_associations
-  end
-
-  it "should detect no unused preload associations" do
-    User.all.collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
-  end
-
-  it "should detect unused preload associations" do
-    User.includes(:votes).collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should be_has_unused_preload_associations
-  end
-
-  it "should detect no unused preload associations with voteable" do
-    Vote.all.collect(&:vote)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
-  end
-
-  it "should detect unused preload associations with voteable" do
-    Vote.includes(:voteable).collect(&:vote)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should be_has_unused_preload_associations
-  end
-end
 
-describe Bullet::Association, "has_one" do
+describe Bullet::Detector::Association, "has_one" do
 
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
@@ -856,41 +702,41 @@ describe Bullet::Association, "has_one" do
   end
 
   before(:each) do
-    Bullet::Association.start_request
+    Bullet.start_request
   end
 
   after(:each) do
-    Bullet::Association.end_request
+    Bullet.end_request
   end
 
   it "should detect unpreload association" do
     Company.all.each do |company|
       company.address.name
     end
-    Bullet::Association.should be_has_unpreload_associations
+    Bullet::Detector::Association.should_not be_completely_preloading_associations
   end
 
   it "should detect no unpreload association" do
     Company.find(:all, :include => :address).each do |company|
       company.address.name
     end
-    Bullet::Association.should_not be_has_unpreload_associations
+    Bullet::Detector::Association.should be_completely_preloading_associations
   end
 
   it "should detect no unused preload association" do
     Company.all.collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should_not be_has_unused_preload_associations
   end
 
   it "should detect unused preload association" do
     Company.find(:all, :include => :address).collect(&:name)
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should be_has_unused_preload_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should be_has_unused_preload_associations
   end
 end
 
-describe Bullet::Association, "call one association that in possible objects" do
+describe Bullet::Detector::Association, "call one association that in possible objects" do
 
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
@@ -936,21 +782,21 @@ describe Bullet::Association, "call one association that in possible objects" do
   end
 
   before(:each) do
-    Bullet::Association.start_request
+    Bullet.start_request
   end
 
   after(:each) do
-    Bullet::Association.end_request
+    Bullet.end_request
   end
 
   it "should detect no unpreload association" do
     Contact.all
     Contact.first.emails.collect(&:name)
-    Bullet::Association.should_not be_has_unpreload_associations
+    Bullet::Detector::Association.should be_completely_preloading_associations
   end
 end
 
-describe Bullet::Association, "STI" do
+describe Bullet::Detector::Association, "STI" do
 
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
@@ -1002,42 +848,42 @@ describe Bullet::Association, "STI" do
   end
 
   before(:each) do
-    Bullet::Association.start_request
+    Bullet.start_request
   end
 
   after(:each) do
-    Bullet::Association.end_request
+    Bullet.end_request
   end
 
   it "should detect unpreload associations" do
     Page.all.each do |page|
       page.author.name
     end
-    Bullet::Association.should be_has_unpreload_associations
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
+    Bullet::Detector::Association.should_not be_completely_preloading_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should_not be_has_unused_preload_associations
   end
 
   it "should not detect unpreload associations" do
     Page.find(:all, :include => :author).each do |page|
       page.author.name
     end
-    Bullet::Association.should_not be_has_unpreload_associations
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
+    Bullet::Detector::Association.should be_completely_preloading_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should_not be_has_unused_preload_associations
   end
 
   it "should detect unused preload associations" do
     Page.find(:all, :include => :author).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::Detector::Association.should be_completely_preloading_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should be_has_unused_preload_associations
   end
 
   it "should not detect unused preload associations" do
     Page.all.collect(&:name)
-    Bullet::Association.should_not be_has_unpreload_associations
-    Bullet::Association.check_unused_preload_associations
-    Bullet::Association.should_not be_has_unused_preload_associations
+    Bullet::Detector::Association.should be_completely_preloading_associations
+    Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+    Bullet::Detector::Association.should_not be_has_unused_preload_associations
   end
 end