bullet 5.7.2 → 5.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed0e2ed3898670a46673b101bd879b8d108ac2c
-  data.tar.gz: 6c919b7f0793fbbb653ae7b493adcc0d57342af4
+  metadata.gz: 74a6d3a3671ea862309e08ecd7cb438ff1a0b1fb
+  data.tar.gz: 4796ef4d3dc79f88cab4b3ea1800a368935c3e5b
 SHA512:
-  metadata.gz: f921b2f8de2e9a222d17461f28547693e6442129f8bcd19ba19846054b057062f7ce699aae655a9fb032f68f6f347302f1112bdbe09986c11c17194bb81ee597
-  data.tar.gz: 30a453003a415d5b932b8fe2a1dd86e012baf25dabecea8d473276b4bbe1de2276a4da6edc5b7c866a80da76fe008bac30d2b3c1e3c114ee2613973a09a1b0a9
+  metadata.gz: 1590f51058fa2b58b2adf9f0df431c542bac23e2ed33d42a8733a80419d756c253740bf3c2dc47c89a2945018674164efbe5ee4912880c1b49a366d608859a6e
+  data.tar.gz: 45ba5a4438cc5003b6b5e05e598a9e71ad3b3145996e19d7cc248bc0c6e5c7d03546d1aaf94158a1eb631957bf0fdeae44ef0701917957f1a60eb35f85c3aa1d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Next Release
 
+## 5.7.3 (17/02/2018)
+
+* 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`

data/README.md

@@ -2,8 +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/projects/2)
+[![AwesomeCode Status](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.

data/bullet.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Richard Huang']
   s.email       = ['flyerhzm@gmail.com']
-  s.homepage    = 'http://github.com/flyerhzm/bullet'
+  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.'
 

data/lib/bullet/active_record5.rb

@@ -93,17 +93,34 @@ module Bullet
       end)
 
       ::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|
-              objects = eager_loadings_hash.keys
-              Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+        if ::ActiveRecord::Associations::JoinDependency.instance_method(:instantiate).parameters.last[0] == :block
+          # ActiveRecord >= 5.1.5
+          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
+        else
+          # ActiveRecord <= 5.1.4
+          def instantiate(result_set, aliases)
+            @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
-          records
         end
 
         def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)

data/lib/bullet/stack_trace_filter.rb

@@ -5,9 +5,10 @@ module Bullet
     def caller_in_project
       app_root = rails? ? Rails.root.to_s : Dir.pwd
       vendor_root = app_root + VENDOR_PATH
+      bundler_path = Bundler.bundle_path.to_s
       caller_locations.select do |location|
         caller_path = location.absolute_path.to_s
-        caller_path.include?(app_root) && !caller_path.include?(vendor_root) ||
+        caller_path.include?(app_root) && !caller_path.include?(vendor_root) && !caller_path.include?(bundler_path) ||
           Bullet.stacktrace_includes.any? do |include_pattern|
             case include_pattern
             when String

data/lib/bullet/version.rb

@@ -1,3 +1,3 @@
 module Bullet
-  VERSION = '5.7.2'.freeze
+  VERSION = '5.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.7.2
+  version: 5.7.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,7 +160,7 @@ files:
 - tasks/bullet_tasks.rake
 - test.sh
 - update.sh
-homepage: http://github.com/flyerhzm/bullet
+homepage: https://github.com/flyerhzm/bullet
 licenses:
 - MIT
 metadata: {}