bullet 2.0.0.beta.2 → 2.0.0.beta.3

data/lib/bullet/presenter/xmpp.rb

@@ -0,0 +1,56 @@
+module Bullet
+  module Presenter
+    class Xmpp < Base
+      @receiver = nil
+      @xmpp = nil
+      @password = nil
+
+      def self.active?
+        @xmpp
+      end
+
+      def self.out_of_channel( notice )
+        return unless active?
+        notify( notice.standard_notice )
+      end
+
+      def self.setup_connection( xmpp_information )
+        require 'xmpp4r'
+
+        @receiver = xmpp_information[:receiver]
+        @password = xmpp_information[:password]
+        @account  = xmpp_information[:account]
+        @show_online_status = xmpp_information[:show_online_status]
+
+        connect
+      rescue MissingSourceFile
+        @xmpp = nil
+        raise NotificationError.new( 'You must install the xmpp4r gem to use XMPP notifications: `sudo gem install xmpp4r`' )
+      end
+
+      private
+      def self.connect
+        jid = Jabber::JID.new( @account )
+        @xmpp = Jabber::Client.new( jid )
+        @xmpp.connect
+        @xmpp.auth( @password )
+        @xmpp.send( presence_status ) if @show_online_status
+      end
+
+      def self.notify( message )
+        message = Jabber::Message.new( @receiver, message ).
+                                  set_type( :normal ).
+                                  set_id( '1' ).
+                                  set_subject( 'Bullet Notification' )
+        @xmpp.send( message )
+      end
+
+      def self.presence_status
+        project_name = Rails.root.basename.to_s.camelcase
+        time = Time.now
+
+        Jabber::Presence.new.set_status( "Bullet in project '#{project_name}' started on #{time}" )
+      end
+    end
+  end
+end

data/lib/bullet/rack.rb

@@ -0,0 +1,42 @@
+module Bullet
+  class Rack
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      return @app.call(env) unless Bullet.enable?
+
+      Bullet.start_request
+      status, headers, response = @app.call(env)
+      return [status, headers, response] if empty?(response)
+
+      if Bullet.notification?
+        if status == 200 and !response.body.frozen? and check_html?(headers, response)
+          response_body = response.body << Bullet.gather_inline_notifications
+          headers['Content-Length'] = response_body.length.to_s
+        end
+        Bullet.perform_out_of_channel_notifications
+      end
+      response_body ||= response.body
+      Bullet.end_request
+      no_browser_cache(headers) if Bullet.disable_browser_cache
+      [status, headers, [response_body]]
+    end
+
+    # fix issue if response's body is a Proc
+    def empty?(response)
+      (response.is_a?(Array) && response.empty?) || !response.body.is_a?(String) || response.body.empty?
+    end
+  
+    def check_html?(headers, response)
+      headers['Content-Type'] and headers['Content-Type'].include? 'text/html' and response.body =~ %r{<html.*</html>}m
+    end
+
+    def no_browser_cache(headers)
+      headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
+      headers["Pragma"] = "no-cache"
+      headers["Expires"] = "Wed, 09 Sep 2009 09:09:09 GMT"
+    end
+  end
+end

data/lib/bullet/registry.rb

@@ -0,0 +1,7 @@
+module Bullet
+  module Registry
+    autoload :Base, 'bullet/registry/base'
+    autoload :Object, 'bullet/registry/object'
+    autoload :Association, 'bullet/registry/association'
+  end
+end

data/lib/bullet/registry/association.rb

@@ -0,0 +1,16 @@
+module Bullet
+  module Registry
+    class Association < Base
+      def merge( base, associations )
+        @registry.merge!( { base => associations } )
+        unique( @registry[base] )
+      end
+
+      def similarly_associated( base, associations )
+        @registry.select do |key, value|
+          key.include?( base ) and value == associations
+        end.collect( &:first ).flatten!
+      end
+    end
+  end
+end

data/lib/bullet/registry/base.rb

