rails_spotlight 0.3.9 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424dc49d083eaf39eed2a0002d0af46890c14f6e136ed947851b24b5699427ca
-  data.tar.gz: 6a0e5a013d96b14096ac5bb6a8bd5b0145020fec98eca7caf0666d73cb818672
+  metadata.gz: 7b079149e67ffc19722fc8f79f87bc06318ca607e5ec4e4f306b4b166dfe4b0a
+  data.tar.gz: 49fe7c6ef53eb6674d5b49983ccb7a77b3b4fcad9b7c1fda4164ba32d6911016
 SHA512:
-  metadata.gz: bd59938d44b40b303bc507953c4f381a845093e1c9e4817f23e72341fdf0cfdfb2b975aaccaa93b375ebb36ef5eec6589ee2abf1848fc1f94734a4c171ebb4ee
-  data.tar.gz: d843e22748532f89d3901d914272a8a830a5277ac141f7aa724efc545327f7f3145b153ac5779a3163fc04d6594acecdefa89a982735c143b63f443cdc4d12e5
+  metadata.gz: 534a0d962aede9bb99c2108f1e0eea6f655bf7bacf56d6227fa37fd89aa858ad6581ea2bb24df6ef79b3f38589f017f4ed2a128620dd36e95fdd25f82f25f609
+  data.tar.gz: ca834260ee821483898464fb1132b9b7add515844bc62c768c908715d6f56989e745489b3d31dbc81f58e2f4be2a1ba090fffa1bed3cd754c9cc31c0f080674e

data/lib/rails_spotlight/channels/handlers/live_console_handler.rb

@@ -15,7 +15,7 @@ module RailsSpotlight
         attr_reader :data
 
         def call
-          return unless ::RailsSpotlight.config.live_console_enabled?
+          return unless ::RailsSpotlight.config.live_logs_enabled?
           return unless data['type'] == TYPE
 
           command = data['command']

data/lib/rails_spotlight/channels/handlers/logs_handler.rb

@@ -13,7 +13,7 @@ module RailsSpotlight
         attr_reader :data
 
         def call
-          return unless ::RailsSpotlight.config.live_console_enabled?
+          return unless ::RailsSpotlight.config.live_logs_enabled?
           return unless data['type'] == TYPE
 
           for_project = Array(data['project'])

data/lib/rails_spotlight/configuration.rb

@@ -9,9 +9,7 @@ module RailsSpotlight
       'ActiveRecord' => [
         'ActiveRecord::ConnectionAdapters::AbstractAdapter',
         'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
-        'ActiveRecord::ConnectionAdapters::RealTransaction',
-        'ActiveRecord::SchemaMigration',
-        'ActiveRecord::Transaction'
+        'ActiveRecord::ConnectionAdapters::RealTransaction'
       ],
       'ActionDispatch' => ['ActionDispatch::Request', 'ActionDispatch::Response']
     }.freeze
@@ -79,6 +77,7 @@ module RailsSpotlight
 
     alias live_console_enabled? live_console_enabled
     alias live_logs_enabled? live_logs_enabled
+    alias use_action_cable? use_action_cable
 
     def request_completed_broadcast_enabled
       @request_completed_broadcast_enabled && use_action_cable && action_cable_present?

data/lib/rails_spotlight/event.rb

@@ -34,34 +34,47 @@ module RailsSpotlight
 
     private
 
-    def json_encodable(payload)
+    def json_encodable(payload) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       return {} unless payload.is_a?(Hash)
 
       transform_hash(payload, deep: true) do |hash, key, value|
-        value_class = value.class.to_s
-        if value_class == 'ActionDispatch::Http::Headers'
+        if value.class.to_s == 'ActionDispatch::Http::Headers'
           value = value.to_h.select { |k, _| k.upcase == k }
-        elsif value_class == 'SystemStackError' || not_encodable?(value)
+        elsif value.is_a?(Array) && defined?(ActiveRecord::Relation::QueryAttribute) && value.first.is_a?(ActiveRecord::Relation::QueryAttribute)
+          value = value.map(&method(:map_relation_query_attribute))
+        elsif not_encodable?(value)
           value = NOT_JSON_ENCODABLE
         end
 
         begin
           value.to_json(methods: [:duration])
           new_value = value
-        rescue StandardError, SystemStackError
+        rescue # rubocop:disable Lint/RedundantCopDisableDirective, Style/RescueStandardError
           new_value = NOT_JSON_ENCODABLE
         end
