bullet 4.14.0 → 4.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb37955eb9271242e6c93d070639487d27c41cc4
-  data.tar.gz: 3dcfaee4517be454ae076b8707b479357aef4810
+  metadata.gz: 6a56f8b0100130149fc7c45ceb660b4b100b84b8
+  data.tar.gz: 44a4a67d0ab54bbc6ab8cfef656257e40131e7ab
 SHA512:
-  metadata.gz: aad803335d34af96636af55b2db42e93770c1d989485bad7bcd6a5ac6b78c1cd95d5c133913d2fb606dd9cfedec078785a83d175dac42ebd408595866b791679
-  data.tar.gz: e53e36ef7782a6e94079b128eaebecde19501ce26c0204dd35dbc7df53b81313d0f8fa22c0a445c1f10f5f163cf23afcaa29c998279963667ca7b7f34cdc7c66
+  metadata.gz: bdb47a4a12f599a6c35113a13ba9ed3559c220e06731beb2ff86d4bec9de0a019425c47d3b19c22e987d7106a930a15c985c56f057edd521a6a5000a76c126d8
+  data.tar.gz: 872c82a3e4d7ce373064c7738a45a012e1a001c35b428c49380635723d119bb3828a48e336eed733cdd2bf48905f6ad627dc6061a20b51ebf0b294aa093ca3a4

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
 gemfile:
   - Gemfile.rails-4.2
   - Gemfile.rails-4.1
@@ -8,6 +10,7 @@ gemfile:
   - Gemfile.rails-3.2
   - Gemfile.rails-3.1
   - Gemfile.rails-3.0
+  - Gemfile.mongoid-4.0
   - Gemfile.mongoid-3.1
   - Gemfile.mongoid-3.0
   - Gemfile.mongoid-2.8
@@ -19,3 +22,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,5 +1,29 @@
 # Next Release
 
+## 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`
+
+## 4.14.1
+
+* 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)
 
 * Support rails 4.2

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

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.16'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.4.12'
+gem 'mongoid', '~> 2.4.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-2.5

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.16'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.5.2'
+gem 'mongoid', '~> 2.5.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-2.6

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.16'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 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

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.16'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.7.1'
+gem 'mongoid', '~> 2.7.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-2.8

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.8'
+gem 'mongoid', '~> 2.8.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-3.0

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.16'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 3.0.23'
+gem 'mongoid', '~> 3.0.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-3.1

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.16'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 3.1.6'
+gem 'mongoid', '~> 3.1.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.mongoid-4.0

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.0.5'
+gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 4.0.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.rails-3.0

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.0.20'
+gem 'rails', '~> 3.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/Gemfile.rails-3.1

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.1.12'
+gem 'rails', '~> 3.1.0'
 gem 'sqlite3', platforms: [:ruby]
 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

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.19'
+gem 'rails', '~> 3.2.0'
 gem 'sqlite3', platforms: [:ruby]
 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

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.0.9'
+gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 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

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.1.6'
+gem 'rails', '~> 4.1.0'
 gem 'sqlite3'
 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

@@ -2,14 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.2.0.beta2'
+gem 'rails', '~> 4.2.0'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false
 

data/README.md

@@ -55,8 +55,10 @@ config.after_initialize do
   Bullet.rails_logger = 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,13 +69,16 @@ 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.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.
 
