ruby_cms 0.1.3.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81464763020bbbb1d3f9ac35df979f34dbeeb004063d54af6703362b23b5e589
-  data.tar.gz: d3c46388e12a933dac2a55b14a1a8a5f5cd30b95d51545548dd50951d1f4c90c
+  metadata.gz: d5cb4cca0c59768b347f78d370c203428f9d663e26fe91a8bc6a7b63c3c14ac7
+  data.tar.gz: 706b81555013c29de1e4f4641f70f9a63c39d1231811421867f3beaf3f42073e
 SHA512:
-  metadata.gz: 63b48baeedd15716690c0f88d201c692f1ce65ec665c48fecca2088ec5008c028392b5d35c603258ae41da83c8780786d8daa90ca9bf39aedc77fcac424b8063
-  data.tar.gz: 5c7fae67e6195b6fd2b800c66c5a2a5c53a50ecd1a6b1d283b8b13809b4b03a3dacf4c8998248eaf306978cc8b5ecccc88562384d9a41e527f44c376f4028bb4
+  metadata.gz: 7c175d5c394f5f66f5581c417cd6a6029c543319b91ffa55b5410fd62885cf0dfffa22b700594d05a801816f4adcf3df7046222637f46e9ae0f08b8bf81d81cd
+  data.tar.gz: d24e55dea55ae02cac49473e28a3ed0ac2d3ba7849fd4bc923ca0dab68046af86bf2a3e9f293ffe027f8988ed897c561d0e8043de60e90ac5fadcd8d4c999951

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.1.4] - 2026-03-23
+
+- Improve visual editor and settings admin UX
+- Update sidebar branding to use the new RubyCMS logo
+- Refresh README with project logo
+
 ## [0.1.3] - 2026-03-23
 
 - Update analytics pages (dashboard/detail views)

data/README.md

@@ -1,5 +1,7 @@
 # RubyCMS
 
+![RubyCMS logo](docs/assets/ruby_cms_logo.png)
+
 Reusable Rails engine for a CMS-style admin: permissions, admin UI shell, content blocks, and a visual editor.
 
 Vision: your app owns product features (pages, models, business logic); RubyCMS manages content workflows and admin screens.

data/app/controllers/ruby_cms/admin/visual_editor_controller.rb

@@ -22,7 +22,7 @@ module RubyCms
         return render_invalid_page unless template
 
         load_preview_data(@page_key)
-        render template: template, layout: "ruby_cms/minimal"
+        render template: template, layout: "admin/minimal"
       end
 
       def quick_update
@@ -186,7 +186,13 @@ module RubyCms
         pages = {}
         add_config_pages(pages)
         add_auto_detected_pages(pages) if pages.empty?
-        pages
+        prioritize_home_page(pages)
+      end
+
+      def prioritize_home_page(pages)
+        return pages unless pages.key?("home")
+
+        { "home" => pages["home"] }.merge(pages.except("home"))
       end
 
       def add_auto_detected_pages(pages)
@@ -273,7 +279,10 @@ module RubyCms
         %w[
           layouts shared mailers components
           admin
-        ].include?(dir_name) || relative_path.start_with?("admin")
+        ].include?(dir_name) ||
+          dir_name.end_with?("_mailer") ||
+          dir_name.end_with?("_mailers") ||
+          relative_path.start_with?("admin")
       end
 
       def depth_exceeded?(relative_path)

data/app/services/ruby_cms/analytics/report.rb

@@ -25,33 +25,7 @@ module RubyCms
 
       def dashboard_stats
         Rails.cache.fetch(cache_key("dashboard"), expires_in: cache_duration) do
-          total_views = page_view_events.count
-          total_sessions = visits.distinct.count(:visit_token)
-          unique_visitors = visits.distinct.count(:visitor_token)
-
-          {
-            total_page_views: total_views,
-            unique_visitors: unique_visitors,
-            total_sessions: total_sessions,
-            pages_per_session: total_sessions.positive? ? (total_views.to_f / total_sessions).round(1) : 0,
-            bounce_rate: compute_bounce_rate,
-            new_visitor_percentage: compute_new_visitor_percentage,
-            avg_daily_views: days_in_range.positive? ? (total_views.to_f / days_in_range).round(0).to_i : 0,
-            popular_pages: popular_pages_data,
-            top_visitors: top_visitors_data,
-            hourly_activity: hourly_activity_data,
-            daily_activity: daily_activity_data,
-            daily_visitors: daily_visitors_data,
-            top_referrers: referrer_data,
-            landing_pages: landing_pages_data,
-            utm_sources: utm_sources_data,
-            browser_stats: visits.where.not(browser: [nil, ""]).group(:browser).count,
-            device_stats: visits.where.not(device_type: [nil, ""]).group(:device_type).count,
-            os_stats: visits.where.not(os: [nil, ""]).group(:os).count,
-            suspicious_activity: suspicious_activity_data,
-            recent_page_views: page_view_events.order(time: :desc).limit(recent_page_views_limit),
-            extra_cards: extra_cards_data
-          }
+          dashboard_stats_payload
         end
       end
 
