bullet 4.0.0 → 4.1.0

data/.travis.yml

@@ -7,3 +7,5 @@ gemfile:
   - Gemfile.rails-3.0.12
   - Gemfile.rails-2.3.14
 env: DB=sqlite
+before_install:
+  - echo "yes" | gem uninstall json

data/Gemfile

@@ -8,8 +8,7 @@ gem 'rails', '3.2.3'
 gem 'sqlite3'
 gem 'mysql'
 gem 'activerecord-import'
-gem 'mongoid'
-gem 'bson_ext'
+gem 'mongoid', '3.0.0.rc'
 
 gem "rspec"
 gem "guard"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (4.0.0)
+    bullet (4.1.0)
       uniform_notifier (~> 1.0.0)
 
 GEM
@@ -38,9 +38,6 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
@@ -59,14 +56,15 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.4.9)
+    mongoid (3.0.0.rc)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      moped (~> 1.0.0.rc)
+      origin (~> 1.0.0.rc)
       tzinfo (~> 0.3.22)
-    multi_json (1.3.4)
+    moped (1.0.0.rc)
+    multi_json (1.3.6)
     mysql (2.8.1)
+    origin (1.0.0.rc)
     perftools.rb (2.0.0)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -120,11 +118,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-import
-  bson_ext
   bullet!
   guard
   guard-rspec
-  mongoid
+  mongoid (= 3.0.0.rc)
   mysql
   perftools.rb
   rails (= 3.2.3)

data/Gemfile.rails-2.3.14.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (2.3.1)
+    bullet (4.1.0)
       uniform_notifier (~> 1.0.0)
 
 GEM

data/Gemfile.rails-3.0.12.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (2.3.1)
+    bullet (4.1.0)
       uniform_notifier (~> 1.0.0)
 
 GEM

data/Gemfile.rails-3.1.4

@@ -8,7 +8,7 @@ gem 'rails', '3.1.4'
 gem 'sqlite3'
 gem 'mysql'
 gem 'activerecord-import'
-gem 'mongoid'
+gem 'mongoid', '2.4.10'
 gem 'bson_ext'
 
 gem "rspec"

data/Gemfile.rails-3.1.4.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (2.3.1)
+    bullet (4.1.0)
       uniform_notifier (~> 1.0.0)
 
 GEM
@@ -61,11 +61,11 @@ GEM
     mime-types (1.18)
     mongo (1.6.2)
       bson (~> 1.6.2)
-    mongoid (2.4.9)
+    mongoid (2.4.10)
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.3.4)
+    multi_json (1.3.6)
     mysql (2.8.1)
     perftools.rb (2.0.0)
     polyglot (0.3.3)
@@ -126,7 +126,7 @@ DEPENDENCIES
   bullet!
   guard
   guard-rspec
-  mongoid
+  mongoid (= 2.4.10)
   mysql
   perftools.rb
   rails (= 3.1.4)

data/lib/bullet.rb

@@ -12,7 +12,15 @@ module Bullet
     autoload :ActiveRecord, 'bullet/active_record2'
     autoload :ActionController, 'bullet/action_controller2'
   end
-  autoload :Mongoid, 'bullet/mongoid'
+  begin
+    require 'mongoid'
+    if Mongoid::VERSION =~ /\A2\.4/
+      autoload :Mongoid, 'bullet/mongoid24'
+    elsif Mongoid::VERSION =~ /\A3/
+      autoload :Mongoid, 'bullet/mongoid3'
+    end
+  rescue LoadError
+  end
   autoload :Rack, 'bullet/rack'
   autoload :BulletLogger, 'bullet/logger'
   autoload :Notification, 'bullet/notification'

data/lib/bullet/{mongoid.rb → mongoid24.rb}

@@ -2,10 +2,12 @@ module Bullet
   module Mongoid
     def self.enable
       require 'mongoid'
+
       ::Mongoid::Contexts::Mongo.class_eval do
         alias_method :origin_first, :first
         alias_method :origin_last, :last
         alias_method :origin_iterate, :iterate
+        alias_method :origin_eager_load, :eager_load
 
         def first
           result = origin_first
@@ -28,19 +30,6 @@ module Bullet
           end
           origin_iterate(&block)
         end
