bullet 5.5.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8cac0418ea4a1bb9f8abc6c12e84022f2f118d
-  data.tar.gz: ebdf99115037dec22a5480a63d3bed5f15956dda
+  metadata.gz: 0b65855ae5365567a18d1fb6ffdee5046b8cec35
+  data.tar.gz: 8df6b7afd18400dd2fe9bf39ec4a537fa04228af
 SHA512:
-  metadata.gz: 0904f996964a403a495af310bab8a0612e614eb72a71d08646948508c25d4bf36d2b939da65156a5fc81595477820e0f123aa2a88d618fe97e28e81a6b6f8ada
-  data.tar.gz: d491e12ccce38a26a5e3d27d3f6b84acafe34bb7b6aff56b78a8e22a73a5a3abf88443110587de0080e50b32ef70d8ca387eab5faac0b1bec16efed04bf3acc1
+  metadata.gz: 212cf02f1520dfaf752f794e42e9b2611fa0eca8b786bf5ef281c36c416ddf24016a524029614447c6241ebb734a2491ab554fa505544d7a7bc6f2e5b767527d
+  data.tar.gz: d2d71ceb54033f58cb6d675ea88268f130a0ea8bcfd7b4987486e374a2d2a3fc9169691ff20a9ca0fd9cf2787656dacc19649a8473879e9d1d68484597ccc18b

data/.travis.yml

@@ -3,14 +3,10 @@ language: ruby
 rvm:
   - 2.3.0
 gemfile:
+  - Gemfile.rails-5.1
   - Gemfile.rails-5.0
   - Gemfile.rails-4.2
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0
-  - Gemfile.mongoid-6.0
-  - Gemfile.mongoid-5.0
-  - Gemfile.mongoid-4.0
 env:
   - DB=sqlite
-services:
-  - mongodb

data/CHANGELOG.md

@@ -1,4 +1,34 @@
-# Next Release
+## Next Release
+
+## 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'
+* Fix `caller_path` in `excluded_stacktrace_path`
+* Update `uniform_notifier` dependency to add Sentry support
+* Integrate awesomecode.io and refactor code
+
+## 5.7.0 (12/03/2017)
+
+* Support rails 5.2
+* Implement Bullet.delete_whitelist to delete a specific whitelist definition
+* Fix caller_path in the case of nil
+
+## 5.6.0 (07/16/2017)
+
+* Migrate alias_method to Module#prepend
+* Add install generator
+* Stack trace filter
+* Fix rails 5.1 compatibility
+* Fix inverse_of for rails 5
+* Fix detect file attachment for rack #319
 
 ## 5.5.0 (12/30/2016)
 

data/Gemfile

@@ -1,8 +1,13 @@
 source 'https://rubygems.org'
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
+  "https://github.com/#{repo_name}.git"
+end
+
 gemspec
 
-gem 'rails', github: 'rails/rails'
+gem 'rails', github: 'rails'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'

data/Gemfile.rails-5.0

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

data/Gemfile.rails-5.1

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 5.1.0'
+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/Gemfile.rails-5.2

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 5.2.0'
+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/Guardfile

@@ -1,8 +1,8 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2, :all_after_pass => false, :all_on_start => false, :cli => "--color --format nested --fail-fast" do
+guard 'rspec', version: 2, all_after_pass: false, all_on_start: false, cli: '--color --format nested --fail-fast' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end

data/Hacking.md

@@ -28,7 +28,7 @@ So the flow of a request goes like this:
    the notification collector
 2. The request is handled by Rails, and the installed ActiveRecord extensions
    trigger Detector callbacks
