rails_event_viewer 0.1.0 → 0.1.2

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/events/show.html.erb

@@ -22,7 +22,7 @@
         <div class="px-6 py-4 border-b border-gray-200 flex justify-between items-center">
           <h3 class="text-lg font-medium text-gray-900">Payload</h3>
           <button type="button"
-                  onclick="navigator.clipboard.writeText('<%= j event_payload(@event).to_json %>'); this.textContent='Copied!'; setTimeout(() => this.textContent='Copy', 1500)"
+                  data-event-viewer-copy="<%= event_payload(@event).to_json %>"
                   class="text-indigo-600 hover:text-indigo-500 text-sm font-medium">
             Copy
           </button>

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/config/routes.rb

@@ -13,6 +13,6 @@ RailsEventViewer::Engine.routes.draw do
     get :events_by_type
   end
 
-  resources :event_types, only: [:index, :show], param: :name
-  resources :groups, only: [:index, :show]
+  resources :event_types, only: [:index, :show], param: :name, constraints: { name: %r{[^/]+} }
+  resources :groups, only: [:index, :show], constraints: { id: %r{[^/]+} }
 end

data/lib/rails_event_viewer/engine.rb

@@ -11,8 +11,13 @@ module RailsEventViewer
 
     initializer "rails_event_viewer.assets" do |app|
       if app.config.respond_to?(:assets)
-        app.config.assets.paths << root.join("app/assets/stylesheets")
-        app.config.assets.precompile += %w[rails_event_viewer/application.css]
+        app.config.assets.precompile += %w[
+          rails_event_viewer/application.css
+          rails_event_viewer/application.js
+          rails_event_viewer/chart.umd.min.js
+          rails_event_viewer/chartjs-adapter-date-fns.bundle.min.js
+          rails_event_viewer/chartkick.min.js
+        ]
       end
     end
 

data/lib/rails_event_viewer/version.rb

@@ -1,3 +1,3 @@
 module RailsEventViewer
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 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.0
+  version: 0.1.2
 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
@@ -78,6 +64,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/rails_event_viewer/application.js
+- app/assets/javascripts/rails_event_viewer/chart.umd.min.js
+- 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
@@ -89,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
@@ -119,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
@@ -138,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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