-      end
-
-      ::Mongoid::Relations::Accessors.class_eval do
-        alias_method :origin_set_relation, :set_relation
-
-        def set_relation(name, relation)
-          Bullet::Detector::NPlusOneQuery.call_association(self, name)
-          origin_set_relation(name, relation)
-        end
-      end
-
-      ::Mongoid::Contexts::Mongo.class_eval do
-        alias_method :origin_eager_load, :eager_load
 
         def eager_load(docs)
           associations = criteria.inclusions.map(&:name)
@@ -51,6 +40,15 @@ module Bullet
           origin_eager_load(docs)
         end
       end
+
+      ::Mongoid::Relations::Accessors.class_eval do
+        alias_method :origin_set_relation, :set_relation
+
+        def set_relation(name, relation)
+          Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          origin_set_relation(name, relation)
+        end
+      end
     end
   end
 end

data/lib/bullet/mongoid3.rb

@@ -0,0 +1,53 @@
+module Bullet
+  module Mongoid
+    def self.enable
+      require 'mongoid'
+      ::Mongoid::Contextual::Mongo.class_eval do
+        alias_method :origin_first, :first
+        alias_method :origin_last, :last
+        alias_method :origin_each, :each
+        alias_method :origin_eager_load, :eager_load
+
+        def first
+          result = origin_first
+          Bullet::Detector::Association.add_impossible_object(result)
+          result
+        end
+
+        def last
+          result = origin_last
+          Bullet::Detector::Association.add_impossible_object(result)
+          result
+        end
+
+        def each(&block)
+          records = query.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          if records.length > 1
+            Bullet::Detector::Association.add_possible_objects(records)
+          elsif records.size == 1
+            Bullet::Detector::Association.add_impossible_object(records.first)
+          end
+          origin_each(&block)
+        end
+
+        def eager_load(docs)
+          associations = criteria.inclusions.map(&:name)
+          docs.each do |doc|
+            Bullet::Detector::Association.add_object_associations(doc, associations)
+          end
+          Bullet::Detector::Association.add_eager_loadings(docs, associations)
+          origin_eager_load(docs)
+        end
+      end
+
+      ::Mongoid::Relations::Accessors.class_eval do
+        alias_method :origin_set_relation, :set_relation
+
+        def set_relation(name, relation)
+          Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          origin_set_relation(name, relation)
+        end
+      end
+    end
+  end
+end

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end
 

data/spec/integration/mongoid/association_spec.rb

@@ -1,275 +1,252 @@
-require 'spec_helper'
-
 begin
   require 'mongoid'
-  describe Bullet::Detector::Association, 'has_many' do
+  require 'spec_helper'
+
+  describe Bullet::Detector::Association do
     before(:each) do
       Bullet.clear
       Bullet.start_request
     end
     after(:each) do
       Bullet.end_request
+      Mongoid::IdentityMap.clear
     end
 
-    context "posts => comments" do
-      it "should detect non preload posts => comments" do
-        Mongoid::Post.all.each do |post|
-          post.comments.map(&:name)
+    context 'has_many' do
+      context "posts => comments" do
+        it "should detect non preload posts => comments" do
+          Mongoid::Post.all.each do |post|
+            post.comments.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+
+          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Post, :comments)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Post, :comments)
-      end
+        it "should detect preload post => comments" do
+          Mongoid::Post.includes(:comments).each do |post|
+            post.comments.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      it "should detect preload post => comments" do
-        Mongoid::Post.includes(:comments).each do |post|
-          post.comments.map(&:name)
+          Bullet::Detector::Association.should be_completely_preloading_associations
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
-
-      it "should detect unused preload post => comments" do
-        Mongoid::Post.includes(:comments).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Post, :comments)
+        it "should detect unused preload post => comments" do
+          Mongoid::Post.includes(:comments).map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
 
-      it "should not detect unused preload post => comments" do
-        Mongoid::Post.all.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        it "should not detect unused preload post => comments" do
+          Mongoid::Post.all.map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
       end
-    end
 
