backstage 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d5018436566611adae93216ace1303f8ae4ed22af25015099291bf4b042290
-  data.tar.gz: 14af0f649cdb30c48cc3aaae389892f5e533894e1ab61339f342b55316be7367
+  metadata.gz: e1dc01f215a31bcb5c84237cdfb95a7622ab7c8298e3b822eb476a9363e2f35c
+  data.tar.gz: 2a83eb127cfe5da24e409bf9f1ef69019a4d11be122402b5ca712f66ddfd1b3d
 SHA512:
-  metadata.gz: 71d2b10bbb890c1a372a23bfde83eb78aa7e8773485dcbbcc48db3d1b438e485a16ebea095f1f322a461939af9e8d57cf8bcd6271a6062fc197793489e9bbe04
-  data.tar.gz: 7f767a0c986971fb1916194fc969df576d3fd2b315d39f1196fe92c65ccd4fbf90b356f267072a9bda02e59a2bbd17b1f3d16c2db6f122327ed92f934d3bd482
+  metadata.gz: 46f7f8d377fa8c1fa57f3113b224df3428cdc99d21282ea1812a3e4d6b5f617c1f051adcc303217df1da8f4c2edfa1c800fa32dc3ae91b4f77aca0f3deb90a82
+  data.tar.gz: 3600c7c9e27c410a887fa6e63458eee543eb2d23271ee24adb99d1a8785272c7e3625498a86ae6ee54f0d68da3b6a6ed826c858a764394dcaea0b30536195d81

data/CHANGELOG.md

@@ -7,6 +7,21 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+## [0.1.12] — 2026-05-25
+
+### Added
+
+- `c.row :field1, :field2` groups fields horizontally in a Pico CSS grid on the edit page
+- `c.section "Label" [, collapsed: true]` wraps fields in a native `<details>`/`<summary>` collapsible block (no JavaScript required); rows and individual fields can be nested inside sections
+- `c.field` called inside a `section` block moves an existing auto-discovered field into the section rather than leaving it at the top level
+
+## [0.1.11] — 2026-05-25
+
+### Fixed
+
+- Pagination window no longer generates links below page 1 or above the last page when there are fewer than 6 total pages; window is clamped to the valid inner range and skipped entirely when `total_pages <= 2`
+- Sidebar moved from the layout into the edit view, rendering to the right of the form in a two-column grid; links open in a new tab (`target="_blank"`) and blank URLs (e.g. from a proc returning `""`) are skipped silently
+
 ## [0.1.10] — 2026-05-25
 
 ### Fixed

data/app/assets/stylesheets/backstage/backstage.css

