bullet 5.7.0 → 5.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c9650d2dbc870d2ac04be4ca0e19723ef6a85c2
-  data.tar.gz: 35839d605fb1e11687836dbcbe12572b1eb07775
+  metadata.gz: 45f885605935c340cac5cf587663a77526f4b9d5
+  data.tar.gz: 4982228f2d3e7722bb920e515a16aa65906c21d2
 SHA512:
-  metadata.gz: 5064948ab9db44cc9b4082397990a3d91e93dc6986db2767a528a4a05734b1d1ba9231af337624d79d7e312d13e075afb53217191d017a3c511a0889c436d0a0
-  data.tar.gz: 2c12bd045e5e41b4db0761b07562a763d3be089231d5e420fc3d7d8d27a40f184216c9090667883a606e35fcdfd2eda3f276838e60696c642bff0939ab35e85f
+  metadata.gz: 2cca58f89a5fc6bf1154d82d301f54748b3822aebb8fbcbada75cb71daeffce1d9e5b6d8bb163c0844947933e2ecf12eb48b9af2ad37223b1f3c113209ab8b09
+  data.tar.gz: 7f1c4692b84a07a285af404764eee88849f01cfed587e732d30d2f9056ce99a34b319a6093c591bb148715603a39725ac3ed6e8dccc8f61f6d425f39d5d841a5

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# Next Release
+## Next Release
+
+## 5.7.1 (07/01/2017)
+
+* Update `uniform_notifier` dependency to add Sentry support
 
 ## 5.7.0 (12/03/2017)
 

data/Gemfile.rails-5.2

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

data/Guardfile

@@ -1,7 +1,7 @@
 # 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' }

data/README.md

