bullet 5.7.5 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb27c10f2796dc6cc38899be2b88943f6c124d80
-  data.tar.gz: c89d95e08212b3bf8da49f2ce4c542ec2aa3021d
+SHA256:
+  metadata.gz: 749d1d92dc0373b1f2521c85825dfea656e985c438cdfafe774242b31f25c2d5
+  data.tar.gz: 4e76a9da65613f2b9cf3802f4969f84c1e5bb9849c5892898fa9d999fde3900c
 SHA512:
-  metadata.gz: 8f4d67bebf52a6730fa623bb150717e56c052605fc339f37d89d915af0981e442200e2bfee5c3405e6269d0907dc4e4f89fd2965000e637555aa8614580837c0
-  data.tar.gz: 3fbfc65e37e50444107e153050b33f66fe51037fd9d325438015d51c71f4a5ccb387e9b76ba28a2c753c9f9227653686535c857f457c80d62213cdda070b9c18
+  metadata.gz: 72f8f18edecb79d8631a215229afb71bb94050c0fcc65794a88dc3adf21545acf4ae38eb59bd6bdfa0e34609854ab149d02f47e761fba00452e28f2575306376
+  data.tar.gz: 94058fcb502d63ce470b6dfa06d05dd367c8a7e251948040b91c22164d6583d8a82ab120bb2a42d109c121170042573c9964aaa55ebc0093c07adc1fb8f23fd5

data/.travis.yml

@@ -3,6 +3,8 @@ language: ruby
 rvm:
   - 2.3.0
 gemfile:
+  - Gemfile.rails-6.0
+  - Gemfile.rails-5.2
   - Gemfile.rails-5.1
   - Gemfile.rails-5.0
   - Gemfile.rails-4.2

data/CHANGELOG.md

@@ -1,27 +1,30 @@
 ## Next Release
 
-## 5.7.5 (12/03/2018)
+## 6.0.0 (02/22/2019)
 
-* Fix duplicate logs in mongoid 4.x and 5.x version
-* Add magic comment frozen_string_literal: true
+* Add XHR support to Bullet
+* Support Rails 6.0
+* Handle case where ID is manually set on unpersisted record
 
-## 5.7.4 (10/03/2018)
+## 5.9.0 (11/11/2018)
 
-* Avoid Bullet from making extra queries in mongoid6
-* Use caller for ruby 1.9 while caller_locations for 2.0+
+* Require Ruby 2.3+
+* Support Mongo 7.x
 
-## 5.7.3 (17/02/2018)
+## 5.8.0 (10/29/2018)
 
+* Fix through reflection for rails 5.x
+* Fix false positive in after_save/after_create callbacks
+* Don't triger a preload error on "manual" preloads
+* Avoid Bullet from making extra queries in mongoid6
+* Support option for #first and #last on mongoid6.x
+* Fix duplicate logs in mongoid 4.x and 5.x version
+* Use caller for ruby 1.9 while caller_locations for 2.0+
+* Extend stacktrace matching for sub-file precision
 * Exclude configured bundler path in addition to '/vendor'
-* Support rails 5.1.5
-
-## 5.7.2 (18/01/2018)
-
 * Fix `caller_path` in `excluded_stacktrace_path`
-
-## 5.7.1 (07/01/2017)
-
 * Update `uniform_notifier` dependency to add Sentry support
+* Integrate awesomecode.io and refactor code
 
 ## 5.7.0 (12/03/2017)
 