-3. Detectors once called, will determine whether something noteworthy happend.
+3. Detectors once called, will determine whether something noteworthy happened.
    If yes, then a Notification is created and stored in the notification collector.
 4. Rails finishes handling the request
 5. For each notification in the collector, Bullet will iterate over each

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)
-<a href="https://codeclimate.com/github/flyerhzm/bullet"><img src="https://codeclimate.com/github/flyerhzm/bullet.png" /></a>
+[![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.
@@ -13,7 +13,7 @@ Bullet gem now supports **activerecord** >= 4.0 and **mongoid** >= 4.0.
 
 If you use activerecord 2.x, please use bullet <= 4.5.0
 
-If you use activerecord 3.x, plesae use bullet < 5.5.0
+If you use activerecord 3.x, please use bullet < 5.5.0
 
 ## External Introduction
 
@@ -34,7 +34,7 @@ or add it into a Gemfile (Bundler):
 
 
 ```ruby
-gem "bullet", :group => "development"
+gem 'bullet', group: 'development'
 ```
 
 **Note**: make sure `bullet` gem is added after activerecord (rails) and
@@ -48,6 +48,7 @@ Bullet won't do ANYTHING unless you tell it to explicitly. Append to
 ```ruby
 config.after_initialize do
   Bullet.enable = true
+  Bullet.sentry = true
   Bullet.alert = true
   Bullet.bullet_logger = true
   Bullet.console = true
@@ -63,30 +64,34 @@ 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
 ```
 
 The notifier of Bullet is a wrap of [uniform_notifier](https://github.com/flyerhzm/uniform_notifier)
 
-The code above will enable all seven of the Bullet notification systems:
+The code above will enable all of the Bullet notification systems:
 * `Bullet.enable`: enable Bullet gem, otherwise do nothing
 * `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.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.rails_logger`: add warnings directly to the Rails log
 * `Bullet.honeybadger`: add notifications to Honeybadger
 * `Bullet.bugsnag`: add notifications to bugsnag
 * `Bullet.airbrake`: add notifications to airbrake
 * `Bullet.rollbar`: add notifications to rollbar
-* `Bullet.console`: log warnings to your browser's console.log (Safari/Webkit browsers or Firefox w/Firebug installed)
-* `Bullet.growl`: pop up Growl warnings if your system has Growl installed. Requires a little bit of configuration
-* `Bullet.xmpp`: send XMPP/Jabber notifications to the receiver indicated. Note that the code will currently not handle the adding of contacts, so you will need to make both accounts indicated know each other manually before you will receive any notifications. If you restart the development server frequently, the 'coming online' sound for the Bullet account may start to annoy - in this case set :show_online_status to false; you will still get notifications, but the Bullet account won't announce it's online status anymore.
-* `Bullet.raise`: raise errors, useful for making your specs fail unless they have optimized queries
+* `Bullet.sentry`: add notifications to sentry
 * `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
+
 
 Bullet also allows you to disable any of its detectors.
 
@@ -123,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
 ```
@@ -177,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
@@ -302,19 +308,10 @@ And run
 bundle install
 ```
 
-6\. enable the Bullet gem in development, add a line to
-`config/environments/development.rb`
+6\. enable the Bullet gem with generate command
 
-```ruby
-config.after_initialize do
-  Bullet.enable = true
-  Bullet.alert = true
-  Bullet.bullet_logger = true
-  Bullet.console = true
-#  Bullet.growl = true
-  Bullet.rails_logger = true
-  Bullet.add_footer = true
-end
+```
+bundle exec rails g bullet:install
 ```
 
 7\. Start the server

data/Rakefile

@@ -1,52 +1,51 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "bundler"
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
+require 'bundler'
 Bundler.setup
 
-require "rake"
-require "rspec"
-require "rspec/core/rake_task"
+require 'rake'
+require 'rspec'
+require 'rspec/core/rake_task'
 
-require "bullet/version"
+require 'bullet/version'
 
 task :build do
-  system "gem build bullet.gemspec"
+  system 'gem build bullet.gemspec'
 end
 
-task :install => :build do
+task install: :build do
   system "sudo gem install bullet-#{Bullet::VERSION}.gem"
 end
 
-task :release => :build do
+task release: :build do
   puts "Tagging #{Bullet::VERSION}..."
   system "git tag -a #{Bullet::VERSION} -m 'Tagging #{Bullet::VERSION}'"
-  puts "Pushing to Github..."
-  system "git push --tags"
-  puts "Pushing to rubygems.org..."
+  puts 'Pushing to Github...'
+  system 'git push --tags'
+  puts 'Pushing to rubygems.org...'
   system "gem push bullet-#{Bullet::VERSION}.gem"
 end
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
 RSpec::Core::RakeTask.new('spec:progress') do |spec|
-  spec.rspec_opts = %w(--format progress)
-  spec.pattern = "spec/**/*_spec.rb"
+  spec.rspec_opts = %w[--format progress]
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-
 begin
   require 'rdoc/task'
 
-  desc "Generate documentation for the plugin."
+  desc 'Generate documentation for the plugin.'
   Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = "rdoc"
+    rdoc.rdoc_dir = 'rdoc'
     rdoc.title = "bullet #{Bullet::VERSION}"
-    rdoc.rdoc_files.include("README*")
-    rdoc.rdoc_files.include("lib/**/*.rb")
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
   end
 rescue LoadError
   puts 'RDocTask is not supported for this platform'
 end
 
-task :default => :spec
+task default: :spec

data/bullet.gemspec

@@ -1,27 +1,32 @@
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+# frozen_string_literal: true
 
-require "bullet/version"
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+
+require 'bullet/version'
 
 Gem::Specification.new do |s|
-  s.name        = "bullet"
+  s.name        = 'bullet'
   s.version     = Bullet::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Richard Huang"]
-  s.email       = ["flyerhzm@gmail.com"]
-  s.homepage    = "http://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.authors     = ['Richard Huang']
+  s.email       = ['flyerhzm@gmail.com']
+  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_rubygems_version = ">= 1.3.6"
+  s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "uniform_notifier", "~> 1.10.0"
+  s.add_runtime_dependency 'activesupport', '>= 3.0.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")
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 end
-

data/lib/bullet/active_record4.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module ActiveRecord
     def self.enable
@@ -46,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
-          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
+        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
+        alias_method_chain :_create_record, :bullet
       end
 
       ::ActiveRecord::Associations::Preloader.class_eval do
@@ -72,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
@@ -105,7 +99,7 @@ module Bullet
           records = origin_instantiate(rows)
 
           if Bullet.start?
-            @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
+            @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
@@ -187,6 +181,7 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_has_cached_counter?, :has_cached_counter?
 
+        # rubocop:disable Style/MethodCallWithoutArgsParentheses
         def has_cached_counter?(reflection = reflection())
           result = origin_has_cached_counter?(reflection)
           if Bullet.start? && !result
@@ -194,6 +189,15 @@ module Bullet
           end
           result
         end
+        # rubocop:enable Style/MethodCallWithoutArgsParentheses
+      end
+
+      ::ActiveRecord::Associations::BelongsToAssociation.class_eval do
+        def writer_with_bullet(record)
+          Bullet::Detector::Association.add_object_associations(owner, reflection.name) if Bullet.start?
+          writer_without_bullet(record)
+        end
+        alias_method_chain :writer, :bullet
       end
     end
   end

data/lib/bullet/active_record41.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module ActiveRecord
     def self.enable
@@ -48,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
-          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
+        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
+        alias_method_chain :_create_record, :bullet
       end
 
       ::ActiveRecord::Associations::Preloader.class_eval do
@@ -87,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
@@ -108,7 +102,7 @@ module Bullet
           records = origin_instantiate(result_set, aliases)
 
           if Bullet.start?
-            @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
+            @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
@@ -185,6 +179,14 @@ module Bullet
           origin_count_records
         end
       end
+
+      ::ActiveRecord::Associations::BelongsToAssociation.class_eval do
+        def writer_with_bullet(record)
+          Bullet::Detector::Association.add_object_associations(owner, reflection.name) if Bullet.start?
+          writer_without_bullet(record)
+        end
+        alias_method_chain :writer, :bullet
+      end
     end
   end
 end

data/lib/bullet/active_record42.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   module ActiveRecord
     def self.enable
@@ -42,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
@@ -102,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
@@ -124,7 +118,7 @@ module Bullet
           records = origin_instantiate(result_set, aliases)
 
           if Bullet.start?
-            @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
+            @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
@@ -138,14 +132,14 @@ module Bullet
               parent.children.each do |node|
                 key = aliases.column_alias(node, node.primary_key)
                 id = row[key]
-                if id.nil?
-                  associations = node.reflection.name
-                  Bullet::Detector::Association.add_object_associations(ar_parent, associations)
-                  Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
-                  @bullet_eager_loadings[ar_parent.class] ||= {}
-                  @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
-                  @bullet_eager_loadings[ar_parent.class][ar_parent] << associations
-                end
+                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)
+                @bullet_eager_loadings[ar_parent.class] ||= {}
+                @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
+                @bullet_eager_loadings[ar_parent.class][ar_parent] << associations
               end
             end
           end
@@ -246,6 +240,14 @@ module Bullet
           origin_count_records
         end
       end
+
+      ::ActiveRecord::Associations::BelongsToAssociation.class_eval do
+        def writer_with_bullet(record)
+          Bullet::Detector::Association.add_object_associations(owner, reflection.name) if Bullet.start?
+          writer_without_bullet(record)
+        end
+        alias_method_chain :writer, :bullet
+      end
     end
   end
 end