bullet 5.6.0 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652f59b5a91224c16cace3931e368d0da02fa449
-  data.tar.gz: 9ef371969315cd308b194a9d230d1f19892a57e4
+  metadata.gz: 7c9650d2dbc870d2ac04be4ca0e19723ef6a85c2
+  data.tar.gz: 35839d605fb1e11687836dbcbe12572b1eb07775
 SHA512:
-  metadata.gz: ed473ab951e1f168de703cf0615f203abc93e37ef896330d6f91c7b61d320cd0906e691e41245e13a11aa9e3aa3d059ea62b00b256fa96af0540c8ab35ebc2fb
-  data.tar.gz: f6c4456dfb56957b441fce1b56094baacc911186b59b48b43f22e41ad3bbed88c52aa16b4bc7247b7ca37a3c7d026bb45f5342ccc24b37bc47836cd63fb41a1c
+  metadata.gz: 5064948ab9db44cc9b4082397990a3d91e93dc6986db2767a528a4a05734b1d1ba9231af337624d79d7e312d13e075afb53217191d017a3c511a0889c436d0a0
+  data.tar.gz: 2c12bd045e5e41b4db0761b07562a763d3be089231d5e420fc3d7d8d27a40f184216c9090667883a606e35fcdfd2eda3f276838e60696c642bff0939ab35e85f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Next Release
 
+## 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

data/Gemfile.rails-5.2

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

@@ -1,15 +1,15 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "bundler"
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+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
@@ -19,31 +19,30 @@ end
 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.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'

data/bullet.gemspec

@@ -1,27 +1,27 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
-require "bullet/version"
+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    = '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.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.10.0'
 
   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_record52.rb

@@ -0,0 +1,225 @@
+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
+      end
+    end
+  end
+
+  module ActiveRecord
+    def self.enable
+      require 'active_record'
+      ::ActiveRecord::Base.extend(Module.new {
+        def find_by_sql(sql, binds = [], preparable: nil, &block)
+          result = super
+          if Bullet.start?
+            if result.is_a? Array
+              if result.size > 1
+                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                Bullet::Detector::CounterCache.add_possible_objects(result)
+              elsif result.size == 1
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                Bullet::Detector::CounterCache.add_impossible_object(result.first)
+              end
+            elsif result.is_a? ::ActiveRecord::Base
+              Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+              Bullet::Detector::CounterCache.add_impossible_object(result)
+            end
+          end
+          result
+        end
+      })
+
+      ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
+
+      ::ActiveRecord::Relation.prepend(Module.new {
+        # 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 records
+          result = super
+          if Bullet.start?
+            if result.first.class.name !~ /^HABTM_/
+              if result.size > 1
+                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                Bullet::Detector::CounterCache.add_possible_objects(result)
+              elsif result.size == 1
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                Bullet::Detector::CounterCache.add_impossible_object(result.first)
+              end
+            end
+          end
+          result
+        end
+      })
+
+      ::ActiveRecord::Associations::Preloader.prepend(Module.new {
+        def preloaders_for_one(association, records, scope)
+          if Bullet.start?
+            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
+          end
+          super
+        end
+      })
+
+      ::ActiveRecord::FinderMethods.prepend(Module.new {
+        # 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
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, associations)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
+          end
+          records
+        end
+      })
+
+      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new {
+        def instantiate(result_set, &block)
+          @bullet_eager_loadings = {}
+          records = super
+
+          if Bullet.start?
+            @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
+          end
+          records
+        end
+
+        def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+          if Bullet.start?
+            unless ar_parent.nil?
+              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
+              end
+            end
+          end
+
+          super
+        end
+
+        # call join associations
+        def construct_model(record, node, row, model_cache, id, aliases)
+          result = super
+
+          if Bullet.start?
+            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
+          end
+
+          result
+        end
+      })
+
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new {
+        def load_target
+          records = super
+
+          if Bullet.start?
+            if self.is_a? ::ActiveRecord::Associations::ThroughAssociation
+              Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+              association = self.owner.association self.through_reflection.name
+              Array(association.target).each do |through_record|
+                Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+              end
+            end
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
+            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
+          end
+          records
+        end
+
+        def empty?
+          if Bullet.start? && !reflection.has_cached_counter?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          end
+          super
+        end
+
+        def include?(object)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          end
+          super
+        end
+      })
+
+      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new {
+        # call has_one and belongs_to associations
+        def target
+          result = super()
+          if Bullet.start?
+            if owner.class.name !~ /^HABTM_/ && !@inversed
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              if Bullet::Detector::NPlusOneQuery.impossible?(owner)
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+              else
+                Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
+              end
+            end
+          end
+          result
+        end
+      })
+
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new {
+        def empty?
+          result = super
+          if Bullet.start? && !reflection.has_cached_counter?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+          end
+          result
+        end
+
+        def count_records
+          result = reflection.has_cached_counter?
+          if Bullet.start? && !result && !self.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          end
+          super
+        end
+      })
+    end
+  end
+end

