spina-blocks 0.3.0 → 0.4.0

data/app/controllers/spina/blocks/admin/blocks_controller.rb

@@ -17,30 +17,45 @@ module Spina
 
           @block_templates = current_theme.try(:block_templates) || []
 
-          if params[:block_template].present?
+          if params[:filter] == "layout"
+            @current_filter = "layout"
+            @blocks = Spina::Blocks::Block.undeletable.sorted
+          elsif params[:block_template].present?
             @current_block_template = params[:block_template]
             @blocks = Spina::Blocks::Block.where(block_template: @current_block_template).sorted
           else
-            @current_block_template = nil
             @blocks = Spina::Blocks::Block.sorted
           end
         end
 
         def new
-          @block_templates = current_theme.try(:block_templates) || []
+          @block_templates = creatable_block_templates
           @block = Spina::Blocks::Block.new(block_template: params[:block_template])
+          @modal = params[:modal]
         end
 
         def create
           @block = Spina::Blocks::Block.new(block_params)
           if @block.save
-            redirect_to(spina.edit_blocks_admin_block_url(@block))
+            if params[:modal]
+              redirect_to(spina.edit_modal_blocks_admin_block_url(@block))
+            else
+              redirect_to(spina.edit_blocks_admin_block_url(@block))
+            end
           else
-            @block_templates = current_theme.try(:block_templates) || []
-            render(turbo_stream: turbo_stream.update(
-              helpers.dom_id(@block, :new_block_form),
-              partial: "new_block_form",
-            ))
+            @block_templates = creatable_block_templates
+            if params[:modal]
+              @modal = true
+              render(turbo_stream: turbo_stream.update(
+                helpers.dom_id(@block, :new_block_modal_form),
+                partial: "new_block_modal_form",
+              ))
+            else
+              render(turbo_stream: turbo_stream.update(
+                helpers.dom_id(@block, :new_block_form),
+                partial: "new_block_form",
+              ))
+            end
           end
         end
 
@@ -79,6 +94,19 @@ module Spina
           end
         end
 
+        def blocks_data
+          blocks = Spina::Blocks::Block.active.sorted
+          template_titles = build_template_titles
+          render(json: blocks.map do |b|
+            {
+              id: b.id,
+              name: b.name,
+              templateName: b.block_template.to_s,
+              templateTitle: template_titles[b.block_template.to_s] || b.block_template.to_s.titleize,
+            }
+          end)
+        end
+
         def sort
           params[:ids].each.with_index do |id, index|
             Spina::Blocks::Block.where(id: id).update_all(position: index + 1)
@@ -89,6 +117,12 @@ module Spina
         end
 
         def destroy
+          unless @block.deletable?
+            flash[:error] = I18n.t("spina.blocks.cannot_be_deleted")
+            redirect_to(spina.edit_blocks_admin_block_url(@block))
+            return
+          end
+
           flash[:info] = I18n.t("spina.blocks.deleted")
           @block.destroy
           redirect_to(spina.blocks_admin_blocks_url)
@@ -108,6 +142,24 @@ module Spina
           @tabs = ["block_content", "block_settings"]
         end
 
+        def build_template_titles
+          titles = {}
+          (current_theme.try(:block_templates) || []).each do |bt|
+            titles[bt[:name].to_s] = bt[:title].to_s
+          end
+          titles
+        end
+
+        # Returns block templates available for manual block creation,
+        # excluding templates reserved for layout (custom) blocks.
+        def creatable_block_templates
+          all_templates = current_theme.try(:block_templates) || []
+          layout_template_names = (current_theme.try(:custom_blocks) || [])
+            .map { |cb| cb[:block_template].to_s }.uniq
+
+          all_templates.reject { |bt| layout_template_names.include?(bt[:name].to_s) }
+        end
+
         def block_params
           params.require(:block).permit!
         end

data/app/controllers/spina/blocks/admin/page_blocks_controller.rb

