RubyGems - bullet - Versions diffs - 4.0.0 → 4.1.4 - Mend

bullet 4.0.0 → 4.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

data/.gitignore +1 -0
data/.travis.yml +4 -2
data/Gemfile +2 -3
data/Gemfile.lock +36 -39
data/Gemfile.rails-2.3.14.lock +1 -1
data/{Gemfile.rails-3.0.12 → Gemfile.rails-3.0.13} +1 -1
data/{Gemfile.rails-3.0.12.lock → Gemfile.rails-3.0.13.lock} +27 -27
data/{Gemfile.rails-3.1.4 → Gemfile.rails-3.1.5} +2 -2
data/{Gemfile.rails-3.1.4.lock → Gemfile.rails-3.1.5.lock} +34 -34
data/README.textile +3 -1
data/README_for_rails2.textile +4 -0
data/lib/bullet/action_controller2.rb +5 -4
data/lib/bullet/dependency.rb +83 -0
data/lib/bullet/{mongoid.rb → mongoid24.rb} +13 -15
data/lib/bullet/mongoid3.rb +53 -0
data/lib/bullet/rack.rb +8 -6
data/lib/bullet/version.rb +1 -2
data/lib/bullet.rb +12 -17
data/spec/bullet/ext/object_spec.rb +1 -4
data/spec/integration/association_spec.rb +1 -1
data/spec/integration/counter_spec.rb +1 -1
data/spec/integration/mongoid/association_spec.rb +174 -199
data/spec/integration/rails2/association_spec.rb +1 -1
data/spec/integration/rails2/counter_spec.rb +2 -2
data/spec/models/post.rb +3 -1
data/spec/spec_helper.rb +26 -22
data/spec/support/mongo_seed.rb +10 -2
data/test.sh +4 -0
metadata +14 -12
data/test.result +0 -2293

data/lib/bullet/rack.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Bullet
       Bullet.start_request
       status, headers, response = @app.call(env)
-      return [status, headers, response] if empty?(response)
+      return [status, headers, response] if file?(headers) || empty?(response)
       response_body = nil
       if Bullet.notification?
@@ -28,14 +28,16 @@ module Bullet
     def empty?(response)
       # response may be ["Not Found"], ["Move Permanently"], etc.
       (response.is_a?(Array) && response.size <= 1) ||
-      !response.body.is_a?(String) || response.body.empty?
+        !response.respond_to?(:body) || response.body.empty?
+    end
+    # if send file?
+    def file?(headers)
+      headers["Content-Transfer-Encoding"] == "binary"
     end
     def html_request?(headers, response)
-      headers['Content-Type'] &&
-        headers['Content-Type'].include?('text/html') &&
-        response.body.include?("<html>") &&
-        response.body.include?("</html>")
+      headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response.body.include?("<html>")
     end
     def no_browser_cache(headers)

data/lib/bullet/version.rb CHANGED Viewed

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

data/lib/bullet.rb CHANGED Viewed

@@ -2,17 +2,18 @@ require 'set'
 require 'uniform_notifier'
 require 'bullet/ext/object'
 require 'bullet/ext/string'
+require 'bullet/dependency'
 module Bullet
-  if Rails.version =~ /\A3\.0/
-    autoload :ActiveRecord, 'bullet/active_record3'
-  elsif Rails.version =~ /\A3\.[12]/
-    autoload :ActiveRecord, 'bullet/active_record31'
-  else
-    autoload :ActiveRecord, 'bullet/active_record2'
-    autoload :ActionController, 'bullet/action_controller2'
+  extend Dependency
+  if active_record?
+    autoload :ActiveRecord, "bullet/#{active_record_version}"
+    autoload :ActionController, 'bullet/action_controller2' if active_record2?
+  end
+  if mongoid?
+    autoload :Mongoid, "bullet/#{mongoid_version}"
   end
-  autoload :Mongoid, 'bullet/mongoid'
   autoload :Rack, 'bullet/rack'
   autoload :BulletLogger, 'bullet/logger'
   autoload :Notification, 'bullet/notification'
@@ -41,18 +42,12 @@ module Bullet
     def enable=(enable)
       @enable = enable
       if enable?
-        begin
-          require 'mongoid'
+        if mongoid?
           Bullet::Mongoid.enable
-        rescue LoadError
         end
-        begin
-          require 'active_record'
+        if active_record?
           Bullet::ActiveRecord.enable
-          if Rails.version =~ /\A2./
-            Bullet::ActionController.enable
-          end
-        rescue LoadError
+          Bullet::ActionController.enable if active_record2?
         end
       end
     end

data/spec/bullet/ext/object_spec.rb CHANGED Viewed

@@ -7,14 +7,11 @@ describe Object do
       post.bullet_ar_key.should == "Post:#{post.id}"
     end
-    begin
-      require 'mongoid'
+    if mongoid?
       it "should return class with namesapce and id composition" do
         post = Mongoid::Post.first
         post.bullet_ar_key.should == "Mongoid::Post:#{post.id}"
       end
-    rescue LoadError
     end
   end
 end

data/spec/integration/association_spec.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 require 'spec_helper'
-if Rails.version.to_i > 2
+if active_record3?
   describe Bullet::Detector::Association, 'has_many' do
     before(:each) do
       Bullet.clear

data/spec/integration/counter_spec.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 require 'spec_helper'
-if Rails.version.to_i > 2
+if active_record3?
   describe Bullet::Detector::Counter do
     before(:each) do
       Bullet.start_request

data/spec/integration/mongoid/association_spec.rb CHANGED Viewed

@@ -1,276 +1,251 @@
 require 'spec_helper'
-begin
-  require 'mongoid'
-  describe Bullet::Detector::Association, 'has_many' do
+if mongoid?
+  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
-    context "company => address" do
-      it "should detect non preload association" do
-        Mongoid::Company.all.each do |company|
-          company.address.name
+        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
+          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
 end

data/spec/integration/rails2/association_spec.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 require 'spec_helper'
-if Rails.version.to_i == 2
+if active_record2?
   describe Bullet::Detector::Association, 'has_many' do
     before(:each) do
       Bullet.clear

data/spec/integration/rails2/counter_spec.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 require 'spec_helper'
-if Rails.version.to_i > 2
+if active_record2?
   describe Bullet::Detector::Counter do
     before(:each) do
       Bullet.start_request
@@ -31,7 +31,7 @@ if Rails.version.to_i > 2
     it "should not need counter cache with part of cities" do
       Country.all.each do |country|
-        country.cities.where(:name => 'first').size
+        country.cities.find(:all, :conditions => {:name => 'first'}).size
       end
       Bullet.collected_counter_cache_notifications.should be_empty
     end

data/spec/models/post.rb CHANGED Viewed

@@ -1,9 +1,11 @@
 class Post < ActiveRecord::Base
+  extend Bullet::Dependency
   belongs_to :category
   belongs_to :writer
   has_many :comments
-  if Rails.version.to_i == 2
+  if active_record2?
     named_scope :preload_comments, lambda { {:include => :comments} }
     named_scope :in_category_name, lambda { |name|
       {:conditions => ['categories.name = ?', name], :include => :category}