@@ -3,6 +3,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/projects/2)
 [![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.
@@ -48,6 +49,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
@@ -82,6 +84,7 @@ The code above will enable all of the Bullet notification systems:
 * `Bullet.bugsnag`: add notifications to bugsnag
 * `Bullet.airbrake`: add notifications to airbrake
 * `Bullet.rollbar`: add notifications to rollbar
+* `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.

data/Rakefile

@@ -12,11 +12,11 @@ task :build do
   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...'
@@ -30,7 +30,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 RSpec::Core::RakeTask.new('spec:progress') do |spec|
-  spec.rspec_opts = %w(--format progress)
+  spec.rspec_opts = %w[--format progress]
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
@@ -48,4 +48,4 @@ rescue LoadError
   puts 'RDocTask is not supported for this platform'
 end
 
-task :default => :spec
+task default: :spec

data/bullet.gemspec

@@ -1,5 +1,5 @@
 lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'bullet/version'
 
@@ -18,10 +18,9 @@ Gem::Specification.new do |s|
   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 'uniform_notifier', '~> 1.11.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 end
-

data/lib/bullet.rb

@@ -29,13 +29,13 @@ module Bullet
   end
 
   class << self
-    attr_writer :enable, :n_plus_one_query_enable, :unused_eager_loading_enable, :counter_cache_enable, :stacktrace_includes, :stacktrace_excludes
-    attr_reader :notification_collector, :whitelist
+    attr_writer :n_plus_one_query_enable, :unused_eager_loading_enable, :counter_cache_enable, :stacktrace_includes, :stacktrace_excludes
+    attr_reader :whitelist
     attr_accessor :add_footer, :orm_pathches_applied
 
     available_notifiers = UniformNotifier::AVAILABLE_NOTIFIERS.map { |notifier| "#{notifier}=" }
-    available_notifiers << { :to => UniformNotifier }
-    delegate *available_notifiers
+    available_notifiers << { to: UniformNotifier }
+    delegate(*available_notifiers)
 
     def raise=(should_raise)
       UniformNotifier.raise = (should_raise ? Notification::UnoptimizedQueryError : false)
@@ -62,15 +62,15 @@ module Bullet
     end
 
     def n_plus_one_query_enable?
-      self.enable? && !!@n_plus_one_query_enable
+      enable? && !!@n_plus_one_query_enable
     end
 
     def unused_eager_loading_enable?
-      self.enable? && !!@unused_eager_loading_enable
+      enable? && !!@unused_eager_loading_enable
     end
 
     def counter_cache_enable?
-      self.enable? && !!@counter_cache_enable
+      enable? && !!@counter_cache_enable
     end
 
     def stacktrace_includes
@@ -91,7 +91,7 @@ module Bullet
       reset_whitelist
       @whitelist[options[:type]][options[:class_name]] ||= []
       @whitelist[options[:type]][options[:class_name]].delete(options[:association].to_sym)
-      @whitelist[options[:type]].delete_if { |key, val| val.empty? }
+      @whitelist[options[:type]].delete_if { |_key, val| val.empty? }
     end
 
     def get_whitelist_associations(type, class_name)
@@ -99,7 +99,7 @@ module Bullet
     end
 
     def reset_whitelist
-      @whitelist ||= { :n_plus_one_query => {}, :unused_eager_loading => {}, :counter_cache => {} }
+      @whitelist ||= { n_plus_one_query: {}, unused_eager_loading: {}, counter_cache: {} }
     end
 
     def clear_whitelist
@@ -109,7 +109,7 @@ module Bullet
     def bullet_logger=(active)
       if active
         require 'fileutils'
-        root_path = "#{rails? ? Rails.root.to_s : Dir.pwd}"
+        root_path = (rails? ? Rails.root.to_s : Dir.pwd).to_s
         FileUtils.mkdir_p(root_path + '/log')
         bullet_log_file = File.open("#{root_path}/log/bullet.log", 'a+')
         bullet_log_file.sync = true
@@ -219,23 +219,23 @@ module Bullet
 
     private
 
-      def for_each_active_notifier_with_notification
-        UniformNotifier.active_notifiers.each do |notifier|
-          notification_collector.collection.each do |notification|
-            notification.notifier = notifier
-            yield notification
-          end
+    def for_each_active_notifier_with_notification
+      UniformNotifier.active_notifiers.each do |notifier|
+        notification_collector.collection.each do |notification|
+          notification.notifier = notifier
+          yield notification
         end
       end
+    end
 
-      def build_request_uri(env)
-        return "#{env['REQUEST_METHOD']} #{env['REQUEST_URI']}" if env['REQUEST_URI']
+    def build_request_uri(env)
+      return "#{env['REQUEST_METHOD']} #{env['REQUEST_URI']}" if env['REQUEST_URI']
 
-        if env['QUERY_STRING'].present?
-          "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}?#{env['QUERY_STRING']}"
-        else
-          "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}"
-        end
+      if env['QUERY_STRING'].present?
+        "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}?#{env['QUERY_STRING']}"
+      else
+        "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}"
       end
+    end
   end
 end

data/lib/bullet/active_record4.rb

@@ -105,7 +105,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 +187,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 +195,7 @@ module Bullet
           end
           result
         end
+        # rubocop:enable Style/MethodCallWithoutArgsParentheses
       end
     end
   end

data/lib/bullet/active_record41.rb

@@ -108,7 +108,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

data/lib/bullet/active_record42.rb

@@ -124,7 +124,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 +138,13 @@ 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

data/lib/bullet/active_record5.rb

@@ -18,7 +18,7 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
-      ::ActiveRecord::Base.extend(Module.new {
+      ::ActiveRecord::Base.extend(Module.new do
         def find_by_sql(sql, binds = [], preparable: nil, &block)
           result = super
           if Bullet.start?
@@ -37,11 +37,11 @@ module Bullet
           end
           result
         end
-      })
+      end)
 
       ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
 
-      ::ActiveRecord::Relation.prepend(Module.new {
+      ::ActiveRecord::Relation.prepend(Module.new do
         # 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
@@ -59,9 +59,9 @@ module Bullet
           end
           result
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::Preloader.prepend(Module.new {
+      ::ActiveRecord::Associations::Preloader.prepend(Module.new do
         def preloaders_for_one(association, records, scope)
           if Bullet.start?
             records.compact!
@@ -74,9 +74,9 @@ module Bullet
           end
           super
         end
-      })
+      end)
 
-      ::ActiveRecord::FinderMethods.prepend(Module.new {
+      ::ActiveRecord::FinderMethods.prepend(Module.new do
         # add includes in scope
         def find_with_associations
           return super { |r| yield r } if block_given?
@@ -90,15 +90,15 @@ module Bullet
           end
           records
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new {
+      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new do
         def instantiate(result_set, aliases)
           @bullet_eager_loadings = {}
           records = super
 
           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
@@ -112,14 +112,13 @@ 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
@@ -142,16 +141,16 @@ module Bullet
 
           result
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new {
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new do
         def load_target
           records = super
 
           if Bullet.start?
-            if self.is_a? ::ActiveRecord::Associations::ThroughAssociation
+            if is_a? ::ActiveRecord::Associations::ThroughAssociation
               Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
-              association = self.owner.association self.through_reflection.name
+              association = owner.association through_reflection.name
               Array(association.target).each do |through_record|
                 Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
               end
@@ -183,9 +182,9 @@ module Bullet
           end
           super
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new {
+      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new do
         # call has_one and belongs_to associations
         def target
           result = super()
@@ -201,9 +200,9 @@ module Bullet
           end
           result
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new {
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new do
         def empty?
           result = super
           if Bullet.start? && !reflection.has_cached_counter?
@@ -214,12 +213,12 @@ module Bullet
 
         def count_records
           result = reflection.has_cached_counter?
-          if Bullet.start? && !result && !self.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+          if Bullet.start? && !result && !is_a?(::ActiveRecord::Associations::ThroughAssociation)
             Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
           super
         end
-      })
+      end)
     end
   end
 end

data/lib/bullet/active_record52.rb

@@ -18,7 +18,7 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
-      ::ActiveRecord::Base.extend(Module.new {
+      ::ActiveRecord::Base.extend(Module.new do
         def find_by_sql(sql, binds = [], preparable: nil, &block)
           result = super
           if Bullet.start?
@@ -37,11 +37,11 @@ module Bullet
           end
           result
         end
-      })
+      end)
 
       ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
 
-      ::ActiveRecord::Relation.prepend(Module.new {
+      ::ActiveRecord::Relation.prepend(Module.new do
         # 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
@@ -59,9 +59,9 @@ module Bullet
           end
           result
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::Preloader.prepend(Module.new {
+      ::ActiveRecord::Associations::Preloader.prepend(Module.new do
         def preloaders_for_one(association, records, scope)
           if Bullet.start?
             records.compact!
@@ -74,9 +74,9 @@ module Bullet
           end
           super
         end
-      })
+      end)
 
-      ::ActiveRecord::FinderMethods.prepend(Module.new {
+      ::ActiveRecord::FinderMethods.prepend(Module.new do
         # add includes in scope
         def find_with_associations
           return super { |r| yield r } if block_given?
@@ -90,15 +90,15 @@ module Bullet
           end
           records
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new {
+      ::ActiveRecord::Associations::JoinDependency.prepend(Module.new do
         def instantiate(result_set, &block)
           @bullet_eager_loadings = {}
           records = super
 
           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
@@ -112,14 +112,13 @@ 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
@@ -142,16 +141,16 @@ module Bullet
 
           result
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new {
+      ::ActiveRecord::Associations::CollectionAssociation.prepend(Module.new do
         def load_target
           records = super
 
           if Bullet.start?
-            if self.is_a? ::ActiveRecord::Associations::ThroughAssociation
+            if is_a? ::ActiveRecord::Associations::ThroughAssociation
               Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
-              association = self.owner.association self.through_reflection.name
+              association = owner.association through_reflection.name
               Array(association.target).each do |through_record|
                 Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
               end
@@ -183,9 +182,9 @@ module Bullet
           end
           super
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new {
+      ::ActiveRecord::Associations::SingularAssociation.prepend(Module.new do
         # call has_one and belongs_to associations
         def target
           result = super()
@@ -201,9 +200,9 @@ module Bullet
           end
           result
         end
-      })
+      end)
 
-      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new {
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(Module.new do
         def empty?
           result = super
           if Bullet.start? && !reflection.has_cached_counter?
@@ -214,12 +213,12 @@ module Bullet
 
         def count_records
           result = reflection.has_cached_counter?
-          if Bullet.start? && !result && !self.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+          if Bullet.start? && !result && !is_a?(::ActiveRecord::Associations::ThroughAssociation)
             Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
           super
         end
-      })
+      end)
     end
   end
 end