@@ -32,6 +32,13 @@ module Spina
 
         def destroy
           @page_block = @page.page_blocks.find(params[:id])
+
+          unless @page_block.block.deletable?
+            flash[:error] = I18n.t("spina.page_blocks.cannot_remove_layout_block")
+            redirect_to(spina.blocks_admin_page_page_blocks_url(page_id: @page.id))
+            return
+          end
+
           @page_block.destroy
           flash[:info] = I18n.t("spina.page_blocks.removed")
           redirect_to(spina.blocks_admin_page_page_blocks_url(page_id: @page.id))

data/app/helpers/spina/blocks/blocks_helper.rb

@@ -17,9 +17,13 @@ module Spina
         end
       end
 
-      # Render a single block using its block_template partial
-      # Usage: <%= render_block(some_block) %>
-      def render_block(block)
+      # Render a single block using its block_template partial.
+      # An optional content block is forwarded to the partial, so block
+      # templates can expose `<%= yield %>` slots for callers to inject markup.
+      # Usage:
+      #   <%= render_block(some_block) %>
+      #   <%= render_block(some_block) do %>...<% end %>
+      def render_block(block, &content_block)
         return unless block&.active?
 
         current_spina_theme = Spina::Current.theme || current_theme
@@ -28,7 +32,10 @@ module Spina
         partial_path = "#{theme_name}/blocks/#{block.block_template}"
 
         if lookup_context.exists?(partial_path, [], true)
-          render(partial: partial_path, locals: { block: block })
+          # Use the string-form `render(string, locals, &block)` so passing a
+          # content block doesn't trigger `render`'s implicit layout branch
+          # (which would treat `:partial` as the wrapped content instead).
+          render(partial_path, { block: block }, &content_block)
         else
           render_block_fallback(block)
         end
@@ -45,6 +52,15 @@ module Spina
         block.has_content?(part_name)
       end
 
+      # Render a custom (system) block by its unique key
+      # Usage:
+      #   <%= render_custom_block("header") %>
+      #   <%= render_custom_block("header") do %>...<% end %>
+      def render_custom_block(key, &content_block)
+        block = Spina::Blocks::Block.find_by(key: key)
+        render_block(block, &content_block) if block
+      end
+
       private
 
       def render_block_fallback(block)

data/app/models/concerns/spina/parts/block_filterable.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    module BlockFilterable
+      extend ActiveSupport::Concern
+
+      def available_blocks
+        scope = ::Spina::Blocks::Block.active.sorted
+        opts = options.is_a?(Hash) ? options.with_indifferent_access : nil
+        if opts&.dig(:block_template).present?
+          scope = scope.where(block_template: opts[:block_template])
+        end
+        scope
+      end
+    end
+  end
+end

data/app/models/spina/blocks/account_extension.rb

@@ -7,6 +7,7 @@ module Spina
 
       included do
         after_save :bootstrap_block_categories
+        after_save :bootstrap_custom_blocks
       end
 
       private
@@ -22,6 +23,37 @@ module Spina
             .update(label: category[:label], position: index)
         end
       end
+
+      def bootstrap_custom_blocks
+        theme_config = Spina::Theme.find_by_name(theme)
+        return unless theme_config
+        return unless theme_config.respond_to?(:custom_blocks) && theme_config.custom_blocks.present?
+
+        theme_config.custom_blocks.each do |block_config|
+          category = if block_config[:category].present?
+            Spina::Blocks::Category.find_by(name: block_config[:category])
+          end
+
+          display_name = block_config[:title].presence || block_config[:name].to_s.titleize
+
+          block = Spina::Blocks::Block
+            .where(key: block_config[:name])
+            .first_or_initialize
+
+          block.assign_attributes(
+            name: block.persisted? ? block.name : display_name,
+            block_template: block_config[:block_template],
+            category: category,
+            deletable: false,
+            active: block.persisted? ? block.active : true,
+          )
+
+          # Set key only on new records (it is immutable after creation)
+          block.key = block_config[:name] unless block.persisted?
+
+          block.save!
+        end
+      end
     end
   end
 end

