bullet 4.14.3 → 4.14.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe02316f8b3e0b61718c940420f189423c3f5f0
-  data.tar.gz: 93db165a6618fb9c470081013e4b2f5fe002c602
+  metadata.gz: 262911eb5bb5cc6577489084cca4c06042ec466b
+  data.tar.gz: 6aa0f9e1403c8f36cac9375b451880a82c9561cd
 SHA512:
-  metadata.gz: 6c9ec0b4e3c23e6de5f59f74cb9378f5db7c32a448a42d4304b2399c3762308bab649dffc7f86bd04aaf175946391df9658994a1a190fb2a64fb8ec5bd21dbb3
-  data.tar.gz: 47451dec206f2d05aaa11466d8f6c063bbb9e3e9c03929d7dc8867b11e77be6871ee6a58f1f2b52435db3bb6854e913228dc9b310bf7dd78f5b968de5f042932
+  metadata.gz: 99c812cc4085c2e9763ba05564f98b4b3ab9027820932eb70d09060fbfb69071d38d8d844b67d29dc167ad04983e8133fa5727b426122d9a4e0f3b9c55e9bd3b
+  data.tar.gz: d1316bb72c9228fb4b7746795d528506eb472d1bd906424c17bbb5a3adcdd995e75bcdec59b8a93959d80e9ef88e0bfb692092db505c95a50fcd32735f4dda8e

data/.travis.yml

@@ -1,6 +1,9 @@
+sudo: false
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
 gemfile:
   - Gemfile.rails-4.2
   - Gemfile.rails-4.1
@@ -8,6 +11,8 @@ gemfile:
   - Gemfile.rails-3.2
   - Gemfile.rails-3.1
   - Gemfile.rails-3.0
+  - Gemfile.mongoid-5.0
+  - Gemfile.mongoid-4.0
   - Gemfile.mongoid-3.1
   - Gemfile.mongoid-3.0
   - Gemfile.mongoid-2.8
@@ -19,3 +24,25 @@ env:
   - DB=sqlite
 services:
   - mongodb
+matrix:
+  exclude:
+    - rvm: 2.2
+      gemfile: Gemfile.rails-3.0
+    - rvm: 2.2
+      gemfile: Gemfile.rails-3.1
+    - rvm: 2.2
+      gemfile: Gemfile.rails-3.2
+    - rvm: 2.2
+      gemfile: Gemfile.mongoid-3.1
+    - rvm: 2.2
+      gemfile: Gemfile.mongoid-3.0
+    - rvm: 2.2
+      gemfile: Gemfile.mongoid-2.8
+    - rvm: 2.2
+      gemfile: Gemfile.mongoid-2.7
+    - rvm: 2.2
+      gemfile: Gemfile.mongoid-2.6
+    - rvm: 2.2
+      gemfile: Gemfile.mongoid-2.5
+    - rvm: 2.2
+      gemfile: Gemfile.mongoid-2.4

data/CHANGELOG.md

@@ -1,16 +1,52 @@
 # Next Release
 
+## 4.14.10
+
+* Fix `has_many :through` infinite loop issue
+
+## 4.14.9
+
+* Support mongoid 5.0.0
+* Do not report association queries immediately after object creation to
+  require a preload
+* Detect `counter_cache` for `has_many :through` association
+
+## 4.14.8
+
+* compatible with `composite_primary_keys` gem
+
+## 4.14.7
+
+* Fix AR 4.2 SingularAssociation#reader result can be nil
+* `perform_out_of_channel_notifications` should always be triggered
+
+## 4.14.6
+
+* Fix false positive with `belongs_to` -> `belongs_to` for active\_record 4.2
+* Activate active\_record hacks only when Bullet already start
+
+## 4.14.5
+
+* Don't execute query when running `to_sql`
+* Send backtrace to `uniform_notifier`
+* Fix sse response check
+* Dynamically delegate available notifiers to UniformNotifier
+
+## 4.14.4
+
+* Fix false N + 1 warnings on Rails 4.2
+
 ## 4.14.3
 
 * Fix false positive on create
 
 ## 4.14.2
 
-* Hotfix nil object when add_impossible_object
+* Hotfix nil object when `add_impossible_object`
 
 ## 4.14.1
 
-* Fix has_one then has_many associations in rails 4.2
+* Fix `has_one` then `has_many` associations in rails 4.2
 * Append js and dom to html body in proper position
 
 ## 4.14.0 (10/03/2014)

data/Gemfile.mongoid

@@ -8,7 +8,5 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', github: 'mongoid/mongoid'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false