@@ -0,0 +1,39 @@
+module Bullet
+  module Registry
+    class Base
+      attr_reader :registry
+
+      def initialize
+        @registry = {}
+      end
+
+      def [](key)
+        @registry[key]
+      end
+
+      def each( &block )
+        @registry.each( &block )
+      end
+
+      def delete( base )
+        @registry.delete( base )
+      end
+
+      def select( *args, &block )
+        @registry.select( *args, &block )
+      end
+
+      def add( key, value )
+        @registry[key] ||= []
+        @registry[key] << value
+        unique( @registry[key] )
+      end
+
+      private
+      def unique( array )
+        array.flatten!
+        array.uniq!
+      end
+    end
+  end
+end

data/lib/bullet/registry/object.rb

@@ -0,0 +1,15 @@
+module Bullet
+  module Registry
+    class Object < Base
+      def add( object_or_objects )
+        klazz = object_or_objects.is_a?( Array ) ? object_or_objects.first.class :
+                                                   object_or_objects.class
+        super( klazz, object_or_objects )
+      end
+
+      def contains?( object )
+        @registry[object.class] and @registry[object.class].include?( object )
+      end
+    end
+  end
+end

data/spec/bullet/association_for_chris_spec.rb

@@ -2,7 +2,7 @@ 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 do
+describe Bullet::Detector::Association do
 
   describe "for chris" do
     def setup_db
@@ -65,32 +65,32 @@ describe Bullet::Association 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 from deal to hotel" do
       Deal.all.each do |deal|
         deal.hotel.location.name
       end
-      Bullet::Association.should be_detecting_unpreloaded_association_for(Deal, :hotel)
+      Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Deal, :hotel)
     end
   
     it "should detect unpreload association from hotel to location" do
       Deal.includes(:hotel).each do |deal|
         deal.hotel.location.name
       end
-      Bullet::Association.should be_detecting_unpreloaded_association_for(Hotel, :location)
+      Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Hotel, :location)
     end
   
     it "should not detect unpreload association" do
       Deal.includes({:hotel => :location}).each do |deal|
         deal.hotel.location.name
       end
-      Bullet::Association.should_not be_has_unused_preload_associations
+      Bullet::Detector::Association.should_not be_has_unused_preload_associations
     end
   end
 end

data/spec/bullet/association_for_peschkaj_spec.rb

@@ -2,7 +2,7 @@ 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 do
+describe Bullet::Detector::Association do
   
   describe "for peschkaj" do
     def setup_db
@@ -65,11 +65,11 @@ describe Bullet::Association 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 not detect unused preload associations" do
@@ -78,9 +78,9 @@ describe Bullet::Association do
         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)
+      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+      Bullet::Detector::Association.should_not be_unused_preload_associations_for(Category, :submissions)
+      Bullet::Detector::Association.should_not be_unused_preload_associations_for(Submission, :user)
     end
   end
 end

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
@@ -121,11 +121,11 @@ 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
@@ -159,8 +159,8 @@ 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
 
@@ -174,7 +174,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 +183,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 +202,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
@@ -218,47 +218,51 @@ describe Bullet::Association, 'has_many' do
 
   # FIXME: setup and teardown are not inherited by context
   # 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
 
@@ -270,7 +274,8 @@ describe Bullet::Association, 'has_many' do
           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 +284,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 +294,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,8 +318,8 @@ 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
 
@@ -323,7 +330,7 @@ describe Bullet::Association, 'has_many' do
         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 +338,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 +346,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,8 +368,8 @@ 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
 
@@ -372,12 +379,12 @@ describe Bullet::Association, 'has_many' 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
 
@@ -387,14 +394,14 @@ describe Bullet::Association, 'has_many' 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
 
@@ -404,14 +411,14 @@ describe Bullet::Association, 'has_many' 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
 
@@ -428,8 +435,8 @@ 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
 
@@ -439,52 +446,52 @@ describe Bullet::Association, 'has_many' 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
 
-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 +541,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 +632,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 +712,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 +792,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 +858,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