data/app/models/spina/blocks/block.rb

@@ -12,15 +12,41 @@ module Spina
       has_many :page_blocks, class_name: "Spina::Blocks::PageBlock", dependent: :destroy
       has_many :pages, through: :page_blocks, class_name: "Spina::Page"
 
-      validates :name, presence: true
+      before_destroy :ensure_deletable
+
+      validates :name, presence: true, uniqueness: true
       validates :block_template, presence: true
+      validates :key, uniqueness: { allow_nil: true }
+      validate :key_must_not_change, on: :update
 
       scope :active, -> { where(active: true) }
       scope :sorted, -> { order(:position) }
+      scope :deletable, -> { where(deletable: true) }
+      scope :undeletable, -> { where(deletable: false) }
 
       def to_s
         name
       end
+
+      # Whether this block is a system (custom) block with an immutable key
+      def system?
+        key.present?
+      end
+
+      private
+
+      def ensure_deletable
+        unless deletable?
+          errors.add(:base, :undeletable)
+          throw(:abort)
+        end
+      end
+
+      def key_must_not_change
+        if key_was.present? && key_changed?
+          errors.add(:key, :immutable)
+        end
+      end
     end
   end
 end

data/app/models/spina/parts/block_collection.rb

@@ -3,6 +3,8 @@
 module Spina
   module Parts
     class BlockCollection < Base
+      include BlockFilterable
+
       attr_json :block_ids, :integer, array: true, default: -> { [] }
 
       attr_accessor :options

data/app/models/spina/parts/block_reference.rb

@@ -3,12 +3,32 @@
 module Spina
   module Parts
     class BlockReference < Base
+      include BlockFilterable
+
       attr_json :block_id, :integer, default: nil
 
       attr_accessor :options
 
       def content
-        ::Spina::Blocks::Block.active.find_by(id: block_id)
+        if custom_block_name.present?
+          custom_block_record
+        else
+          ::Spina::Blocks::Block.active.find_by(id: block_id)
+        end
+      end
+
+      # Returns the custom_block key from options, supporting both symbol and string keys
+      def custom_block_name
+        return if options.blank?
+
+        options[:custom_block] || options["custom_block"]
+      end
+
+      # Looks up the custom block record by key
+      def custom_block_record
+        return if custom_block_name.blank?
+
+        ::Spina::Blocks::Block.find_by(key: custom_block_name)
       end
     end
   end

data/app/models/spina/parts/content_block.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    class ContentBlock < Base
+      include Partable
+      include AttrJson::NestedAttributes
+
+      attr_json :block_type, :string
+      attr_json :parts, AttrJson::Type::SpinaPartsModel.new, array: true
+      attr_json_accepts_nested_attributes_for :parts
+
+      def find_part(name)
+        (parts || []).find { |part| part.name.to_s == name.to_s }
+      end
+    end
+  end
+end

data/app/models/spina/parts/content_blocks.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    class ContentBlocks < Base
+      include AttrJson::NestedAttributes
+
+      attr_json :content, ContentBlock.to_type, array: true
+      attr_json_accepts_nested_attributes_for :content
+
+      attr_accessor :options
+
+      # Returns available content block templates from the theme,
+      # optionally filtered by the :content_block_templates option.
+      def available_templates(theme)
+        templates = theme.content_block_templates || []
+        allowed = options&.dig(:content_block_templates)
+        return templates if allowed.blank?
+
+        allowed_names = Array(allowed).map(&:to_s)
+        templates.select { |t| allowed_names.include?(t[:name].to_s) }
+      end
+    end
+  end
+end

