rails_event_viewer 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 752061254efb5dd9bb402c098fd0b53241f5919f312650510213b36046792884
-  data.tar.gz: 131edfa9428def3ae0da02c9f622162ee52a0de11a263a3c7ff7ba86249481af
+  metadata.gz: df70eeee67ca7c67116c852f98659be2d9ee3803a1bd4b949d3190f0aed1d40b
+  data.tar.gz: 0a83f0ce0b0504c7ba9823a1e2c3eaa1e9a4f79297aae5ff35e8f742c01b51ea
 SHA512:
-  metadata.gz: 6f6945accdea24afb5c058910e690fbbd152c32bb70cc74655a1eefd6a7d176f819621962d0709327f2b723f74e5a544e2889b5fec82d294da516e694a6d3178
-  data.tar.gz: cbf5155e5905e351f368254188a71a93c9bf54f28cd358bc2c72c9173ff825aa9cc416e99983e3b1ed541c536276808c1abc5a705714bc3a619ed64e08e6f083
+  metadata.gz: 23eaca12170699b79b5fd635204e24a25bfc6a8eb8bbef0605aeaea40fab2701dda65ca4101fb9d64fea1a5c57fc77a9f94d6362a90f91fea587b196b5d38667
+  data.tar.gz: 8d981f6fe1a2673e91453ddf400be91537bd8b3686217c471e783939f9814ecc0b6240c368689c45219011e6d19ccdfed2e98ea19b61f7dcfcd2e0b5095267a9

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.1.3 (2026-10-01)
+
+- The flusher thread starts on the first buffered event, not at boot, so consoles and rake tasks no longer run an idle thread.
+- Flusher start/stop messages log at debug level.
+- Events emitted after shutdown are written immediately instead of lost.
+- Web requests never write to storage. A full buffer wakes the flusher thread instead.
+- The buffer is capped at 10 times `buffer_size`. Overflow drops the oldest events and logs a warning.
+- Removed the unused ActionCable broadcast.
+
+## 0.1.2 (2026-09-30)
+
+- Removed the `pagy` dependency. Pagination is handled by a small built-in class, so host apps on any Pagy version, or none, can install the gem.
+- Page links now keep the active filters, search query, and `per_page`. Previously every page link dropped them, so page 2 of a filtered list showed unfiltered results.
+- A page number past the end now shows the last page instead of an empty one.
+
 ## 0.1.1 (2026-09-30)
 
 - The dashboard now works under a strict Content Security Policy. Tailwind CSS is compiled into the gem, and Chart.js, its date adapter, and Chartkick are served from the host app with CSP nonces instead of from CDNs.

data/README.md

