v0.2.0.8

Author: Job Hammer

CHANGELOG.md

@@ -1,5 +1,26 @@
 ## [Unreleased]
 
+## [0.2.0.8] - 2026-04-09
+
+- Analytics performance: migration adds `ahoy_events (name, time)`, `ahoy_events (visit_id, time)`, `ahoy_visits (started_at)`, `ahoy_visits (visitor_token)` indexes
+- Analytics performance: `compute_new_visitor_percentage` uses subquery instead of plucking all historical visitor tokens into Ruby memory
+- Analytics performance: `exit_pages_data` uses a single DB join-subquery instead of loading all page view rows into Ruby
+
+## [0.2.0.7] - 2026-04-09
+
+- Analytics: add `EVENT_PAGE_VIEW` / `EVENT_CONVERSION` constants for consistent ahoy.track usage
+- Analytics: conversion tracking — `Report` queries `conversion` events and surfaces totals + goal breakdown in dashboard
+- Analytics: exit pages — last `page_view` per visit in selected range, displayed as new dashboard section
+- Analytics: period-over-period comparison — KPI deltas (↑/↓ %) shown on page views, unique visitors, and sessions stat cards
+- Analytics: expanded bot-filtering documentation in install template (`analytics_visit_scope` examples)
+- Analytics: register `analytics_max_exit_pages`, `analytics_max_conversions`, `analytics_max_referrers`, `analytics_max_landing_pages`, `analytics_max_utm_sources` in SettingsRegistry
+- PageTracking: document conversion tracking convention in concern comments
+- Locales: add analytics i18n keys for exit pages, conversions, and period comparison (en + nl)
+
+## [0.2.0.6] - 2026-04-09
+
+- Analytics improvements
+
 ## [0.2.0.5] - 2026-04-08
 
 - The host app no longer needs to scan de gem for tailwind

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_cms (0.2.0.5)
+    ruby_cms (0.2.0.8)
       actiontext (>= 7.1)
       ahoy_matey (>= 5.0)
       rails (>= 7.1)
@@ -518,7 +518,7 @@ CHECKSUMS
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
-  ruby_cms (0.2.0.5)
+  ruby_cms (0.2.0.8)
   rugged (1.9.0) sha256=7faaa912c5888d6e348d20fa31209b6409f1574346b1b80e309dbc7e8d63efac
   safely_block (0.5.0) sha256=782c342bc400a79c1233c40cf8c379da6116c6cfd1d7c1f17f0ef2ef11090103
   sawyer (0.9.3) sha256=0d0f19298408047037638639fe62f4794483fb04320269169bd41af2bdcf5e41

app/components/ruby_cms/admin/bulk_action_table/bulk_action_table.rb

@@ -128,7 +128,15 @@ def table_data_attributes
             data: {
               controller: @controller_name,
               "#{@controller_name}-csrf-token-value": csrf_token,
-              "#{@controller_name}-item-name-value": @item_name
+              "#{@controller_name}-item-name-value": @item_name,
+              "#{@controller_name}-processing-label-value": t("ruby_cms.admin.bulk_action_table.processing", default: "Processing..."),
+              "#{@controller_name}-confirm-label-value": t("ruby_cms.admin.bulk_action_table.confirm", default: "Confirm"),
+              "#{@controller_name}-select-at-least-one-message-value": t("ruby_cms.admin.bulk_action_table.select_at_least_one", default: "Please select at least one item."),
+              "#{@controller_name}-item-id-not-found-message-value": t("ruby_cms.admin.bulk_action_table.item_id_not_found", default: "Item ID not found for deletion."),
+              "#{@controller_name}-delete-path-not-found-message-value": t("ruby_cms.admin.bulk_action_table.delete_path_not_found", default: "Delete path not found."),
+              "#{@controller_name}-action-url-not-configured-message-value": t("ruby_cms.admin.bulk_action_table.action_url_not_configured", default: "Action URL not configured. Please configure an action URL for this page."),
+              "#{@controller_name}-default-confirm-message-value": t("ruby_cms.admin.bulk_action_table.default_confirm", default: "Are you sure you want to proceed?"),
+              "#{@controller_name}-generic-action-error-message-value": t("ruby_cms.admin.bulk_action_table.generic_action_error", default: "An error occurred while performing %{action}.")
             }
           }
 