data/lib/bullet/dependency.rb

@@ -24,6 +24,8 @@ module Bullet
                                      'active_record5'
                                    elsif active_record51?
                                      'active_record5'
+                                   elsif active_record52?
+                                     'active_record52'
                                    else
                                      raise "Bullet does not support active_record #{::ActiveRecord::VERSION} yet"
                                    end
@@ -72,6 +74,10 @@ module Bullet
       active_record5? && ::ActiveRecord::VERSION::MINOR == 1
     end
 
+    def active_record52?
+      active_record5? && ::ActiveRecord::VERSION::MINOR == 2
+    end
+
     def mongoid4x?
       mongoid? && ::Mongoid::VERSION =~ /\A4/
     end

data/lib/bullet/detector/association.rb

@@ -7,7 +7,7 @@ module Bullet
           return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::Association#add_object_associations".freeze, "object: #{object.bullet_key}, associations: #{associations}")
+          Bullet.debug('Detector::Association#add_object_associations'.freeze, "object: #{object.bullet_key}, associations: #{associations}")
           object_associations.add(object.bullet_key, associations)
         end
 
@@ -16,7 +16,7 @@ module Bullet
           return if !Bullet.n_plus_one_query_enable? && !Bullet.unused_eager_loading_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::Association#add_call_object_associations".freeze, "object: #{object.bullet_key}, associations: #{associations}")
+          Bullet.debug('Detector::Association#add_call_object_associations'.freeze, "object: #{object.bullet_key}, associations: #{associations}")
           call_object_associations.add(object.bullet_key, associations)
         end
 
@@ -37,6 +37,7 @@ module Bullet
         end
 
         private
+
           # object_associations keep the object relationships
           # that the object has many associations.
           # e.g. { "Post:1" => [:comments] }

data/lib/bullet/detector/counter_cache.rb

@@ -7,7 +7,7 @@ module Bullet
           return unless Bullet.counter_cache_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::CounterCache#add_counter_cache", "object: #{object.bullet_key}, associations: #{associations}")
+          Bullet.debug('Detector::CounterCache#add_counter_cache', "object: #{object.bullet_key}, associations: #{associations}")
           if conditions_met?(object, associations)
             create_notification object.class.to_s, associations
           end
@@ -19,7 +19,7 @@ module Bullet
           objects = Array(object_or_objects)
           return if objects.map(&:primary_key_value).compact.empty?
 
-          Bullet.debug("Detector::CounterCache#add_possible_objects", "objects: #{objects.map(&:bullet_key).join(', ')}")
+          Bullet.debug('Detector::CounterCache#add_possible_objects', "objects: #{objects.map(&:bullet_key).join(', ')}")
           objects.each { |object| possible_objects.add object.bullet_key }
         end
 