-    context "category => posts, category => entries" do
-      it "should detect non preload with category => [posts, entries]" do
-        Mongoid::Category.all.each do |category|
-          category.posts.map(&:name)
-          category.entries.map(&:name)
+      context "category => posts, category => entries" do
+        it "should detect non preload with category => [posts, entries]" do
+          Mongoid::Category.all.each do |category|
+            category.posts.map(&:name)
+            category.entries.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+
+          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
+          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
-      end
+        it "should detect preload with category => posts, but not with category => entries" do
+          Mongoid::Category.includes(:posts).each do |category|
+            category.posts.map(&:name)
+            category.entries.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      it "should detect preload with category => posts, but not with category => entries" do
-        Mongoid::Category.includes(:posts).each do |category|
-          category.posts.collect(&:name)
-          category.entries.collect(&:name)
+          Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
+          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
-      end
+        it "should detect preload with category => [posts, entries]" do
+          Mongoid::Category.includes(:posts, :entries).each do |category|
+            category.posts.map(&:name)
+            category.entries.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      it "should detect preload with category => [posts, entries]" do
-        Mongoid::Category.includes([:posts, :entries]).each do |category|
-          category.posts.map(&:name)
-          category.entries.map(&:name)
+          Bullet::Detector::Association.should be_completely_preloading_associations
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+        it "should detect unused preload with category => [posts, entries]" do
+          Mongoid::Category.includes(:posts, :entries).map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :posts)
+          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :entries)
 
-      it "should detect unused preload with category => [posts, entries]" do
-        Mongoid::Category.includes([:posts, :entries]).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :posts)
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :entries)
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+        it "should detect unused preload with category => entries, but not with category => posts" do
+          Mongoid::Category.includes(:posts, :entries).each do |category|
+            category.posts.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_unused_preload_associations_for(Mongoid::Category, :posts)
+          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :entries)
 
-      it "should detect unused preload with category => entries, but not with category => posts" do
-        Mongoid::Category.includes([:posts, :entries]).each do |category|
-          category.posts.map(&:name)
+          Bullet::Detector::Association.should be_completely_preloading_associations
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_unused_preload_associations_for(Mongoid::Category, :posts)
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :entries)
-
-        Bullet::Detector::Association.should be_completely_preloading_associations
       end
-    end
 
-    context "post => comment" do
-      it "should detect unused preload with post => comments" do
-        Mongoid::Post.includes(:comments).each do |post|
-          post.comments.first.name
-        end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_unused_preload_associations_for(Mongoid::Post, :comments)
+      context "post => comment" do
+        it "should detect unused preload with post => comments" do
+          Mongoid::Post.includes(:comments).each do |post|
+            post.comments.first.name
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_unused_preload_associations_for(Mongoid::Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
 
-      it "should detect preload with post => commnets" do
-        Mongoid::Post.first.comments.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        it "should detect preload with post => commnets" do
+          Mongoid::Post.first.comments.map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
       end
-    end
 
-    context "scope preload_comments" do
-      it "should detect preload post => comments with scope" do
-        Mongoid::Post.preload_comments.each do |post|
-          post.comments.map(&:name)
-        end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+      context "scope preload_comments" do
+        it "should detect preload post => comments with scope" do
+          Mongoid::Post.preload_comments.each do |post|
+            post.comments.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
 
-      it "should detect unused preload with scope" do
-        Mongoid::Post.preload_comments.map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Post, :comments)
+        it "should detect unused preload with scope" do
+          Mongoid::Post.preload_comments.map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Post, :comments)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
       end
     end
-  end
 
-  describe Bullet::Detector::Association, 'belongs_to' do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
+    context 'belongs_to' do
+      context "comment => post" do
+        it "should detect non preload with comment => post" do
+          Mongoid::Comment.all.each do |comment|
+            comment.post.name
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-    after(:each) do
-      Bullet.end_request
-    end
-
-    context "comment => post" do
-      it "should detect non preload with comment => post" do
-        Mongoid::Comment.all.each do |comment|
-          comment.post.name
+          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Comment, :post)
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Comment, :post)
-      end
+        it "should detect preload with one comment => post" do
+          Mongoid::Comment.first.post.name
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      it "should detect preload with one comment => post" do
-        Mongoid::Comment.first.post.name
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+        it "should detect preload with comment => post" do
+          Mongoid::Comment.includes(:post).each do |comment|
+            comment.post.name
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      it "should detect preload with comment => post" do
-        Mongoid::Comment.includes(:post).each do |comment|
-          comment.post.name
+          Bullet::Detector::Association.should be_completely_preloading_associations
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+        it "should not detect preload with comment => post" do
+          Mongoid::Comment.all.map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      it "should not detect preload with comment => post" do
-        Mongoid::Comment.all.collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
-
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
 