@@ -352,7 +326,7 @@ module RubyCms
         return 0 unless total.positive?
 
         event_counts = page_view_events.group(:visit_id).count
-        single_page = event_counts.count { |_, c| c == 1 }
+        single_page = event_counts.count {|_, c| c == 1 }
         ((single_page.to_f / total) * 100).round(1)
       rescue StandardError
         0
@@ -363,9 +337,9 @@ module RubyCms
         return 0 unless total.positive?
 
         returning_tokens = Ahoy::Visit
-          .where("started_at < ?", @start_date)
-          .distinct
-          .pluck(:visitor_token)
+                           .where(started_at: ...@start_date)
+                           .distinct
+                           .pluck(:visitor_token)
 
         new_count = visits.where.not(visitor_token: returning_tokens).distinct.count(:visitor_token)
         ((new_count.to_f / total) * 100).round(0).to_i
@@ -391,6 +365,36 @@ module RubyCms
         RubyCms::Settings.get(:analytics_visitor_details_limit,
                               default: DEFAULT_VISITOR_DETAILS_LIMIT).to_i
       end
+
+      def dashboard_stats_payload
+        total_views = page_view_events.count
+        total_sessions = visits.distinct.count(:visit_token)
+        unique_visitors = visits.distinct.count(:visitor_token)
+
+        {
+          total_page_views: total_views,
+          unique_visitors: unique_visitors,
+          total_sessions: total_sessions,
+          pages_per_session: total_sessions.positive? ? (total_views.to_f / total_sessions).round(1) : 0,
+          bounce_rate: compute_bounce_rate,
+          new_visitor_percentage: compute_new_visitor_percentage,
+          avg_daily_views: days_in_range.positive? ? (total_views.to_f / days_in_range).round(0).to_i : 0,
+          popular_pages: popular_pages_data,
+          top_visitors: top_visitors_data,
+          hourly_activity: hourly_activity_data,
+          daily_activity: daily_activity_data,
+          daily_visitors: daily_visitors_data,
+          top_referrers: referrer_data,
+          landing_pages: landing_pages_data,
+          utm_sources: utm_sources_data,
+          browser_stats: visits.where.not(browser: [nil, ""]).group(:browser).count,
+          device_stats: visits.where.not(device_type: [nil, ""]).group(:device_type).count,
+          os_stats: visits.where.not(os: [nil, ""]).group(:os).count,
+          suspicious_activity: suspicious_activity_data,
+          recent_page_views: page_view_events.order(time: :desc).limit(recent_page_views_limit),
+          extra_cards: extra_cards_data
+        }
+      end
     end
   end
 end

data/app/views/layouts/ruby_cms/_admin_sidebar.html.erb

@@ -3,10 +3,11 @@
   <div class="px-5 py-5 flex-shrink-0 bg-[#FAF9F5]">
     <div class="flex items-center gap-3" data-ruby-cms--mobile-menu-target="sidebarContent">
       <% if respond_to?(:image_tag, true) %>
-        <div class="w-7 h-7 flex-shrink-0 rounded-sm bg-gray-900 flex items-center justify-center text-white font-bold text-sm">
-          <% if respond_to?(:main_app, true) && main_app.respond_to?(:image_path) %>
-            <%= image_tag main_app.image_path("logo.png"), alt: "Logo", onerror: "this.style.display='none'", class: "w-full h-full object-contain" rescue nil %>
-          <% end %>
+        <div class="w-9 h-9 flex-shrink-0 rounded-md bg-white border border-gray-200 overflow-hidden">
+          <%= image_tag "ruby_cms/logo.png",
+                        alt: "RubyCMS logo",
+                        class: "w-full h-full object-contain",
+                        onerror: "this.style.display='none'; this.parentElement.classList.add('bg-gray-900','text-white','font-bold','text-xs','flex','items-center','justify-center'); this.parentElement.innerHTML='R';" %>
         </div>
       <% end %>
       <p class="text-base font-semibold text-gray-900 m-0">RubyCMS</p>

data/app/views/ruby_cms/admin/settings/index.html.erb