app/components/ruby_cms/admin/bulk_action_table/bulk_action_table_actions.rb

@@ -45,8 +45,8 @@ def view_template
         def render_edit_button
           link_options = {
             href: @edit_path,
-            class: "inline-flex size-8 items-center justify-center rounded-md text-muted-foreground " \
-                   "hover:bg-muted hover:text-foreground transition-colors"
+            class: "inline-flex size-8 items-center justify-center rounded-md text-blue-600 " \
+                   "hover:bg-blue-50 hover:text-blue-700 transition-colors"
           }
           link_options[:data] = { turbo_frame: @turbo_frame } if @turbo_frame
 
@@ -71,7 +71,7 @@ def render_delete_button
           item_id = @item_id || extract_item_id_from_path
           button(
             type: "button",
-            class: "inline-flex size-8 items-center justify-center rounded-md text-muted-foreground " \
+            class: "inline-flex size-8 items-center justify-center rounded-md text-destructive " \
                    "hover:bg-destructive/10 hover:text-destructive transition-colors",
             data: {
               action: "click->#{@controller_name}#showIndividualDeleteDialog",

app/components/ruby_cms/admin/bulk_action_table/bulk_action_table_delete_modal.rb

@@ -79,10 +79,10 @@ def render_close_button
             data: {
               action: "click->#{@controller_name}#closeDialog"
             },
-            aria_label: "Close"
+            aria_label: t("ruby_cms.admin.bulk_action_table.close", default: "Close")
           ) do
             render_close_icon
-            span(class: "sr-only") { "Close" }
+            span(class: "sr-only") { t("ruby_cms.admin.bulk_action_table.close", default: "Close") }
           end
         end
 
@@ -123,7 +123,7 @@ def render_header
             data: {
               "#{@controller_name}-target": "dialogTitle"
             }
-          ) { "Delete Selected Items" }
+          ) { t("ruby_cms.admin.bulk_action_table.delete_selected_items", default: "Delete Selected Items") }
         end
 
         def render_message
@@ -133,8 +133,8 @@ def render_message
               "#{@controller_name}-target": "dialogMessage"
             }
           ) do
-            p { "Are you sure you want to delete the selected items?" }
-            p { "This action cannot be undone." }
+            p { t("ruby_cms.admin.bulk_action_table.are_you_sure_you_want_to_delete_the_selected_items", default: "Are you sure you want to delete the selected items?") }
+            p { t("ruby_cms.admin.bulk_action_table.this_action_cannot_be_undone", default: "This action cannot be undone.") }
           end
         end
 
@@ -154,19 +154,19 @@ def render_cancel_button
             data: {
               action: "click->#{@controller_name}#closeDialog"
             }
-          ) { "Cancel" }
+          ) { t("ruby_cms.admin.bulk_action_table.cancel", default: "Cancel") }
         end
 
         def render_confirm_button
           button(
             type: "button",
             class: "inline-flex h-9 items-center justify-center rounded-md bg-destructive px-4 " \
-                   "text-sm font-medium text-destructive-foreground shadow-sm hover:bg-destructive/90 transition-colors",
+                   "text-sm font-medium text-white font-bold shadow-sm hover:bg-destructive/90 transition-colors",
             data: {
               "#{@controller_name}-target": "dialogConfirmButton",
               action: "click->#{@controller_name}#confirmAction"
             }
-          ) { "Delete Selected" }
+          ) { t("ruby_cms.admin.bulk_action_table.delete_selected", default: "Delete Selected") }
         end
       end
     end

app/components/ruby_cms/admin/bulk_action_table/bulk_action_table_header_bar.rb