data/Gemfile.mongoid-2.4

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 2.4.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-2.5

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 2.5.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-2.6

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 2.6.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-2.7

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 2.7.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-2.8

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 2.8.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-3.0

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 3.0.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-3.1

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 3.1.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-4.0

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 4.0.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-5.0

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 4.0.0'
+gem 'sqlite3', platforms: [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'mongoid', '~> 5.0.0.beta', github: 'mongoid'
+
+gem "rspec"
+
+gem 'coveralls', require: false
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/Gemfile.rails-3.1

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.rails-3.2

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.rails-4.0

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.rails-4.1

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.rails-4.2

@@ -8,8 +8,6 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/README.md

@@ -36,6 +36,9 @@ or add it into a Gemfile (Bundler):
 gem "bullet", :group => "development"
 ```
 
+**Note**: make sure `bullet` gem is added after activerecord (rails) and
+mongoid.
+
 ## Configuration
 
 Bullet won't do ANYTHING unless you tell it to explicitly. Append to
@@ -53,10 +56,13 @@ config.after_initialize do
                   :receiver => 'your_account@jabber.org',
                   :show_online_status => true }
   Bullet.rails_logger = true
+  Bullet.honeybadger = true
   Bullet.bugsnag = true
   Bullet.airbrake = true
+  Bullet.rollbar = true
   Bullet.add_footer = true
   Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
+  Bullet.slack = { webhook_url: 'http://some.slack.url', foo: 'bar' }
 end
 ```
 
@@ -67,14 +73,17 @@ The code above will enable all seven of the Bullet notification systems:
 * `Bullet.alert`: pop up a JavaScript alert in the browser
 * `Bullet.bullet_logger`: log to the Bullet log file (Rails.root/log/bullet.log)
 * `Bullet.rails_logger`: add warnings directly to the Rails log
+* `Bullet.honeybadger`: add notifications to Honeybadger
 * `Bullet.bugsnag`: add notifications to bugsnag
 * `Bullet.airbrake`: add notifications to airbrake
+* `Bullet.rollbar`: add notifications to rollbar
 * `Bullet.console`: log warnings to your browser's console.log (Safari/Webkit browsers or Firefox w/Firebug installed)
 * `Bullet.growl`: pop up Growl warnings if your system has Growl installed. Requires a little bit of configuration
 * `Bullet.xmpp`: send XMPP/Jabber notifications to the receiver indicated. Note that the code will currently not handle the adding of contacts, so you will need to make both accounts indicated know each other manually before you will receive any notifications. If you restart the development server frequently, the 'coming online' sound for the Bullet account may start to annoy - in this case set :show_online_status to false; you will still get notifications, but the Bullet account won't announce it's online status anymore.
 * `Bullet.raise`: raise errors, useful for making your specs fail unless they have optimized queries
 * `Bullet.add_footer`: adds the details in the bottom left corner of the page
 * `Bullet.stacktrace_includes`: include paths with any of these substrings in the stack trace, even if they are not in your main app
+* `Bullet.slack`: add notifications to slack
 
 Bullet also allows you to disable any of its detectors.
 
@@ -103,6 +112,22 @@ Bullet.add_whitelist :type => :unused_eager_loading, :class_name => "Post", :ass
 Bullet.add_whitelist :type => :counter_cache, :class_name => "Country", :association => :cities
 ```
 
+If you want to skip bullet in some specific controller actions, you can
+do like
+
+```ruby
+class ApplicationController < ActionController::Base
+  around_action :skip_bullet
+
+  def skip_bullet
+    Bullet.enable = false
+    yield
+  ensure
+    Bullet.enable = true
+  end
+end
+```
+
 ## Log
 
 The Bullet log `log/bullet.log` will look something like this:
@@ -154,8 +179,9 @@ The Bullet gem uses rack middleware to profile requests. If you want to use Bull
 ```ruby
 Bullet.profile do
   # do anything
+
+  warnings = Bullet.warnings
 end
-warnings = Bullet.warnings
 ```
 
 ### Work with sinatra

data/bullet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "uniform_notifier", ">= 1.6.0"
+  s.add_runtime_dependency "uniform_notifier", "~> 1.9.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bullet/active_record3.rb

@@ -1,5 +1,7 @@
 module Bullet
   module ActiveRecord
+    LOAD_TARGET = 'load_target'.freeze
+
     def self.enable
       require 'active_record'
       ::ActiveRecord::Relation.class_eval do
@@ -8,12 +10,14 @@ module Bullet
         # if select only one object, then the only one object has impossible to cause N+1 query.
         def to_a
           records = origin_to_a
-          if records.size > 1
-            Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
-            Bullet::Detector::CounterCache.add_possible_objects(records)
-          elsif records.size == 1
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
-            Bullet::Detector::CounterCache.add_impossible_object(records.first)
+          if Bullet.start?
+            if records.size > 1
+              Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+              Bullet::Detector::CounterCache.add_possible_objects(records)
+            elsif records.size == 1
+              Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+              Bullet::Detector::CounterCache.add_impossible_object(records.first)
+            end
           end
           records
         end
@@ -24,12 +28,14 @@ module Bullet
         # include query for one to many associations.
         # keep this eager loadings.
         def preload_associations(records, associations, preload_options={})
-          records = [records].flatten.compact.uniq
-          return if records.empty?
-          records.each do |record|
-            Bullet::Detector::Association.add_object_associations(record, associations)
+          if Bullet.start?
+            records = [records].flatten.compact.uniq
+            return if records.empty?
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, associations)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           end
-          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           origin_preload_associations(records, associations, preload_options={})
         end
       end
@@ -39,11 +45,13 @@ module Bullet
         alias_method :origin_find_with_associations, :find_with_associations
         def find_with_associations
           records = origin_find_with_associations
-          associations = (@eager_load_values + @includes_values).uniq
-          records.each do |record|
-            Bullet::Detector::Association.add_object_associations(record, associations)
+          if Bullet.start?
+            associations = (@eager_load_values + @includes_values).uniq
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, associations)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           end
-          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           records
         end
       end
@@ -56,9 +64,11 @@ module Bullet
           @bullet_eager_loadings = {}
           records = origin_instantiate(rows)
 
-          @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
-            objects = eager_loadings_hash.keys
-            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+          if Bullet.start?
+            @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
+              objects = eager_loadings_hash.keys
+              Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+            end
           end
           records
         end
@@ -67,12 +77,14 @@ module Bullet
         def construct_association(record, join, row)
           result = origin_construct_association(record, join, row)
 
-          associations = join.reflection.name
-          Bullet::Detector::Association.add_object_associations(record, associations)
-          Bullet::Detector::NPlusOneQuery.call_association(record, associations)
-          @bullet_eager_loadings[record.class] ||= {}
-          @bullet_eager_loadings[record.class][record] ||= Set.new
-          @bullet_eager_loadings[record.class][record] << associations
+          if Bullet.start?
+            associations = join.reflection.name
+            Bullet::Detector::Association.add_object_associations(record, associations)
+            Bullet::Detector::NPlusOneQuery.call_association(record, associations)
+            @bullet_eager_loadings[record.class] ||= {}
+            @bullet_eager_loadings[record.class][record] ||= Set.new
+            @bullet_eager_loadings[record.class][record] << associations
+          end
 
           result
         end
@@ -82,31 +94,41 @@ module Bullet
         # call one to many associations
         alias_method :origin_load_target, :load_target
         def load_target
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_load_target
         end
 
         alias_method :origin_first, :first
         def first(*args)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_first(*args)
         end
 
         alias_method :origin_last, :last
         def last(*args)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_last(*args)
         end
 
         alias_method :origin_empty?, :empty?
         def empty?
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_empty?
         end
 
         alias_method :origin_include?, :include?
         def include?(object)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_include?(object)
         end
       end
@@ -117,15 +139,19 @@ module Bullet
         def load_target
           # avoid stack level too deep
           result = origin_load_target
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless caller.any? { |c| c.include?("load_target") }
-          Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless caller.any? { |c| c.include?(LOAD_TARGET) }
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          end
           result
         end
 
         alias_method :origin_set_inverse_instance, :set_inverse_instance
         def set_inverse_instance(record, instance)
-          if record && we_can_set_the_inverse_on_this?(record)
-            Bullet::Detector::NPlusOneQuery.add_inversed_object(record, @reflection.inverse_of.name)
+          if Bullet.start?
+            if record && we_can_set_the_inverse_on_this?(record)
+              Bullet::Detector::NPlusOneQuery.add_inversed_object(record, @reflection.inverse_of.name)
+            end
           end
           origin_set_inverse_instance(record, instance)
         end
@@ -136,7 +162,9 @@ module Bullet
 
         def has_cached_counter?
           result = origin_has_cached_counter?
-          Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
+          end
           result
         end
       end
@@ -145,7 +173,9 @@ module Bullet
         alias_method :origin_has_cached_counter?, :has_cached_counter?
         def has_cached_counter?
           result = origin_has_cached_counter?
-          Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(@owner, @reflection.name)
+          end
           result
         end
       end