@@ -22,10 +22,10 @@
 
 <%# Single card: category rail | separator | content (Todoist-like) %>
 <div class="rounded-2xl border border-border bg-card shadow-sm ring-1 ring-black/[0.03] overflow-hidden">
-  <div class="flex flex-col lg:flex-row lg:min-h-[min(100vh-12rem,52rem)]">
+  <div class="flex flex-col lg:flex-row lg:h-[min(100vh-12rem,64rem)]">
     <%# Left: sections (icons from TAB_CONFIG) %>
     <aside class="shrink-0 border-b border-border lg:w-56 lg:border-b-0 lg:border-r bg-muted/25">
-      <div class="p-3 sm:p-4">
+      <div class="p-3 sm:p-4 lg:h-full lg:overflow-y-auto">
         <p class="mb-3 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">
           <%= t("ruby_cms.admin.settings.categories_title", default: "Sections") %>
         </p>
@@ -50,7 +50,7 @@
     </aside>
 
     <%# Right: active section %>
-    <div class="flex min-w-0 flex-1 flex-col bg-background">
+    <div class="flex min-w-0 flex-1 flex-col bg-background min-h-0">
       <% tab_description = settings_tab_description(@active_tab) %>
 
       <div class="border-b border-border/80 px-5 py-4 sm:px-6 sm:py-5">
@@ -88,7 +88,7 @@
         <% end %>
       </div>
 
-      <div class="flex flex-1 flex-col px-5 py-5 sm:px-6 sm:py-6">
+      <div class="flex flex-1 flex-col px-5 py-5 sm:px-6 sm:py-6 min-h-0 overflow-y-auto">
         <% if is_navigation %>
           <% if nav_sub == "order" %>
             <%= form_with url: settings_url, method: :patch, local: true, html: { id: "nav_order_form", class: "flex flex-1 flex-col space-y-6", data: { turbo: false } } do %>

data/app/views/ruby_cms/admin/visual_editor/index.html.erb

@@ -5,16 +5,29 @@
     <!-- Header -->
     <div class="flex flex-wrap items-center justify-between gap-4">
       <h1 class="text-lg font-semibold tracking-tight text-gray-900">Visual Editor</h1>
-      <%= form_with url: ruby_cms_admin_visual_editor_path, method: :get, class: "flex items-center gap-2", data: { turbo: false } do %>
+      <%= form_with url: ruby_cms_admin_visual_editor_path, method: :get, class: "flex items-center gap-2", data: { turbo: false, controller: "visual-editor-page-select" } do %>
         <%= hidden_field_tag :edit_mode, @edit_mode %>
 
         <% if @available_pages && @available_pages.size > 1 %>
-          <%= select_tag(
-            :page,
-            options_for_select(@available_pages.map { |k, v| [v[:name], k] }, @current_page),
-            class: "h-9 rounded-md border border-gray-200 bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200",
-            onchange: "this.form.requestSubmit()"
-          ) %>
+          <% selected_page_name = @available_pages.dig(@current_page, :name) || @current_page.to_s.humanize %>
+          <%= Select(class: "min-w-56") do %>
+            <%= SelectInput(name: :page, value: @current_page, data: { action: "change->visual-editor-page-select#submit" }) %>
+            <%= SelectTrigger(class: "h-9 bg-white font-medium") do %>
+              <%= SelectValue(placeholder: selected_page_name) { selected_page_name } %>
+            <% end %>
+            <%= SelectContent do %>
+              <%= SelectGroup do %>
+                <% @available_pages.each do |key, page| %>
+                    <% is_selected = key.to_s == @current_page.to_s %>
+                    <%= SelectItem(
+                      value: key,
+                      aria_selected: is_selected.to_s,
+                      class: (is_selected ? "bg-primary/10 text-primary ring-1 ring-primary/20" : nil)
+                    ) { page[:name] } %>
+                <% end %>
+              <% end %>
+            <% end %>
+          <% end %>
         <% else %>
           <%= hidden_field_tag :page, @current_page %>
         <% end %>

data/lib/ruby_cms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCms
-  VERSION = "0.1.3.1"
+  VERSION = "0.1.4"
 end

data/lib/tasks/admin.rake

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-namespace :admin do
+namespace :admin do # rubocop:disable Metrics/BlockLength
   def ruby_cms_user_class
     Object.const_get(Rails.application.config.ruby_cms.user_class_name.presence ||
                         "User")
@@ -118,3 +118,5 @@ namespace :admin do
     puts "Logged out #{count} session(s)"
   end
 end
+
+# rubocop:enable Metrics/BlockLength