-        hash[key] = new_value
+        hash[key] = new_value # encode_value(value)
       end.with_indifferent_access
     end
 
+    # ActiveRecord::Relation::QueryAttribute implementation changed in Rails 7.1 it getting binds need to be manually added
+    def map_relation_query_attribute(attr)
+      {
+        name: attr.name,
+        value: attr.value,
+        value_before_type_cast: attr.value_before_type_cast,
+        value_for_database: attr.value_for_database
+        # resign from type and original_attribute for now
+        # type: attr.type,
+        # original_attribute: attr.original_attribute or attr.original_value_for_database,
+      }
+    end
+
     def not_encodable?(value)
       ::RailsSpotlight.config.not_encodable_event_values.any? do |module_name, class_names|
         next unless defined?(module_name.constantize)
 
         class_names.any? { |class_name| value.is_a?(class_name.constantize) }
-      rescue # rubocop:disable Lint/RescueException, Lint/RedundantCopDisableDirective, Style/RescueStandardError
-        false
+      rescue # rubocop:disable Lint/SuppressedException, Style/RescueStandardError
       end
     end
 

data/lib/rails_spotlight/log_interceptor.rb

@@ -23,26 +23,74 @@ module RailsSpotlight
       end
       return true if _skip_logging?(message)
 
-      _push_event(SEVERITY_MAP[severity], message, progname)
+      _rails_spotlight_log(SEVERITY_MAP[severity], message, progname, :broadcast)
       super(severity, message, progname) if defined?(super)
       true
     end
 
+    def debug(message = nil, *args)
+      message = yield if message.nil? && block_given?
+      _rails_spotlight_log(:debug, message)
+      super
+    end
+
+    def info(message = nil, *args)
+      message = yield if message.nil? && block_given?
+      _rails_spotlight_log(:info, message)
+      super
+    end
+
+    def warn(message = nil, *args)
+      message = yield if message.nil? && block_given?
+      _rails_spotlight_log(:warn, message)
+      super
+    end
+
+    def error(message = nil, *args)
+      message = yield if message.nil? && block_given?
+      _rails_spotlight_log(:error, message)
+      super
+    end
+
+    def fatal(message = nil, *args)
+      message = yield if message.nil? && block_given?
+      _rails_spotlight_log(:fatal, message)
+      super
+    end
+
+    def unknown(message = nil, *args)
+      message = yield if message.nil? && block_given?
+      _rails_spotlight_log(:unknown, message)
+      super
+    end
+
     private
 
     def _skip_logging?(message)
-      return false unless ::RailsSpotlight.config.live_console_enabled?
+      return false unless ::RailsSpotlight.config.use_action_cable?
       return false unless message.is_a?(String)
 
       message.include?(::RailsSpotlight::Channels::SPOTLIGHT_CHANNEL)
     end
 
-    def _push_event(level, message, progname = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/AbcSize
+    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
-      AppRequest.current.events << Event.new('rsl.notification.log', 0, 0, 0, callsite.merge(message: message, level: level, progname: name)) if AppRequest.current && callsite
+      output == :event ? _push_event(level, message, name) : _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)) || {}
+      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
+    rescue StandardError => e
+      RailsSpotlight.config.logger.fatal("#{e.message}\n #{e.backtrace.join("\n ")}")
+    end
 
-      return unless ::RailsSpotlight.config.live_console_enabled?
+    def _broadcast_log(message, level, callsite = {}, name = nil)
+      return unless ::RailsSpotlight.config.use_action_cable?
       return if message.blank?
 
       id = AppRequest.current ? AppRequest.current.id : nil # rubocop:disable Style/SafeNavigation

data/lib/rails_spotlight/version.rb

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

data/lib/tasks/init.rake

@@ -16,7 +16,7 @@ namespace :rails_spotlight do # rubocop:disable Metrics/BlockLength
       STORAGE_PATH: <%=Rails.root.join('tmp', 'data', 'rails_spotlight')%>
       STORAGE_POOL_SIZE: 20
       LOGGER: <%=Logger.new(Rails.root.join('log', 'rails_spotlight.log'))%>
-      # Prevent from processing and sending some data to the extension 
+      # Prevent from processing and sending some data to the extension
       MIDDLEWARE_SKIPPED_PATHS: []
       NOT_ENCODABLE_EVENT_VALUES:
       SKIP_RENDERED_IVARS: []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_spotlight
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.1
 platform: ruby
 authors:
 - Pawel Niemczyk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-contrib