-      it "should detect unused preload with comments => post" do
-        Mongoid::Comment.includes(:post).map(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Comment, :post)
+        it "should detect unused preload with comments => post" do
+          Mongoid::Comment.includes(:post).map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Comment, :post)
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
       end
     end
-  end
 
-  describe Bullet::Detector::Association, "has_one" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
+    context "has_one" do
+      context "company => address" do
+        it "should detect non preload association" do
+          Mongoid::Company.all.each do |company|
+            company.address.name
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-    after(:each) do
-      Bullet.end_request
-    end
+          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Company, :address)
+        end
+
+        it "should detect preload association" do
+          Mongoid::Company.includes(:address).each do |company|
+            company.address.name
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-    context "company => address" do
-      it "should detect non preload association" do
-        Mongoid::Company.all.each do |company|
-          company.address.name
+          Bullet::Detector::Association.should be_completely_preloading_associations
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Company, :address)
-      end
+        it "should not detect preload association" do
+          Mongoid::Company.all.map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-      it "should detect preload association" do
-        Mongoid::Company.includes(:address).each do |company|
-          company.address.name
+          Bullet::Detector::Association.should be_completely_preloading_associations
         end
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        it "should detect unused preload association" do
+          criteria = Mongoid::Company.includes(:address)
+          criteria.map(&:name)
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Company, :address)
+
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
       end
+    end
 
+    context "call one association that in possible objects" do
       it "should not detect preload association" do
-        Mongoid::Company.all.collect(&:name)
+        Mongoid::Post.all
+        Mongoid::Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
         Bullet::Detector::Association.should be_completely_preloading_associations
       end
-
-      it "should detect unused preload association" do
-        Mongoid::Company.includes(:address).collect(&:name)
-        Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-        Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Company, :address)
-
-        Bullet::Detector::Association.should be_completely_preloading_associations
-      end
-    end
-  end
-
-  describe Bullet::Detector::Association, "call one association that in possible objects" do
-    before(:each) do
-      Bullet.clear
-      Bullet.start_request
-    end
-
-    after(:each) do
-      Bullet.end_request
-    end
-
-    it "should not detect preload association" do
-      Mongoid::Post.all
-      Mongoid::Post.first.comments.map(&:name)
-      Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
-      Bullet::Detector::Association.should_not be_has_unused_preload_associations
-
-      Bullet::Detector::Association.should be_completely_preloading_associations
     end
   end
 rescue LoadError

data/spec/support/mongo_seed.rb

@@ -29,11 +29,19 @@ module Support
     end
 
     def setup_db
-      Mongoid.database = Mongo::Connection.new("localhost", 27017).db("bullet")
+      if Mongoid::VERSION =~ /\A2\.4/
+        Mongoid.configure do |config|
+          config.master = Mongo::Connection.new.db("bullet")
+        end
+      elsif Mongoid::VERSION =~ /\A3/
+        Mongoid.configure do |config|
+          config.connect_to("bullet")
+        end
+      end
     end
 
     def teardown_db
-      Mongoid.database.collections.select {|c| c.name !~ /system/ }.map(&:drop)
+      Mongoid.purge!
     end
 
     extend self

data/test.sh

@@ -0,0 +1,4 @@
+bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.1.4 bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.0.12 bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-2.3.14 bundle && bundle exec rspec spec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &70311383422560 !ruby/object:Gem::Requirement
+  requirement: &70161212330380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70311383422560
+  version_requirements: *70161212330380
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -62,7 +62,8 @@ files:
 - lib/bullet/detector/unused_eager_association.rb
 - lib/bullet/ext/object.rb
 - lib/bullet/ext/string.rb
-- lib/bullet/mongoid.rb
+- lib/bullet/mongoid24.rb
+- lib/bullet/mongoid3.rb
 - lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb
@@ -135,6 +136,7 @@ files:
 - spec/support/sqlite_seed.rb
 - tasks/bullet_tasks.rake
 - test.result
+- test.sh
 homepage: http://github.com/flyerhzm/bullet
 licenses: []
 post_install_message: 
@@ -149,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3387566190207483190
+      hash: 2670779275443337107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A rails plugin to kill N+1 queries and unused eager loading.