@@ -61,6 +61,8 @@ RailsEventViewer.configure do |config|
 end
 ```
 
+With `async`, events are written by a background thread, never by your web requests. The buffer holds at most 10 times `buffer_size` events. If storage can't keep up, the oldest are dropped and a warning is logged. Events still in the buffer are written on a normal shutdown but lost if the process is killed.
+
 Internal Rails events such as `active_record.*` and `action_controller.*` are ignored by default. Remove a pattern from `ignored_events` to capture it.
 
 ## Authentication

data/app/controllers/rails_event_viewer/application_controller.rb

@@ -1,7 +1,5 @@
 module RailsEventViewer
   class ApplicationController < ActionController::Base
-    include Pagy::Method
-
     layout "rails_event_viewer/application"
 
     before_action :authenticate!
@@ -72,13 +70,9 @@ module RailsEventViewer
       (params[:per_page] || RailsEventViewer.per_page).to_i.clamp(1, 100)
     end
 
-    # Helper to create paginated results from EventsRelation
-    # Uses a countable wrapper to make EventsRelation work with Pagy
-    def pagy_events(relation)
-      countable = RailsEventViewer::PagyCountable.new(relation)
-      pagy, records = pagy(:offset, countable, limit: per_page)
-
-      [pagy, records.to_a]
+    def paginate(relation)
+      pagination = Page.new(count: relation.count, per_page: per_page, page: params[:page])
+      [pagination, relation.offset(pagination.offset).limit(pagination.per_page).to_a]
     end
   end
 end

data/app/controllers/rails_event_viewer/event_types_controller.rb

@@ -8,8 +8,8 @@ module RailsEventViewer
       @event_type_name = params[:name]
       total_events = RailsEventViewer.events.with_name(@event_type_name)
 
-      @pagy, @events = pagy_events(total_events)
-      @total_count = @pagy.count
+      @pagination, @events = paginate(total_events)
+      @total_count = @pagination.count
       @events_today = total_events.since(Time.current.beginning_of_day).count
     end
   end

data/app/controllers/rails_event_viewer/events_controller.rb

@@ -2,7 +2,7 @@ module RailsEventViewer
   class EventsController < ApplicationController
     def index
       relation = apply_filters(RailsEventViewer.events)
-      @pagy, @events = pagy_events(relation)
+      @pagination, @events = paginate(relation)
       @event_names = current_adapter.distinct_event_names
     end
 
@@ -20,7 +20,7 @@ module RailsEventViewer
     def search
       @query = params[:q]
       relation = RailsEventViewer.events.search(@query)
-      @pagy, @events = pagy_events(relation)
+      @pagination, @events = paginate(relation)
       @event_names = current_adapter.distinct_event_names
 
       render :index

data/app/controllers/rails_event_viewer/groups_controller.rb

@@ -27,8 +27,8 @@ module RailsEventViewer
         RailsEventViewer.events.with_context(@key, @value)
       end
 
-      @pagy, @events = pagy_events(events)
-      @total_count = @pagy.count
+      @pagination, @events = paginate(events)
+      @total_count = @pagination.count
       @event_names = @events.map { |e| event_name(e) }.uniq
 
       @first_event_at, @last_event_at = current_adapter.event_time_span(events)

data/app/helpers/rails_event_viewer/application_helper.rb

@@ -41,6 +41,10 @@ module RailsEventViewer
       end
     end
 
+    def page_path(page)
+      "#{request.path}?#{request.query_parameters.merge("page" => page.to_s).to_query}"
+    end
+
     def timezone_options
       ActiveSupport::TimeZone.all.map { |tz| [tz.to_s, tz.name] }
     end

data/app/models/rails_event_viewer/page.rb

@@ -0,0 +1,35 @@
+module RailsEventViewer
+  class Page
+    attr_reader :page, :per_page, :count
+
+    def initialize(count:, per_page:, page:)
+      @count = count
+      @per_page = per_page
+      @page = page.to_i.clamp(1, pages)
+    end
+
+    def pages
+      [(count.to_f / per_page).ceil, 1].max
+    end
+
+    def offset
+      (page - 1) * per_page
+    end
+
+    def from
+      count.zero? ? 0 : offset + 1
+    end
+
+    def to
+      [offset + per_page, count].min
+    end
+
+    def previous
+      page - 1 if page > 1
+    end
+
+    def next
+      page + 1 if page < pages
+    end
+  end
+end

data/app/views/rails_event_viewer/event_types/show.html.erb

@@ -31,7 +31,7 @@
         icon: "calendar" %>
     <%= render "rails_event_viewer/shared/stat_card",
         title: "Page",
-        value: "#{@pagy.page} of #{@pagy.pages}",
+        value: "#{@pagination.page} of #{@pagination.pages}",
         icon: "tag" %>
   </div>
 
@@ -92,7 +92,7 @@
         </table>
       </div>
 
-      <%= render "rails_event_viewer/shared/pagination", pagy: @pagy %>
+      <%= render "rails_event_viewer/shared/pagination", pagination: @pagination %>
     <% else %>
       <div class="px-6 py-12 text-center text-gray-500">
         No events of this type yet.

data/app/views/rails_event_viewer/events/index.html.erb

@@ -11,7 +11,7 @@
       <% end %>
     </h1>
     <div class="text-sm text-gray-500">
-      <%= @pagy.count %> total events
+      <%= @pagination.count %> total events
     </div>
   </div>
 
@@ -43,7 +43,7 @@
               </table>
             </div>
 
-            <%= render "rails_event_viewer/shared/pagination", pagy: @pagy %>
+            <%= render "rails_event_viewer/shared/pagination", pagination: @pagination %>
           <% else %>
             <div class="px-6 py-12 text-center text-gray-500">
               <svg class="mx-auto h-12 w-12 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">

data/app/views/rails_event_viewer/groups/show.html.erb

@@ -124,7 +124,7 @@
         </div>
       </div>
 
-      <%= render "rails_event_viewer/shared/pagination", pagy: @pagy %>
+      <%= render "rails_event_viewer/shared/pagination", pagination: @pagination %>
     <% else %>
       <div class="px-6 py-12 text-center text-gray-500">
         No events found in this group.

data/app/views/rails_event_viewer/shared/_pagination.html.erb

@@ -1,20 +1,20 @@
-<% if pagy.pages > 1 %>
+<% if pagination.pages > 1 %>
   <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
     <div class="flex-1 flex items-center justify-between">
       <div>
         <p class="text-sm text-gray-700">
           Showing
-          <span class="font-medium"><%= pagy.from %></span>
+          <span class="font-medium"><%= pagination.from %></span>
           to
-          <span class="font-medium"><%= pagy.to %></span>
+          <span class="font-medium"><%= pagination.to %></span>
           of
-          <span class="font-medium"><%= pagy.count %></span>
+          <span class="font-medium"><%= pagination.count %></span>
           results
         </p>
       </div>
       <nav class="flex items-center space-x-1" aria-label="Pagination">
-        <% if pagy.previous %>
-          <%= link_to url_for(page: pagy.previous), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" do %>
+        <% if pagination.previous %>
+          <%= link_to page_path(pagination.previous), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" do %>
             <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
             </svg>
@@ -29,18 +29,18 @@
           </span>
         <% end %>
 
-        <% (1..pagy.pages).each do |page_num| %>
-          <% if page_num == pagy.page %>
+        <% (1..pagination.pages).each do |page_num| %>
+          <% if page_num == pagination.page %>
             <span class="relative inline-flex items-center px-3 py-2 text-sm font-medium text-white bg-indigo-600 border border-indigo-600 rounded-md"><%= page_num %></span>
-          <% elsif page_num == 1 || page_num == pagy.pages || (page_num >= pagy.page - 2 && page_num <= pagy.page + 2) %>
-            <%= link_to page_num, url_for(page: page_num), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" %>
-          <% elsif page_num == pagy.page - 3 || page_num == pagy.page + 3 %>
+          <% elsif page_num == 1 || page_num == pagination.pages || (page_num >= pagination.page - 2 && page_num <= pagination.page + 2) %>
+            <%= link_to page_num, page_path(page_num), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" %>
+          <% elsif page_num == pagination.page - 3 || page_num == pagination.page + 3 %>
             <span class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-700">...</span>
           <% end %>
         <% end %>
 
-        <% if pagy.next %>
-          <%= link_to url_for(page: pagy.next), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" do %>
+        <% if pagination.next %>
+          <%= link_to page_path(pagination.next), class: "relative inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50" do %>
             <span class="mr-1">Next</span>
             <svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />

data/lib/rails_event_viewer/subscriber.rb

@@ -4,16 +4,16 @@ module RailsEventViewer
   class Subscriber
     NANOSECONDS_PER_SECOND = 1_000_000_000.0
     SHUTDOWN_TIMEOUT_SECONDS = 5
-    ACTION_CABLE_CHANNEL = "rails_event_viewer:events"
+    MAX_BUFFER_MULTIPLIER = 10
 
     def initialize
       @buffer = Queue.new
+      @flush_requests = Queue.new
       @mutex = Mutex.new
       @flusher_thread = nil
       @shutdown_requested = false
+      @dropped_count = 0
       @pid = Process.pid
-
-      ensure_flusher_thread!
     end
 
     def emit(event)
@@ -41,7 +41,7 @@ module RailsEventViewer
       return if events_to_write.empty?
 
       write_immediately(events_to_write)
-      broadcast_events(events_to_write)
+      report_dropped_events
     end
 
     def stop!
@@ -50,7 +50,7 @@ module RailsEventViewer
       end
 
       if @flusher_thread&.alive?
-        @flusher_thread.wakeup rescue nil
+        @flush_requests << true
         @flusher_thread.join(SHUTDOWN_TIMEOUT_SECONDS)
       end
 
@@ -58,7 +58,7 @@ module RailsEventViewer
         @flusher_thread = nil
       end
 
-      flush!
+      flush! until @buffer.empty?
     end
 
     def running?
@@ -77,25 +77,56 @@ module RailsEventViewer
         if @pid != Process.pid
           @pid = Process.pid
           @buffer = Queue.new
+          @flush_requests = Queue.new
           @flusher_thread = nil
           @shutdown_requested = false
+          @dropped_count = 0
         end
       end
-      ensure_flusher_thread!
     end
 
     def drain_buffer
       events = []
-      loop { events << @buffer.pop(true) }
+      [@buffer.size, max_buffer_size].min.times { events << @buffer.pop(true) }
+      events
     rescue ThreadError
       events
     end
 
     def buffer_event(entry)
       @buffer << entry
+      return flush! if shutdown_requested?
+
       ensure_flusher_thread!
+      drop_oldest_events if @buffer.size > max_buffer_size
+      request_flush if @buffer.size >= RailsEventViewer.buffer_size
+    end
 
-      flush! if @buffer.size >= RailsEventViewer.buffer_size
+    def max_buffer_size
+      RailsEventViewer.buffer_size * MAX_BUFFER_MULTIPLIER
+    end
+
+    def drop_oldest_events
+      dropped = 0
+      while @buffer.size > max_buffer_size
+        @buffer.pop(true)
+        dropped += 1
+      end
+    rescue ThreadError
+      nil
+    ensure
+      @mutex.synchronize { @dropped_count += dropped } if dropped.positive?
+    end
+
+    def report_dropped_events
+      dropped = @mutex.synchronize { @dropped_count.tap { @dropped_count = 0 } }
+      return if dropped.zero?
+
+      effective_logger&.warn("[RailsEventViewer] Dropped #{dropped} events because the buffer was full")
+    end
+
+    def request_flush
+      @flush_requests << true if @flush_requests.empty?
     end
 
     def ensure_flusher_thread!
@@ -110,18 +141,21 @@ module RailsEventViewer
     end
 
     def run_flusher_loop
-      log_info("[RailsEventViewer] Flusher thread started (PID: #{Process.pid})")
+      effective_logger&.debug("[RailsEventViewer] Flusher thread started (PID: #{Process.pid})")
 
       until shutdown_requested?
         begin
-          sleep(RailsEventViewer.flush_interval)
-          flush! unless @buffer.empty?
+          @flush_requests.pop(timeout: RailsEventViewer.flush_interval)
+          loop do
+            flush!
+            break if @buffer.size < RailsEventViewer.buffer_size || shutdown_requested?
+          end
         rescue => e
           log_error("[RailsEventViewer] Flusher error: #{e.message}")
         end
       end
 
-      log_info("[RailsEventViewer] Flusher thread stopped (PID: #{Process.pid})")
+      effective_logger&.debug("[RailsEventViewer] Flusher thread stopped (PID: #{Process.pid})")
     end
 
     def shutdown_requested?
@@ -136,22 +170,6 @@ module RailsEventViewer
       log_error("[RailsEventViewer] Failed to write #{events.size} events: #{e.message}")
     end
 
-    def broadcast_events(events)
-      return unless defined?(ActionCable)
-      return unless events.any?
-
-      ActionCable.server.broadcast(
-        ACTION_CABLE_CHANNEL,
-        {
-          action: "new_events",
-          count: events.size,
-          events: events.map { |e| { name: e[:name], occurred_at: e[:occurred_at]&.iso8601 } }
-        }
-      )
-    rescue => e
-      log_error("[RailsEventViewer] Broadcast error: #{e.message}")
-    end
-
     def should_capture?(event)
       return false unless event.is_a?(Hash)
       return false if event[:name].blank?
@@ -234,10 +252,6 @@ module RailsEventViewer
       log_error("[RailsEventViewer] Failed to capture event '#{event[:name]}': #{error.message}")
     end
 
-    def log_info(message)
-      effective_logger&.info(message)
-    end
-
     def log_error(message)
       logger = effective_logger
 

data/lib/rails_event_viewer/version.rb

@@ -1,3 +1,3 @@
 module RailsEventViewer
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/rails_event_viewer.rb

@@ -1,4 +1,3 @@
-require "pagy"
 require "chartkick"
 require "groupdate"
 
@@ -118,5 +117,4 @@ require "rails_event_viewer/adapter"
 require "rails_event_viewer/events_relation"
 require "rails_event_viewer/subscriber"
 require "rails_event_viewer/json_query"
-require "rails_event_viewer/pagy_countable"
 require "rails_event_viewer/time_utils"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_viewer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Keshav Biswa
@@ -23,20 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 8.1.0
-- !ruby/object:Gem::Dependency
-  name: pagy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '43.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '43.0'
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +79,7 @@ files:
 - app/helpers/rails_event_viewer/application_helper.rb
 - app/models/rails_event_viewer/application_record.rb
 - app/models/rails_event_viewer/entry.rb
+- app/models/rails_event_viewer/page.rb
 - app/views/layouts/rails_event_viewer/application.html.erb
 - app/views/rails_event_viewer/analytics/overview.html.erb
 - app/views/rails_event_viewer/dashboard/index.html.erb
@@ -123,7 +110,6 @@ files:
 - lib/rails_event_viewer/engine.rb
 - lib/rails_event_viewer/events_relation.rb
 - lib/rails_event_viewer/json_query.rb
-- lib/rails_event_viewer/pagy_countable.rb
 - lib/rails_event_viewer/subscriber.rb
 - lib/rails_event_viewer/time_utils.rb
 - lib/rails_event_viewer/version.rb

data/lib/rails_event_viewer/pagy_countable.rb

@@ -1,31 +0,0 @@
-module RailsEventViewer
-  class PagyCountable
-    def initialize(relation)
-      @relation = relation
-    end
-
-    def count(*)
-      @relation.count
-    end
-
-    def offset(value)
-      OffsetWrapper.new(@relation, value)
-    end
-
-    # Intermediate wrapper that captures offset and applies limit
-    class OffsetWrapper
-      def initialize(relation, offset_value)
-        @relation = relation
-        @offset_value = offset_value
-      end
-
-      def limit(value)
-        @relation.offset(@offset_value).limit(value).to_a
-      end
-
-      def to_a
-        @relation.offset(@offset_value).to_a
-      end
-    end
-  end
-end