bullet 8.0.6 → 8.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f00b664af513340b8b094dfa967a2dbd2c3a72edfcb0031532dd4ba38a1fb4b2
-  data.tar.gz: 76b42f07c889542a50cc75a52d52fef26bf8647721d3c9913eb4f1dbb21db9a0
+  metadata.gz: ac2296e419c6f32f6ed2e2dbe92a344884d1197b8287bb6c67783a1587c31c72
+  data.tar.gz: 523f4b66265e7ca8b4d67b19ecd13a547f7ad55acbdbd8190ec1e48a1cb4993e
 SHA512:
-  metadata.gz: db329cba6757c1ec372a7a7b6a8a9aa4a92fd5c63ce1a0e92cd43c89abd852768a83eddd95873a1cdeb2155abfa899d4c385df2a670b326c3eaa8736398a996e
-  data.tar.gz: 35c6df4a0e0aefd934c1038f2dc5faa7978cbe7b81e482ea0ca931045d4b445a67d33d0c69d603830111cee46f9bf5128a9824277de7ef3dc347c10eae5d84ea
+  metadata.gz: 463b978de4299a651821f4bf66ce219ba3def30f32d8fbb790086d10b869526578c2f5b441a1c0c5d368c03906e833a86b5ed88cda1a2f983e5769c04bf7efb2
+  data.tar.gz: 5ab230e714c07790210516fbb760007fbbb49875a4021950b8e5d2c8ab77e132240f632ee50a62ee25dc58f629663f6d9802bee626d870d456284e3d4130ed3e

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Next Release
 
+## 8.0.8 (05/30/2025)
+
+* Add middleware after initializers
+* Fix bullet composite primary key retrieval
+
+## 8.0.7 (05/15/2025)
+
+* Try to insert `Bullet::Rack` properly
+
 ## 8.0.6 (05/07/2025)
 
 * Add CSP nonce for footer styles as well

data/lib/bullet/ext/object.rb

@@ -26,10 +26,10 @@ module Bullet
         private
 
         def bullet_join_potential_composite_primary_key(primary_keys)
-          return send(primary_keys) unless primary_keys.is_a?(Enumerable)
+          return read_attribute(primary_keys) unless primary_keys.is_a?(Enumerable)
 
-          primary_keys.map { |primary_key| send primary_key }
-                      .join(',')
+          primary_keys.map { |primary_key| read_attribute primary_key }
+                      .compact.join(',')
         end
       end
     end

data/lib/bullet/version.rb

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

data/lib/bullet.rb

@@ -23,14 +23,11 @@ module Bullet
 
   if defined?(Rails::Railtie)
     class BulletRailtie < Rails::Railtie
-      initializer 'bullet.add_middleware' do |app|
-        # I don't find a way to detect if the middleware is already in the stack,
-        # so I'm using the api_only flag.
-        # If it is true, ActionDispatch::ContentSecurityPolicy::Middleware is not in the stack.
-        if app.config.api_only || !defined?(ActionDispatch::ContentSecurityPolicy::Middleware)
-          app.middleware.use Bullet::Rack
-        else
+      initializer 'bullet.add_middleware', after: :load_config_initializers do |app|
+        if defined?(ActionDispatch::ContentSecurityPolicy::Middleware) && Rails.application.config.content_security_policy && !app.config.api_only
           app.middleware.insert_before ActionDispatch::ContentSecurityPolicy::Middleware, Bullet::Rack
+        else
+          app.middleware.use Bullet::Rack
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 8.0.6
+  version: 8.0.8
 platform: ruby
 authors:
 - Richard Huang
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
 test_files: []