@@ -3,7 +3,8 @@ body { display: grid; grid-template-columns: 200px 1fr; grid-template-rows: auto
 header { grid-column: 1 / -1; }
 nav { padding: 1rem; grid-row: 2; grid-column: 1; }
 main { padding: 1rem; grid-row: 2; grid-column: 2; }
-aside { grid-column: 2; padding: 1rem; border-top: 1px solid var(--pico-muted-border-color); }
+.edit-layout { display: grid; grid-template-columns: 1fr 220px; gap: 2rem; align-items: start; }
+.edit-layout aside { border-left: 1px solid var(--pico-muted-border-color); padding-left: 1rem; }
 
 /* Override Pico's horizontal nav list */
 nav ul { flex-direction: column; }

data/app/controllers/backstage/resources_controller.rb

@@ -85,10 +85,21 @@ module Backstage
     end
 
     def record_params
-      permitted = @resource_config.edit_fields.reject(&:readonly?).map do |field|
-        field.has_many? ? {field.name => []} : field.name
+      params
+        .require(@resource_config.model_class.model_name.param_key)
+        .permit(permitted_field_names(@resource_config.edit_fields))
+    end
+
+    def permitted_field_names(fields)
+      fields.reject(&:readonly?).flat_map do |field|
+        if field.container?
+          permitted_field_names(field.sub_fields)
+        elsif field.has_many?
+          [{field.name => []}]
+        else
+          [field.name]
+        end
       end
-      params.require(@resource_config.model_class.model_name.param_key).permit(permitted)
     end
   end
 end

data/app/views/backstage/fields/_row.html.erb

@@ -0,0 +1,8 @@
+<div class="grid">
+  <% field.sub_fields.each do |sub| %>
+    <div>
+      <%= f.label sub.name %>
+      <%= render partial: sub.partial_path, locals: { f: f, field: sub, record: @record } %>
+    </div>
+  <% end %>
+</div>

data/app/views/backstage/fields/_section.html.erb

@@ -0,0 +1,13 @@
+<details <%= "open" unless field.collapsed? %>>
+  <summary><strong><%= field.heading %></strong></summary>
+  <% field.sub_fields.each do |sub| %>
+    <% if sub.container? %>
+      <%= render partial: sub.partial_path, locals: { f: f, field: sub, record: @record } %>
+    <% else %>
+      <div>
+        <%= f.label sub.name %>
+        <%= render partial: sub.partial_path, locals: { f: f, field: sub, record: @record } %>
+      </div>
+    <% end %>
+  <% end %>
+</details>

data/app/views/backstage/resources/edit.html.erb

@@ -1,18 +1,39 @@
 <h1>Edit <%= @resource_config.model_class.model_name.human %></h1>
 
-<%= form_with model: @record, url: resource_path(resource: params[:resource], id: @record.id), method: :patch do |f| %>
-  <% @resource_config.edit_fields.each do |field| %>
-    <div>
-      <%= f.label field.name %>
-      <%= render partial: field.partial_path, locals: { f: f, field: field, record: @record } %>
-    </div>
-  <% end %>
-  <%= f.submit "Save" %>
-<% end %>
+<% sidebar = @resource_config.sidebar_config %>
+<div class="<%= sidebar&.links&.any? ? "edit-layout" : "" %>">
+  <div>
+    <%= form_with model: @record, url: resource_path(resource: params[:resource], id: @record.id), method: :patch do |f| %>
+      <% @resource_config.edit_fields.each do |field| %>
+        <% if field.container? %>
+          <%= render partial: field.partial_path, locals: { f: f, field: field, record: @record } %>
+        <% else %>
+          <div>
+            <%= f.label field.name %>
+            <%= render partial: field.partial_path, locals: { f: f, field: field, record: @record } %>
+          </div>
+        <% end %>
+      <% end %>
+      <%= f.submit "Save" %>
+    <% end %>
+
+    <%= link_to "Cancel", resources_path(resource: params[:resource]) %>
 
-<%= link_to "Cancel", resources_path(resource: params[:resource]) %>
+    <%= button_to "Delete",
+          resource_path(resource: params[:resource], id: @record.id),
+          method: :delete,
+          data: { confirm_message: "Delete this #{@resource_config.model_class.model_name.human}?" } %>
+  </div>
 
-<%= button_to "Delete",
-      resource_path(resource: params[:resource], id: @record.id),
-      method: :delete,
-      data: { confirm_message: "Delete this #{@resource_config.model_class.model_name.human}?" } %>
+  <% if sidebar&.links&.any? %>
+    <aside>
+      <ul>
+        <% sidebar.links.each do |link| %>
+          <% url = link.url_or_proc.respond_to?(:call) ? link.url_or_proc.call(@record) : link.url_or_proc %>
+          <% next if url.blank? %>
+          <li><%= link_to link.label, url, target: "_blank" %></li>
+        <% end %>
+      </ul>
+    </aside>
+  <% end %>
+</div>

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

@@ -1,13 +1,15 @@
 <% if @total_pages > 1 %>
-  <% window_start = [[@page - 2, 2].max, @total_pages - 4].min
-     window_end   = [[@page + 2, @total_pages - 1].min, 5].max %>
   <nav>
     <%= link_to "1", url_for(page: 1), class: (@page == 1 ? "current" : nil) %>
-    <% if window_start > 2 %> &hellip;<% end %>
-    <% (window_start..window_end).each do |p| %>
-      &nbsp;<%= link_to p, url_for(page: p), class: (p == @page ? "current" : nil) %>
+    <% if @total_pages > 2 %>
+      <% window_start = [[@page - 2, 2].max, @total_pages - 4].min.clamp(2, @total_pages - 1)
+         window_end   = [[@page + 2, @total_pages - 1].min, 5].max.clamp(2, @total_pages - 1) %>
+      <% if window_start > 2 %> &hellip;<% end %>
+      <% (window_start..window_end).each do |p| %>
+        &nbsp;<%= link_to p, url_for(page: p), class: (p == @page ? "current" : nil) %>
+      <% end %>
+      <% if window_end < @total_pages - 1 %> &hellip;<% end %>
     <% end %>
-    <% if window_end < @total_pages - 1 %> &hellip;<% end %>
     &nbsp;<%= link_to @total_pages, url_for(page: @total_pages), class: (@page == @total_pages ? "current" : nil) %>
   </nav>
 <% end %>

data/app/views/layouts/backstage/backstage.html.erb

@@ -44,17 +44,5 @@
     <main>
       <%= yield %>
     </main>
-    <% sidebar = defined?(@resource_config) && @resource_config&.sidebar_config
-       record  = defined?(@record) ? @record : nil %>
-    <% if sidebar&.links&.any? && record&.persisted? %>
-      <aside>
-        <ul>
-          <% sidebar.links.each do |link| %>
-            <% url = link.url_or_proc.respond_to?(:call) ? link.url_or_proc.call(record) : link.url_or_proc %>
-            <li><%= link_to link.label, url %></li>
-          <% end %>
-        </ul>
-      </aside>
-    <% end %>
   </body>
 </html>

data/lib/backstage/field.rb

@@ -32,6 +32,30 @@ module Backstage
       type == :has_many
     end
 
+    def row?
+      type == :row
+    end
+
+    def section?
+      type == :section
+    end
+
+    def container?
+      row? || section?
+    end
+
+    def sub_fields
+      options[:sub_fields] || []
+    end
+
+    def heading
+      options[:heading]
+    end
+
+    def collapsed?
+      options.fetch(:collapsed, false)
+    end
+
     def association
       options[:association]
     end

data/lib/backstage/resource_config.rb

@@ -74,13 +74,34 @@ module Backstage
       if existing
         existing.options.merge!(opts)
         existing.instance_variable_set(:@type, type.to_sym) if type
+        if @current_target
+          @edit_fields.reject! { |f| f.name == sym }
+          @current_target << existing
+        end
       else
         new_field = Field.new(sym, type || :string, opts)
-        @edit_fields << new_field
-        @index_fields << new_field unless @index_fields_explicit
+        (@current_target || @edit_fields) << new_field
+        @index_fields << new_field unless @index_fields_explicit || @current_target
       end
     end
 
+    def row(*names)
+      syms = names.map(&:to_sym)
+      sub = syms.map { |n| find_field(n) || Field.new(n, :string) }
+      @edit_fields.reject! { |f| syms.include?(f.name) }
+      row_field = Field.new(:"row_#{names.first}", :row, sub_fields: sub)
+      (@current_target || @edit_fields) << row_field
+    end
+
+    def section(heading, **opts)
+      section_field = Field.new(:"section_#{heading.parameterize}", :section,
+        heading: heading, sub_fields: [], **opts)
+      @current_target = section_field.sub_fields
+      yield if block_given?
+      @current_target = nil
+      @edit_fields << section_field
+    end
+
     private
 
     def find_field(name)

data/lib/backstage/version.rb

@@ -1,3 +1,3 @@
 module Backstage
-  VERSION = "0.1.10"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backstage
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Gareth James
@@ -51,6 +51,8 @@ files:
 - app/views/backstage/fields/_has_many.html.erb
 - app/views/backstage/fields/_image_url.html.erb
 - app/views/backstage/fields/_integer.html.erb
+- app/views/backstage/fields/_row.html.erb
+- app/views/backstage/fields/_section.html.erb
 - app/views/backstage/fields/_string.html.erb
 - app/views/backstage/fields/_text.html.erb
 - app/views/backstage/fields/_thumbnails.html.erb