bullet 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f255102db3ae1250632db2b30a9e6f1bce87dab49b4dabee73709ffde82a4e0
-  data.tar.gz: 025ab0e3513546a56e984aa83a0b925d27e631bdfe61feb694b3e21ecfb6ffda
+  metadata.gz: 152296ae0c6092687f600a52f129bfa88688b6d5a96db52dd554dbe5db848b11
+  data.tar.gz: 65967b8561c27febdab5112572bd5bec8ea7e4d948028eefed843988cedcef99
 SHA512:
-  metadata.gz: 23d701691dc1f2286ec11ffb26f548878bfa7ddd2ea8f20d97bb4c64df4e3a7a10f54adb16fa7cacd8bb8807dd1804e349c1b889e32530cbb7c57432ceec17da
-  data.tar.gz: 281a4a6619695a7db4098f1ed62066cd4e81cf9c2c3bf33fa83f87a205a5c4779e9c8125143a78ca482247ed2a271465b3011af84a5dfc67753cbad2357ee2ae
+  metadata.gz: 011db6a9187cbb7d1ce77f249e041b8dda64e8c5cae0ff528081878a3b117cd2180b28c394333504479572eed14701feeba0d4ffa565c235f2fda401b85bd1a0
+  data.tar.gz: 332e755d1304b832ccbb4da6c7d05109a11cd62056c0ec911d1346b04e49475cce35c93e8174ca80d5850fbfa8cecc2d6dc630f713d7e681c16d24fb9fac51bc

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Next Release
 
+## 6.0.2 (08/20/2019)
+
+* Fully support Rails 6.0
+
 ## 6.0.1 (06/26/2019)
 
 * Add Bullet::ActiveJob

data/Gemfile.rails-6.0

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '6.0.0.rc1'
+gem 'rails', '6.0.0'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'

data/README.md

@@ -125,7 +125,7 @@ do like
 
 ```ruby
 class ApplicationController < ActionController::Base
-  around_action :skip_bullet
+  around_action :skip_bullet, if: -> { defined?(Bullet) }
 
   def skip_bullet
     previous_value = Bullet.enable?

data/lib/bullet/active_record60.rb

@@ -84,6 +84,20 @@ module Bullet
         end
       end)
 
+      ::ActiveRecord::Associations::Preloader::ThroughAssociation.prepend(Module.new do
+        def preloaded_records
+          if Bullet.start? && !defined?(@preloaded_records)
+            source_preloaders.each do |source_preloader|
+              reflection_name = source_preloader.send(:reflection).name
+              source_preloader.send(:owners).each do |owner|
+                Bullet::Detector::NPlusOneQuery.call_association(owner, reflection_name)
+              end
+            end
+          end
+          super
+        end
+      end)
+
       ::ActiveRecord::FinderMethods.prepend(Module.new do
         # add includes in scope
         def find_with_associations
@@ -160,7 +174,7 @@ module Bullet
           if Bullet.start?
             if is_a? ::ActiveRecord::Associations::ThroughAssociation
               Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.through_reflection.name)
-              association = owner.association reflection.through_reflection.name
+              association = owner.association(reflection.through_reflection.name)
               Array(association.target).each do |through_record|
                 Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
               end

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bullet
-  VERSION = '6.0.1'
+  VERSION = '6.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport