bullet 4.13.1 → 4.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c663f19d349dc9be3a82803ba5e5af344ed0e2
-  data.tar.gz: f996a53cd2ce05eb85f11e55477b41d7b6f841f8
+  metadata.gz: dbe02316f8b3e0b61718c940420f189423c3f5f0
+  data.tar.gz: 93db165a6618fb9c470081013e4b2f5fe002c602
 SHA512:
-  metadata.gz: 9fe6ad4a5e0b23c19815a121e8b3dec2989c04f2e81836eba4a096a06b68ae7b33c7c202c1a7a99e697a48bd5bd29711b7ad0a2b17e1d203e32cc964a0e95314
-  data.tar.gz: 77e4bc950eaa4e0e87fd32beaa6f11a605e1e443b0de0f3fbea89798cd11721c3c6a4fa0c9f70bad5c3b7f65586a56b050e38265a21d57d57244e219ab0f8501
+  metadata.gz: 6c9ec0b4e3c23e6de5f59f74cb9378f5db7c32a448a42d4304b2399c3762308bab649dffc7f86bd04aaf175946391df9658994a1a190fb2a64fb8ec5bd21dbb3
+  data.tar.gz: 47451dec206f2d05aaa11466d8f6c063bbb9e3e9c03929d7dc8867b11e77be6871ee6a58f1f2b52435db3bb6854e913228dc9b310bf7dd78f5b968de5f042932

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.1.2
 gemfile:
+  - Gemfile.rails-4.2
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0
   - Gemfile.rails-3.2

data/CHANGELOG.md

@@ -1,8 +1,23 @@
 # Next Release
 
-## 4.13.1
+## 4.14.3
 
