bullet 4.1.0 → 4.1.1

data/.gitignore

@@ -8,3 +8,4 @@ tags
 .bundle
 *.gem
 benchmark_profile*
+/nbproject/private/

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - 1.9.3
 gemfile:
   - Gemfile
-  - Gemfile.rails-3.1.4
-  - Gemfile.rails-3.0.12
+  - Gemfile.rails-3.1.5
+  - Gemfile.rails-3.0.13
   - Gemfile.rails-2.3.14
 env: DB=sqlite
 before_install:

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.5'
 gem 'sqlite3'
 gem 'mysql'
 gem 'activerecord-import'

data/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: .
   specs:
-    bullet (4.1.0)
+    bullet (4.1.1)
       uniform_notifier (~> 1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-import (0.2.9)
       activerecord (~> 3.0)
       activerecord (~> 3.0)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+    activesupport (3.2.5)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -50,7 +50,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    json (1.7.0)
+    json (1.7.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -74,21 +74,21 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.5)
+      actionmailer (= 3.2.5)
+      actionpack (= 3.2.5)
+      activerecord (= 3.2.5)
+      activeresource (= 3.2.5)
+      activesupport (= 3.2.5)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.5)
+    railties (3.2.5)
+      actionpack (= 3.2.5)
+      activesupport (= 3.2.5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -124,6 +124,6 @@ DEPENDENCIES
   mongoid (= 3.0.0.rc)
   mysql
   perftools.rb
-  rails (= 3.2.3)
+  rails (= 3.2.5)
   rspec
   sqlite3

data/Gemfile.rails-2.3.14.lock

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

data/{Gemfile.rails-3.0.12 → Gemfile.rails-3.0.13}

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '3.0.12'
+gem 'rails', '3.0.13'
 gem 'sqlite3'
 gem 'mysql'
 gem 'activerecord-import'

data/{Gemfile.rails-3.0.12.lock → Gemfile.rails-3.0.13.lock}

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    bullet (4.1.0)
+    bullet (4.1.1)
       uniform_notifier (~> 1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.12)
-      actionpack (= 3.0.12)
+    actionmailer (3.0.13)
+      actionpack (= 3.0.13)
       mail (~> 2.2.19)
-    actionpack (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
+    actionpack (3.0.13)
+      activemodel (= 3.0.13)
+      activesupport (= 3.0.13)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -21,22 +21,22 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.12)
-      activesupport (= 3.0.12)
+    activemodel (3.0.13)
+      activesupport (= 3.0.13)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
+    activerecord (3.0.13)
+      activemodel (= 3.0.13)
+      activesupport (= 3.0.13)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
     activerecord-import (0.2.9)
       activerecord (~> 3.0)
       activerecord (~> 3.0)
-    activeresource (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-    activesupport (3.0.12)
+    activeresource (3.0.13)
+      activemodel (= 3.0.13)
+      activesupport (= 3.0.13)
+    activesupport (3.0.13)
     arel (2.0.10)
     bson (1.6.2)
     bson_ext (1.6.2)
@@ -52,7 +52,7 @@ GEM
     guard-rspec (0.7.0)
       guard (>= 0.10.0)
     i18n (0.5.0)
-    json (1.7.0)
+    json (1.7.3)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -67,17 +67,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.12)
-      actionmailer (= 3.0.12)
-      actionpack (= 3.0.12)
-      activerecord (= 3.0.12)
-      activeresource (= 3.0.12)
-      activesupport (= 3.0.12)
+    rails (3.0.13)
+      actionmailer (= 3.0.13)
+      actionpack (= 3.0.13)
+      activerecord (= 3.0.13)
+      activeresource (= 3.0.13)
+      activesupport (= 3.0.13)
       bundler (~> 1.0)
-      railties (= 3.0.12)
-    railties (3.0.12)
-      actionpack (= 3.0.12)
-      activesupport (= 3.0.12)
+      railties (= 3.0.13)
+    railties (3.0.13)
+      actionpack (= 3.0.13)
+      activesupport (= 3.0.13)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
@@ -111,6 +111,6 @@ DEPENDENCIES
   guard-rspec
   mysql
   perftools.rb
-  rails (= 3.0.12)
+  rails (= 3.0.13)
   rspec
   sqlite3

data/{Gemfile.rails-3.1.4 → Gemfile.rails-3.1.5}

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails', '3.1.4'
+gem 'rails', '3.1.5'
 gem 'sqlite3'
 gem 'mysql'
 gem 'activerecord-import'

data/{Gemfile.rails-3.1.4.lock → Gemfile.rails-3.1.5.lock}

@@ -1,43 +1,43 @@
 PATH
   remote: .
   specs:
-    bullet (4.1.0)
+    bullet (4.1.1)
       uniform_notifier (~> 1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.4)
-      actionpack (= 3.1.4)
-      mail (~> 2.3.0)
-    actionpack (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
+    actionmailer (3.1.5)
+      actionpack (= 3.1.5)
+      mail (~> 2.3.3)
+    actionpack (3.1.5)
+      activemodel (= 3.1.5)
+      activesupport (= 3.1.5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.6)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.4)
-      activesupport (= 3.1.4)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.5)
+      activesupport (= 3.1.5)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
+    activerecord (3.1.5)
+      activemodel (= 3.1.5)
+      activesupport (= 3.1.5)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
     activerecord-import (0.2.9)
       activerecord (~> 3.0)
       activerecord (~> 3.0)
