bulletmark_repairer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d44edbc5a6deb0c95e4e1ed79c2f2b1c7b283ff54e3f00d33bbf9a8b70f698e
-  data.tar.gz: 5d3ba75ca53cd5e721f971894fc2f1001e1fd391f4daf44a53184ef861cb532b
+  metadata.gz: 5eabc96bcf1961f834090322c3b9a62173139f806513c5ec99d452f18a661c71
+  data.tar.gz: b55ab6f5adade690b6cb34ef92fc752bdfa697a3b8d7779d54150aaf4e1083bb
 SHA512:
-  metadata.gz: 617f5750639fe286efd6fa7d0d7bb40d0be0d258ef94600717ad98f2f46c6bfad966ea651bd5b0113f3ab9b0ff4d5749a5316bc7cca7c83c7dabc781d890ac20
-  data.tar.gz: e6698f869f1c1f50b08332c6ec3134cfd32716325c5b2607e4a7247cf5bf807ed5f39f633822288d641246167b82e1f6b6e969d24b7cde322764204823fbea24
+  metadata.gz: 714da7b74b7015194f965c83c1260d31b8a4f75b4f7a24b3038eac6c81ced4aa8a77a79abbe5a684a347093fbb00d0e9f1b05682729b96afe64ed2a83b110534
+  data.tar.gz: e48064688caaa2003d30192bfd2a76ff677fdcb4b4bb02bb8b828fece22b9fd5dab69a47aef2fb836a69e9f5b16db10d2c1faefcb9e249ba5b8a3df671310c03

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.1.6] - 2023-11-09
+
+Fix a bug when N+1 is caused not in the request (e.g. Sidekiq) [51f051e](https://github.com/makicamel/bulletmark_repairer/commit/51f051e608b84b7da96ac879a324ed438c14eeeb)
+
 ## [0.1.5] - 2023-10-27
 
 Be able to patch for nested associations require `includes` though child associations are already included [d1b7445](https://github.com/makicamel/bulletmark_repairer/commit/d1b7445556c20bc037beb6a013ac70531426a7ea)

data/lib/bulletmark_repairer/monkey_patches/active_record/query_method.rb

@@ -4,17 +4,17 @@ module BulletmarkRepairer
   module ActiveRecord
     module QueryMethod
       def includes(*args)
-        Thread.current[:bulletmark_repaier_loaded_associations][model.name][:includes].add(args)
+        BulletmarkRepairer::Thread.add(name: model.name, method_type: :includes, args: args)
         super(args)
       end
 
       def eager_load(*args)
-        Thread.current[:bulletmark_repaier_loaded_associations][model.name][:eager_load].add(args)
+        BulletmarkRepairer::Thread.add(name: model.name, method_type: :eager_load, args: args)
         super(args)
       end
 
       def preload(*args)
-        Thread.current[:bulletmark_repaier_loaded_associations][model.name][:preload].add(args)
+        BulletmarkRepairer::Thread.add(name: model.name, method_type: :preload, args: args)
         super(args)
       end
     end

data/lib/bulletmark_repairer/rack.rb

@@ -7,24 +7,21 @@ module BulletmarkRepairer
     end
 
     def call(env)
-      Thread.current[:bulletmark_repaier_loaded_associations] = Hash.new do |hash, key|
-        hash[key] = { includes: Set.new, eager_load: Set.new, preload: Set.new }
-      end
       @app.call(env)
     ensure
       begin
-        if Thread.current[:bullet_notification_collector].notifications_present?
+        if ::Thread.current[:bullet_notification_collector].notifications_present?
           BulletmarkRepairer::Patcher.execute(
-            notifications: Thread.current[:bullet_notification_collector],
+            notifications: ::Thread.current[:bullet_notification_collector],
             controller: env['action_dispatch.request.parameters']['controller'],
             action: env['action_dispatch.request.parameters']['action'],
-            loaded_associations: Thread.current[:bulletmark_repaier_loaded_associations]
+            loaded_associations: BulletmarkRepairer::Thread.current
           )
         end
       rescue StandardError => e
         raise e if BulletmarkRepairer.config.debug?
       end
-      Thread.current[:bulletmark_repaier_loaded_associations].clear
+      BulletmarkRepairer::Thread.clear
     end
   end
 end

data/lib/bulletmark_repairer/thread.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails'
+
+module BulletmarkRepairer
+  class Thread
+    class << self
+      def current
+        touch
+      end
+
+      def add(name:, method_type:, args:)
+        touch
+        ::Thread.current[:bulletmark_repaier_loaded_associations][name][method_type].add(args)
+      end
+
+      def clear
+        ::Thread.current[:bulletmark_repaier_loaded_associations] = nil
+      end
+
+      private
+
+      def touch
+        ::Thread.current[:bulletmark_repaier_loaded_associations] ||= Hash.new do |hash, key|
+          hash[key] = { includes: Set.new, eager_load: Set.new, preload: Set.new }
+        end
+      end
+    end
+  end
+end

data/lib/bulletmark_repairer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BulletmarkRepairer
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/bulletmark_repairer.rb

@@ -9,6 +9,7 @@ require 'bulletmark_repairer/corrector_builder'
 require 'bulletmark_repairer/loaded_associations'
 require 'bulletmark_repairer/markers'
 require 'bulletmark_repairer/patcher'
+require 'bulletmark_repairer/thread'
 
 module BulletmarkRepairer
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulletmark_repairer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - makicamel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,6 +95,7 @@ files:
 - lib/bulletmark_repairer/rack.rb
 - lib/bulletmark_repairer/railtie.rb
 - lib/bulletmark_repairer/retry_corrector.rb
+- lib/bulletmark_repairer/thread.rb
 - lib/bulletmark_repairer/version.rb
 - sig/bulletmark_repairer.rbs
 homepage: https://github.com/makicamel/bulletmark_repairer
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Auto corrector for N+1 queries detected at runtime with Bullet