@@ -28,7 +28,7 @@ module Bullet
           return unless Bullet.counter_cache_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::CounterCache#add_impossible_object", "object: #{object.bullet_key}")
+          Bullet.debug('Detector::CounterCache#add_impossible_object', "object: #{object.bullet_key}")
           impossible_objects.add object.bullet_key
         end
 
@@ -45,6 +45,7 @@ module Bullet
         end
 
         private
+
           def create_notification(klazz, associations)
             notify_associations = Array(associations) - Bullet.get_whitelist_associations(:counter_cache, klazz)
 

data/lib/bullet/detector/n_plus_one_query.rb

@@ -16,9 +16,9 @@ module Bullet
           return if inversed_objects.include?(object.bullet_key, associations)
           add_call_object_associations(object, associations)
 
-          Bullet.debug("Detector::NPlusOneQuery#call_association".freeze, "object: #{object.bullet_key}, associations: #{associations}")
+          Bullet.debug('Detector::NPlusOneQuery#call_association'.freeze, "object: #{object.bullet_key}, associations: #{associations}")
           if !excluded_stacktrace_path? && conditions_met?(object, associations)
-            Bullet.debug("detect n + 1 query", "object: #{object.bullet_key}, associations: #{associations}")
+            Bullet.debug('detect n + 1 query', "object: #{object.bullet_key}, associations: #{associations}")
             create_notification caller_in_project, object.class.to_s, associations
           end
         end
@@ -29,7 +29,7 @@ module Bullet
           objects = Array(object_or_objects)
           return if objects.map(&:primary_key_value).compact.empty?
 
-          Bullet.debug("Detector::NPlusOneQuery#add_possible_objects".freeze, "objects: #{objects.map(&:bullet_key).join(', '.freeze)}")
+          Bullet.debug('Detector::NPlusOneQuery#add_possible_objects'.freeze, "objects: #{objects.map(&:bullet_key).join(', '.freeze)}")
           objects.each { |object| possible_objects.add object.bullet_key }
         end
 
@@ -38,7 +38,7 @@ module Bullet
           return unless Bullet.n_plus_one_query_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::NPlusOneQuery#add_impossible_object".freeze, "object: #{object.bullet_key}")
+          Bullet.debug('Detector::NPlusOneQuery#add_impossible_object'.freeze, "object: #{object.bullet_key}")
           impossible_objects.add object.bullet_key
         end
 
@@ -47,7 +47,7 @@ module Bullet
           return unless Bullet.n_plus_one_query_enable?
           return unless object.primary_key_value
 
-          Bullet.debug("Detector::NPlusOneQuery#add_inversed_object".freeze, "object: #{object.bullet_key}, association: #{association}")
+          Bullet.debug('Detector::NPlusOneQuery#add_inversed_object'.freeze, "object: #{object.bullet_key}, association: #{association}")
           inversed_objects.add object.bullet_key, association
         end
 
@@ -81,6 +81,7 @@ module Bullet
         end
 
         private
+
           def create_notification(callers, klazz, associations)
             notify_associations = Array(associations) - Bullet.get_whitelist_associations(:n_plus_one_query, klazz)
 

data/lib/bullet/detector/unused_eager_loading.rb

@@ -17,7 +17,7 @@ module Bullet
             object_association_diff = diff_object_associations bullet_key, associations
             next if object_association_diff.empty?
 
-            Bullet.debug("detect unused preload", "object: #{bullet_key}, associations: #{object_association_diff}")
+            Bullet.debug('detect unused preload', "object: #{bullet_key}, associations: #{object_association_diff}")
             create_notification(caller_in_project, bullet_key.bullet_class_name, object_association_diff)
           end
         end
@@ -27,7 +27,7 @@ module Bullet
           return unless Bullet.unused_eager_loading_enable?
           return if objects.map(&:primary_key_value).compact.empty?
 