@@ -153,8 +158,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
@@ -429,4 +435,4 @@ Meanwhile, there's a line appended to `log/bullet.log`
   Post => [:comments]
 ```
 
-Copyright (c) 2009 - 2014 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2015 Richard Huang (flyerhzm@gmail.com), released under the MIT license

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_record4.rb

@@ -104,8 +104,10 @@ module Bullet
         alias_method :origin_reader, :reader
         def reader(force_reload = false)
           result = origin_reader(force_reload)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
-          Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          unless @inversed
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          end
           result
         end
       end

data/lib/bullet/active_record41.rb

@@ -40,6 +40,7 @@ module Bullet
         # add includes in scope
         alias_method :origin_find_with_associations, :find_with_associations
         def find_with_associations
+          return origin_find_with_associations { |r| yield r } if block_given?
           records = origin_find_with_associations
           associations = (eager_load_values + includes_values).uniq
           records.each do |record|
@@ -106,8 +107,8 @@ module Bullet
         alias_method :origin_reader, :reader
         def reader(force_reload = false)
           result = origin_reader(force_reload)
-          if @owner.class.name !~ /^HABTM_/
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+          if @owner.class.name !~ /^HABTM_/ && !@inversed
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
             Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
           end
           result

data/lib/bullet/active_record42.rb

@@ -2,6 +2,23 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
+      ::ActiveRecord::Base.class_eval do
+        class <<self
+          alias_method :origin_find, :find
+          def find(*args)
+            result = origin_find(*args)
+            if result.is_a? Array
+              Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+              Bullet::Detector::CounterCache.add_possible_objects(result)
+            elsif result.is_a? ::ActiveRecord::Base
+              Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+              Bullet::Detector::CounterCache.add_impossible_object(result)
+            end
+            result
+          end
+        end
+      end
+
       ::ActiveRecord::Relation.class_eval do
         alias_method :origin_to_a, :to_a
         # if select a collection of objects, then these objects have possible to cause N+1 query.
@@ -40,6 +57,7 @@ module Bullet
         # add includes in scope
         alias_method :origin_find_with_associations, :find_with_associations
         def find_with_associations
+          return origin_find_with_associations { |r| yield r } if block_given?
           records = origin_find_with_associations
           associations = (eager_load_values + includes_values).uniq
           records.each do |record|
@@ -117,10 +135,13 @@ module Bullet
         alias_method :origin_reader, :reader
         def reader(force_reload = false)
           result = origin_reader(force_reload)
-          if @owner.class.name !~ /^HABTM_/
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+          if @owner.class.name !~ /^HABTM_/ && !@inversed
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
             Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
           end
+          if ::ActiveRecord::Reflection::HasOneReflection === @reflection && result
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+          end
           result
         end
       end

data/lib/bullet/detector/n_plus_one_query.rb

@@ -86,7 +86,10 @@ module Bullet
             value = object_associations[bullet_key]
             if value
               value.each do |v|
-                result = v.is_a?(Hash) ? v.has_key?(associations) : v == associations
+                # associations == v comparision order is important here because
+                # v variable might be a squeel node where :== method is redefined,
+                # so it does not compare values at all and return unexpected results
+                result = v.is_a?(Hash) ? v.has_key?(associations) : associations == v
                 return true if result
               end
             end

data/lib/bullet/notification/base.rb

@@ -70,7 +70,7 @@ module Bullet
         end
 
         def associations_str
-          ":include => #{@associations.map{ |a| a.to_s.to_sym unless a.is_a? Hash }.inspect}"
+          ":includes => #{@associations.map{ |a| a.to_s.to_sym unless a.is_a? Hash }.inspect}"
         end
     end
   end

data/lib/bullet/notification/n_plus_one_query.rb

@@ -15,6 +15,12 @@ module Bullet
         "N+1 Query #{@path ? "in #{@path}" : 'detected'}"
       end
 
+      def notification_data
+        super.merge(
+          :backtrace => @callers
+        )
+      end
+
       protected
         def call_stack_messages
           (['N+1 Query method call stack'] + @callers).join( "\n  " )

data/lib/bullet/rack.rb

@@ -10,17 +10,16 @@ module Bullet
       return @app.call(env) unless Bullet.enable?
       Bullet.start_request
       status, headers, response = @app.call(env)
-      return [status, headers, response] if file?(headers) || sse?(response) || empty?(response)
+      return [status, headers, response] if file?(headers) || sse?(headers) || empty?(response)
 
       response_body = nil
       if Bullet.notification?
         if status == 200 && !response_body(response).frozen? && html_request?(headers, response)
-          response_body = response_body(response) << Bullet.gather_inline_notifications
-          add_footer_note(response_body) if Bullet.add_footer
+          response_body = response_body(response)
+          append_to_html_body(response_body, footer_note) if Bullet.add_footer
+          append_to_html_body(response_body, Bullet.gather_inline_notifications)
           headers['Content-Length'] = response_body.bytesize.to_s
         end
-      end
-      if Bullet.enable? && Bullet.notification?
         Bullet.perform_out_of_channel_notifications(env)
       end
       [status, headers, response_body ? [response_body] : response]
@@ -42,16 +41,25 @@ module Bullet
       end
     end
 
-    def add_footer_note(response_body)
-      response_body << "<div #{footer_div_attributes}>" + Bullet.footer_info.uniq.join("<br>") + "</div>"
+    def append_to_html_body(response_body, content)
+      if response_body.include?('</body>')
+        position = response_body.rindex('</body>')
+        response_body.insert(position, content)
+      else
+        response_body << content
+      end
+    end
+
+    def footer_note
+      "<div #{footer_div_attributes}>" + Bullet.footer_info.uniq.join("<br>") + "</div>"
     end
 
     def file?(headers)
       headers["Content-Transfer-Encoding"] == "binary"
     end
 
-    def sse?(response)
-      response.respond_to?(:stream) && response.stream.is_a?(ActionController::Live::Buffer)
+    def sse?(headers)
+      headers["Content-Type"] == "text/event-stream"
     end
 
     def html_request?(headers, response)
@@ -69,7 +77,7 @@ module Bullet
     private
     def footer_div_attributes
 <<EOF
-data-is-bullet-footer style="position: fixed; bottom: 0pt; left: 0pt; cursor: pointer; border-style: solid; border-color: rgb(153, 153, 153);
+data-is-bullet-footer ondblclick="this.parentNode.removeChild(this);" style="position: fixed; bottom: 0pt; left: 0pt; cursor: pointer; border-style: solid; border-color: rgb(153, 153, 153);
  -moz-border-top-colors: none; -moz-border-right-colors: none; -moz-border-bottom-colors: none;
  -moz-border-left-colors: none; -moz-border-image: none; border-width: 2pt 2pt 0px 0px;
  padding: 5px; border-radius: 0pt 10pt 0pt 0px; background: none repeat scroll 0% 0% rgba(200, 200, 200, 0.8);

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.14.0"
+  VERSION = "4.14.5"
 end

data/lib/bullet.rb

@@ -29,7 +29,7 @@ module Bullet
     attr_reader :notification_collector, :whitelist
     attr_accessor :add_footer, :orm_pathches_applied
 
-    delegate :alert=, :console=, :growl=, :rails_logger=, :xmpp=, :airbrake=, :bugsnag=, :to => UniformNotifier
+    delegate *UniformNotifier::AVAILABLE_NOTIFIERS.map { |notifier| "#{notifier}=" }, :to => UniformNotifier
 
     def raise=(should_raise)
       UniformNotifier.raise=(should_raise ? Notification::UnoptimizedQueryError : false)
@@ -160,7 +160,7 @@ module Bullet
 
     def footer_info
       info = []
-      for_each_active_notifier_with_notification do |notification|
+      notification_collector.collection.each do |notification|
         info << notification.short_notice
       end
       info
@@ -176,14 +176,17 @@ module Bullet
     end
 
     def profile
-      Bullet.start_request if Bullet.enable?
+      if Bullet.enable?
+        begin
+          Bullet.start_request
 
-      yield
+          yield
 
-      if Bullet.enable? && Bullet.notification?
-        Bullet.perform_out_of_channel_notifications
+          Bullet.perform_out_of_channel_notifications if Bullet.notification?
+        ensure
+          Bullet.end_request
+        end
       end
-      Bullet.end_request if Bullet.enable?
     end
 
     private

data/spec/bullet/notification/n_plus_one_query_spec.rb

@@ -5,9 +5,9 @@ module Bullet
     describe NPlusOneQuery do
       subject { NPlusOneQuery.new([["caller1", "caller2"]], Post, [:comments, :votes], "path") }
 
-      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n") }
-      it { expect([ subject.body_with_caller, subject.body_with_caller]).to eq([ "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n" ]) }
-      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]") }
+      it { expect(subject.body_with_caller).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n") }
+      it { expect([subject.body_with_caller, subject.body_with_caller]).to eq([ "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n", "  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2\n" ]) }
+      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Add to your finder: :includes => [:comments, :votes]") }
       it { expect(subject.title).to eq("N+1 Query in path") }
     end
   end

data/spec/bullet/notification/unused_eager_loading_spec.rb

@@ -5,7 +5,7 @@ module Bullet
     describe UnusedEagerLoading do
       subject { UnusedEagerLoading.new(Post, [:comments, :votes], "path") }
 
-      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Remove from your finder: :include => [:comments, :votes]") }
+      it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Remove from your finder: :includes => [:comments, :votes]") }
       it { expect(subject.title).to eq("Unused Eager Loading in path") }
     end
   end

data/spec/bullet/rack_spec.rb

@@ -65,19 +65,19 @@ module Bullet
         end
 
         it "should change response body if notification is active" do
-          expect(Bullet).to receive(:notification?).and_return(true).twice
+          expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
           expect(Bullet).to receive(:perform_out_of_channel_notifications)
           status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
           expect(headers["Content-Length"]).to eq("56")
-          expect(response).to eq(["<html><head></head><body></body></html><bullet></bullet>"])
+          expect(response).to eq(["<html><head></head><body><bullet></bullet></body></html>"])
         end
 
         it "should set the right Content-Length if response body contains accents" do
           response = Support::ResponseDouble.new
           response.body = "<html><head></head><body>é</body></html>"
           app.response = response
-          expect(Bullet).to receive(:notification?).and_return(true).twice
+          expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
           status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
           expect(headers["Content-Length"]).to eq("58")

data/spec/integration/active_record4/association_spec.rb

@@ -219,6 +219,20 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should not detect unused preload with category => posts" do
+        category = Category.first
+        category.draft_post.destroy!
+        post = category.draft_post
+        post.update_attributes!(link: true)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+
+        Support::SqliteSeed.setup_db
+        Support::SqliteSeed.seed_db
+      end
     end
 
     context "category => posts => writer" do
@@ -313,7 +327,7 @@ if !mongoid? && active_record4?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it "should detect unused preload with comments => post" do
+      it "should detect unused preload with comment => post" do
         Comment.includes(:post).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :post)
@@ -515,6 +529,17 @@ if !mongoid? && active_record4?
     end
   end
 
+  describe Bullet::Detector::Association, "has_one => has_many" do
+    it "should not detect preload association" do
+      user = User.first
+      user.submission.replies.map(&:name)
+      Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+      expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+      expect(Bullet::Detector::Association).to be_completely_preloading_associations
+    end
+  end
+
   describe Bullet::Detector::Association, "call one association that in possible objects" do
     it "should not detect preload association" do
       Post.all

data/spec/models/category.rb

@@ -2,6 +2,9 @@ class Category < ActiveRecord::Base
   has_many :posts, inverse_of: :category
   has_many :entries
 
-  has_many :submissions
   has_many :users
+
+  def draft_post
+    posts.draft.first_or_create
+  end
 end

data/spec/models/comment.rb

@@ -1,4 +1,6 @@
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
   belongs_to :author, class_name: "BaseUser"
+
+  validates :post, presence: true
 end

data/spec/models/post.rb

@@ -1,10 +1,15 @@
 class Post < ActiveRecord::Base
-  extend Bullet::Dependency
-
   belongs_to :category, inverse_of: :posts
   belongs_to :writer
   has_many :comments, inverse_of: :post
 
+  validates :category, presence: true
+
   scope :preload_comments, -> { includes(:comments) }
   scope :in_category_name, ->(name) { where(['categories.name = ?', name]).includes(:category) }
+  scope :draft, -> { where(active: false) }
+
+  def link=(*)
+    comments.new
+  end
 end

data/spec/models/reply.rb

@@ -0,0 +1,3 @@
+class Reply < ActiveRecord::Base
+  belongs_to :submission
+end

data/spec/models/submission.rb

@@ -1,4 +1,4 @@
 class Submission < ActiveRecord::Base
-  belongs_to :category
   belongs_to :user
+  has_many :replies
 end

data/spec/spec_helper.rb

@@ -56,11 +56,11 @@ if active_record?
       Support::SqliteSeed.seed_db
     end
 
-    config.before(:each) do
+    config.before(:example) do
       Bullet.start_request
     end
 
-    config.after(:each) do
+    config.after(:example) do
       Bullet.end_request
     end
   end

data/spec/support/sqlite_seed.rb

@@ -14,7 +14,7 @@ module Support
       category2 = Category.create(:name => 'second')
 
       post1 = category1.posts.create(:name => 'first', :writer => writer1)
-      post1a = category1.posts.create(:name => 'like first', :writer => writer2)
+      post1a = category1.posts.create(:name => 'like first', :writer => writer2, active: false)
       post2 = category2.posts.create(:name => 'second', :writer => writer2)
 
       comment1 = post1.comments.create(:name => 'first', :author => writer1)
@@ -82,10 +82,13 @@ module Support
       user1 = User.create(:name => 'user1', :category => category1)
       user2 = User.create(:name => 'user2', :category => category1)
 
-      submission1 = category1.submissions.create(:name => "submission1", :user => user1)
-      submission2 = category1.submissions.create(:name => "submission2", :user => user2)
-      submission3 = category2.submissions.create(:name => "submission3", :user => user1)
-      submission4 = category2.submissions.create(:name => "submission4", :user => user2)
+      submission1 = user1.create_submission(:name => "submission1")
+      submission2 = user2.create_submission(:name => "submission2")
+
+      submission1.replies.create(:name => 'reply1')
+      submission1.replies.create(:name => 'reply2')
+      submission2.replies.create(:name => 'reply3')
+      submission2.replies.create(:name => 'reply4')
     end
 
     def setup_db
@@ -191,6 +194,7 @@ module Support
           t.column :name, :string
           t.column :category_id, :integer
           t.column :writer_id, :integer
+          t.column :active, :boolean, :default => true
         end
 
         create_table :relationships do |t|
@@ -211,9 +215,13 @@ module Support
           t.column :name, :string
         end
 
+        create_table :replies do |t|
+          t.column :name, :string
+          t.column :submission_id, :integer
+        end
+
         create_table :submissions do |t|
           t.column :name, :string
-          t.column :category_id, :integer
           t.column :user_id, :integer
         end
 

data/update.sh

@@ -0,0 +1,14 @@
+BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle update
+BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.8 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.7 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.6 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.5 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-2.4 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.14.5
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: uniform_notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
 description: help to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -150,6 +150,7 @@ files:
 - spec/models/pet.rb
 - spec/models/post.rb
 - spec/models/relationship.rb
+- spec/models/reply.rb
 - spec/models/student.rb
 - spec/models/submission.rb
 - spec/models/teacher.rb
@@ -162,6 +163,7 @@ files:
 - spec/support/sqlite_seed.rb
 - tasks/bullet_tasks.rake
 - test.sh
+- update.sh
 homepage: http://github.com/flyerhzm/bullet
 licenses:
 - MIT
@@ -182,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
@@ -234,6 +236,7 @@ test_files:
 - spec/models/pet.rb
 - spec/models/post.rb
 - spec/models/relationship.rb
+- spec/models/reply.rb
 - spec/models/student.rb
 - spec/models/submission.rb
 - spec/models/teacher.rb