bullet 2.3.0 → 4.0.0

data/.travis.yml

@@ -1,4 +1,9 @@
 language: ruby
 rvm:
   - 1.9.3
+gemfile:
+  - Gemfile
+  - Gemfile.rails-3.1.4
+  - Gemfile.rails-3.0.12
+  - Gemfile.rails-2.3.14
 env: DB=sqlite

data/Gemfile

@@ -4,10 +4,12 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'rails'
+gem 'rails', '3.2.3'
 gem 'sqlite3'
 gem 'mysql'
 gem 'activerecord-import'
+gem 'mongoid'
+gem 'bson_ext'
 
 gem "rspec"
 gem "guard"

data/Gemfile.lock

@@ -1,43 +1,46 @@
 PATH
   remote: .
   specs:
-    bullet (2.3.0)
+    bullet (4.0.0)
       uniform_notifier (~> 1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-import (0.2.9)
       activerecord (~> 3.0)
       activerecord (~> 3.0)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       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)
@@ -50,13 +53,19 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    json (1.6.5)
+    json (1.7.0)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.1.0)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.9)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.3.4)
     mysql (2.8.1)
     perftools.rb (2.0.0)
     polyglot (0.3.3)
@@ -67,17 +76,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -93,7 +102,7 @@ GEM
     rspec-expectations (2.9.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -103,19 +112,21 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    uniform_notifier (1.0.1)
+    tzinfo (0.3.33)
+    uniform_notifier (1.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord-import
+  bson_ext
   bullet!
   guard
   guard-rspec
+  mongoid
   mysql
   perftools.rb
-  rails
+  rails (= 3.2.3)
   rspec
   sqlite3

data/Gemfile.rails-2.3.14

@@ -0,0 +1,16 @@
+# Use `bundle install` in order to install these gems
+# Use `bundle exec rake` in order to run the specs using the bundle
+source "http://rubygems.org"
+
+gemspec
+
+gem 'rails', '2.3.14'
+gem 'sqlite3'
+gem 'mysql'
+gem 'bson_ext'
+
+gem "rspec"
+gem "guard"
+gem "guard-rspec"
+
+gem "perftools.rb"

data/Gemfile.rails-2.3.14.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: .
+  specs:
+    bullet (2.3.1)
+      uniform_notifier (~> 1.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    guard (1.0.2)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
+    mysql (2.8.1)
+    perftools.rb (2.0.0)
+    rack (1.1.3)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
+      rake (>= 0.8.3)
+    rake (0.9.2.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    sqlite3 (1.3.6)
+    thor (0.14.6)
+    uniform_notifier (1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  bullet!
+  guard
+  guard-rspec
+  mysql
+  perftools.rb
+  rails (= 2.3.14)
+  rspec
+  sqlite3

data/Gemfile.rails-3.0.12

@@ -0,0 +1,17 @@
+# Use `bundle install` in order to install these gems
+# Use `bundle exec rake` in order to run the specs using the bundle
+source "http://rubygems.org"
+
+gemspec
+
+gem 'rails', '3.0.12'
+gem 'sqlite3'
+gem 'mysql'
+gem 'activerecord-import'
+gem 'bson_ext'
+
+gem "rspec"
+gem "guard"
+gem "guard-rspec"
+
+gem "perftools.rb"

data/Gemfile.rails-3.0.12.lock

@@ -0,0 +1,116 @@
+PATH
+  remote: .
+  specs:
+    bullet (2.3.1)
+      uniform_notifier (~> 1.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.12)
+      actionpack (= 3.0.12)
+      mail (~> 2.2.19)
+    actionpack (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      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)
+    arel (2.0.10)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    ffi (1.0.11)
+    guard (1.0.2)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
+    i18n (0.5.0)
+    json (1.7.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    mysql (2.8.1)
+    perftools.rb (2.0.0)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      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)
+      bundler (~> 1.0)
+      railties (= 3.0.12)
+    railties (3.0.12)
+      actionpack (= 3.0.12)
+      activesupport (= 3.0.12)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    sqlite3 (1.3.6)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    uniform_notifier (1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-import
+  bson_ext
+  bullet!
+  guard
+  guard-rspec
+  mysql
+  perftools.rb
+  rails (= 3.0.12)
+  rspec
+  sqlite3

data/Gemfile.rails-3.1.4

@@ -0,0 +1,18 @@
+# Use `bundle install` in order to install these gems
+# Use `bundle exec rake` in order to run the specs using the bundle
+source "http://rubygems.org"
+
+gemspec
+
+gem 'rails', '3.1.4'
+gem 'sqlite3'
+gem 'mysql'
+gem 'activerecord-import'
+gem 'mongoid'
+gem 'bson_ext'
+
+gem "rspec"
+gem "guard"
+gem "guard-rspec"
+
+gem "perftools.rb"

data/Gemfile.rails-3.1.4.lock

@@ -0,0 +1,134 @@
+PATH
+  remote: .
+  specs:
+    bullet (2.3.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)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.4)
+      activesupport (= 3.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+      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)
+    arel (2.2.3)
+    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)
+    ffi (1.0.11)
+    guard (1.0.2)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.7.1)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.9)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.3.4)
+    mysql (2.8.1)
+    perftools.rb (2.0.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      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)
+      bundler (~> 1.0)
+      railties (= 3.1.4)
+    railties (3.1.4)
+      actionpack (= 3.1.4)
+      activesupport (= 3.1.4)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    uniform_notifier (1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-import
+  bson_ext
+  bullet!
+  guard
+  guard-rspec
+  mongoid
+  mysql
+  perftools.rb
+  rails (= 3.1.4)
+  rspec
+  sqlite3

data/README.textile

@@ -1,12 +1,12 @@
-h1. Bullet
+h1. Bullet !https://gemnasium.com/flyerhzm/bullet.png?travis(Dependency Status)!:https://gemnasium.com/flyerhzm/bullet
 
 !https://secure.travis-ci.org/flyerhzm/bullet.png!:http://travis-ci.org/flyerhzm/bullet
 
-The Bullet plugin/gem is designed to help you increase your application's performance by reducing the number of queries it makes. It will watch your queries while you develop your application and notify you when you should add eager loading (N+1 queries), when you're using eager loading that isn't necessary and when you should use counter cache.
+The Bullet gem is designed to help you increase your application's performance by reducing the number of queries it makes. It will watch your queries while you develop your application and notify you when you should add eager loading (N+1 queries), when you're using eager loading that isn't necessary and when you should use counter cache.
 
 Best practice is to use Bullet in development mode or custom mode (staging, profile, etc.). The last thing you want is your clients getting alerts about how lazy you are.
 
-The Bullet plugin/gem now supports rails 2.1, 2.2, 2.3, 3.0, 3.1 and 3.2.
+The Bullet gem now supports **activerecord** 2.1, 2.2, 2.3, 3.0, 3.1, 3.2 and **mongoid** >= 2.4.1.
 
 ****************************************************************************
 
@@ -46,7 +46,7 @@ end
 The notifier of bullet is a wrap of "uniform_notifier":https://github.com/flyerhzm/uniform_notifier
 
 The code above will enable all six of the Bullet notification systems:
-* <code>Bullet.enable</code>: enable Bullet plugin/gem, otherwise do nothing
+* <code>Bullet.enable</code>: enable Bullet gem, otherwise do nothing
 * <code>Bullet.alert</code>: pop up a JavaScript alert in the browser
 * <code>Bullet.bullet_logger</code>: log to the Bullet log file (Rails.root/log/bullet.log)
 * <code>Bullet.rails_logger</code>: add warnings directly to the Rails log
@@ -127,7 +127,7 @@ If you find bullet does not work for you, *please disable your browser's cache*.
 
 h2. Advance
 
-The bullet plugin/gem use rack middleware for http request. If you want to bullet for without http server, such as job server. You can do like this:
+The bullet gem use rack middleware for http request. If you want to bullet for without http server, such as job server. You can do like this:
 
 <pre><code>
 Bullet.start_request if Bullet.enable?
@@ -233,7 +233,7 @@ And run
 
 <pre><code>bundle install</code></pre>
 
-6. enable the bullet plugin in development, add a line to <code>config/environments/development.rb</code>
+6. enable the bullet gem in development, add a line to <code>config/environments/development.rb</code>
 
 <pre><code>
 config.after_initialize do

data/lib/bullet/active_record2.rb

@@ -73,6 +73,18 @@ module Bullet
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           origin_load_target
         end
+
+        alias_method :origin_first, :first
+        def first(*args)
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_first(*args)
+        end
+
+        alias_method :origin_last, :last
+        def last(*args)
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_last(*args)
+        end
       end
 
       ::ActiveRecord::Associations::AssociationProxy.class_eval do

data/lib/bullet/active_record3.rb

@@ -67,6 +67,18 @@ module Bullet
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
           origin_load_target
         end
+
+        alias_method :origin_first, :first
+        def first(*args)
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_first(*args)
+        end
+
+        alias_method :origin_last, :last
+        def last(*args)
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_last(*args)
+        end
       end
 
       ::ActiveRecord::Associations::AssociationProxy.class_eval do

data/lib/bullet/detector/association.rb

@@ -20,34 +20,33 @@ module Bullet
         end
 
         def add_object_associations(object, associations)
-          object_associations.add(object.ar_key, associations)
+          object_associations.add(object.bullet_ar_key, associations) if object.id
         end
 
         def add_call_object_associations(object, associations)
-          if object.id
-            call_object_associations.add(object.ar_key, associations)
-          end
+          call_object_associations.add(object.bullet_ar_key, associations) if object.id
         end
 
         def add_possible_objects(object_or_objects)
+          return unless object_or_objects
           if object_or_objects.is_a? Array
-            object_or_objects.each { |object| possible_objects.add object.ar_key }
+            object_or_objects.each { |object| possible_objects.add object.bullet_ar_key }
           else
-            possible_objects.add object_or_objects.ar_key
+            possible_objects.add object_or_objects.bullet_ar_key if object_or_objects.id
           end
         end
 
         def add_impossible_object(object)
-          impossible_objects.add object.ar_key
+          impossible_objects.add object.bullet_ar_key if object.id
         end
 
         def add_eager_loadings(objects, associations)
-          object_ar_keys = Array(objects).map(&:ar_key)
+          bullet_ar_keys = objects.map(&:bullet_ar_key)
 
           to_add = nil
           to_merge, to_delete = [], []
           eager_loadings.each do |k, v|
-            key_objects_overlap = k & object_ar_keys
+            key_objects_overlap = k & bullet_ar_keys
 
             next if key_objects_overlap.empty?
 
@@ -57,10 +56,10 @@ module Bullet
             else
               to_merge << [key_objects_overlap, ( eager_loadings[k].dup  << associations )]
 
-              keys_without_objects = k - object_ar_keys
+              keys_without_objects = k - bullet_ar_keys
               to_merge << [keys_without_objects, eager_loadings[k]]
               to_delete << k
-              object_ar_keys = object_ar_keys - k
+              bullet_ar_keys = bullet_ar_keys - k
             end
           end
 
@@ -68,7 +67,7 @@ module Bullet
           to_merge.each { |k,val| eager_loadings.merge k, val }
           to_delete.each { |k| eager_loadings.delete k }
 
-          eager_loadings.add object_ar_keys, associations unless object_ar_keys.empty?
+          eager_loadings.add bullet_ar_keys, associations unless bullet_ar_keys.empty?
         end
 
         private