@@ -32,9 +32,9 @@ def initialize(
 
         def view_template
           div(class: "px-5 py-3 border-b border-border/60 bg-white") do
-            div(class: "flex flex-wrap items-center justify-between gap-4") do
+            div(class: "flex items-center justify-between gap-3") do
               render_title_group if @title.present?
-              div(class: "flex items-center gap-2 flex-wrap") do
+              div(class: "ml-auto flex items-center gap-2 overflow-x-auto whitespace-nowrap") do
                 render_header_filter if @header_filter.present?
                 render_action_icons
                 render_search_form
@@ -75,9 +75,15 @@ def render_search_form
           form_options = {
             url: @search_url,
             method: :get,
-            class: "w-full sm:w-auto"
+            class: "w-full sm:w-auto",
+            data: { "#{default_controller_name}-target": "searchForm" }
           }
           form_options[:data] = { turbo_frame: @turbo_frame } if @turbo_frame.present?
+          if @turbo_frame.present?
+            form_options[:data] = form_options[:data].merge(
+              "#{default_controller_name}-target": "searchForm"
+            )
+          end
 
           form_with(**form_options) do
             div(class: "relative flex items-center") do
@@ -106,10 +112,10 @@ def render_search_input
             type: "search",
             name: @search_param,
             placeholder: "Search",
-            class: "h-9 w-full sm:w-72 rounded-md border border-border bg-white pl-9 " \
+            class: "h-9 w-64 sm:w-72 rounded-md border border-border bg-white pl-9 " \
                    "pr-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-primary/20",
             value: search_value,
-            data: { action: "input->turbo-frame#submit" }
+            data: { action: "input->#{default_controller_name}#autoSearch" }
           )
         end
 
@@ -153,6 +159,10 @@ def render_icon_svg(icon_path)
                    d: icon_path)
           end
         end
+
+        def default_controller_name
+          "ruby-cms--bulk-action-table"
+        end
       end
     end
   end

app/components/ruby_cms/admin/bulk_action_table/bulk_actions.rb

@@ -51,7 +51,9 @@ def render_selection_info
         def render_selection_left
           div(class: "flex items-center gap-2") do
             render_selected_count_badge
-            span(class: "text-sm font-medium text-foreground") { "selected" }
+            span(class: "text-sm font-medium text-foreground") do
+              t("ruby_cms.admin.bulk_action_table.selected", default: "selected")
+            end
           end
         end
 
@@ -74,15 +76,15 @@ def render_selection_buttons
               "#{@controller_name}-target": "selectAllButton",
               action: "click->#{@controller_name}#selectAll"
             }
-          ) { "Select all" }
+          ) { t("ruby_cms.admin.bulk_action_table.select_all", default: "Select all") }
 
           button(
             type: "button",
             class: "text-xs font-medium text-muted-foreground hover:text-foreground transition-colors",
             data: {
               action: "click->#{@controller_name}#clearSelection"
             }
-          ) { "Clear" }
+          ) { t("ruby_cms.admin.bulk_action_table.clear", default: "Clear") }
         end
 
         def render_action_buttons
@@ -98,19 +100,24 @@ def render_action_buttons
         def render_custom_action_button(config)
           label = config[:label] || config[:text] || config[:name]&.humanize || "Button"
           action_name = config[:name] || config[:action_name]
+          icon_path = resolve_icon_path(config, action_name)
 
           button(
             type: "button",
             class: build_button_class(config),
             data: build_button_data_attrs(config, label, action_name)
-          ) { label }
+          ) do
+            render_button_icon(icon_path)
+            span { label }
+          end
         end
 
         def build_button_class(config)
-          base = "inline-flex items-center justify-center rounded-md border border-border " \
-                 "bg-white px-3 py-1.5 text-sm font-medium text-foreground shadow-sm " \
+          color_class = resolve_button_color_class(config)
+          base = "inline-flex items-center justify-center gap-1.5 rounded-md border border-border " \
+                 "bg-white px-3 py-1.5 text-sm font-medium shadow-sm " \
                  "hover:bg-muted transition-colors"
-          config[:class].present? ? "#{base} #{config[:class]}" : base
+          [base, color_class, config[:class]].compact.join(" ")
         end
 
         def build_button_data_attrs(config, label, action_name)
