bullet 7.1.0 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3556ad95bac8e87086710acf1c5b7ea5aa8252ee83ab3b20dfb4ec9e06a06474
-  data.tar.gz: 5d3695f3e2ab1ff51232e56d056aaf994630d465f5902106ceef125a7c6426d9
+  metadata.gz: 7c62bb5eb8bdfdb62ce49a79609ce7665d6af8be0f7dede7361379597415dcd4
+  data.tar.gz: 8da00673c07b79eb6dbf7b061aaf6dd0208fd0be841a96c3169ba919259fcf82
 SHA512:
-  metadata.gz: 150e4ba5ae1900d1e50b87cfed8f325ff2615bbe613e908bc5e253d7072a0018869a6a67ca311a3f22cd190cadc87882e99700e0f9ae1e54277b64ddd0d2fe45
-  data.tar.gz: cf3c2bf147e67915dd46670a8cf2b77b90c236fddca56fe1663ff62d8bf10a1a10506ee54773a28b7759d892ed6ed7fcdd7e0952d6b67ec8074b5a66abce0a8f
+  metadata.gz: f33ad269a72ba293680c65ed460ef4e598446eebf62c82d79879de03b3cb52098f27499cab681facec3fdc3a3d6f937d064c21621aefcc69edcf499a52680838
+  data.tar.gz: 4a386c2bda2cdea90926ce9ff8bca0932954507ac4fa1e5986a356d869c3fb410b48708a5de843fb0e1f822f744ef1cf26dcecc9036ad3036f774ffad1c6e84e

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Next Release
 
+## 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
+* Fix count method signature
+
 ## 7.1.0 (10/06/2023)
 
 * Support rails 7.1

data/lib/bullet/active_record4.rb

@@ -178,11 +178,11 @@ module Bullet
       end
 
       ::ActiveRecord::Associations::CollectionProxy.class_eval do
-        def count
+        def count(column_name = nil, options = {})
           if Bullet.start?
             Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
           end
-          super
+          super(column_name, options)
         end
       end
     end

data/lib/bullet/active_record41.rb

@@ -170,11 +170,11 @@ module Bullet
       end
 
       ::ActiveRecord::Associations::CollectionProxy.class_eval do
-        def count
+        def count(column_name = nil, options = {})
           if Bullet.start?
             Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
           end
-          super
+          super(column_name, options)
         end
       end
     end

data/lib/bullet/active_record42.rb

@@ -235,11 +235,11 @@ module Bullet
       end
 
       ::ActiveRecord::Associations::CollectionProxy.class_eval do
-        def count
+        def count(column_name = nil, options = {})
           if Bullet.start?
             Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
           end
-          super
+          super(column_name, options)
         end
       end
     end

data/lib/bullet/active_record5.rb

@@ -265,7 +265,10 @@ module Bullet
         Module.new do
           def count
             if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