data/app/models/spina/parts/nested_content_blocks.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    # Same behavior as ContentBlocks but registered as a separate Part type
+    # with its own Stimulus controller name ("nested-content-blocks").
+    # This avoids Stimulus scope conflicts when used inside Repeaters or
+    # other ContentBlocks containers.
+    #
+    # Use `options[:content_block_templates]` to limit which block types
+    # are available (prevents recursive nesting of the same block type).
+    class NestedContentBlocks < ContentBlocks
+    end
+  end
+end

data/app/views/spina/admin/parts/block_collections/_form.html.erb

@@ -1,5 +1,5 @@
 <%
-  blocks = Spina::Blocks::Block.active.sorted
+  blocks = f.object.available_blocks
   selected_ids = f.object.block_ids || []
   field_name = "#{f.object_name}[block_ids][]"
 
@@ -27,6 +27,8 @@
      data-block-collection-blocks-value="<%= blocks_json.to_json %>"
      data-block-collection-selected-ids-value="<%= selected_ids.to_json %>"
      data-block-collection-edit-url-value="<%= spina.edit_modal_blocks_admin_block_path("__ID__") %>"
+     data-block-collection-new-url-value="<%= spina.new_blocks_admin_block_path(modal: 1) %>"
+     data-block-collection-blocks-data-url-value="<%= spina.blocks_data_blocks_admin_blocks_path(format: :json) %>"
      data-field-name="<%= field_name %>">
 
   <label class="block text-sm leading-5 font-medium text-gray-700"><%= f.object.title %></label>
@@ -34,11 +36,26 @@
     <div class="text-gray-400 text-sm mb-2"><%= f.object.hint %></div>
   <% end %>
 
+  <%# Search input + dropdown %>
+  <div class="relative mb-3">
+    <input type="text"
+           data-block-collection-target="searchInput"
+           data-action="input->block-collection#onSearchInput focus->block-collection#onSearchFocus"
+           placeholder="Search or add block..."
+           autocomplete="off"
+           class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-spina focus:ring-spina" />
+
+    <div data-block-collection-target="dropdown"
+         style="display:none"
+         class="absolute z-10 w-full bg-white border border-gray-200 rounded-md shadow-lg py-1 max-h-60 overflow-y-auto">
+    </div>
+  </div>
+
   <%# Empty state message %>
   <div data-block-collection-target="emptyMessage"
        class="text-sm text-gray-400 italic py-3"
        style="<%= selected_ids.any? ? 'display:none' : '' %>">
-    No blocks selected. Click &ldquo;Add block&rdquo; to get started.
+    No blocks selected. Use the search field above to add blocks.
   </div>
 
   <%# Sortable list of selected blocks (rendered by Stimulus) %>
@@ -47,24 +64,6 @@
   <%# Hidden fields container (rendered by Stimulus) %>
   <div data-block-collection-target="hiddenFields"></div>
 
-  <%# Add block button + dropdown %>
-  <div class="relative inline-block">
-    <button type="button"
-            data-action="block-collection#toggleDropdown"
-            data-block-collection-target="addButton"
-            class="inline-flex items-center px-3 py-1.5 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-spina">
-      <svg class="w-4 h-4 mr-1.5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"/>
-      </svg>
-      Add block
-    </button>
-
-    <div data-block-collection-target="dropdown"
-         style="display:none"
-         class="absolute z-10 mt-1 w-64 bg-white border border-gray-200 rounded-md shadow-lg py-1 max-h-60 overflow-y-auto">
-    </div>
-  </div>
-
   <%# ===== Templates for Stimulus controller ===== %>
 
   <%# Selected block list item %>
@@ -110,6 +109,19 @@
 
   <%# Dropdown empty state %>
   <template data-block-collection-target="dropdownEmptyTemplate">
-    <div class="px-3 py-2 text-sm text-gray-400 italic">All blocks added</div>
+    <div class="px-3 py-2 text-sm text-gray-400 italic">No blocks found</div>
+  </template>
+
+  <%# Dropdown "New block" link %>
+  <template data-block-collection-target="newBlockTemplate">
+    <div class="border-t border-gray-200 mt-1 pt-1">
+      <a class="w-full text-left px-3 py-2 text-sm text-spina-primary hover:bg-gray-100 flex items-center font-medium"
+         href="" data-turbo-frame="modal" data-role="new-block-link">
+        <svg class="w-4 h-4 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"/>
+        </svg>
+        <%= t('spina.blocks.new') %>
+      </a>
+    </div>
   </template>
 </div>

data/app/views/spina/admin/parts/block_references/_form.html.erb

@@ -4,10 +4,21 @@
     <div class="text-gray-400 text-sm"><%= f.object.hint %></div>
   <% end %>
   <div class="mt-1">
-    <% blocks = Spina::Blocks::Block.active.sorted %>
-    <%= f.select :block_id,
-          blocks.map { |b| [b.name, b.id] },
-          {include_blank: t('spina.blocks.select_block')},
-          class: "form-select text-sm w-full shadow-xs" %>
+    <% if f.object.custom_block_name.present? %>
+      <% custom_block = f.object.custom_block_record %>
+      <% if custom_block %>
+        <%= link_to custom_block.name,
+              spina.edit_blocks_admin_block_path(custom_block),
+              class: "inline-flex items-center text-sm font-medium text-spina-primary hover:underline" %>
+      <% else %>
+        <span class="text-sm text-red-500"><%= t('spina.blocks.custom_block_not_found') %></span>
+      <% end %>
+    <% else %>
+      <% blocks = f.object.available_blocks %>
+      <%= f.select :block_id,
+            blocks.map { |b| [b.name, b.id] },
+            {include_blank: t('spina.blocks.select_block')},
+            class: "form-select text-sm w-full shadow-xs" %>
+    <% end %>
   </div>
 </div>

data/app/views/spina/admin/parts/content_blocks/_fields.html.erb

@@ -0,0 +1,57 @@
+<%#
+  Renders form fields for a single ContentBlock item.
+  Looks up the content_block_template by block_type to determine which parts to render.
+
+  Accepts an optional `stimulus_controller` local to support nested contexts.
+  Defaults to "content-blocks".
+%>
+<% sc = local_assigns[:stimulus_controller] || "content-blocks" %>
+<% template_config = current_theme.content_block_templates&.find { |t| t[:name].to_s == f.object.block_type.to_s } || {} %>
+<% template_title = template_config[:title] || f.object.block_type&.titleize || "Block" %>
+<% parts = template_config[:parts] || [] %>
+
+<div class="border border-gray-200 rounded-md bg-white shadow-sm"
+     data-<%= sc %>-target="block"
+     data-block-type="<%= f.object.block_type %>">
+
+  <%= f.hidden_field :name %>
+  <%= f.hidden_field :block_type %>
+
+  <%# Header: drag handle, type label (clickable to collapse), delete with confirm %>
+  <div class="flex items-center px-4 py-3 border-b border-gray-100 bg-gray-50 rounded-t-md cursor-pointer select-none"
+       data-action="click-><%= sc %>#toggleCollapse">
+    <button type="button" data-sortable-handle
+            class="mr-3 text-gray-300 hover:text-gray-500 cursor-grab">
+      <svg class="w-4 h-4" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+        <path d="M432 288H16c-8.8 0-16 7.2-16 16v16c0 8.8 7.2 16 16 16h416c8.8 0 16-7.2 16-16v-16c0-8.8-7.2-16-16-16zm0-112H16c-8.8 0-16 7.2-16 16v16c0 8.8 7.2 16 16 16h416c8.8 0 16-7.2 16-16v-16c0-8.8-7.2-16-16-16z"/>
+      </svg>
+    </button>
+
+    <span class="flex-1 text-sm font-medium text-gray-700"><%= template_title %></span>
+
+    <button type="button"
+            class="ml-3 text-gray-300 hover:text-red-500 transition-colors"
+            data-action="click-><%= sc %>#removeBlock:stop"
+            title="<%= t('spina.content_blocks.remove') %>">
+      <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
+      </svg>
+    </button>
+  </div>
+
+  <%# Content: form fields for this block's parts %>
+  <div class="px-4 pb-4" data-<%= sc %>-target="blockContent">
+    <% if parts.any? %>
+      <%= f.fields_for :parts, build_parts(f.object, parts) do |ff| %>
+        <%= ff.hidden_field :title %>
+        <%= ff.hidden_field :type, value: ff.object.class %>
+        <%= ff.hidden_field :name %>
+        <%= render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff %>
+      <% end %>
+    <% else %>
+      <p class="text-sm text-gray-400 italic mt-4">
+        <%= t('spina.content_blocks.no_template_found', type: f.object.block_type) %>
+      </p>
+    <% end %>
+  </div>
+</div>

data/app/views/spina/admin/parts/content_blocks/_form.html.erb

@@ -0,0 +1,73 @@
+<%#
+  Admin form for Spina::Parts::ContentBlocks.
+  Renders an ordered list of typed content blocks with add/remove/reorder.
+%>
+<% available_templates = f.object.available_templates(current_theme) %>
+
+<div class="mt-6" data-controller="content-blocks">
+  <label class="block text-sm leading-5 font-medium text-gray-700"><%= f.object.title %></label>
+  <% if f.object.hint.present? %>
+    <div class="text-gray-400 text-sm mb-2"><%= f.object.hint %></div>
+  <% end %>
+
+  <%# List of existing content blocks %>
+  <div data-content-blocks-target="list" class="space-y-3 mb-4">
+    <% (f.object.content || []).each do |content_block| %>
+      <%= f.fields_for :content, [content_block], child_index: content_block.object_id do |ff| %>
+        <%= render "spina/admin/parts/content_blocks/fields", f: ff %>
+      <% end %>
+    <% end %>
+  </div>
+
+  <%# Empty state %>
+  <div data-content-blocks-target="emptyMessage"
+       class="text-sm text-gray-400 italic py-3 text-center"
+       style="<%= (f.object.content || []).any? ? 'display:none' : '' %>">
+    <%= t('spina.content_blocks.empty') %>
+  </div>
+
+  <%# Add block button with type picker dropdown %>
+  <% if available_templates.any? %>
+    <div class="relative">
+      <button type="button"
+              class="btn btn-default text-sm"
+              data-action="content-blocks#toggleTypeMenu">
+        <svg class="w-4 h-4 mr-1.5 inline-block" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"/>
+        </svg>
+        <%= t('spina.content_blocks.add_block') %>
+      </button>
+
+      <div data-content-blocks-target="typeMenu"
+           class="absolute z-10 mt-1 w-56 bg-white border border-gray-200 rounded-md shadow-lg py-1"
+           style="display:none">
+        <% available_templates.each do |template| %>
+          <button type="button"
+                  class="w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
+                  data-action="content-blocks#addBlock"
+                  data-block-type="<%= template[:name] %>">
+            <%= template[:title] || template[:name].titleize %>
+          </button>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+
+  <%# Pre-rendered templates for each block type (used by Stimulus to clone) %>
+  <% available_templates.each do |template| %>
+    <%
+      content_block = Spina::Parts::ContentBlock.new(
+        name: f.object.name,
+        block_type: template[:name].to_s
+      )
+      child_index_placeholder = content_block.object_id.to_s
+    %>
+    <template data-content-blocks-target="blockTemplate"
+              data-block-type="<%= template[:name] %>"
+              data-child-index="<%= child_index_placeholder %>">
+      <%= f.fields_for(:content, [content_block], child_index: child_index_placeholder) do |ff| %>
+        <%= render "spina/admin/parts/content_blocks/fields", f: ff %>
+      <% end %>
+    </template>
+  <% end %>
+</div>