rails_spotlight 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b079149e67ffc19722fc8f79f87bc06318ca607e5ec4e4f306b4b166dfe4b0a
-  data.tar.gz: 49fe7c6ef53eb6674d5b49983ccb7a77b3b4fcad9b7c1fda4164ba32d6911016
+  metadata.gz: e3080195b8e2481d0af07b1c8a7c0e5d59dc7b90d95afc82e722514676003d01
+  data.tar.gz: 472e0580e0e7fceb406bc6810be98ea2945232f673deaaecd28737d3c9bf54ff
 SHA512:
-  metadata.gz: 534a0d962aede9bb99c2108f1e0eea6f655bf7bacf56d6227fa37fd89aa858ad6581ea2bb24df6ef79b3f38589f017f4ed2a128620dd36e95fdd25f82f25f609
-  data.tar.gz: ca834260ee821483898464fb1132b9b7add515844bc62c768c908715d6f56989e745489b3d31dbc81f58e2f4be2a1ba090fffa1bed3cd754c9cc31c0f080674e
+  metadata.gz: f72425d6484fe1574d05d5f44189265bab421e834fdde23c9e2c96df0911f0b673750395d86e2b45563cac53dc3f0fc2d82794262c7d24ab3787161890259225
+  data.tar.gz: 98cf2fb54e51e960022a2819aabe04f21bfa66d2f7dd34057fb2fb2d5c4a23481c635d3f40deabc1f387d700b6a1dfb152b1ed5be0135c7ec0139e947db9cb78

data/lib/rails_spotlight/log_interceptor.rb

@@ -28,39 +28,34 @@ module RailsSpotlight
       true
     end
 
-    def debug(message = nil, *args)
-      message = yield if message.nil? && block_given?
-      _rails_spotlight_log(:debug, message)
+
+    def debug(message = nil, *args, &block)
+      _rails_spotlight_log(:debug, message, nil, :event, &block)
       super
     end
 
-    def info(message = nil, *args)
-      message = yield if message.nil? && block_given?
-      _rails_spotlight_log(:info, message)
+    def info(message = nil, *args, &block)
+      _rails_spotlight_log(:info, message, nil, :event, &block)
       super
     end
 
-    def warn(message = nil, *args)
-      message = yield if message.nil? && block_given?
-      _rails_spotlight_log(:warn, message)
+    def warn(message = nil, *args, &block)
+      _rails_spotlight_log(:warn, message, nil, :event, &block)
       super
     end
 
-    def error(message = nil, *args)
-      message = yield if message.nil? && block_given?
-      _rails_spotlight_log(:error, message)
+    def error(message = nil, *args, &block)
+      _rails_spotlight_log(:error, message, nil, :event, &block)
       super
     end
 
-    def fatal(message = nil, *args)
-      message = yield if message.nil? && block_given?
-      _rails_spotlight_log(:fatal, message)
+    def fatal(message = nil, *args, &block)
+      _rails_spotlight_log(:fatal, message, nil, :event, &block)
       super
     end
 
-    def unknown(message = nil, *args)
-      message = yield if message.nil? && block_given?
-      _rails_spotlight_log(:unknown, message)
+    def unknown(message = nil, *args, &block)
+      _rails_spotlight_log(:unknown, message, nil, :event, &block)
       super
     end
 
@@ -76,15 +71,15 @@ module RailsSpotlight
     def _rails_spotlight_log(level, message, progname = nil, output = :event)
       callsite = Utils.dev_callsite(caller.drop(1))
       name = progname.is_a?(String) || progname.is_a?(Symbol) ? progname : nil
-      output == :event ? _push_event(level, message, name) : _broadcast_log(message, level, callsite, name)
+      message = yield if output == :event && message.nil? && block_given?
+      output == :event ? _push_event(level, message, name, callsite) : _broadcast_log(message, level, callsite, name)
     rescue StandardError => e
       RailsSpotlight.config.logger.fatal("#{e.message}\n #{e.backtrace.join("\n ")}")
     end
 
-    def _push_event(level, message, progname = nil)
-      callsite = Utils.dev_callsite(caller.drop(1)) || {}
+    def _push_event(level, message, progname = nil, callsite = {})
       name = progname.is_a?(String) || progname.is_a?(Symbol) ? progname : nil
-      AppRequest.current.events << Event.new('rsl.notification.log', 0, 0, 0, callsite.merge(message: message, level: level, progname: name)) if AppRequest.current
+      AppRequest.current.events << Event.new('rsl.notification.log', 0, 0, 0, (callsite || {}).merge(message: message, level: level, progname: name)) if AppRequest.current
     rescue StandardError => e
       RailsSpotlight.config.logger.fatal("#{e.message}\n #{e.backtrace.join("\n ")}")
     end

data/lib/rails_spotlight/middlewares/handlers/sql_action_handler.rb

@@ -14,22 +14,31 @@ module RailsSpotlight
 
         private
 
-        def transaction
+        def transactional(&block)
+          return block.call if force_execution?
+
           ActiveRecord::Base.transaction do
-            begin # rubocop:disable Style/RedundantBegin
-              ActiveSupport::Notifications.subscribed(method(:logger), 'sql.active_record', monotonic: true) do
-                run
-              end
-            rescue => e # rubocop:disable Style/RescueStandardError
-              self.error = e
+            begin
+              block.call
             ensure
-              raise ActiveRecord::Rollback unless force_execution?
+              raise ActiveRecord::Rollback
+            end
+          end
+        end
+
+        def transaction
+          begin # rubocop:disable Style/RedundantBegin
+            ActiveSupport::Notifications.subscribed(method(:logger), 'sql.active_record', monotonic: true) do
+              run
             end
+          rescue => e # rubocop:disable Style/RescueStandardError
+            self.error = e
           end
         end
 
         def run # rubocop:disable Metrics/AbcSize
           RailsSpotlight.config.logger && RailsSpotlight.config.logger.info("Executing query: #{query}") # rubocop:disable Style/SafeNavigation
+
           return self.result = ActiveRecord::Base.connection.exec_query(query) if connection_options.blank? || !ActiveRecord::Base.respond_to?(:connects_to)
 
           connections = ActiveRecord::Base.connects_to(**connection_options)
@@ -48,7 +57,7 @@ module RailsSpotlight
             result: result,
             logs: logs,
             error: error.present? ? error.inspect : nil,
-          query_mode: force_execution? ? 'force' : 'default'
+            query_mode: force_execution? ? 'force' : 'default'
           }
         end
 
@@ -80,9 +89,9 @@ module RailsSpotlight
 
         def connection_options
           @connection_options ||= raw_options
-                                  .symbolize_keys
-                                  .slice(:database, :shards)
-                                  .reject { |_, v| v.nil? || (!v.is_a?(TrueClass) && !v.is_a?(FalseClass) && v.empty?) } # TODO: Check for each rails version
+                                    .symbolize_keys
+                                    .slice(:database, :shards)
+                                    .reject { |_, v| v.nil? || (!v.is_a?(TrueClass) && !v.is_a?(FalseClass) && v.empty?) } # TODO: Check for each rails version
         end
 
         def force_execution?

data/lib/rails_spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsSpotlight
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_spotlight
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Pawel Niemczyk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 2024-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-contrib
@@ -39,7 +39,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: action-cable-testing
   requirement: !ruby/object:Gem::Requirement