-          Bullet.debug("Detector::UnusedEagerLoading#add_eager_loadings", "objects: #{objects.map(&:bullet_key).join(', ')}, associations: #{associations}")
+          Bullet.debug('Detector::UnusedEagerLoading#add_eager_loadings', "objects: #{objects.map(&:bullet_key).join(', ')}, associations: #{associations}")
           bullet_keys = objects.map(&:bullet_key)
 
           to_add, to_merge, to_delete = [], [], []
@@ -40,7 +40,7 @@ module Bullet
             if key_objects_overlap == k
               to_add << [k, associations]
             else
-              to_merge << [key_objects_overlap, ( eager_loadings[k].dup  << associations )]
+              to_merge << [key_objects_overlap, (eager_loadings[k].dup << associations)]
 
               keys_without_objects = k - key_objects_overlap
               to_merge << [keys_without_objects, eager_loadings[k]]
@@ -56,6 +56,7 @@ module Bullet
         end
 
         private
+
           def create_notification(callers, klazz, associations)
             notify_associations = Array(associations) - Bullet.get_whitelist_associations(:unused_eager_loading, klazz)
 

data/lib/bullet/ext/string.rb

@@ -1,5 +1,5 @@
 class String
   def bullet_class_name
-    self.sub(/:[^:]*?$/, "".freeze)
+    self.sub(/:[^:]*?$/, ''.freeze)
   end
 end

data/lib/bullet/mongoid4x.rb

@@ -21,7 +21,7 @@ module Bullet
         end
 
         def each(&block)
-          records = query.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          records = query.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1

data/lib/bullet/mongoid5x.rb

@@ -21,7 +21,7 @@ module Bullet
         end
 
         def each(&block)
-          records = view.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          records = view.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1

data/lib/bullet/mongoid6x.rb

@@ -21,7 +21,7 @@ module Bullet
         end
 
         def each(&block)
-          records = view.map{ |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          records = view.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1

data/lib/bullet/notification/base.rb

@@ -6,28 +6,28 @@ module Bullet
 
       def initialize(base_class, association_or_associations, path = nil)
         @base_class = base_class
-        @associations = association_or_associations.is_a?(Array) ?  association_or_associations : [association_or_associations]
+        @associations = association_or_associations.is_a?(Array) ? association_or_associations : [association_or_associations]
         @path = path
       end
 
       def title
-        raise NoMethodError.new("no method title defined")
+        raise NoMethodError.new('no method title defined')
       end
 
       def body
-        raise NoMethodError.new("no method body defined")
+        raise NoMethodError.new('no method body defined')
       end
 
       def call_stack_messages
-        ""
+        ''
       end
 
       def whoami
-        @user ||= ENV['USER'].presence || (`whoami`.chomp rescue "")
+        @user ||= ENV['USER'].presence || (`whoami`.chomp rescue '')
         if @user.present?
           "user: #{@user}"
         else
-          ""
+          ''
         end
       end
 
@@ -44,7 +44,7 @@ module Bullet
       end
 
       def short_notice
-        [whoami.presence, url, title, body].compact.join("  ")
+        [whoami.presence, url, title, body].compact.join('  ')
       end
 
       def notification_data
@@ -65,12 +65,13 @@ module Bullet
       end
 
       protected
+
         def klazz_associations_str
           "  #{@base_class} => [#{@associations.map(&:inspect).join(', '.freeze)}]"
         end
 
         def associations_str
-          ":includes => #{@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/counter_cache.rb

@@ -6,7 +6,7 @@ module Bullet
       end
 
       def title
-        "Need Counter Cache"
+        'Need Counter Cache'
       end
     end
   end

data/lib/bullet/notification/n_plus_one_query.rb

@@ -22,8 +22,9 @@ module Bullet
       end
 
       protected
+
         def call_stack_messages
-          (['Call stack'] + @callers).join( "\n  " )
+          (['Call stack'] + @callers).join("\n  ")
         end
     end
   end