@@ -132,18 +139,56 @@ def build_button_data_attrs(config, label, action_name)
         def render_delete_button
           button(
             type: "button",
-            class: "inline-flex items-center justify-center rounded-md border border-destructive/30 " \
+            class: "inline-flex items-center justify-center gap-1.5 rounded-md border border-destructive/30 " \
                    "bg-white px-3 py-1.5 text-sm font-medium text-destructive shadow-sm " \
                    "hover:bg-destructive/10 transition-colors",
             data: {
               action: "click->#{@controller_name}#showActionDialog",
               action_name: "delete",
-              action_label: "Delete Selected",
-              action_confirm: "Are you sure you want to delete the selected \
-               items? This action cannot be undone.",
+              action_label: t("ruby_cms.admin.bulk_action_table.delete_selected", default: "Delete Selected"),
+              action_confirm: t("ruby_cms.admin.bulk_action_table.delete_selected_confirm", default: "Are you sure you want to delete the selected items? This action cannot be undone."),
               action_url: @bulk_actions_url&.to_s
             }
-          ) { "Delete Selected" }
+          ) do
+            render_button_icon("M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16")
+            span { t("ruby_cms.admin.bulk_action_table.delete_selected", default: "Delete Selected") }
+          end
+        end
+
+        def render_button_icon(path_d)
+          svg(class: "h-3.5 w-3.5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24") do |s|
+            s.path(stroke_linecap: "round", stroke_linejoin: "round", stroke_width: "2", d: path_d)
+          end
+        end
+
+        def resolve_button_color_class(config)
+          color = (config[:color] || config[:tone] || config[:variant]).to_s
+          return "text-foreground" if color.blank?
+
+          {
+            "blue" => "text-blue-700 border-blue-200 hover:bg-blue-50",
+            "green" => "text-emerald-700 border-emerald-200 hover:bg-emerald-50",
+            "emerald" => "text-emerald-700 border-emerald-200 hover:bg-emerald-50",
+            "orange" => "text-amber-700 border-amber-200 hover:bg-amber-50",
+            "amber" => "text-amber-700 border-amber-200 hover:bg-amber-50",
+            "red" => "text-destructive border-destructive/30 hover:bg-destructive/10",
+            "purple" => "text-violet-700 border-violet-200 hover:bg-violet-50"
+          }.fetch(color, "text-foreground")
+        end
+
+        def resolve_icon_path(config, action_name)
+          return config[:icon] if config[:icon].present?
+
+          case action_name.to_s
+          when "publish"
+            "M5 13l4 4L19 7"
+          when "unpublish"
+            "M6 18L18 6M6 6l12 12"
+          when "archive"
+            "M20 7l-1 12H5L4 7m16 0H4m3-3h10l1 3H6l1-3z"
+          else
+            "M12 4v16m8-8H4"
+          end
         end
       end
     end

app/controllers/concerns/ruby_cms/page_tracking.rb

@@ -12,6 +12,21 @@ module RubyCms
   # Sets @page_name to controller_name by default. Override in actions:
   #   @page_name = "custom_page_name"
   #
+  # Event naming conventions (keep property keys consistent across the app):
+  #   Page views (tracked automatically):
+  #     ahoy.track RubyCms::Analytics::Report::EVENT_PAGE_VIEW,
+  #                page_name: "home", request_path: request.path
+  #
+  #   Conversions (tracked by host app controllers/forms):
+  #     ahoy.track RubyCms::Analytics::Report::EVENT_CONVERSION,
+  #                goal: "contact_form", path: request.path
+  #     ahoy.track RubyCms::Analytics::Report::EVENT_CONVERSION,
+  #                goal: "newsletter_signup", path: request.path
+  #
+  # Convention for property keys:
+  #   page_view:  page_name (String), request_path (String)
+  #   conversion: goal (String, required), path (String, optional)
+  #
   module PageTracking
     extend ActiveSupport::Concern
 

app/controllers/ruby_cms/admin/analytics_controller.rb

@@ -17,6 +17,7 @@ def index
         )
         @stats = report.dashboard_stats
         @stats.each {|key, value| instance_variable_set(:"@#{key}", value) }
+        @active_users = active_users_count
       end
 
       def page_details
@@ -73,6 +74,17 @@ def validate_date_range
                     alert: "Invalid date range. Maximum range is #{max_days} days."
       end
 
+      def active_users_count
+        Ahoy::Event
+          .where(name: RubyCms::Analytics::Report::EVENT_PAGE_VIEW)
+          .where(time: 5.minutes.ago..)
+          .joins(:visit)
+          .distinct
+          .count(:visitor_token)
+      rescue StandardError
+        nil
+      end
+
       def sanitize_period(value)
         %w[day week month year].include?(value.to_s) ? value.to_s : nil
       end