-    activeresource (3.1.4)
-      activemodel (= 3.1.4)
-      activesupport (= 3.1.4)
-    activesupport (3.1.4)
-      multi_json (~> 1.0)
+    activeresource (3.1.5)
+      activemodel (= 3.1.5)
+      activesupport (= 3.1.5)
+    activesupport (3.1.5)
+      multi_json (>= 1.0, < 1.3)
     arel (2.2.3)
     bson (1.6.2)
     bson_ext (1.6.2)
@@ -53,7 +53,7 @@ GEM
       guard (>= 0.10.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.7.1)
+    json (1.7.3)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -65,7 +65,7 @@ GEM
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.3.6)
+    multi_json (1.2.0)
     mysql (2.8.1)
     perftools.rb (2.0.0)
     polyglot (0.3.3)
@@ -78,17 +78,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.4)
-      actionmailer (= 3.1.4)
-      actionpack (= 3.1.4)
-      activerecord (= 3.1.4)
-      activeresource (= 3.1.4)
-      activesupport (= 3.1.4)
+    rails (3.1.5)
+      actionmailer (= 3.1.5)
+      actionpack (= 3.1.5)
+      activerecord (= 3.1.5)
+      activeresource (= 3.1.5)
+      activesupport (= 3.1.5)
       bundler (~> 1.0)
-      railties (= 3.1.4)
-    railties (3.1.4)
-      actionpack (= 3.1.4)
-      activesupport (= 3.1.4)
+      railties (= 3.1.5)
+    railties (3.1.5)
+      actionpack (= 3.1.5)
+      activesupport (= 3.1.5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -129,6 +129,6 @@ DEPENDENCIES
   mongoid (= 2.4.10)
   mysql
   perftools.rb
-  rails (= 3.1.4)
+  rails (= 3.1.5)
   rspec
   sqlite3

data/lib/bullet.rb

@@ -2,24 +2,17 @@ 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
-  begin
-    require 'mongoid'
-    if Mongoid::VERSION =~ /\A2\.4/
-      autoload :Mongoid, 'bullet/mongoid24'
-    elsif Mongoid::VERSION =~ /\A3/
-      autoload :Mongoid, 'bullet/mongoid3'
-    end
-  rescue LoadError
+  if mongoid?
+    autoload :Mongoid, "bullet/#{mongoid_version}"
   end
   autoload :Rack, 'bullet/rack'
   autoload :BulletLogger, 'bullet/logger'
@@ -49,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/lib/bullet/action_controller2.rb

@@ -1,8 +1,10 @@
 module Bullet
   class ActionController
+    extend Dependency
+
     def self.enable
       require 'action_controller'
-      if Rails.version =~ /\A2.3/
+      if active_record23?
         ::ActionController::Dispatcher.middleware.use Bullet::Rack
         ::ActionController::Dispatcher.class_eval do
           class <<self
@@ -13,7 +15,7 @@ module Bullet
             end
           end
         end
-      elsif Rails.version =~ /\A2.[12]/
+      elsif active_record21? || active_record22?
         ::ActionController::Dispatcher.class_eval do
           alias_method :origin_reload_application, :reload_application
           def reload_application
@@ -29,8 +31,7 @@ module Bullet
             response = origin_process(request, response, method = :perform_action, *arguments)
 
             if Bullet.notification?
-              if response.headers["type"] && response.headers["type"].include?('text/html') &&
-                  response.body.include?("<html>") && response.body.include?("</html>")
+              if response.headers["type"] && response.headers["type"].include?('text/html') && response.body.include?("<html>")
                 response.body <<= Bullet.gather_inline_notifications
                 response.headers["Content-Length"] = response.body.length.to_s
               end

data/lib/bullet/dependency.rb

@@ -0,0 +1,83 @@
+module Bullet
+  module Dependency
+    def mongoid?
+      @mongoid ||= begin
+                     require 'mongoid'
+                     true
+                   rescue LoadError
+                     false
+                   end
+    end
+
+    def active_record?
+      @active_record ||= begin
+                           require 'active_record'
+                           true
+                         rescue LoadError
+                           false
+                         end
+    end
+
+    def active_record_version
+      @active_record_version ||= begin
+                                   if active_record2?
+                                     'active_record2'
+                                   elsif active_record30?
+                                     'active_record3'
+                                   elsif active_record31? || active_record32?
+                                     'active_record31'
+                                   end
+                                 end
+    end
+
+    def mongoid_version
+      @mongoid_version ||= begin
+                             if mongoid24?
+                               'mongoid24'
+                             elsif mongoid3?
+                               'mongoid3'
+                             end
+                           end
+    end
+
+    def active_record2?
+      ::ActiveRecord::VERSION::MAJOR == 2
+    end
+
+    def active_record23?
+      active_record2? && ::ActiveRecord::VERSION::MINOR == 3
+    end
+
+    def active_record22?
+      active_record2? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
+    def active_record21?
+      active_record2? && ::ActiveRecord::VERSION::MINOR == 1
+    end
+
+    def active_record3?
+      ::ActiveRecord::VERSION::MAJOR == 3
+    end
+
+    def active_record30?
+      active_record3? && ::ActiveRecord::VERSION::MINOR == 0
+    end
+
+    def active_record31?
+      active_record3? && ::ActiveRecord::VERSION::MINOR == 1
+    end
+
+    def active_record32?
+      active_record3? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
+    def mongoid24?
+      ::Mongoid::VERSION =~ /\A2\.4/
+    end
+
+    def mongoid3?
+      ::Mongoid::VERSION =~ /\A3/
+    end
+  end
+end

data/lib/bullet/rack.rb

@@ -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?
@@ -31,11 +31,13 @@ module Bullet
       !response.body.is_a?(String) || 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

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

data/spec/bullet/ext/object_spec.rb

@@ -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

@@ -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

@@ -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

@@ -1,7 +1,6 @@
-begin
-  require 'mongoid'
-  require 'spec_helper'
+require 'spec_helper'
 
+if mongoid?
   describe Bullet::Detector::Association do
     before(:each) do
       Bullet.clear
@@ -249,5 +248,4 @@ begin
       end
     end
   end
-rescue LoadError
 end

data/spec/integration/rails2/association_spec.rb

@@ -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

@@ -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

@@ -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}

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ rescue LoadError
   # rails 2.3
   require 'initializer'
 end
