bullet 7.1.1 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3337004db8160edc4f3fecbb4b9d9caf5db356f2bc53cbb8a87dc32661747db
-  data.tar.gz: cf987a580af8f2451043a7ccc0ad0fd2f4f30b4832c8889e2a7891a85e1ed062
+  metadata.gz: 68fdd5b4a91b98bb9fa4399088979b48a0e07432f268df9f0116b413433f8e89
+  data.tar.gz: d7832e74768e19a93355b7d67341cebedde9f14048b331b91564ed9b218f3a4d
 SHA512:
-  metadata.gz: 88ba85427aeb892d39b66d6f98edfa2dd1d80a23eba3080c2497b7b2b496add6cf3835239bc81b349a5176413fe771637e1218e72eca1d15b24f9f6cd737826d
-  data.tar.gz: d3982d128702e65d65ec669be5a8ef0c15725e2f474db26911186aafedf6192f2278709cc1dee0f8d5857ca43105bb34fa6d2fa59eafaadb7b3284e5821a1388
+  metadata.gz: 2a8ec0d54d2d0557793b1ad53b571ff5c04345d0e699d4052649b96f08ac911d5a200058fd9c13ee3ef342da65e14229f99e6cdc6fdab65668e468a062b1debe
+  data.tar.gz: 4c2606728e7e84f80dbbdfc66c34510825d4b365204718a1eaaf3a42247ff9c8708d5be321ae07aad95f0ddc3e57e97961327d58f1dced9912a7c26822584b54

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Next Release
 
+## 7.1.3 (11/05/2023)
+
+* Call NPlusOneQuery's call_association when calling count on collectino assocation
+
+## 7.1.2 (10/13/2023)
+
+* Handle Rails 7.1 composite primary keys
+
 ## 7.1.1 (10/07/2023)
 
 * Add support for `Content-Security-Policy-Report-Only` nonces

data/README.md

@@ -287,17 +287,17 @@ $ rails new test_bullet
 $ cd test_bullet
 $ rails g scaffold post name:string
 $ rails g scaffold comment name:string post_id:integer
-$ bundle exec rake db:migrate
+$ bundle exec rails db:migrate
 ```
 
 2\. Change `app/models/post.rb` and `app/models/comment.rb`
 
 ```ruby
-class Post < ActiveRecord::Base
+class Post < ApplicationRecord
   has_many :comments
 end
 
-class Comment < ActiveRecord::Base
+class Comment < ApplicationRecord
   belongs_to :post
 end
 ```

data/lib/bullet/active_record4.rb

@@ -181,6 +181,7 @@ module Bullet
         def count(column_name = nil, options = {})
           if Bullet.start?
             Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+            Bullet::Detector::NPlusOneQuery.call_association(proxy_association.owner, proxy_association.reflection.name)
           end
           super(column_name, options)
         end

data/lib/bullet/active_record41.rb

@@ -173,6 +173,7 @@ module Bullet
         def count(column_name = nil, options = {})
           if Bullet.start?
             Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+            Bullet::Detector::NPlusOneQuery.call_association(proxy_association.owner, proxy_association.reflection.name)
           end
           super(column_name, options)
         end

data/lib/bullet/active_record42.rb

@@ -238,6 +238,7 @@ module Bullet
         def count(column_name = nil, options = {})
           if Bullet.start?
             Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+            Bullet::Detector::NPlusOneQuery.call_association(proxy_association.owner, proxy_association.reflection.name)
           end
           super(column_name, options)
         end

data/lib/bullet/active_record5.rb

@@ -269,6 +269,10 @@ module Bullet
                 proxy_association.owner,
                 proxy_association.reflection.name
               )
+              Bullet::Detector::NPlusOneQuery.call_association(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super
           end

data/lib/bullet/active_record52.rb

@@ -251,6 +251,10 @@ module Bullet
                 proxy_association.owner,
                 proxy_association.reflection.name
               )
+              Bullet::Detector::NPlusOneQuery.call_association(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super(column_name)
           end

data/lib/bullet/active_record60.rb

@@ -278,6 +278,10 @@ module Bullet
                 proxy_association.owner,
                 proxy_association.reflection.name
               )
+              Bullet::Detector::NPlusOneQuery.call_association(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super
           end

data/lib/bullet/active_record61.rb

@@ -278,6 +278,10 @@ module Bullet
                 proxy_association.owner,
                 proxy_association.reflection.name
               )
+              Bullet::Detector::NPlusOneQuery.call_association(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super(column_name)
           end

data/lib/bullet/active_record70.rb

@@ -294,6 +294,10 @@ module Bullet
                 proxy_association.owner,
                 proxy_association.reflection.name
               )
+              Bullet::Detector::NPlusOneQuery.call_association(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super(column_name)
           end

data/lib/bullet/active_record71.rb

@@ -294,6 +294,10 @@ module Bullet
                 proxy_association.owner,
                 proxy_association.reflection.name
               )
+              Bullet::Detector::NPlusOneQuery.call_association(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super(column_name)
           end

data/lib/bullet/ext/object.rb

@@ -9,12 +9,22 @@ class Object
     return if respond_to?(:persisted?) && !persisted?
 
     if self.class.respond_to?(:primary_keys) && self.class.primary_keys
-      self.class.primary_keys.map { |primary_key| send primary_key }
-          .join(',')
+      primary_key = self.class.primary_keys
     elsif self.class.respond_to?(:primary_key) && self.class.primary_key
-      send self.class.primary_key
+      primary_key = self.class.primary_key
     else
-      id
+      primary_key = :id
     end
+
+    bullet_join_potential_composite_primary_key(primary_key)
+  end
+
+  private
+
+  def bullet_join_potential_composite_primary_key(primary_keys)
+    return send(primary_keys) unless primary_keys.is_a?(Enumerable)
+
+    primary_keys.map { |primary_key| send primary_key }
+                .join(',')
   end
 end

data/lib/bullet/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport