bullet 4.14.0 → 4.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb37955eb9271242e6c93d070639487d27c41cc4
-  data.tar.gz: 3dcfaee4517be454ae076b8707b479357aef4810
+  metadata.gz: cb724ff2fab91cffc833fdf09ec6c9661b805c50
+  data.tar.gz: 65a2701588d1af6703608ce5c1e0b8505cf1c330
 SHA512:
-  metadata.gz: aad803335d34af96636af55b2db42e93770c1d989485bad7bcd6a5ac6b78c1cd95d5c133913d2fb606dd9cfedec078785a83d175dac42ebd408595866b791679
-  data.tar.gz: e53e36ef7782a6e94079b128eaebecde19501ce26c0204dd35dbc7df53b81313d0f8fa22c0a445c1f10f5f163cf23afcaa29c998279963667ca7b7f34cdc7c66
+  metadata.gz: e1e047c94101b65ee2360bd04f1432f7cb7965f50b9c613469dcec12603e4f9f4cdd5d973a86e0a68a5bb186d3a49d0cfef92b829b3c1169b9c8f48894ae810c
+  data.tar.gz: 0ee846a9c3963c6097dc7c98c157df6a78fc553efea2e668336ec20c64b109022dfe9e87e755a6b0807598fbd0de5fdca8c0e8d6bea2f11a439ec8d033fe3cab

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Next Release
 
+## 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-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.9'
+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.6'
+gem 'rails', '~> 4.1.0'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'

data/Gemfile.rails-4.2

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

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

data/lib/bullet/active_record42.rb

@@ -121,6 +121,9 @@ module Bullet
             Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
             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/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/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_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)
@@ -69,7 +79,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.2"
 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\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

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

@@ -515,6 +515,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,5 @@ class Category < ActiveRecord::Base
   has_many :posts, inverse_of: :category
   has_many :entries
 
-  has_many :submissions
   has_many :users
 end

data/spec/models/post.rb

@@ -1,6 +1,4 @@
 class Post < ActiveRecord::Base
-  extend Bullet::Dependency
-
   belongs_to :category, inverse_of: :posts
   belongs_to :writer
   has_many :comments, inverse_of: :post

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/support/sqlite_seed.rb

@@ -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
@@ -211,9 +214,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.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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