-              Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+              Bullet::Detector::CounterCache.add_counter_cache(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super
           end

data/lib/bullet/active_record52.rb

@@ -245,11 +245,14 @@ module Bullet
 
       ::ActiveRecord::Associations::CollectionProxy.prepend(
         Module.new do
-          def count
+          def count(column_name = nil)
             if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
-              Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+              Bullet::Detector::CounterCache.add_counter_cache(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
-            super
+            super(column_name)
           end
         end
       )

data/lib/bullet/active_record60.rb

@@ -274,7 +274,10 @@ module Bullet
         Module.new do
           def count
             if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
-              Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+              Bullet::Detector::CounterCache.add_counter_cache(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
             super
           end

data/lib/bullet/active_record61.rb

@@ -272,11 +272,14 @@ module Bullet
 
       ::ActiveRecord::Associations::CollectionProxy.prepend(
         Module.new do
-          def count
+          def count(column_name = nil)
             if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
-              Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+              Bullet::Detector::CounterCache.add_counter_cache(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
-            super
+            super(column_name)
           end
         end
       )

data/lib/bullet/active_record70.rb

@@ -65,7 +65,9 @@ module Bullet
           def call
             if Bullet.start?
               @preloaders.each do |preloader|
-                preloader.records.each { |record| Bullet::Detector::Association.add_object_associations(record, preloader.associations) }
+                preloader.records.each { |record|
+                  Bullet::Detector::Association.add_object_associations(record, preloader.associations)
+                }
                 Bullet::Detector::UnusedEagerLoading.add_eager_loadings(preloader.records, preloader.associations)
               end
             end
@@ -80,7 +82,9 @@ module Bullet
             if Bullet.start?
               reflection_records.compact!
               if reflection_records.first.class.name !~ /^HABTM_/
-                reflection_records.each { |record| Bullet::Detector::Association.add_object_associations(record, reflection.name) }
+                reflection_records.each { |record|
+                  Bullet::Detector::Association.add_object_associations(record, reflection.name)
+                }
                 Bullet::Detector::UnusedEagerLoading.add_eager_loadings(reflection_records, reflection.name)
               end
             end
@@ -284,11 +288,14 @@ module Bullet
 
       ::ActiveRecord::Associations::CollectionProxy.prepend(
         Module.new do
-          def count
+          def count(column_name = nil)
             if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
-              Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+              Bullet::Detector::CounterCache.add_counter_cache(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
-            super
+            super(column_name)
           end
         end
       )

data/lib/bullet/active_record71.rb

@@ -65,7 +65,9 @@ module Bullet
           def call
             if Bullet.start?
               @preloaders.each do |preloader|
-                preloader.records.each { |record| Bullet::Detector::Association.add_object_associations(record, preloader.associations) }
+                preloader.records.each { |record|
+                  Bullet::Detector::Association.add_object_associations(record, preloader.associations)
+                }
                 Bullet::Detector::UnusedEagerLoading.add_eager_loadings(preloader.records, preloader.associations)
               end
             end
@@ -80,7 +82,9 @@ module Bullet
             if Bullet.start?
               reflection_records.compact!
               if reflection_records.first.class.name !~ /^HABTM_/
-                reflection_records.each { |record| Bullet::Detector::Association.add_object_associations(record, reflection.name) }
+                reflection_records.each { |record|
+                  Bullet::Detector::Association.add_object_associations(record, reflection.name)
+                }
                 Bullet::Detector::UnusedEagerLoading.add_eager_loadings(reflection_records, reflection.name)
               end
             end
@@ -284,11 +288,14 @@ module Bullet
 
       ::ActiveRecord::Associations::CollectionProxy.prepend(
         Module.new do
-          def count
+          def count(column_name = nil)
             if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
-              Bullet::Detector::CounterCache.add_counter_cache(proxy_association.owner, proxy_association.reflection.name)
+              Bullet::Detector::CounterCache.add_counter_cache(
+                proxy_association.owner,
+                proxy_association.reflection.name
+              )
             end
-            super
+            super(column_name)
           end
         end
       )

data/lib/bullet/detector/n_plus_one_query.rb

@@ -44,13 +44,10 @@ module Bullet
             unless obj.bullet_primary_key_value.nil?
               primary_key_values_are_empty = false
             end
-            keys_joined += "#{(keys_joined.empty?? '' : ', ')}#{obj.bullet_key}"
+            keys_joined += "#{(keys_joined.empty? ? '' : ', ')}#{obj.bullet_key}"
           end
           unless class_names_match_regex || primary_key_values_are_empty
-            Bullet.debug(
-              'Detector::NPlusOneQuery#add_possible_objects',
-              "objects: #{keys_joined}"
-            )
+            Bullet.debug('Detector::NPlusOneQuery#add_possible_objects', "objects: #{keys_joined}")
             objects.each { |object| possible_objects.add object.bullet_key }
           end
         end

data/lib/bullet/detector/unused_eager_loading.rb

@@ -65,7 +65,10 @@ module Bullet
         private
 
         def create_notification(callers, klazz, associations)
-          notify_associations = Array.wrap(associations) - Bullet.get_safelist_associations(:unused_eager_loading, klazz)
+          notify_associations = Array.wrap(associations) - Bullet.get_safelist_associations(
+            :unused_eager_loading,
+            klazz
+          )
 
           if notify_associations.present?
             notice = Bullet::Notification::UnusedEagerLoading.new(callers, klazz, notify_associations)

data/lib/bullet/ext/object.rb

@@ -9,11 +9,21 @@ 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/mongoid8x.rb

@@ -1,4 +1,3 @@
-
 module Bullet
   module Mongoid
     def self.enable
@@ -23,6 +22,7 @@ module Bullet
 
         def each(&block)
           return to_enum unless block_given?
+
           records = []
           origin_each { |record| records << record }
           if records.length > 1

data/lib/bullet/notification/base.rb

@@ -28,13 +28,13 @@ module Bullet
       def whoami
         @user ||=
           ENV['USER'].presence ||
-            (
-              begin
-                `whoami`.chomp
-              rescue StandardError
-                ''
-              end
-            )
+          (
+            begin
+              `whoami`.chomp
+            rescue StandardError
+              ''
+            end
+          )
         @user.present? ? "user: #{@user}" : ''
       end
 
@@ -73,7 +73,8 @@ module Bullet
       end
 
       def associations_str
-        ".includes(#{@associations.map { |a| a.to_s.to_sym }.inspect})"
+        ".includes(#{@associations.map { |a| a.to_s.to_sym }
+.inspect})"
       end
     end
   end

data/lib/bullet/rack.rb

@@ -49,6 +49,7 @@ module Bullet
       # response may be ["Not Found"], ["Move Permanently"], etc, but
       # those should not happen if the status is 200
       return true if !response.respond_to?(:body) && !response.respond_to?(:first)
+
       body = response_body(response)
       body.nil? || body.empty?
     end
@@ -135,7 +136,8 @@ module Bullet
     end
 
     def with_security_policy_nonce(headers)
-      matched = (headers['Content-Security-Policy'] || '').match(NONCE_MATCHER)
+      csp = headers['Content-Security-Policy'] || headers['Content-Security-Policy-Report-Only'] || ''
+      matched = csp.match(NONCE_MATCHER)
       nonce = matched[:nonce] if matched
 
       if nonce

data/lib/bullet/registry/association.rb

@@ -8,7 +8,8 @@ module Bullet
       end
 
       def similarly_associated(base, associations)
-        @registry.select { |key, value| key.include?(base) && value == associations }.collect(&:first).flatten
+        @registry.select { |key, value| key.include?(base) && value == associations }
+                 .collect(&:first).flatten
       end
     end
   end

data/lib/bullet/stack_trace_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler"
 
 module Bullet
@@ -14,8 +15,8 @@ module Bullet
         caller_path = location_as_path(location)
         caller_path.include?(Bullet.app_root) && !caller_path.include?(vendor_root) &&
           !caller_path.include?(bundler_path) || Bullet.stacktrace_includes.any? { |include_pattern|
-          pattern_matches?(location, include_pattern)
-        }
+                                                   pattern_matches?(location, include_pattern)
+                                                 }
       end
     end
 

data/lib/bullet/version.rb

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

data/lib/bullet.rb

@@ -43,7 +43,8 @@ module Bullet
     attr_accessor :add_footer, :orm_patches_applied, :skip_http_headers, :always_append_html_body
 
     available_notifiers =
-      UniformNotifier::AVAILABLE_NOTIFIERS.select { |notifier| notifier != :raise }.map { |notifier| "#{notifier}=" }
+      UniformNotifier::AVAILABLE_NOTIFIERS.select { |notifier| notifier != :raise }
+                                          .map { |notifier| "#{notifier}=" }
     available_notifiers_options = { to: UniformNotifier }
     delegate(*available_notifiers, **available_notifiers_options)
 

metadata

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