data/Gemfile.mongoid-7.0

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 5.0'
+gem 'sqlite3', platforms: [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'mongoid', '~> 7.0.0'
+
+gem "rspec"
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/Gemfile.rails-4.0

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

data/Gemfile.rails-4.1

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

data/Gemfile.rails-4.2

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rails', '~> 4.2.0'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 gem 'tins', '~> 1.6.0', platforms: [:ruby_19]

data/Gemfile.rails-5.0

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

data/Gemfile.rails-5.1

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

data/Gemfile.rails-5.2

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

data/Gemfile.rails-6.0

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '6.0.0.rc1'
+gem 'sqlite3'
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'activerecord-import'
+
+gem "rspec"
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/bullet.png)](http://badge.fury.io/rb/bullet)
 [![Build Status](https://secure.travis-ci.org/flyerhzm/bullet.png)](http://travis-ci.org/flyerhzm/bullet)
-[![AwesomeCode Status](https://awesomecode.io/projects/6755235b-e2c1-459e-bf92-b8b13d0c0472/status)](https://awesomecode.io/projects/2)
+[![AwesomeCode Status for flyerhzm/bullet](https://awesomecode.io/projects/6755235b-e2c1-459e-bf92-b8b13d0c0472/status)](https://awesomecode.io/repos/flyerhzm/bullet)
 [![Coderwall Endorse](http://api.coderwall.com/flyerhzm/endorsecount.png)](http://coderwall.com/flyerhzm)
 
 The Bullet gem is designed to help you increase your application's performance by reducing the number of queries it makes. It will watch your queries while you develop your application and notify you when you should add eager loading (N+1 queries), when you're using eager loading that isn't necessary and when you should use counter cache.
@@ -64,7 +64,7 @@ config.after_initialize do
   Bullet.rollbar = true
   Bullet.add_footer = true
   Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
-  Bullet.stacktrace_excludes = [ 'their_gem', 'their_middleware' ]
+  Bullet.stacktrace_excludes = [ 'their_gem', 'their_middleware', ['my_file.rb', 'my_method'], ['my_file.rb', 16..20] ]
   Bullet.slack = { webhook_url: 'http://some.slack.url', channel: '#default', username: 'notifier' }
 end
 ```
@@ -87,6 +87,8 @@ The code above will enable all of the Bullet notification systems:
 * `Bullet.add_footer`: adds the details in the bottom left corner of the page. Double click the footer or use close button to hide footer.
 * `Bullet.stacktrace_includes`: include paths with any of these substrings in the stack trace, even if they are not in your main app
 * `Bullet.stacktrace_excludes`: ignore paths with any of these substrings in the stack trace, even if they are not in your main app.
+   Each item can be a string (match substring), a regex, or an array where the first item is a path to match, and the second
+   item is a line number, a Range of line numbers, or a (bare) method name, to exclude only particular lines in a file.
 * `Bullet.slack`: add notifications to slack
 * `Bullet.raise`: raise errors, useful for making your specs fail unless they have optimized queries
 
@@ -126,10 +128,11 @@ class ApplicationController < ActionController::Base
   around_action :skip_bullet
 
   def skip_bullet
+    previous_value = Bullet.enable?
     Bullet.enable = false
     yield
   ensure
-    Bullet.enable = true
+    Bullet.enable = previous_value
   end
 end
 ```
@@ -180,7 +183,7 @@ If you find Bullet does not work for you, *please disable your browser's cache*.
 
 ### Profile a job
 
-The Bullet gem uses rack middleware to profile requests. If you want to use Bullet without an http server, like to profile a job, you can use use profile method and fetch warnings
+The Bullet gem uses rack middleware to profile requests. If you want to use Bullet without an http server, like to profile a job, you can use the profile method and fetch warnings
 
 ```ruby
 Bullet.profile do
@@ -218,7 +221,7 @@ end
 Then wrap each test in Bullet api.
 
 ```ruby
-# spec/spec_helper.rb
+# spec/rails_helper.rb
 if Bullet.enable?
   config.before(:each) do
     Bullet.start_request

data/Rakefile

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'bundler'
 Bundler.setup
 

data/bullet.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib/', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'bullet/version'
@@ -14,13 +14,18 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/flyerhzm/bullet'
   s.summary     = 'help to kill N+1 queries and unused eager loading.'
   s.description = 'help to kill N+1 queries and unused eager loading.'
+  s.metadata    = {
+    'changelog_uri' => 'https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/flyerhzm/bullet'
+  }
 
-  s.license     = 'MIT'
+  s.license = 'MIT'
 
+  s.required_ruby_version = '>= 2.3'
   s.required_rubygems_version = '>= 1.3.6'
 
   s.add_runtime_dependency 'activesupport', '>= 3.0.0'
-  s.add_runtime_dependency 'uniform_notifier', '~> 1.11.0'
+  s.add_runtime_dependency 'uniform_notifier', '~> 1.11'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bullet/active_record4.rb

@@ -48,21 +48,12 @@ module Bullet
       end
 
       ::ActiveRecord::Persistence.class_eval do
-        def save_with_bullet(*args, &proc)
-          was_new_record = new_record?
-          save_without_bullet(*args, &proc).tap do |result|
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+        def _create_record_with_bullet(*args)
+          _create_record_without_bullet(*args).tap do
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
           end
         end
-        alias_method_chain :save, :bullet
-
-        def save_with_bullet!(*args, &proc)
-          was_new_record = new_record?
-          save_without_bullet!(*args, &proc).tap do |result|
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
-          end
-        end
-        alias_method_chain :save!, :bullet
+        alias_method_chain :_create_record, :bullet
       end
 
       ::ActiveRecord::Associations::Preloader.class_eval do
@@ -74,6 +65,7 @@ module Bullet
           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

data/lib/bullet/active_record41.rb

@@ -50,21 +50,12 @@ module Bullet
       end
 
       ::ActiveRecord::Persistence.class_eval do
-        def save_with_bullet(*args, &proc)
-          was_new_record = new_record?
-          save_without_bullet(*args, &proc).tap do |result|
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+        def _create_record_with_bullet(*args)
+          _create_record_without_bullet(*args).tap do
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
           end
         end
-        alias_method_chain :save, :bullet
-
-        def save_with_bullet!(*args, &proc)
-          was_new_record = new_record?
-          save_without_bullet!(*args, &proc).tap do |result|
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
-          end
-        end
-        alias_method_chain :save!, :bullet
+        alias_method_chain :_create_record, :bullet
       end
 
       ::ActiveRecord::Associations::Preloader.class_eval do
@@ -89,6 +80,7 @@ module Bullet
         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
           if Bullet.start?
             associations = (eager_load_values + includes_values).uniq

data/lib/bullet/active_record42.rb

@@ -44,21 +44,12 @@ module Bullet
       end
 
       ::ActiveRecord::Persistence.class_eval do
-        def save_with_bullet(*args, &proc)
-          was_new_record = new_record?
-          save_without_bullet(*args, &proc).tap do |result|
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+        def _create_record_with_bullet(*args)
+          _create_record_without_bullet(*args).tap do
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
           end
         end
-        alias_method_chain :save, :bullet
-
-        def save_with_bullet!(*args, &proc)
-          was_new_record = new_record?
-          save_without_bullet!(*args, &proc).tap do |result|
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
-          end
-        end
-        alias_method_chain :save!, :bullet
+        alias_method_chain :_create_record, :bullet
       end
 
       ::ActiveRecord::Relation.class_eval do
@@ -104,6 +95,7 @@ module Bullet
         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
           if Bullet.start?
             associations = (eager_load_values + includes_values).uniq
@@ -141,6 +133,7 @@ module Bullet
                 key = aliases.column_alias(node, node.primary_key)
                 id = row[key]
                 next unless id.nil?
+
                 associations = node.reflection.name
                 Bullet::Detector::Association.add_object_associations(ar_parent, associations)
                 Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)

data/lib/bullet/active_record5.rb

@@ -2,17 +2,10 @@
 
 module Bullet
   module SaveWithBulletSupport
-    def save(*args)
-      was_new_record = new_record?
-      super(*args).tap do |result|
-        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
-      end
-    end
-
-    def save!(*args)
-      was_new_record = new_record?
-      super(*args).tap do |result|
-        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+    def _create_record(*)
+      super do
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
+        yield(self) if block_given?
       end
     end
   end
@@ -82,6 +75,7 @@ module Bullet
         # add includes in scope
         def find_with_associations
           return super { |r| yield r } if block_given?
+
           records = super
           if Bullet.start?
             associations = (eager_load_values + includes_values).uniq
@@ -132,6 +126,7 @@ module Bullet
                 key = aliases.column_alias(node, node.primary_key)
                 id = row[key]
                 next unless id.nil?
+
                 associations = node.reflection.name
                 Bullet::Detector::Association.add_object_associations(ar_parent, associations)
                 Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
@@ -168,11 +163,18 @@ module Bullet
 
           if Bullet.start?
             if is_a? ::ActiveRecord::Associations::ThroughAssociation
-              Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
-              association = owner.association through_reflection.name
+              refl = reflection.through_reflection
+              Bullet::Detector::NPlusOneQuery.call_association(owner, refl.name)
+              association = owner.association refl.name
               Array(association.target).each do |through_record|
                 Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
               end
+
+              if refl.through_reflection?
+                refl = refl.through_reflection while refl.through_reflection?
+
+                Bullet::Detector::NPlusOneQuery.call_association(owner, refl.name)
+              end
             end
             Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
             if records.first.class.name !~ /^HABTM_/

data/lib/bullet/active_record52.rb

@@ -2,17 +2,10 @@
 
 module Bullet
   module SaveWithBulletSupport
-    def save(*args)
-      was_new_record = new_record?
-      super(*args).tap do |result|
-        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
-      end
-    end
-
-    def save!(*args)
-      was_new_record = new_record?
-      super(*args).tap do |result|
-        Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+    def _create_record(*)
+      super do
+        Bullet::Detector::NPlusOneQuery.add_impossible_object(self)
+        yield(self) if block_given?
       end
     end
   end
@@ -82,6 +75,7 @@ module Bullet
         # add includes in scope
         def find_with_associations
           return super { |r| yield r } if block_given?
+
           records = super
           if Bullet.start?
             associations = (eager_load_values + includes_values).uniq
@@ -115,6 +109,7 @@ module Bullet
                 key = aliases.column_alias(node, node.primary_key)
                 id = row[key]
                 next unless id.nil?
+
                 associations = node.reflection.name
                 Bullet::Detector::Association.add_object_associations(ar_parent, associations)
                 Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
@@ -151,11 +146,15 @@ module Bullet
 
           if Bullet.start?
             if is_a? ::ActiveRecord::Associations::ThroughAssociation
-              Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
-              association = owner.association through_reflection.name
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
+              association = owner.association reflection.through_reflection.name
               Array(association.target).each do |through_record|
                 Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
               end
+
+              if reflection.through_reflection != through_reflection
+                Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+              end
             end
             Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
             if records.first.class.name !~ /^HABTM_/