-* Fix swallow exception issue
+* 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
+* Polish notification output
+* Fix warning: `*' interpreted as argument prefix
 
 ## 4.13.0 (07/19/2014)
 

data/Gemfile.mongoid-2.4

@@ -2,10 +2,10 @@ 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"

data/Gemfile.mongoid-2.5

@@ -2,10 +2,10 @@ 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"

data/Gemfile.mongoid-2.6

@@ -2,7 +2,7 @@ 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'

data/Gemfile.mongoid-2.7

@@ -2,10 +2,10 @@ 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"

data/Gemfile.mongoid-2.8

@@ -2,10 +2,10 @@ 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"

data/Gemfile.mongoid-3.0

@@ -2,10 +2,10 @@ 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"

data/Gemfile.mongoid-3.1

@@ -2,10 +2,10 @@ 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"

data/Gemfile.mongoid-4.0

@@ -2,7 +2,7 @@ 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'

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,7 +2,7 @@ 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'

data/Gemfile.rails-3.2

@@ -2,7 +2,7 @@ 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'

data/Gemfile.rails-4.0

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.0.8'
+gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'

data/Gemfile.rails-4.1

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.1.4'
+gem 'rails', '~> 4.1.0'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'

data/Gemfile.rails-4.2

@@ -0,0 +1,19 @@
+source "https://rubygems.org"
+
+gemspec
+
+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
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/README.md

@@ -67,6 +67,7 @@ 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.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
@@ -429,4 +430,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/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

@@ -106,8 +106,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

@@ -0,0 +1,152 @@
+module Bullet
+  module ActiveRecord
+    def self.enable
+      require 'active_record'
+      ::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.
+        # 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.first.class.name !~ /^HABTM_/
+            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
+      end
+
+      ::ActiveRecord::Associations::Preloader.class_eval do
+        alias_method :origin_preloaders_on, :preloaders_on
+
+        def preloaders_on(association, records, scope)
+          records.compact!
+          if records.first.class.name !~ /^HABTM_/
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, association)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
+          end
+          origin_preloaders_on(association, records, scope)
+        end
+      end
+
+      ::ActiveRecord::FinderMethods.class_eval do
+        # add includes in scope
+        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)
+          end
+          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
+          records
+        end
+      end
+
+      ::ActiveRecord::Associations::JoinDependency.class_eval do
+        alias_method :origin_instantiate, :instantiate
+        alias_method :origin_construct_model, :construct_model
+
+        def instantiate(result_set, aliases)
+          @bullet_eager_loadings = {}
+          records = origin_instantiate(result_set, aliases)
+
+          @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
+          records
+        end
+
+        # call join associations
+        def construct_model(record, node, row, model_cache, id, aliases)
+          result = origin_construct_model(record, node, row, model_cache, id, aliases)
+
+          associations = node.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
+
+          result
+        end
+      end
+
+      ::ActiveRecord::Associations::CollectionAssociation.class_eval do
+        # call one to many associations
+        alias_method :origin_load_target, :load_target
+        def load_target
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+          records = origin_load_target
+
+          if records.first.class.name !~ /^HABTM_/
+            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
+
+        alias_method :origin_empty?, :empty?
+        def empty?
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_empty?
+        end
+
+        alias_method :origin_include?, :include?
+        def include?(object)
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_include?(object)
+        end
+      end
+
+      ::ActiveRecord::Associations::SingularAssociation.class_eval do
+        # call has_one and belongs_to associations
+        alias_method :origin_reader, :reader
+        def reader(force_reload = false)
+          result = origin_reader(force_reload)
+          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
+
+      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
+        alias_method :origin_many_empty?, :empty?
+        def empty?
+          Thread.current[:bullet_collection_empty] = true
+          result = origin_many_empty?
+          Thread.current[:bullet_collection_empty] = nil
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          result
+        end
+
+        alias_method :origin_has_cached_counter?, :has_cached_counter?
+        def has_cached_counter?(reflection = reflection())
+          result = origin_has_cached_counter?(reflection)
+          if !result && !Thread.current[:bullet_collection_empty]
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/bullet/dependency.rb

@@ -22,6 +22,8 @@ module Bullet
                                      'active_record4'
                                    elsif active_record41?
                                      'active_record41'
+                                   elsif active_record42?
+                                     'active_record42'
                                    end
                                  end
     end
@@ -66,6 +68,10 @@ module Bullet
       active_record4? && ::ActiveRecord::VERSION::MINOR == 1
     end
 
+    def active_record42?
+      active_record4? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
     def mongoid2x?
       mongoid? && ::Mongoid::VERSION =~ /\A2\.[4-8]/
     end

data/lib/bullet/detector/unused_eager_loading.rb

@@ -47,7 +47,7 @@ module Bullet
             end
           end
 
-          eager_loadings.add *to_add if to_add
+          eager_loadings.add(*to_add) if to_add
           to_merge.each { |k,val| eager_loadings.merge k, val }
           to_delete.each { |k| eager_loadings.delete k }
 

data/lib/bullet/ext/object.rb

@@ -1,6 +1,6 @@
 class Object
   def bullet_key
-    [self.class, self.primary_key_value].join(':')
+    "#{self.class}:#{self.primary_key_value}"
   end
 
   def primary_key_value

data/lib/bullet/notification/base.rb

@@ -18,6 +18,10 @@ module Bullet
         raise NoMethodError.new("no method body defined")
       end
 
+      def call_stack_messages
+        ""
+      end
+
       def whoami
         @user ||= ENV['USER'].presence || (`whoami`.chomp rescue "")
         if @user.present?
@@ -28,15 +32,7 @@ module Bullet
       end
 
       def body_with_caller
-        body
-      end
-
-      def standard_notice
-        @standard_notifice ||= title + "\n" + body
-      end
-
-      def full_notice
-        [whoami.presence, url, title, body_with_caller].compact.join("\n")
+        "#{body}\n#{call_stack_messages}\n"
       end
 
       def notify_inline
@@ -48,7 +44,7 @@ module Bullet
       end
 
       def short_notice
-        [whoami.presence, url, title, body].compact.join("\n")
+        [whoami.presence, url, title, body].compact.join("  ")
       end
 
       def notification_data
@@ -74,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

@@ -7,10 +7,6 @@ module Bullet
         @callers = callers
       end
 
-      def body_with_caller
-        "#{body}\n#{call_stack_messages}"
-      end
-
       def body
         "#{klazz_associations_str}\n  Add to your finder: #{associations_str}"
       end

data/lib/bullet/rack.rb

@@ -15,8 +15,9 @@ module Bullet
       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
@@ -42,8 +43,17 @@ module Bullet
       end
     end
 
-    def add_footer_note(response_body)
-      response_body << "<div #{footer_div_style}>" + 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)
@@ -67,9 +77,9 @@ module Bullet
     end
 
     private
-    def footer_div_style
+    def footer_div_attributes
 <<EOF
-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);
@@ -78,4 +88,3 @@ EOF
     end
   end
 end
-

data/lib/bullet/version.rb

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

data/lib/bullet.rb

@@ -153,7 +153,7 @@ module Bullet
 
     def perform_out_of_channel_notifications(env = {})
       for_each_active_notifier_with_notification do |notification|
-        notification.url = [env['HTTP_HOST'], env['REQUEST_URI']].compact.join
+        notification.url = env['REQUEST_URI']
         notification.notify_out_of_channel
       end
     end

data/spec/bullet/notification/base_spec.rb

@@ -56,33 +56,8 @@ module Bullet
       context "#body_with_caller" do
         it "should return body" do
           allow(subject).to receive(:body).and_return("body")
-          expect(subject.body_with_caller).to eq("body")
-        end
-      end
-
-      context "#standard_notice" do
-        it "should return title + body" do
-          allow(subject).to receive(:title).and_return("title")
-          allow(subject).to receive(:body).and_return("body")
-          expect(subject.standard_notice).to eq("title\nbody")
-        end
-      end
-
-      context "#full_notice" do
-        it "should return whoami + url + title + body_with_caller" do
-          allow(subject).to receive(:whoami).and_return("whoami")
-          allow(subject).to receive(:url).and_return("url")
-          allow(subject).to receive(:title).and_return("title")
-          allow(subject).to receive(:body_with_caller).and_return("body_with_caller")
-          expect(subject.full_notice).to eq("whoami\nurl\ntitle\nbody_with_caller")
-        end
-
-        it "should return url + title + body_with_caller" do
-          allow(subject).to receive(:whoami).and_return("")
-          allow(subject).to receive(:url).and_return("url")
-          allow(subject).to receive(:title).and_return("title")
-          allow(subject).to receive(:body_with_caller).and_return("body_with_caller")
-          expect(subject.full_notice).to eq("url\ntitle\nbody_with_caller")
+          allow(subject).to receive(:call_stack_messages).and_return("call_stack_messages")
+          expect(subject.body_with_caller).to eq("body\ncall_stack_messages\n")
         end
       end
 

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") }
-      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", "  Post => [:comments, :votes]\n  Add to your finder: :include => [:comments, :votes]\nN+1 Query method call stack\n  caller1\n  caller2" ]) }
-      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

@@ -70,7 +70,7 @@ module 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

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/test.sh

@@ -1,5 +1,6 @@
 #bundle update rails && bundle exec rspec spec
 #BUNDLE_GEMFILE=Gemfile.mongoid bundle update mongoid && BUNDLE_GEMFILE=Gemfile.mongoid bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle exec rspec spec

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.13.1
+  version: 4.14.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,6 +64,7 @@ files:
 - Gemfile.rails-3.2
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
+- Gemfile.rails-4.2
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -75,6 +76,7 @@ files:
 - lib/bullet/active_record3x.rb
 - lib/bullet/active_record4.rb
 - lib/bullet/active_record41.rb
+- lib/bullet/active_record42.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -148,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
@@ -160,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
@@ -180,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.
@@ -232,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