bullet 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652f59b5a91224c16cace3931e368d0da02fa449
-  data.tar.gz: 9ef371969315cd308b194a9d230d1f19892a57e4
+  metadata.gz: 32281988136558818e4c3ae98c4059d88b6baf79
+  data.tar.gz: eb9281de70a51206eddebfe0eb70fa681b7bff51
 SHA512:
-  metadata.gz: ed473ab951e1f168de703cf0615f203abc93e37ef896330d6f91c7b61d320cd0906e691e41245e13a11aa9e3aa3d059ea62b00b256fa96af0540c8ab35ebc2fb
-  data.tar.gz: f6c4456dfb56957b441fce1b56094baacc911186b59b48b43f22e41ad3bbed88c52aa16b4bc7247b7ca37a3c7d026bb45f5342ccc24b37bc47836cd63fb41a1c
+  metadata.gz: 49d6dba2f3881bd6c129ff12b2c241627431602804010a2a09cc11e5a1912c636f75b1f286e863117426faa830a7486b17b29b37fe6aa706f241e18eb3df282e
+  data.tar.gz: a24b68afef28189f25406b8233d50e1b14a002d71749d4bfa85a0fff40a9d9a927140e133d2f11aaf5878b126da70544a4e335ddedb6db99ce1f1fa3b10569af

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 5.6.1 (08/01/2017)
+
+* Fix caller_path in the case of nil
+
 ## 5.6.0 (07/16/2017)
 
 * Migrate alias_method to Module#prepend

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,31 @@ 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.rb

@@ -1,4 +1,4 @@
-require "active_support/core_ext/module/delegation"
+require 'active_support/core_ext/module/delegation'
 require 'set'
 require 'uniform_notifier'
 require 'bullet/ext/object'
@@ -22,7 +22,7 @@ module Bullet
 
   if defined? Rails::Railtie
     class BulletRailtie < Rails::Railtie
-      initializer "bullet.configure_rails_initialization" do |app|
+      initializer 'bullet.configure_rails_initialization' do |app|
         app.middleware.use Bullet::Rack
       end
     end
@@ -43,7 +43,7 @@ module Bullet
 
     DETECTORS = [ Bullet::Detector::NPlusOneQuery,
                   Bullet::Detector::UnusedEagerLoading,
-                  Bullet::Detector::CounterCache ]
+                  Bullet::Detector::CounterCache ].freeze
 
     def enable=(enable)
       @enable = @n_plus_one_query_enable = @unused_eager_loading_enable = @counter_cache_enable = enable

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
 

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
 

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
 

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 = [], [], []

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/notification/base.rb

@@ -11,23 +11,23 @@ module Bullet
       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

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/rack.rb

@@ -51,19 +51,19 @@ module Bullet
     end
 
     def footer_note
-      "<div #{footer_div_attributes}>" + footer_close_button + Bullet.footer_info.uniq.join("<br>") + "</div>"
+      "<div #{footer_div_attributes}>" + footer_close_button + Bullet.footer_info.uniq.join('<br>') + '</div>'
     end
 
     def file?(headers)
-      headers["Content-Transfer-Encoding"] == "binary" || headers["Content-Disposition"]
+      headers['Content-Transfer-Encoding'] == 'binary' || headers['Content-Disposition']
     end
 
     def sse?(headers)
-      headers["Content-Type"] == "text/event-stream"
+      headers['Content-Type'] == 'text/event-stream'
     end
 
     def html_request?(headers, response)
-      headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response_body(response).include?("<html")
+      headers['Content-Type'] && headers['Content-Type'].include?('text/html') && response_body(response).include?('<html')
     end
 
     def response_body(response)

data/lib/bullet/stack_trace_filter.rb

@@ -1,12 +1,12 @@
 module Bullet
   module StackTraceFilter
-    VENDOR_PATH = "/vendor"
+    VENDOR_PATH = '/vendor'.freeze
 
     def caller_in_project
       app_root = rails? ? Rails.root.to_s : Dir.pwd
       vendor_root = app_root + VENDOR_PATH
       caller_locations.select do |location|
-        caller_path = location.absolute_path
+        caller_path = location.absolute_path.to_s
         caller_path.include?(app_root) && !caller_path.include?(vendor_root) ||
           Bullet.stacktrace_includes.any? do |include_pattern|
           case include_pattern

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+
 module Bullet
-  VERSION = "5.6.0"
+  VERSION = '5.6.1'.freeze
 end

data/lib/generators/bullet/install_generator.rb

@@ -7,7 +7,7 @@ Description:
       DESC
 
       def enable_in_development
-        environment(nil, env: "development") do
+        environment(nil, env: 'development') do
           <<-"FILE".strip
 
   config.after_initialize do
@@ -22,12 +22,12 @@ Description:
           FILE
         end
 
-        say "Enabled bullet in config/environments/development.rb"
+        say 'Enabled bullet in config/environments/development.rb'
       end
 
       def enable_in_test
-        if yes?("Would you like to enable bullet in test environment? (y/n)")
-          environment(nil, env: "test") do
+        if yes?('Would you like to enable bullet in test environment? (y/n)')
+          environment(nil, env: 'test') do
             <<-"FILE".strip
 
   config.after_initialize do
@@ -38,7 +38,7 @@ Description:
             FILE
           end
 
-          say "Enabled bullet in config/environments/test.rb"
+          say 'Enabled bullet in config/environments/test.rb'
         end
       end
     end

data/perf/benchmark.rb

@@ -74,7 +74,7 @@ comments_size.times do |i|
 end
 Comment.import comments
 
-puts "Start benchmarking..."
+puts 'Start benchmarking...'
 
 
 Bullet.enable = true
@@ -83,7 +83,7 @@ Benchmark.bm(70) do |bm|
   bm.report("Querying & Iterating #{posts_size} Posts with #{comments_size} Comments and #{users_size} Users") do
     10.times do
       Bullet.start_request
-      Post.select("SQL_NO_CACHE *").includes(:user, :comments => :user).each do |p|
+      Post.select('SQL_NO_CACHE *').includes(:user, :comments => :user).each do |p|
         p.title
         p.user.name
         p.comments.each do |c|
@@ -96,7 +96,7 @@ Benchmark.bm(70) do |bm|
   end
 end
 
-puts "End benchmarking..."
+puts 'End benchmarking...'
 
 
 # Run benchmark with bundler

data/spec/bullet/detector/association_spec.rb

@@ -8,15 +8,15 @@ module Bullet
         @post2 = Post.last
       end
 
-      context ".add_object_association" do
-        it "should add object, associations pair" do
+      context '.add_object_association' do
+        it 'should add object, associations pair' do
           Association.add_object_associations(@post1, :associations)
           expect(Association.send(:object_associations)).to be_include(@post1.bullet_key, :associations)
         end
       end
 
-      context ".add_call_object_associations" do
-        it "should add call object, associations pair" do
+      context '.add_call_object_associations' do
+        it 'should add call object, associations pair' do
           Association.add_call_object_associations(@post1, :associations)
           expect(Association.send(:call_object_associations)).to be_include(@post1.bullet_key, :associations)
         end