bullet 5.7.3 → 5.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a6d3a3671ea862309e08ecd7cb438ff1a0b1fb
-  data.tar.gz: 4796ef4d3dc79f88cab4b3ea1800a368935c3e5b
+  metadata.gz: 8dc58f03ac00764a73d88e5687a32895d94abcac
+  data.tar.gz: bd8d3b6215063a5536489aeaab2ffbdc72cb85e3
 SHA512:
-  metadata.gz: 1590f51058fa2b58b2adf9f0df431c542bac23e2ed33d42a8733a80419d756c253740bf3c2dc47c89a2945018674164efbe5ee4912880c1b49a366d608859a6e
-  data.tar.gz: 45ba5a4438cc5003b6b5e05e598a9e71ad3b3145996e19d7cc248bc0c6e5c7d03546d1aaf94158a1eb631957bf0fdeae44ef0701917957f1a60eb35f85c3aa1d
+  metadata.gz: c19ffb78e51f2307ce792759149e67a8f354db648b1aa0a0a746c5153c2337596ca067bbec8ed12df536bb455502438df50fc23dce1c05c1595e31b488ff1c33
+  data.tar.gz: 784d901307fbd9ba2286d6281e25229ea11e580a81b2dd7d5514a20b713faa72902d2c79ab6804d0ed93c61859cd1bb36955374b16e4101353329b318a8fa8d3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Next Release
 
+## 5.7.4 (10/03/2018)
+
+* Avoid Bullet from making extra queries in mongoid6
+* Use caller for ruby 1.9 while caller_locations for 2.0+
+
 ## 5.7.3 (17/02/2018)
 
 * Exclude configured bundler path in addition to '/vendor'

data/lib/bullet/mongoid6x.rb

@@ -21,13 +21,15 @@ module Bullet
         end
 
         def each(&block)
-          records = view.map { |doc| ::Mongoid::Factory.from_db(klass, doc) }
+          return to_enum unless block_given?
+          records = []
+          origin_each { |record| records << record }
           if records.length > 1
             Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
           elsif records.size == 1
             Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
           end
-          origin_each(&block)
+          records.each(&block)
         end
 
         def eager_load(docs)

data/lib/bullet/stack_trace_filter.rb

@@ -6,8 +6,7 @@ module Bullet
       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
+      select_caller_locations do |caller_path|
         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
@@ -33,5 +32,20 @@ module Bullet
         end
       end
     end
+
+    private
+
+    def select_caller_locations
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+        caller.select do |caller_path|
+          yield caller_path
+        end
+      else
+        caller_locations.select do |location|
+          caller_path = location.absolute_path.to_s
+          yield caller_path
+        end
+      end
+    end
   end
 end

data/lib/bullet/version.rb

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

data/spec/support/mongo_seed.rb

@@ -65,6 +65,6 @@ module Support
       Mongoid::IdentityMap.clear if Mongoid.const_defined?(:IdentityMap)
     end
 
-    extend self
+    module_function
   end
 end

data/spec/support/sqlite_seed.rb

@@ -232,6 +232,6 @@ module Support
       end
     end
 
-    extend self
+    module_function
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.7.3
+  version: 5.7.4
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport