rails_event_viewer 0.3.1 → 0.4.0

data/lib/rails_event_viewer/adapters/active_record.rb

@@ -3,10 +3,6 @@ module RailsEventViewer
     class ActiveRecord
       include Adapter
 
-      def initialize(**options)
-        @options = options
-      end
-
       def table_exists?
         Entry.table_exists?
       rescue ::ActiveRecord::NoDatabaseError
@@ -16,7 +12,6 @@ module RailsEventViewer
       def write_events(events)
         return if events.empty?
 
-        # Use insert_all for bulk inserts (more efficient)
         records = events.map do |event|
           {
             name: event[:name],
@@ -32,7 +27,7 @@ module RailsEventViewer
           }
         end
 
-        Entry.insert_all(records)
+        Entry.insert_all(records, returning: false)
       end
 
       def fetch_events(relation)
@@ -88,16 +83,6 @@ module RailsEventViewer
           end
       end
 
-      def distinct_group_values(key, source: :context)
-        column = source == :tags ? :tags : :context
-        json_path = JsonQuery.extract_path(column, key)
-
-        Entry
-          .where(JsonQuery.extract_path_present(column, key))
-          .distinct
-          .pluck(Arel.sql(json_path))
-      end
-
       def group_instances(key, source: :context, limit: 100)
         column = source == :tags ? :tags : :context
         json_path = JsonQuery.extract_path(column, key)
@@ -148,39 +133,18 @@ module RailsEventViewer
       end
 
       def build_scope(relation)
-        scope = Entry.order(occurred_at: :desc)
-        scope = apply_name_filters(scope, relation)
-        scope = apply_tag_filters(scope, relation)
-        scope = apply_context_filters(scope, relation)
+        scope = Entry.order(occurred_at: :desc, id: :desc)
+        scope = scope.where(name: relation.names) if relation.names.present?
+        scope = apply_json_filters(scope, :tags, relation.tags)
+        scope = apply_json_filters(scope, :context, relation.contexts)
         scope = apply_time_filters(scope, relation)
         scope = apply_search(scope, relation)
         scope
       end
 
-      def apply_name_filters(scope, relation)
-        return scope if relation.names.blank?
-
-        if relation.names.size == 1
-          scope.where(name: relation.names.first)
-        else
-          scope.where(name: relation.names)
-        end
-      end
-
-      def apply_tag_filters(scope, relation)
-        return scope if relation.tags.blank?
-
-        relation.tags.each do |key, value|
-          scope = scope.where(*JsonQuery.contains(:tags, key, value))
-        end
-        scope
-      end
-
-      def apply_context_filters(scope, relation)
-        return scope if relation.contexts.blank?
-
-        relation.contexts.each do |key, value|
-          scope = scope.where(*JsonQuery.contains(:context, key, value))
+      def apply_json_filters(scope, column, filters)
+        filters.each do |key, value|
+          scope = scope.where(*JsonQuery.contains(column, key, value))
         end
         scope
       end

data/lib/rails_event_viewer/adapters/concerns/in_memory_filtering.rb

@@ -6,13 +6,6 @@ module RailsEventViewer
       module InMemoryFiltering
         extend ActiveSupport::Concern
 
-        def distinct_group_values(key, source: :context)
-          in_memory_events
-            .map { |e| group_value_for(e, key, source) }
-            .compact
-            .uniq
-        end
-
         def group_instances(key, source: :context, limit: 100)
           in_memory_events
             .group_by { |e| group_value_for(e, key, source).to_s }

data/lib/rails_event_viewer/adapters/memory.rb

@@ -24,10 +24,6 @@ module RailsEventViewer
         @max_events = max_events
       end
 
-      def supports_retention?
-        true
-      end
-
       def write_events(new_events)
         return if new_events.empty?
 

data/lib/rails_event_viewer/adapters/null.rb

@@ -11,10 +11,6 @@ module RailsEventViewer
         false
       end
 
-      def supports_retention?
-        false
-      end
-
       def write_events(events)
         nil
       end
@@ -51,10 +47,6 @@ module RailsEventViewer
         0
       end
 
-      def distinct_group_values(key, source: :context)
-        []
-      end
-
       def group_instances(key, source: :context, limit: 100)
         []
       end

data/lib/rails_event_viewer/adapters/redis.rb

@@ -26,10 +26,6 @@ module RailsEventViewer
         @max_events = max_events
       end
 
-      def supports_analytics?
-        true
-      end
-
       def write_events(events)
         return if events.empty?
 
@@ -57,7 +53,7 @@ module RailsEventViewer
 
       def fetch_events(relation)
         if relation.filtered?
-          return fetch_all_filtered(relation).drop(relation.offset_value).take(relation.limit_value)
+          return filter_events(in_memory_events, relation).drop(relation.offset_value).take(relation.limit_value)
         end
 
         start_idx = relation.offset_value
@@ -68,7 +64,7 @@ module RailsEventViewer
 
       def count_events(relation)
         if relation.filtered?
-          fetch_all_filtered(relation).size
+          filter_events(in_memory_events, relation).size
         else
           @redis.with { |conn| conn.zcard(events_key) }
         end
@@ -171,18 +167,8 @@ module RailsEventViewer
         data
       end
 
-      def fetch_all_events
-        serialized_events = @redis.with { |conn| conn.zrevrange(events_key, 0, -1) }
-        serialized_events.map { |json| deserialize_event(json) }
-      end
-
-      def fetch_all_filtered(relation)
-        events = fetch_all_events
-        filter_events(events, relation)
-      end
-
       def in_memory_events
-        fetch_all_events
+        @redis.with { |conn| conn.zrevrange(events_key, 0, -1) }.map { |json| deserialize_event(json) }
       end
     end
   end

data/lib/rails_event_viewer/flusher.rb

@@ -56,7 +56,7 @@ module RailsEventViewer
       if @thread&.alive?
         @flush_requests << true
         @thread.join(shutdown_timeout)
-        effective_logger&.warn("[RailsEventViewer] Flusher thread still busy after #{shutdown_timeout}s writing #{@writing} events") if @thread.alive?
+        RailsEventViewer.effective_logger.warn("[RailsEventViewer] Flusher thread still busy after #{shutdown_timeout}s writing #{@writing} events") if @thread.alive?
       end
 
       @mutex.synchronize { @thread = nil }
@@ -72,7 +72,7 @@ module RailsEventViewer
 
       report_dropped_events
       leftover = @buffer.size
-      effective_logger&.warn("[RailsEventViewer] #{leftover} events still buffered at shutdown") if leftover.positive?
+      RailsEventViewer.effective_logger.warn("[RailsEventViewer] #{leftover} events still buffered at shutdown") if leftover.positive?
     end
 
     def running?
@@ -126,7 +126,7 @@ module RailsEventViewer
       end
       return if dropped.zero?
 
-      effective_logger&.warn("[RailsEventViewer] Dropped #{dropped} events because the buffer was full")
+      RailsEventViewer.effective_logger.warn("[RailsEventViewer] Dropped #{dropped} events because the buffer was full")
     end
 
     def request_flush
@@ -143,7 +143,7 @@ module RailsEventViewer
     end
 
     def run_loop
-      effective_logger&.debug("[RailsEventViewer] Flusher thread started (PID: #{Process.pid})")
+      RailsEventViewer.effective_logger.debug("[RailsEventViewer] Flusher thread started (PID: #{Process.pid})")
 
       until shutdown_requested?
         begin
@@ -157,7 +157,7 @@ module RailsEventViewer
         end
       end
 
-      effective_logger&.debug("[RailsEventViewer] Flusher thread stopped (PID: #{Process.pid})")
+      RailsEventViewer.effective_logger.debug("[RailsEventViewer] Flusher thread stopped (PID: #{Process.pid})")
     end
 
     def wait_for_flush

data/lib/rails_event_viewer/logging.rb

@@ -3,17 +3,7 @@ module RailsEventViewer
     private
 
     def log_error(message)
-      logger = effective_logger
-
-      if logger
-        logger.error(message)
-      else
-        warn message
-      end
-    end
-
-    def effective_logger
-      RailsEventViewer.logger || (defined?(Rails) && Rails.logger)
+      RailsEventViewer.effective_logger.error(message)
     end
   end
 end

data/lib/rails_event_viewer/version.rb

@@ -1,3 +1,3 @@
 module RailsEventViewer
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/rails_event_viewer.rb

@@ -76,6 +76,10 @@ module RailsEventViewer
       subscriber.stop!
     end
 
+    def effective_logger
+      logger || (defined?(Rails) && Rails.logger) || (@fallback_logger ||= Logger.new($stdout))
+    end
+
     private
 
     def build_adapter
@@ -101,7 +105,7 @@ module RailsEventViewer
 
       if storage_adapter == :active_record && !adapter_instance.table_exists?
         effective_logger.warn "[RailsEventViewer] Table 'rails_event_viewer_entries' not found. " \
-                              "Run `rails rails_event_viewer:install:migrations` and `rails db:migrate`. " \
+                              "Run `bin/rails generate rails_event_viewer:install` and `bin/rails db:migrate`. " \
                               "Falling back to NullAdapter (events will not be persisted)."
         require "rails_event_viewer/adapters/null"
         Adapters::Null.new
@@ -109,10 +113,6 @@ module RailsEventViewer
         adapter_instance
       end
     end
-
-    def effective_logger
-      logger || (defined?(Rails) && Rails.logger) || Logger.new($stdout)
-    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_viewer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Keshav Biswa
@@ -30,6 +30,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -37,6 +40,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: groupdate
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +75,6 @@ files:
 - app/assets/javascripts/rails_event_viewer/chartjs-adapter-date-fns.bundle.min.js
 - app/assets/javascripts/rails_event_viewer/chartkick.min.js
 - app/assets/stylesheets/rails_event_viewer/application.css
-- app/assets/stylesheets/rails_event_viewer/tailwind.css
 - app/controllers/rails_event_viewer/analytics_controller.rb
 - app/controllers/rails_event_viewer/application_controller.rb
 - app/controllers/rails_event_viewer/dashboard_controller.rb

data/app/assets/stylesheets/rails_event_viewer/tailwind.css

@@ -1,29 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-.json-tree {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
-  font-size: 0.875rem;
-}
-
-.json-tree-key {
-  color: #4b5563;
-  font-weight: 500;
-}
-
-.json-tree-string {
-  color: #059669;
-}
-
-.json-tree-number {
-  color: #2563eb;
-}
-
-.json-tree-boolean {
-  color: #7c3aed;
-}
-
-.json-tree-null {
-  color: #9ca3af;
-}