-require 'active_record'
 require 'action_controller'
 
 module Rails
@@ -18,39 +17,45 @@ end
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'bullet'
+extend Bullet::Dependency
 Bullet.enable = true
-ActiveRecord::Migration.verbose = false
 
 MODELS = File.join(File.dirname(__FILE__), "models")
 $LOAD_PATH.unshift(MODELS)
-
-# Autoload every model for the test suite that sits in spec/models.
-Dir[ File.join(MODELS, "*.rb") ].sort.each do |filename|
-  name = File.basename(filename, ".rb")
-  autoload name.camelize.to_sym, name
-end
-
 SUPPORT = File.join(File.dirname(__FILE__), "support")
-Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /mongo_seed.rb$/ }.sort.each { |file| require file }
+Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /_seed.rb$/ }.sort.each { |file| require file }
 
 RSpec.configure do |config|
-  config.before(:suite) do
-    Support::SqliteSeed.setup_db
-    Support::SqliteSeed.seed_db
-  end
-
-  config.after(:suite) do
-    Support::SqliteSeed.teardown_db
-  end
+  config.extend Bullet::Dependency
 
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end
 
-begin
-  require 'mongoid'
+if active_record?
+  ActiveRecord::Migration.verbose = false
 
-  # Autoload every model for the test suite that sits in spec/models.
+  # Autoload every active_record model for the test suite that sits in spec/models.
+  Dir[ File.join(MODELS, "*.rb") ].sort.each do |filename|
+    name = File.basename(filename, ".rb")
+    autoload name.camelize.to_sym, name
+  end
+  require File.join(SUPPORT, "sqlite_seed.rb")
+
+  RSpec.configure do |config|
+    config.before(:suite) do
+      Support::SqliteSeed.setup_db
+      Support::SqliteSeed.seed_db
+    end
+
+    config.after(:suite) do
+      Support::SqliteSeed.teardown_db
+    end
+  end
+end
+
+if mongoid?
+  # Autoload every mongoid model for the test suite that sits in spec/models.
   Dir[ File.join(MODELS, "mongoid", "*.rb") ].sort.each { |file| require file }
   require File.join(SUPPORT, "mongo_seed.rb")
 
@@ -64,5 +69,4 @@ begin
       Support::MongoSeed.teardown_db
     end
   end
-rescue LoadError
 end

data/test.sh

@@ -1,4 +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-3.1.5 bundle && bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.0.13 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.1.0
+  version: 4.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &70161212330380 !ruby/object:Gem::Requirement
+  requirement: &70259190750800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70161212330380
+  version_requirements: *70259190750800
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -38,10 +38,10 @@ files:
 - Gemfile.lock
 - Gemfile.rails-2.3.14
 - Gemfile.rails-2.3.14.lock
-- Gemfile.rails-3.0.12
-- Gemfile.rails-3.0.12.lock
-- Gemfile.rails-3.1.4
-- Gemfile.rails-3.1.4.lock
+- Gemfile.rails-3.0.13
+- Gemfile.rails-3.0.13.lock
+- Gemfile.rails-3.1.5
+- Gemfile.rails-3.1.5.lock
 - Guardfile
 - Hacking.textile
 - MIT-LICENSE
@@ -54,6 +54,7 @@ files:
 - lib/bullet/active_record2.rb
 - lib/bullet/active_record3.rb
 - lib/bullet/active_record31.rb
+- lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
 - lib/bullet/detector/base.rb
@@ -151,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2670779275443337107
+      hash: 3239988902273692039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: