spina-blocks 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e197d3a0201be80942ea3c1807a1c538312e4ca58ddf9cc0c8ce08f39a0c05'
-  data.tar.gz: 04ae851acfdbfbecf0f30486748f0283b9afa9d18c0bb8f03cde8f83fec21450
+  metadata.gz: 76633f69018375e8d330eee4b062677dd4dc10bd380ec2e7b08f3900fd448540
+  data.tar.gz: dd386042f84a6554db3eb15200011e4a953f3559054a44f05caa0e052b10fa3b
 SHA512:
-  metadata.gz: 4606d45194c8fabe89c79f51a8129af1d1fb8043ec07e6601a65c3c2d5f59997c475904ee04088f6966b3a56652584c20c41c0fb15433d22589b445373276af1
-  data.tar.gz: cb7906b60e6100513d8e637759074e0e7ed6968a7a18deaa7a6b3806b93c86853efc9df43fdc0461e3c025d78f8070f6db2546bec0a60ab766929909b9440c2b
+  metadata.gz: 19b5d1d156f66e85fb34aa6d2240d0f23cd0ffdb973601e2a4a1f3eca8c9058d39332c33bc986b52a69519b7eee22c3e39c6b713c6aadc9ccb5bdb93abaf5e3e
+  data.tar.gz: 7442845e4527e7dcfc8e429771b957638b89c053ae6b20767393756429000908af24337853d5899b9af5d06298efd492f53316a1db91712e85d9321f690647f2

data/README.md

@@ -1,5 +1,7 @@
 # Spina Blocks
 
+> ⚠️ **Warning**: This plugin is not production-ready and may cause issues. Use at your own risk.
+
 A plugin for [Spina CMS](https://www.spinacms.com) that adds reusable block components. Blocks are independent content units with their own templates and fields that can be assembled into pages.
 
 ## Installation
@@ -14,9 +16,15 @@ Run:
 
 ```bash
 bundle install
-rails db:migrate
+rails generate spina:blocks:install
 ```
 
+This copies the plugin's migrations into your app and runs `db:migrate`.
+
+## Upgrading
+
+If you are upgrading from a version that used timestamp migrations (`20250101000001`–`20250101000004`), the new migrations will detect the old version numbers in your `schema_migrations` table, clean them up automatically, and skip any tables that already exist. No manual intervention is needed.
+
 ## Configuration
 
 ### Theme setup
@@ -125,10 +133,10 @@ Then in your template:
 
 ## Models
 
-| Model | Description |
-|-------|-------------|
-| `Spina::Blocks::Block` | Reusable content block with template and parts |
-| `Spina::Blocks::Category` | Block category for organizing the library |
+| Model                      | Description                                        |
+| -------------------------- | -------------------------------------------------- |
+| `Spina::Blocks::Block`     | Reusable content block with template and parts     |
+| `Spina::Blocks::Category`  | Block category for organizing the library          |
 | `Spina::Blocks::PageBlock` | Join model linking blocks to pages (with position) |
 
 ## Admin interface
@@ -142,13 +150,13 @@ The plugin adds:
 
 ## Helper methods
 
-| Helper | Description |
-|--------|-------------|
-| `render_blocks(page)` | Render all blocks attached to a page via PageBlocks |
-| `render_block(block)` | Render a single block using its template partial |
-| `block_content(block, :part_name)` | Access a block's content |
-| `block_has_content?(block, :part_name)` | Check if a block has content |
+| Helper                                  | Description                                         |
+| --------------------------------------- | --------------------------------------------------- |
+| `render_blocks(page)`                   | Render all blocks attached to a page via PageBlocks |
+| `render_block(block)`                   | Render a single block using its template partial    |
+| `block_content(block, :part_name)`      | Access a block's content                            |
+| `block_has_content?(block, :part_name)` | Check if a block has content                        |
 
 ## License
 
-MIT
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,4 +1,22 @@
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
+
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+
+# The engine.rake mechanism auto-appends db/migrate/ from ENGINE_ROOT to the
+# migration paths. This causes ordering issues because engine migrations use
+# sequential versions (1, 2, 3, 4) that sort before the timestamped copies in
+# spec/dummy/db/migrate/. Since we copy engine migrations to the dummy app via
+# railties:install:migrations, we remove the engine source path to avoid
+# duplicates and ordering problems.
+Rake::Task["app:db:load_config"].enhance do
+  engine_migrate = File.expand_path("db/migrate", ENGINE_ROOT)
+  ActiveRecord::Tasks::DatabaseTasks.migrations_paths.delete(engine_migrate)
+end
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(spec: "app:db:test:prepare")
+
+task default: :spec

data/app/assets/javascripts/spina/controllers/block_collection_controller.js

@@ -18,8 +18,9 @@ export default class extends Controller {
 
   static get values() {
     return {
-      blocks: Array, // [{id, title, templateName, templateTitle}]
+      blocks: Array, // [{id, name, templateName, templateTitle}]
       selectedIds: Array, // [id, id, ...]
+      editUrl: String, // base edit_modal URL with __ID__ placeholder
     };
   }
 
@@ -150,7 +151,7 @@ export default class extends Controller {
             this.dropdownOptionTemplateTarget.content.cloneNode(true);
           const button = option.querySelector("button");
           button.dataset.blockId = block.id;
-          option.querySelector("[data-role='title']").textContent = block.title;
+          option.querySelector("[data-role='title']").textContent = block.name;
           this.dropdownTarget.appendChild(option);
         });
       });
@@ -169,12 +170,18 @@ export default class extends Controller {
     const fragment = this.listItemTemplateTarget.content.cloneNode(true);
     const root = fragment.querySelector("[data-block-id]");
     root.dataset.blockId = block.id;
-    fragment.querySelector("[data-role='title']").textContent = block.title;
+    fragment.querySelector("[data-role='title']").textContent = block.name;
     fragment.querySelector("[data-role='template-label']").textContent =
       "(" + (block.templateTitle || block.templateName) + ")";
     fragment.querySelector(
       "[data-action='block-collection#remove']",
     ).dataset.blockId = block.id;
+
+    const editLink = fragment.querySelector("[data-role='edit-link']");
+    if (editLink && this.hasEditUrlValue && this.editUrlValue) {
+      editLink.href = this.editUrlValue.replace("__ID__", block.id);
+    }
+
     return fragment;
   }
 

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

@@ -7,13 +7,13 @@ module Spina
         admin_section :content
 
         before_action :set_locale
-        before_action :set_block, only: %i[edit edit_content update destroy]
-        before_action :set_tabs, only: %i[edit update]
+        before_action :set_block, only: [:edit, :edit_content, :edit_modal, :update, :destroy]
+        before_action :set_tabs, only: [:edit, :edit_modal, :update]
 
         helper ::Spina::Admin::PagesHelper
 
         def index
-          add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path
+          add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path)
 
           @block_templates = current_theme.try(:block_templates) || []
 
@@ -34,19 +34,19 @@ module Spina
         def create
           @block = Spina::Blocks::Block.new(block_params)
           if @block.save
-            redirect_to spina.edit_blocks_admin_block_url(@block)
+            redirect_to(spina.edit_blocks_admin_block_url(@block))
           else
             @block_templates = current_theme.try(:block_templates) || []
-            render turbo_stream: turbo_stream.update(
+            render(turbo_stream: turbo_stream.update(
               helpers.dom_id(@block, :new_block_form),
-              partial: 'new_block_form'
-            )
+              partial: "new_block_form",
+            ))
           end
         end
 
         def edit
-          add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path, class: 'text-gray-400'
-          add_breadcrumb @block.title
+          add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path, class: "text-gray-400")
+          add_breadcrumb(@block.name)
         end
 
         def edit_content
@@ -55,17 +55,27 @@ module Spina
           end&.dig(:parts) || []
         end
 
+        def edit_modal
+        end
+
         def update
           Mobility.locale = @locale
           if @block.update(block_params)
-            flash[:success] = I18n.t('spina.blocks.saved')
-            redirect_to spina.edit_blocks_admin_block_url(@block, params: { locale: @locale })
+            if params[:modal]
+              render(turbo_stream: turbo_stream.update("modal", ""))
+            else
+              flash[:success] = I18n.t("spina.blocks.saved")
+              redirect_to(spina.edit_blocks_admin_block_url(@block, params: { locale: @locale }))
+            end
+          elsif params[:modal]
+            flash.now[:error] = I18n.t("spina.blocks.couldnt_be_saved")
+            render(:edit_modal, status: :unprocessable_entity)
           else
-            add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path, class: 'text-gray-400'
+            add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path, class: "text-gray-400")
             Mobility.locale = I18n.locale
-            add_breadcrumb @block.title
-            flash.now[:error] = I18n.t('spina.blocks.couldnt_be_saved')
-            render :edit, status: :unprocessable_entity
+            add_breadcrumb(@block.name)
+            flash.now[:error] = I18n.t("spina.blocks.couldnt_be_saved")
+            render(:edit, status: :unprocessable_entity)
           end
         end
 
@@ -74,14 +84,14 @@ module Spina
             Spina::Blocks::Block.where(id: id).update_all(position: index + 1)
           end
 
-          flash.now[:info] = I18n.t('spina.blocks.sorting_saved')
+          flash.now[:info] = I18n.t("spina.blocks.sorting_saved")
           render_flash
         end
 
         def destroy
-          flash[:info] = I18n.t('spina.blocks.deleted')
+          flash[:info] = I18n.t("spina.blocks.deleted")
           @block.destroy
-          redirect_to spina.blocks_admin_blocks_url
+          redirect_to(spina.blocks_admin_blocks_url)
         end
 
         private
@@ -95,7 +105,7 @@ module Spina
         end
 
         def set_tabs
-          @tabs = %w[block_content block_settings]
+          @tabs = ["block_content", "block_settings"]
         end
 
         def block_params

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

@@ -12,18 +12,18 @@ module Spina
 
         def edit
           @category = Spina::Blocks::Category.find(params[:id])
-          add_breadcrumb I18n.t('spina.blocks.title'), spina.blocks_admin_blocks_path, class: 'text-gray-400'
-          add_breadcrumb @category.label
+          add_breadcrumb(I18n.t("spina.blocks.title"), spina.blocks_admin_blocks_path, class: "text-gray-400")
+          add_breadcrumb(@category.label)
         end
 
         def update
           @category = Spina::Blocks::Category.find(params[:id])
           if @category.update(category_params)
-            flash[:success] = I18n.t('spina.block_categories.saved')
-            redirect_to spina.blocks_admin_blocks_url
+            flash[:success] = I18n.t("spina.block_categories.saved")
+            redirect_to(spina.blocks_admin_blocks_url)
           else
-            flash.now[:error] = I18n.t('spina.block_categories.couldnt_be_saved')
-            render :edit, status: :unprocessable_entity
+            flash.now[:error] = I18n.t("spina.block_categories.couldnt_be_saved")
+            render(:edit, status: :unprocessable_entity)
           end
         end
 

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

@@ -9,9 +9,9 @@ module Spina
         before_action :set_page
 
         def index
-          add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path, class: 'text-gray-400'
-          add_breadcrumb @page.title, spina.edit_admin_page_path(@page), class: 'text-gray-400'
-          add_breadcrumb I18n.t('spina.page_blocks.title')
+          add_breadcrumb(I18n.t("spina.website.pages"), spina.admin_pages_path, class: "text-gray-400")
+          add_breadcrumb(@page.title, spina.edit_admin_page_path(@page), class: "text-gray-400")
+          add_breadcrumb(I18n.t("spina.page_blocks.title"))
 
           @page_blocks = @page.page_blocks.sorted.includes(:block)
           @available_blocks = Spina::Blocks::Block.active.sorted.where.not(id: @page.block_ids)
@@ -22,19 +22,19 @@ module Spina
           @page_block.position = @page.page_blocks.maximum(:position).to_i + 1
 
           if @page_block.save
-            flash[:success] = I18n.t('spina.page_blocks.added')
+            flash[:success] = I18n.t("spina.page_blocks.added")
           else
-            flash[:error] = I18n.t('spina.page_blocks.couldnt_be_added')
+            flash[:error] = I18n.t("spina.page_blocks.couldnt_be_added")
           end
 
-          redirect_to spina.blocks_admin_page_page_blocks_url(page_id: @page.id)
+          redirect_to(spina.blocks_admin_page_page_blocks_url(page_id: @page.id))
         end
 
         def destroy
           @page_block = @page.page_blocks.find(params[:id])
           @page_block.destroy
-          flash[:info] = I18n.t('spina.page_blocks.removed')
-          redirect_to spina.blocks_admin_page_page_blocks_url(page_id: @page.id)
+          flash[:info] = I18n.t("spina.page_blocks.removed")
+          redirect_to(spina.blocks_admin_page_page_blocks_url(page_id: @page.id))
         end
 
         def sort
@@ -42,7 +42,7 @@ module Spina
             @page.page_blocks.where(id: id).update_all(position: index + 1)
           end
 
-          flash.now[:info] = I18n.t('spina.page_blocks.sorting_saved')
+          flash.now[:info] = I18n.t("spina.page_blocks.sorting_saved")
           render_flash
         end
 

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

@@ -13,7 +13,7 @@ module Spina
           block = page_block.block
           next unless block&.active?
 
-          concat render_block(block)
+          concat(render_block(block))
         end
       end
 
@@ -28,7 +28,7 @@ module Spina
         partial_path = "#{theme_name}/blocks/#{block.block_template}"
 
         if lookup_context.exists?(partial_path, [], true)
-          render partial: partial_path, locals: { block: block }
+          render(partial: partial_path, locals: { block: block })
         else
           render_block_fallback(block)
         end
@@ -49,7 +49,7 @@ module Spina
 
       def render_block_fallback(block)
         content_tag(:div, class: "spina-block spina-block--#{block.block_template}") do
-          content_tag(:p, block.title, class: 'spina-block__title')
+          content_tag(:p, block.name, class: "spina-block__title")
         end
       end
     end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Spina
+  module Blocks
+    module AccountExtension
+      extend ActiveSupport::Concern
+
+      included do
+        after_save :bootstrap_block_categories
+      end
+
+      private
+
+      def bootstrap_block_categories
+        theme_config = Spina::Theme.find_by_name(theme)
+        return unless theme_config
+        return unless theme_config.respond_to?(:block_categories) && theme_config.block_categories.present?
+
+        theme_config.block_categories.each_with_index do |category, index|
+          Spina::Blocks::Category.where(name: category[:name])
+            .first_or_create(label: category[:label])
+            .update(label: category[:label], position: index)
+        end
+      end
+    end
+  end
+end

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

@@ -8,18 +8,18 @@ module Spina
       include Spina::Partable
       include Spina::TranslatedContent
 
-      belongs_to :category, class_name: 'Spina::Blocks::Category', optional: true
-      has_many :page_blocks, class_name: 'Spina::Blocks::PageBlock', dependent: :destroy
-      has_many :pages, through: :page_blocks, class_name: 'Spina::Page'
+      belongs_to :category, class_name: "Spina::Blocks::Category", optional: true
+      has_many :page_blocks, class_name: "Spina::Blocks::PageBlock", dependent: :destroy
+      has_many :pages, through: :page_blocks, class_name: "Spina::Page"
 
-      validates :title, presence: true
+      validates :name, presence: true
       validates :block_template, presence: true
 
       scope :active, -> { where(active: true) }
       scope :sorted, -> { order(:position) }
 
       def to_s
-        title
+        name
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Spina
   module Blocks
     class Category < ApplicationRecord
-      has_many :blocks, class_name: 'Spina::Blocks::Block', foreign_key: :category_id, dependent: :nullify
+      has_many :blocks, class_name: "Spina::Blocks::Block", foreign_key: :category_id, dependent: :nullify
 
       validates :name, presence: true, uniqueness: true
       validates :label, presence: true

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

@@ -3,8 +3,8 @@
 module Spina
   module Blocks
     class PageBlock < ApplicationRecord
-      belongs_to :page, class_name: 'Spina::Page'
-      belongs_to :block, class_name: 'Spina::Blocks::Block'
+      belongs_to :page, class_name: "Spina::Page"
+      belongs_to :block, class_name: "Spina::Blocks::Block"
 
       validates :block_id, uniqueness: { scope: :page_id }
 

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Spina
+  module Blocks
+    module PageExtension
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :page_blocks, class_name: "Spina::Blocks::PageBlock", foreign_key: :page_id, dependent: :destroy
+        has_many :blocks, through: :page_blocks, class_name: "Spina::Blocks::Block"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spina
+  module Blocks
+    module SearchExtension
+      extend ActiveSupport::Concern
+
+      included do
+        include Spina::Pro::Search
+
+        spina_searchable against: [:name]
+      end
+    end
+  end
+end

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

@@ -15,7 +15,7 @@
   blocks_json = blocks.map { |b|
     {
       id: b.id,
-      title: b.title,
+      name: b.name,
       templateName: b.block_template.to_s,
       templateTitle: template_titles[b.block_template.to_s] || b.block_template.to_s.titleize
     }
@@ -26,6 +26,7 @@
      data-controller="block-collection"
      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-field-name="<%= field_name %>">
 
   <label class="block text-sm leading-5 font-medium text-gray-700"><%= f.object.title %></label>
@@ -78,6 +79,12 @@
         <span class="text-sm font-medium text-gray-800 truncate" data-role="title"></span>
         <span class="ml-2 text-xs text-gray-400" data-role="template-label"></span>
       </div>
+      <a class="ml-2 text-gray-300 hover:text-gray-600 transition-colors"
+         data-role="edit-link" href="" data-turbo-frame="modal" title="Edit">
+        <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="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/>
+        </svg>
+      </a>
       <button type="button" class="ml-2 text-gray-300 hover:text-red-500 transition-colors"
               data-action="block-collection#remove" data-block-id="" title="Remove">
         <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">

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

@@ -6,7 +6,7 @@
   <div class="mt-1">
     <% blocks = Spina::Blocks::Block.active.sorted %>
     <%= f.select :block_id,
-          blocks.map { |b| [b.title, b.id] },
+          blocks.map { |b| [b.name, b.id] },
           {include_blank: t('spina.blocks.select_block')},
           class: "form-select text-sm w-full shadow-xs" %>
   </div>

data/app/views/spina/admin/pro/search/results/_block.html.erb

@@ -0,0 +1,23 @@
+<%= link_to spina.edit_blocks_admin_block_path(block), class: "block px-2 leading-tight", data: {selected: index.zero?, search_target: "result", action: "mouseenter->search#select", turbo_frame: "_top"} do %>
+  <div class="flex items-center justify-between w-full px-4 py-3 rounded-md bg-gray-400 bg-opacity-0 <%= 'bg-opacity-25' if index.zero? %>" data-selected-class="bg-opacity-25">
+    <div>
+      <div class="font-medium flex items-center">
+        <%= block.name %>
+        <% unless block.active? %>
+          <div class="opacity-50 text-xs ml-1">(inactive)</div>
+        <% end %>
+        <div class="flex items-center ml-2 text-xs px-1.5 py-0.5 space-x-1 bg-gray-900 bg-opacity-5 rounded">
+          <%= heroicon('cube', style: :outline, class: 'w-3 h-3 opacity-50') %>
+          <div class="opacity-75"><%= block.block_template %></div>
+        </div>
+      </div>
+      <% if block.category %>
+        <div class="opacity-50 text-xs"><%= block.category.label %></div>
+      <% end %>
+    </div>
+
+    <div class="opacity-0 <%= 'opacity-100' if index.zero? %>" data-selected-class="opacity-100">
+      <%= heroicon('arrow-narrow-right', style: :solid, class: 'w-5 h-5 text-gray-600') %>
+    </div>
+  </div>
+<% end %>

data/app/views/spina/blocks/admin/blocks/_form_block_content.html.erb

@@ -1,8 +1,8 @@
 <div class="max-w-5xl">
   <label class="font-medium text-gray-700">
-    <%= Spina::Blocks::Block.human_attribute_name(:title) %>
+    <%= Spina::Blocks::Block.human_attribute_name(:name) %>
   </label>
-  <%= render Spina::Forms::TextFieldComponent.new(f, :title, size: "lg") %>
+  <%= render Spina::Forms::TextFieldComponent.new(f, :name, size: "lg") %>
   <turbo-frame id="block_content" src="<%= spina.edit_content_blocks_admin_block_path(f.object, locale: @locale) %>">
   </turbo-frame>
 </div>

data/app/views/spina/blocks/admin/blocks/_modal_form.html.erb

@@ -0,0 +1,61 @@
+<%# Reusable modal form for editing a block. Used by edit_modal action.
+    Expects: @block, @tabs, @locale %>
+<%= turbo_frame_tag dom_id(@block, :modal_form) do %>
+  <div data-controller="tabs"
+       data-tabs-active="cursor-default text-gray-900 bg-spina-dark/10"
+       data-tabs-inactive="cursor-pointer bg-transparent text-gray-400 border-transparent">
+
+    <%# Modal header %>
+    <div class="px-6 pt-5 pb-4 border-b border-gray-200">
+      <div class="flex items-center justify-between">
+        <h3 class="text-lg leading-6 font-medium text-gray-900">
+          <%= @block.name %>
+        </h3>
+
+        <%# Tab navigation %>
+        <nav>
+          <ul class="inline-flex w-auto rounded-md bg-gray-100">
+            <% @tabs.each do |tab_name| %>
+              <%= render partial: "button_#{tab_name}" %>
+            <% end %>
+          </ul>
+        </nav>
+      </div>
+    </div>
+
+    <%# Form %>
+    <%= form_with model: @block,
+                  url: spina.blocks_admin_block_path(@block),
+                  id: dom_id(@block, :modal),
+                  data: { turbo_frame: dom_id(@block, :modal_form) } do |f| %>
+      <%= hidden_field_tag :locale, @locale %>
+      <%= hidden_field_tag :modal, 1 %>
+
+      <div class="px-6 py-4 max-h-[70vh] overflow-y-auto">
+        <% Mobility.with_locale(@locale) do %>
+          <% @tabs.each_with_index do |tab_name, idx| %>
+            <div data-tabs-target="pane" id="<%= tab_name %>" <%= 'hidden' unless idx.zero? %>>
+              <%= render partial: "form_#{tab_name}", locals: { f: f } %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+
+      <%# Action buttons %>
+      <div class="px-6 py-4 border-t border-gray-200 flex flex-row-reverse">
+        <button type="submit"
+                form="<%= dom_id(@block, :modal) %>"
+                class="btn btn-primary ml-3"
+                data-controller="button"
+                data-action="button#loading"
+                data-loading-message="<%= t('spina.blocks.save') %>...">
+          <%= t('spina.blocks.save') %>
+        </button>
+
+        <button type="button" class="btn btn-default" data-action="modal#close">
+          <%= t('spina.ui.cancel') %>
+        </button>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/spina/blocks/admin/blocks/_new_block_form.html.erb

@@ -19,7 +19,7 @@
           </div>
 
           <div class="mt-3">
-            <%= render Spina::Forms::TextFieldComponent.new(f, :title, size: 'lg', autofocus: true) %>
+            <%= render Spina::Forms::TextFieldComponent.new(f, :name, size: 'lg', autofocus: true) %>
           </div>
         </div>
       </div>

data/app/views/spina/blocks/admin/blocks/edit_modal.html.erb

@@ -0,0 +1,3 @@
+<%= render(Spina::UserInterface::ModalComponent.new(size: "max-w-5xl")) do %>
+  <%= render 'modal_form' %>
+<% end %>

data/app/views/spina/blocks/admin/blocks/index.html.erb

@@ -75,7 +75,7 @@
             </div>
             <div class="flex-1 py-3 pr-4">
               <%= link_to spina.edit_blocks_admin_block_path(block), class: "block" do %>
-                <div class="text-gray-900 font-medium text-sm"><%= block.title %></div>
+                <div class="text-gray-900 font-medium text-sm"><%= block.name %></div>
                 <div class="text-gray-400 text-xs">
                   <%= block.block_template %>
                   <% unless block.active? %>

data/app/views/spina/blocks/admin/page_blocks/index.html.erb

@@ -18,7 +18,7 @@
                         params: {page_block: {block_id: block.id}},
                         method: :post,
                         class: "block w-full text-left px-4 py-2 text-sm font-medium leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900" do %>
-                    <div><%= block.title %></div>
+                    <div><%= block.name %></div>
                     <div class="text-xs text-gray-400"><%= block.block_template %></div>
                   <% end %>
                 <% end %>
@@ -33,7 +33,7 @@
                       params: {page_block: {block_id: block.id}},
                       method: :post,
                       class: "block w-full text-left px-4 py-2 text-sm font-medium leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900" do %>
-                  <div><%= block.title %></div>
+                  <div><%= block.name %></div>
                   <div class="text-xs text-gray-400"><%= block.block_template %></div>
                 <% end %>
               <% end %>
@@ -64,7 +64,7 @@
             </div>
             <div class="flex-1 py-3">
               <%= link_to spina.edit_blocks_admin_block_path(page_block.block), class: "block" do %>
-                <div class="text-gray-900 font-medium text-sm"><%= page_block.block.title %></div>
+                <div class="text-gray-900 font-medium text-sm"><%= page_block.block.name %></div>
                 <div class="text-gray-400 text-xs">
                   <%= page_block.block.block_template %>
                 </div>

data/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
       new: "New block"
       create: "Create block"
       save: "Save block"
+      edit: "Edit block"
       saved: "Block saved"
       deleted: "Block deleted"
       delete: "Delete block"

data/config/routes.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 Spina::Engine.routes.draw do
-  namespace :blocks, path: '', module: 'blocks' do
+  namespace :blocks, path: "", module: "blocks" do
     namespace :admin, path: Spina.config.backend_path do
       resources :blocks do
         member do
           get :edit_content
+          get :edit_modal
         end
 
         collection do
@@ -13,10 +14,10 @@ Spina::Engine.routes.draw do
         end
       end
 
-      resources :categories, only: %i[index edit update]
+      resources :categories, only: [:index, :edit, :update]
 
       resources :pages, only: [] do
-        resources :page_blocks, only: %i[index create destroy] do
+        resources :page_blocks, only: [:index, :create, :destroy] do
           collection do
             post :sort
           end

data/db/migrate/1_create_spina_blocks_categories.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class CreateSpinaBlocksCategories < ActiveRecord::Migration[7.0]
+  def change
+    if previous_version_applied?("20250101000001")
+      cleanup_version!("20250101000001")
+      return
+    end
+
+    return if connection.table_exists?(:spina_blocks_categories)
+
+    create_table(:spina_blocks_categories) do |t|
+      t.string(:name, null: false)
+      t.string(:label, null: false)
+      t.integer(:position, default: 0)
+
+      t.timestamps
+    end
+
+    add_index(:spina_blocks_categories, :name, unique: true)
+  end
+
+  private
+
+  def previous_version_applied?(version)
+    connection.select_value(
+      "SELECT 1 FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+
+  def cleanup_version!(version)
+    connection.execute(
+      "DELETE FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+end

data/db/migrate/2_create_spina_blocks_blocks.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class CreateSpinaBlocksBlocks < ActiveRecord::Migration[7.0]
+  def change
+    if previous_version_applied?("20250101000002")
+      cleanup_version!("20250101000002")
+      return
+    end
+
+    return if connection.table_exists?(:spina_blocks_blocks)
+
+    create_table(:spina_blocks_blocks) do |t|
+      t.string(:name, null: false)
+      t.string(:block_template, null: false)
+      t.references(:category, foreign_key: { to_table: :spina_blocks_categories }, null: true)
+      t.integer(:position, default: 0)
+      t.boolean(:active, default: true)
+      t.json(:json_attributes)
+
+      t.timestamps
+    end
+
+    add_index(:spina_blocks_blocks, :name, unique: true)
+  end
+
+  private
+
+  def previous_version_applied?(version)
+    connection.select_value(
+      "SELECT 1 FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+
+  def cleanup_version!(version)
+    connection.execute(
+      "DELETE FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+end

data/db/migrate/3_create_spina_blocks_page_blocks.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class CreateSpinaBlocksPageBlocks < ActiveRecord::Migration[7.0]
+  def change
+    if previous_version_applied?("20250101000003")
+      cleanup_version!("20250101000003")
+      return
+    end
+
+    return if connection.table_exists?(:spina_blocks_page_blocks)
+
+    create_table(:spina_blocks_page_blocks) do |t|
+      t.references(:page, null: false, foreign_key: { to_table: :spina_pages })
+      t.references(:block, null: false, foreign_key: { to_table: :spina_blocks_blocks })
+      t.integer(:position, default: 0)
+
+      t.timestamps
+    end
+
+    add_index(:spina_blocks_page_blocks, [:page_id, :block_id], unique: true)
+  end
+
+  private
+
+  def previous_version_applied?(version)
+    connection.select_value(
+      "SELECT 1 FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+
+  def cleanup_version!(version)
+    connection.execute(
+      "DELETE FROM schema_migrations WHERE version = #{connection.quote(version)}",
+    )
+  end
+end

data/db/migrate/5_rename_title_to_name_in_spina_blocks_blocks.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class RenameTitleToNameInSpinaBlocksBlocks < ActiveRecord::Migration[7.0]
+  def change
+    # For fresh installs: migration 2 already creates only `name`, no `title`.
+    return unless connection.column_exists?(:spina_blocks_blocks, :title)
+
+    # Edge case: both `title` and `name` exist (migration 2 ran with both
+    # columns but migration 4, which removed `name`, was never executed).
+    if connection.column_exists?(:spina_blocks_blocks, :name)
+      remove_index(:spina_blocks_blocks, :name) if connection.index_exists?(:spina_blocks_blocks, :name)
+      remove_column(:spina_blocks_blocks, :name, :string)
+    end
+
+    rename_column(:spina_blocks_blocks, :title, :name)
+    add_index(:spina_blocks_blocks, :name, unique: true)
+  end
+end

data/lib/generators/spina/blocks/install_generator.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Spina
+  module Blocks
+    class InstallGenerator < Rails::Generators::Base
+      desc "Install Spina Blocks plugin: copy migrations and run them"
+
+      def copy_migrations
+        rake("spina_blocks:install:migrations")
+      end
+
+      def run_migrations
+        rake("db:migrate")
+      end
+    end
+  end
+end

data/lib/spina/blocks/engine.rb

@@ -7,8 +7,8 @@ module Spina
 
       config.before_initialize do
         ::Spina::Plugin.register do |plugin|
-          plugin.name = 'blocks'
-          plugin.namespace = 'blocks'
+          plugin.name = "blocks"
+          plugin.namespace = "blocks"
         end
 
         ::Spina::Theme.class_eval do
@@ -26,55 +26,55 @@ module Spina
         end
       end
 
-      initializer 'spina.blocks.append_migrations' do |app|
-        unless app.root.to_s.match?(root.to_s)
-          config.paths['db/migrate'].expanded.each do |expanded_path|
-            app.config.paths['db/migrate'] << expanded_path
-          end
-        end
-      end
-
-      initializer 'spina.blocks.importmap', before: 'spina.blocks.register_parts' do
+      initializer "spina.blocks.importmap", before: "spina.blocks.register_parts" do
         Spina.config.importmap.draw do
-          pin_all_from Spina::Blocks::Engine.root.join('app/assets/javascripts/spina/controllers'),
-                       under: 'controllers', to: 'spina/controllers'
+          pin_all_from Spina::Blocks::Engine.root.join("app/assets/javascripts/spina/controllers"),
+            under: "controllers",
+            to: "spina/controllers"
         end
       end
 
-      initializer 'spina.blocks.assets.precompile' do |app|
-        app.config.assets.precompile += %w[spina/controllers/block_collection_controller.js] if defined?(Sprockets)
+      initializer "spina.blocks.assets.precompile" do |app|
+        app.config.assets.precompile += ["spina/controllers/block_collection_controller.js"] if defined?(Sprockets)
       end
 
-      initializer 'spina.blocks.register_parts' do
+      initializer "spina.blocks.register_parts" do
         config.to_prepare do
           ::Spina::Part.register(
             Spina::Parts::BlockReference,
-            Spina::Parts::BlockCollection
+            Spina::Parts::BlockCollection,
           )
         end
       end
 
-      initializer 'spina.blocks.extend_page' do
+      initializer "spina.blocks.extend_models" do
+        config.to_prepare do
+          Spina::Page.include(Spina::Blocks::PageExtension) unless Spina::Page < Spina::Blocks::PageExtension
+          Spina::Account.include(Spina::Blocks::AccountExtension) unless Spina::Account < Spina::Blocks::AccountExtension
+        end
+      end
+
+      initializer "spina.blocks.search" do
         config.to_prepare do
-          Dir.glob(Spina::Blocks::Engine.root.join('app/overrides/**/*.rb')).sort.each do |override|
-            load override
+          if defined?(Spina::Pro::Search)
+            Spina::Blocks::Block.include(Spina::Blocks::SearchExtension) unless Spina::Blocks::Block < Spina::Blocks::SearchExtension
           end
         end
       end
 
-      initializer 'spina.blocks.tailwind_content' do
+      initializer "spina.blocks.tailwind_content" do
         ::Spina.config.tailwind_content << "#{Spina::Blocks::Engine.root}/app/views/**/*.*"
         ::Spina.config.tailwind_content << "#{Spina::Blocks::Engine.root}/app/helpers/**/*.*"
         ::Spina.config.tailwind_content << "#{Spina::Blocks::Engine.root}/app/assets/javascripts/**/*.js"
       end
 
-      initializer 'spina.blocks.i18n' do
-        config.i18n.load_path += Dir[Spina::Blocks::Engine.root.join('config', 'locales', '*.{rb,yml}')]
+      initializer "spina.blocks.i18n" do
+        config.i18n.load_path += Dir[Spina::Blocks::Engine.root.join("config", "locales", "*.{rb,yml}")]
       end
 
-      initializer 'spina.blocks.helpers' do
+      initializer "spina.blocks.helpers" do
         config.to_prepare do
-          ActionView::Base.include Spina::Blocks::BlocksHelper
+          ActionView::Base.include(Spina::Blocks::BlocksHelper)
         end
       end
     end

data/lib/spina/blocks/version.rb

@@ -2,6 +2,6 @@
 
 module Spina
   module Blocks
-    VERSION = '0.2.0'
+    VERSION = "0.3.0"
   end
 end

data/lib/spina-blocks.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'spina'
-require 'spina/blocks/version'
-require 'spina/blocks/engine'
+require "spina"
+require "spina/blocks/version"
+require "spina/blocks/engine"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spina-blocks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Konstantin Kanashchuk
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spina
@@ -24,6 +23,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A plugin for Spina CMS that adds reusable block components that can be
   assembled into pages.
 email:
@@ -39,34 +94,39 @@ files:
 - app/controllers/spina/blocks/admin/categories_controller.rb
 - app/controllers/spina/blocks/admin/page_blocks_controller.rb
 - app/helpers/spina/blocks/blocks_helper.rb
+- app/models/spina/blocks/account_extension.rb
 - app/models/spina/blocks/application_record.rb
 - app/models/spina/blocks/block.rb
 - app/models/spina/blocks/category.rb
 - app/models/spina/blocks/page_block.rb
+- app/models/spina/blocks/page_extension.rb
+- app/models/spina/blocks/search_extension.rb
 - app/models/spina/parts/block_collection.rb
 - app/models/spina/parts/block_reference.rb
-- app/overrides/spina/account_override.rb
-- app/overrides/spina/page_override.rb
 - app/views/spina/admin/hooks/blocks/_website_secondary_navigation.html.erb
 - app/views/spina/admin/parts/block_collections/_form.html.erb
 - app/views/spina/admin/parts/block_references/_form.html.erb
+- app/views/spina/admin/pro/search/results/_block.html.erb
 - app/views/spina/blocks/admin/blocks/_button_block_content.html.erb
 - app/views/spina/blocks/admin/blocks/_button_block_settings.html.erb
 - app/views/spina/blocks/admin/blocks/_form.html.erb
 - app/views/spina/blocks/admin/blocks/_form_block_content.html.erb
 - app/views/spina/blocks/admin/blocks/_form_block_settings.html.erb
+- app/views/spina/blocks/admin/blocks/_modal_form.html.erb
 - app/views/spina/blocks/admin/blocks/_new_block_form.html.erb
 - app/views/spina/blocks/admin/blocks/edit.html.erb
 - app/views/spina/blocks/admin/blocks/edit_content.html.erb
+- app/views/spina/blocks/admin/blocks/edit_modal.html.erb
 - app/views/spina/blocks/admin/blocks/index.html.erb
 - app/views/spina/blocks/admin/blocks/new.html.erb
 - app/views/spina/blocks/admin/page_blocks/index.html.erb
 - config/locales/en.yml
 - config/routes.rb
-- db/migrate/20250101000001_create_spina_blocks_categories.rb
-- db/migrate/20250101000002_create_spina_blocks_blocks.rb
-- db/migrate/20250101000003_create_spina_blocks_page_blocks.rb
-- db/migrate/20250101000004_remove_name_from_spina_blocks_blocks.rb
+- db/migrate/1_create_spina_blocks_categories.rb
+- db/migrate/2_create_spina_blocks_blocks.rb
+- db/migrate/3_create_spina_blocks_page_blocks.rb
+- db/migrate/5_rename_title_to_name_in_spina_blocks_blocks.rb
+- lib/generators/spina/blocks/install_generator.rb
 - lib/spina-blocks.rb
 - lib/spina/blocks/engine.rb
 - lib/spina/blocks/version.rb
@@ -75,7 +135,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,15 +142,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Block component library for Spina CMS
 test_files: []

data/app/overrides/spina/account_override.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-Spina::Account.class_eval do
-  after_save :bootstrap_block_categories
-
-  private
-
-  def bootstrap_block_categories
-    theme_config = Spina::Theme.find_by_name(theme)
-    return unless theme_config
-    return unless theme_config.respond_to?(:block_categories) && theme_config.block_categories.present?
-
-    theme_config.block_categories.each_with_index do |category, index|
-      Spina::Blocks::Category.where(name: category[:name])
-                             .first_or_create(label: category[:label])
-                             .update(label: category[:label], position: index)
-    end
-  end
-end

data/app/overrides/spina/page_override.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-Spina::Page.class_eval do
-  has_many :page_blocks, class_name: 'Spina::Blocks::PageBlock', foreign_key: :page_id, dependent: :destroy
-  has_many :blocks, through: :page_blocks, class_name: 'Spina::Blocks::Block'
-end

data/db/migrate/20250101000001_create_spina_blocks_categories.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class CreateSpinaBlocksCategories < ActiveRecord::Migration[7.0]
-  def change
-    if legacy_migration_applied?
-      cleanup_legacy_version!
-      return
-    end
-
-    create_table :spina_blocks_categories do |t|
-      t.string :name, null: false
-      t.string :label, null: false
-      t.integer :position, default: 0
-
-      t.timestamps
-    end
-
-    add_index :spina_blocks_categories, :name, unique: true
-  end
-
-  private
-
-  def legacy_migration_applied?
-    ActiveRecord::Base.connection
-                      .select_value("SELECT 1 FROM schema_migrations WHERE version = '1'")
-  end
-
-  def cleanup_legacy_version!
-    execute "DELETE FROM schema_migrations WHERE version = '1'"
-  end
-end

data/db/migrate/20250101000002_create_spina_blocks_blocks.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class CreateSpinaBlocksBlocks < ActiveRecord::Migration[7.0]
-  def change
-    if legacy_migration_applied?
-      cleanup_legacy_version!
-      return
-    end
-
-    create_table :spina_blocks_blocks do |t|
-      t.string :title, null: false
-      t.string :name, null: false
-      t.string :block_template, null: false
-      t.references :category, foreign_key: { to_table: :spina_blocks_categories }, null: true
-      t.integer :position, default: 0
-      t.boolean :active, default: true
-      t.json :json_attributes
-
-      t.timestamps
-    end
-
-    add_index :spina_blocks_blocks, :name, unique: true
-  end
-
-  private
-
-  def legacy_migration_applied?
-    ActiveRecord::Base.connection
-                      .select_value("SELECT 1 FROM schema_migrations WHERE version = '2'")
-  end
-
-  def cleanup_legacy_version!
-    execute "DELETE FROM schema_migrations WHERE version = '2'"
-  end
-end

data/db/migrate/20250101000003_create_spina_blocks_page_blocks.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class CreateSpinaBlocksPageBlocks < ActiveRecord::Migration[7.0]
-  def change
-    if legacy_migration_applied?
-      cleanup_legacy_version!
-      return
-    end
-
-    create_table :spina_blocks_page_blocks do |t|
-      t.references :page, null: false, foreign_key: { to_table: :spina_pages }
-      t.references :block, null: false, foreign_key: { to_table: :spina_blocks_blocks }
-      t.integer :position, default: 0
-
-      t.timestamps
-    end
-
-    add_index :spina_blocks_page_blocks, %i[page_id block_id], unique: true
-  end
-
-  private
-
-  def legacy_migration_applied?
-    ActiveRecord::Base.connection
-                      .select_value("SELECT 1 FROM schema_migrations WHERE version = '3'")
-  end
-
-  def cleanup_legacy_version!
-    execute "DELETE FROM schema_migrations WHERE version = '3'"
-  end
-end

data/db/migrate/20250101000004_remove_name_from_spina_blocks_blocks.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveNameFromSpinaBlocksBlocks < ActiveRecord::Migration[7.0]
-  def change
-    if legacy_migration_applied?
-      cleanup_legacy_version!
-      return
-    end
-
-    remove_index :spina_blocks_blocks, :name
-    remove_column :spina_blocks_blocks, :name, :string
-  end
-
-  private
-
-  def legacy_migration_applied?
-    ActiveRecord::Base.connection
-                      .select_value("SELECT 1 FROM schema_migrations WHERE version = '4'")
-  end
-
-  def cleanup_legacy_version!
-    execute "DELETE FROM schema_migrations WHERE version = '4'"
-  end
-end