spina-blocks 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb4bd87c20dc0578090ce0f7e9b26a0ff511f79c52c1e11319527fb9a132362
-  data.tar.gz: 768fbfeb07527abc7d752e7f8af4d51ebd0e86f0e7fc643f313e11d11874de3d
+  metadata.gz: 24a864994819ca4dd7ee93b0cd6957d008d08586659ad9672654014b2add6961
+  data.tar.gz: 264aca6e16771526496af183ef5443091dc4ae70ea5f550bc0e29f0e9c5d1d5a
 SHA512:
-  metadata.gz: 6887a086f16feb25de70d36706ef1f5492c8b3f2831a3e1e7d583b1e62dcf79d547fa9e46edeca27805260a3e68835d9b1234a7144df0a1affd7ef5acf548fbc
-  data.tar.gz: 3741e38abf77005b798a73bdfbfc335f10c7a6109c88551ad6c649f287761714f15aa2e4467e5d65feed3e957c233210da0411e3691dc5204b3b479311dc52a2
+  metadata.gz: 297624cd733819fbdb489b8a6cfe6a5290959eac521aa11117fbf11aa4b50f999c9b4fccba3c3821e7d16a679b5023943b8bd2470f8a9f114529591a4bdfa899
+  data.tar.gz: 448f9470f24ae571bb6ac2f95aa882bca7b6504c968d5369d591b8e8a1d53711f6fc0d60becb2a793c228e0768b13ab63fc4ea3eb7add2bbf883b864d2fc42af

data/README.md

@@ -1,6 +1,6 @@
 # Spina Blocks
 
-> ⚠️ **Warning**: This plugin is not production-ready and may cause issues. Use at your own risk.
+> **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.
 
@@ -72,6 +72,12 @@ Spina::Theme.register do |theme|
     }
   ]
 
+  # Custom blocks (layout blocks, created automatically during bootstrap)
+  theme.custom_blocks = [
+    { name: "header", title: "Header Block", block_template: "header", category: "heroes" },
+    { name: "footer", title: "Footer Block", block_template: "footer", category: "cta" }
+  ]
+
   # Page templates (can use BlockCollection or BlockReference parts)
   theme.view_templates = [
     {
@@ -149,6 +155,94 @@ Then in your template:
 <% end %>
 ```
 
+## Custom blocks (layout blocks)
+
+Custom blocks are non-deletable blocks that are automatically created during `rake spina:bootstrap`. They work similarly to Spina's `custom_pages` — once defined in the theme configuration, they are created on bootstrap and cannot be deleted through the admin interface. In the admin UI they are labeled as **Layout** blocks.
+
+### Defining custom blocks
+
+Add `custom_blocks` to your theme initializer:
+
+```ruby
+theme.custom_blocks = [
+  { name: "header", title: "Header Block", block_template: "header", category: "heroes" },
+  { name: "footer", title: "Footer Block", block_template: "footer", category: "cta" }
+]
+```
+
+Each custom block accepts:
+
+| Key              | Description                                                              |
+| ---------------- | ------------------------------------------------------------------------ |
+| `name`           | Immutable machine key (used for lookups in code and templates)            |
+| `title`          | (Optional) Initial display name shown in admin. Defaults to `name.titleize`. Editable by users after creation |
+| `block_template` | Must match a template defined in `theme.block_templates`                 |
+| `category`       | (Optional) Name of a category from `theme.block_categories`              |
+
+### Key vs Name
+
+Custom blocks have two identifiers:
+
+- **`key`** — an immutable machine identifier (set from `name` in the config). Used by `render_custom_block`, `BlockReference` with `custom_block` option, and for bootstrap lookups. Cannot be changed after creation. Shown as read-only in the block settings tab.
+- **`name`** — the display name shown in the admin UI. Initially set from `title` (or `name.titleize` if `title` is omitted). Users can freely rename it without breaking any template references.
+
+Regular (non-layout) blocks do not have a `key` — it is `nil` for them.
+
+### How it works
+
+- **Bootstrap**: Custom blocks are created (or updated) automatically whenever `Spina::Account` is saved — this includes `rake spina:bootstrap` and admin account edits. They are created with `deletable: false` and an immutable `key`.
+- **Idempotent**: Running bootstrap multiple times will not duplicate blocks. Existing blocks are found by `key` and updated. The display `name` is only set on initial creation — subsequent bootstraps preserve user edits to the display name.
+- **Deletion protection**: Layout blocks cannot be deleted through the admin UI or programmatically via `destroy`. In the block editor, the `...` menu shows "Block can't be deleted" (matching Spina's page behavior). The controller also rejects delete requests.
+- **Template restriction**: Block templates used by custom blocks are excluded from the "New block" form, preventing users from manually creating blocks with layout templates.
+- **Admin UI**: Layout blocks are marked with a **Layout** badge (right-aligned) in the block library. A **Layout blocks** filter is available in the template filter dropdown. On page block lists, the remove button is replaced with a "Layout" label. The `key` is displayed as read-only in the block settings tab.
+
+### Using custom blocks in templates
+
+#### Direct rendering by key
+
+Use `render_custom_block` to render a system block directly in any template:
+
+```erb
+<%# app/views/my_theme/pages/homepage.html.erb %>
+<%= render_custom_block("header") %>
+
+<main>
+  <%= render_blocks %>
+</main>
+
+<%= render_custom_block("footer") %>
+```
+
+This looks up the block by its immutable `key` and renders it using the block's template partial, just like `render_block`. Renaming the block's display name in the admin will not affect this lookup.
+
+#### As a pre-defined BlockReference
+
+Use the `custom_block` option in a `BlockReference` part to hardcode which block it points to:
+
+```ruby
+theme.parts = [
+  { name: "header_block", title: "Header",
+    part_type: "Spina::Parts::BlockReference",
+    options: { custom_block: "header" } },
+
+  { name: "footer_block", title: "Footer",
+    part_type: "Spina::Parts::BlockReference",
+    options: { custom_block: "footer" } }
+]
+```
+
+When `custom_block` is set:
+- The part's `content` method returns the block by `key` (ignoring `block_id`)
+- In the admin form, instead of a dropdown, a clickable link to the block's edit page is shown
+- If the custom block does not exist yet, a warning message is displayed
+
+Then in your template:
+
+```erb
+<%= render_block(content(:header_block)) %>
+<%= render_block(content(:footer_block)) %>
+```
+
 ## Models
 
 | Model                      | Description                                        |
@@ -162,18 +256,24 @@ Then in your template:
 The plugin adds:
 
 - **Blocks** link in the Content section of the admin sidebar
-- Block library with category tabs for filtering
+- Block library with template filter dropdown
 - Block editor with content fields (same as page editor)
 - Page Blocks management page (per-page block assignment and ordering)
+- **Layout** badge on non-deletable blocks in the block library (right-aligned)
+- **Layout blocks** filter in the template filter dropdown
+- `...` menu shows "Block can't be deleted" for layout blocks (like Spina pages)
+- Block templates used by layout blocks are hidden from the "New block" form
+- Immutable **key** shown as read-only in block settings for layout blocks
 
 ## 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       |
+| `render_custom_block(key)`              | Render a custom (layout) block by its immutable key    |
+| `block_content(block, :part_name)`      | Access a block's content                               |
+| `block_has_content?(block, :part_name)` | Check if a block has content                           |
 
 ## License
 

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

@@ -1,5 +1,6 @@
 import { Controller } from "@hotwired/stimulus";
 import Sortable from "libraries/sortablejs";
+import { positionDropdown } from "spina/utils/dropdown_position";
 
 export default class extends Controller {
   #abortController = null;
@@ -209,7 +210,7 @@ export default class extends Controller {
 
     // Reposition if dropdown is currently visible
     if (this.dropdownTarget.style.display !== "none") {
-      this.#positionDropdown();
+      positionDropdown(this.dropdownTarget);
     }
   }
 
@@ -255,12 +256,12 @@ export default class extends Controller {
   openDropdown() {
     if (this.dropdownTarget.style.display === "block") {
       // Already open, just reposition
-      this.#positionDropdown();
+      positionDropdown(this.dropdownTarget);
       return;
     }
 
     this.dropdownTarget.style.display = "block";
-    this.#positionDropdown();
+    positionDropdown(this.dropdownTarget);
 
     this.#abortController = new AbortController();
     const { signal } = this.#abortController;
@@ -273,7 +274,7 @@ export default class extends Controller {
     let scrollTimeout;
     const debouncedPosition = () => {
       clearTimeout(scrollTimeout);
-      scrollTimeout = setTimeout(() => this.#positionDropdown(), 100);
+      scrollTimeout = setTimeout(() => positionDropdown(this.dropdownTarget), 100);
     };
     window.addEventListener("scroll", debouncedPosition, {
       capture: true,
@@ -297,31 +298,6 @@ export default class extends Controller {
 
   // --- Private ---
 
-  #positionDropdown() {
-    const dropdown = this.dropdownTarget;
-    const container = dropdown.parentElement;
-    const containerRect = container.getBoundingClientRect();
-    const dropdownHeight = dropdown.offsetHeight;
-    const viewportHeight = window.innerHeight;
-
-    const spaceBelow = viewportHeight - containerRect.bottom;
-    const spaceAbove = containerRect.top;
-
-    if (spaceBelow < dropdownHeight && spaceAbove > spaceBelow) {
-      // Not enough space below and more space above, show above
-      dropdown.style.bottom = "100%";
-      dropdown.style.top = "auto";
-      dropdown.style.marginBottom = "4px";
-      dropdown.style.marginTop = "0";
-    } else {
-      // Default: show below
-      dropdown.style.bottom = "auto";
-      dropdown.style.top = "100%";
-      dropdown.style.marginTop = "4px";
-      dropdown.style.marginBottom = "0";
-    }
-  }
-
   #observeModal() {
     const modalFrame = document.querySelector("turbo-frame[id='modal']");
     if (!modalFrame || !this.hasBlocksDataUrlValue || !this.blocksDataUrlValue)

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

@@ -0,0 +1,118 @@
+import { Controller } from "@hotwired/stimulus"
+import Sortable from "libraries/sortablejs"
+import { positionDropdown } from "spina/utils/dropdown_position"
+
+// Manages a list of typed content blocks with add, remove, reorder, and collapse.
+//
+// Each block type has a pre-rendered <template> element. When the user adds a
+// block, the template is cloned and the placeholder child_index is replaced
+// with a unique timestamp so Rails form params are unique.
+export default class extends Controller {
+  static targets = [
+    "list",
+    "block",
+    "blockContent",
+    "emptyMessage",
+    "typeMenu",
+    "blockTemplate"
+  ]
+
+  #abortController = null
+
+  connect() {
+    this.sortable = Sortable.create(this.listTarget, {
+      handle: "[data-sortable-handle]",
+      animation: 150
+    })
+    this._updateEmptyMessage()
+  }
+
+  disconnect() {
+    if (this.sortable) this.sortable.destroy()
+    this.#abortController?.abort()
+    this.#abortController = null
+  }
+
+  // --- Actions ---
+
+  addBlock(event) {
+    event.preventDefault()
+    const blockType = event.currentTarget.dataset.blockType
+    const template = this.blockTemplateTargets.find(
+      t => t.dataset.blockType === blockType
+    )
+    if (!template) return
+
+    const childIndex = template.dataset.childIndex
+    const uniqueId = new Date().getTime().toString()
+    const regex = new RegExp(childIndex, "g")
+
+    // Clone template content and replace placeholder child_index
+    const html = template.innerHTML.replace(regex, uniqueId)
+    this.listTarget.insertAdjacentHTML("beforeend", html)
+
+    this._closeTypeMenu()
+    this._updateEmptyMessage()
+  }
+
+  removeBlock(event) {
+    event.preventDefault()
+    if (!confirm("Are you sure you want to remove this block?")) return
+
+    const block = event.currentTarget.closest(`[data-${this.identifier}-target='block']`)
+    if (block) {
+      block.remove()
+      this._updateEmptyMessage()
+    }
+  }
+
+  toggleTypeMenu(event) {
+    event.preventDefault()
+    const menu = this.typeMenuTarget
+    const isOpen = menu.style.display !== "none"
+
+    if (isOpen) {
+      this._closeTypeMenu()
+    } else {
+      menu.style.display = "block"
+      positionDropdown(menu)
+      this.#abortController = new AbortController()
+      const { signal } = this.#abortController
+
+      // Close on outside click (delayed to avoid catching the current click)
+      setTimeout(() => {
+        document.addEventListener("click", (e) => {
+          if (!menu.contains(e.target) && !event.currentTarget.contains(e.target)) {
+            this._closeTypeMenu()
+          }
+        }, { capture: true, once: true, signal })
+      }, 0)
+    }
+  }
+
+  toggleCollapse(event) {
+    event.preventDefault()
+    const block = event.currentTarget.closest(`[data-${this.identifier}-target='block']`)
+    if (!block) return
+
+    const content = block.querySelector(`[data-${this.identifier}-target='blockContent']`)
+    if (content) {
+      content.style.display = content.style.display === "none" ? "" : "none"
+    }
+  }
+
+  // --- Private ---
+
+  _closeTypeMenu() {
+    this.typeMenuTarget.style.display = "none"
+    this.#abortController?.abort()
+    this.#abortController = null
+  }
+
+  _updateEmptyMessage() {
+    if (this.hasEmptyMessageTarget) {
+      const hasBlocks = this.listTarget.children.length > 0
+      this.emptyMessageTarget.style.display = hasBlocks ? "none" : ""
+    }
+  }
+}

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

@@ -0,0 +1,4 @@
+// Re-exports the content_blocks_controller under the name "nested-content-blocks".
+// This provides Stimulus scope isolation when ContentBlocks are used inside
+// Repeaters or other ContentBlocks containers.
+export { default } from "controllers/content_blocks_controller"

data/app/assets/javascripts/spina/utils/dropdown_position.js

@@ -0,0 +1,30 @@
+// Positions an absolutely-positioned dropdown element above or below its
+// container based on available viewport space.
+//
+// Usage:
+//   import { positionDropdown } from "spina/utils/dropdown_position"
+//   positionDropdown(this.dropdownTarget)
+//
+export function positionDropdown(dropdown) {
+  const container = dropdown.parentElement
+  const containerRect = container.getBoundingClientRect()
+  const dropdownHeight = dropdown.offsetHeight
+  const viewportHeight = window.innerHeight
+
+  const spaceBelow = viewportHeight - containerRect.bottom
+  const spaceAbove = containerRect.top
+
+  if (spaceBelow < dropdownHeight && spaceAbove > spaceBelow) {
+    // Not enough space below and more space above — show above
+    dropdown.style.bottom = "100%"
+    dropdown.style.top = "auto"
+    dropdown.style.marginBottom = "4px"
+    dropdown.style.marginTop = "0"
+  } else {
+    // Default: show below
+    dropdown.style.bottom = "auto"
+    dropdown.style.top = "100%"
+    dropdown.style.marginTop = "4px"
+    dropdown.style.marginBottom = "0"
+  }
+}

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

@@ -17,17 +17,19 @@ 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
@@ -41,7 +43,7 @@ module Spina
               redirect_to(spina.edit_blocks_admin_block_url(@block))
             end
           else
-            @block_templates = current_theme.try(:block_templates) || []
+            @block_templates = creatable_block_templates
             if params[:modal]
               @modal = true
               render(turbo_stream: turbo_stream.update(
@@ -115,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)
@@ -142,6 +150,16 @@ module Spina
           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/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_reference.rb

@@ -10,7 +10,25 @@ module Spina
       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_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 = 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" %>
+    <% 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>

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

@@ -0,0 +1,75 @@
+<%#
+  Admin form for Spina::Parts::NestedContentBlocks.
+  Same as ContentBlocks but uses "nested-content-blocks" Stimulus controller
+  to avoid scope conflicts when rendered inside Repeaters or other ContentBlocks.
+  Reuses content_blocks/_fields.html.erb for individual block rendering.
+%>
+<% available_templates = f.object.available_templates(current_theme) %>
+
+<div class="mt-4" data-controller="nested-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-nested-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, stimulus_controller: "nested-content-blocks" %>
+      <% end %>
+    <% end %>
+  </div>
+
+  <%# Empty state %>
+  <div data-nested-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="nested-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-nested-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="nested-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-nested-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, stimulus_controller: "nested-content-blocks" %>
+      <% end %>
+    </template>
+  <% end %>
+</div>

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

@@ -12,11 +12,15 @@
 
         <div hidden data-reveal data-transition class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg border border-gray-200 z-30">
           <div class="rounded-md bg-white shadow-xs py-1">
-            <%= button_to t('spina.blocks.delete'),
-                  spina.blocks_admin_block_path(@block),
-                  method: :delete,
-                  class: "block w-full text-left px-4 py-2 text-sm leading-5 font-medium text-red-500 cursor-pointer bg-white hover:bg-red-100/50 hover:text-red-500",
-                  form: {data: {controller: "confirm", confirm_message: t('spina.blocks.delete_confirmation')}} %>
+            <% if @block.deletable? %>
+              <%= button_to t('spina.blocks.delete'),
+                    spina.blocks_admin_block_path(@block),
+                    method: :delete,
+                    class: "block w-full text-left px-4 py-2 text-sm leading-5 font-medium text-red-500 cursor-pointer bg-white hover:bg-red-100/50 hover:text-red-500",
+                    form: {data: {controller: "confirm", confirm_message: t('spina.blocks.delete_confirmation')}} %>
+            <% else %>
+              <span class="block px-4 py-2 text-sm leading-5 text-gray-400"><%= t('spina.blocks.cannot_be_deleted') %></span>
+            <% end %>
           </div>
         </div>
       </div>

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

@@ -1,4 +1,16 @@
 <div class="max-w-5xl grid grid-cols-1 md:grid-cols-3 gap-3 md:gap-6">
+  <% if @block.key.present? %>
+    <div class="col-span-1 mt-6 md:mt-0">
+      <label class="block text-sm font-medium leading-5 text-gray-700">
+        <%= Spina::Blocks::Block.human_attribute_name(:key) %>
+      </label>
+    </div>
+
+    <div class="col-span-2 mt-1">
+      <span class="text-sm text-gray-500 font-mono"><%= @block.key %></span>
+    </div>
+  <% end %>
+
   <div class="col-span-1 mt-6 md:mt-0">
     <label class="block text-sm font-medium leading-5 text-gray-700">
       <%= Spina::Blocks::Block.human_attribute_name(:block_template) %>

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

@@ -1,7 +1,9 @@
 <%= render Spina::UserInterface::HeaderComponent.new do |header| %>
   <% header.with_actions do %>
-    <% block_templates = current_theme.try(:block_templates) || [] %>
-    <% if block_templates.any? %>
+    <% creatable_templates = (current_theme.try(:block_templates) || []).reject { |bt|
+         ((current_theme.try(:custom_blocks) || []).map { |cb| cb[:block_template].to_s }.uniq).include?(bt[:name].to_s)
+       } %>
+    <% if creatable_templates.any? %>
       <%= link_to spina.new_blocks_admin_block_path,
             class: "btn btn-primary",
             data: {turbo_frame: "modal"} do %>
@@ -18,7 +20,10 @@
           <button type="button"
                   class="inline-flex items-center px-3 py-1.5 rounded-md text-sm font-medium bg-white border border-gray-300 text-gray-700 shadow-xs hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
                   data-action="reveal#toggle">
-            <% if @current_block_template.present? %>
+            <% if @current_filter == "layout" %>
+              <%= heroicon('lock-closed', style: :mini, class: 'h-4 w-4 mr-1.5 -ml-0.5 opacity-75') %>
+              <%= t('spina.blocks.layout_blocks') %>
+            <% elsif @current_block_template.present? %>
               <% current_bt = @block_templates.find { |bt| bt[:name].to_s == @current_block_template } %>
               <%= current_bt ? current_bt[:title] : @current_block_template %>
             <% else %>
@@ -30,18 +35,33 @@
 
           <div hidden data-reveal data-transition class="origin-top-left absolute left-0 mt-2 w-56 rounded-md shadow-lg border border-gray-200 z-30">
             <div class="rounded-md bg-white shadow-xs py-1">
+              <%# "All" filter %>
+              <% all_active = @current_block_template.nil? && @current_filter.nil? %>
               <%= link_to spina.blocks_admin_blocks_path,
-                    class: "flex items-center px-4 py-2 text-sm font-medium leading-5 #{@current_block_template.nil? ? 'text-blue-600 bg-blue-50' : 'text-gray-700 hover:bg-gray-100 hover:text-gray-900'}",
+                    class: "flex items-center px-4 py-2 text-sm font-medium leading-5 #{all_active ? 'text-blue-600 bg-blue-50' : 'text-gray-700 hover:bg-gray-100 hover:text-gray-900'}",
                     data: {action: "reveal#hide"} do %>
                 <%= heroicon('squares-2x2', class: 'h-4 w-4 mr-2 opacity-75') %>
                 <%= t('spina.blocks.all') %>
-                <% if @current_block_template.nil? %>
+                <% if all_active %>
+                  <%= heroicon('check', style: :mini, class: 'w-4 h-4 ml-auto opacity-75') %>
+                <% end %>
+              <% end %>
+
+              <%# "Layout" filter %>
+              <% layout_active = @current_filter == "layout" %>
+              <%= link_to spina.blocks_admin_blocks_path(filter: "layout"),
+                    class: "flex items-center px-4 py-2 text-sm font-medium leading-5 #{layout_active ? 'text-blue-600 bg-blue-50' : 'text-gray-700 hover:bg-gray-100 hover:text-gray-900'}",
+                    data: {action: "reveal#hide"} do %>
+                <%= heroicon('lock-closed', style: :mini, class: 'h-4 w-4 mr-2 opacity-75') %>
+                <%= t('spina.blocks.layout_blocks') %>
+                <% if layout_active %>
                   <%= heroicon('check', style: :mini, class: 'w-4 h-4 ml-auto opacity-75') %>
                 <% end %>
               <% end %>
 
               <div class="border-t border-gray-100 my-1"></div>
 
+              <%# Template filters %>
               <% @block_templates.each do |bt| %>
                 <% active = @current_block_template == bt[:name].to_s %>
                 <%= link_to spina.blocks_admin_blocks_path(block_template: bt[:name]),
@@ -84,6 +104,11 @@
                 </div>
               <% end %>
             </div>
+            <% unless block.deletable? %>
+              <div class="pr-4 shrink-0">
+                <span class="text-sm font-medium text-blue-500"><%= t('spina.blocks.layout_block') %></span>
+              </div>
+            <% end %>
           </li>
         <% end %>
       </ul>

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

@@ -70,14 +70,20 @@
                 </div>
               <% end %>
             </div>
-            <div class="pr-4">
-              <%= button_to spina.blocks_admin_page_page_block_path(page_id: @page.id, id: page_block.id),
-                    method: :delete,
-                    class: "text-gray-300 hover:text-red-500 transition-colors",
-                    form: {data: {controller: "confirm", confirm_message: t('spina.page_blocks.remove_confirmation')}} do %>
-                <%= heroicon('x-mark', style: :mini, class: 'w-5 h-5') %>
-              <% end %>
-            </div>
+            <% if page_block.block.deletable? %>
+              <div class="pr-4">
+                <%= button_to spina.blocks_admin_page_page_block_path(page_id: @page.id, id: page_block.id),
+                      method: :delete,
+                      class: "text-gray-300 hover:text-red-500 transition-colors",
+                      form: {data: {controller: "confirm", confirm_message: t('spina.page_blocks.remove_confirmation')}} do %>
+                  <%= heroicon('x-mark', style: :mini, class: 'w-5 h-5') %>
+                <% end %>
+              </div>
+            <% else %>
+              <div class="pr-4">
+                <span class="text-sm font-medium text-blue-500"><%= t('spina.blocks.layout_block') %></span>
+              </div>
+            <% end %>
           </li>
         <% end %>
       </ul>

data/config/locales/en.yml

@@ -1,4 +1,16 @@
 en:
+  activerecord:
+    attributes:
+      spina/blocks/block:
+        key: "Key"
+    errors:
+      models:
+        spina/blocks/block:
+          attributes:
+            base:
+              undeletable: "This block is a layout block and cannot be deleted."
+            key:
+              immutable: "cannot be changed after creation"
   spina:
     blocks:
       title: "Blocks"
@@ -10,6 +22,7 @@ en:
       deleted: "Block deleted"
       delete: "Delete block"
       delete_confirmation: "Are you sure you want to delete this block?"
+      cannot_be_deleted: "Block can't be deleted"
       couldnt_be_saved: "Block couldn't be saved"
       sorting_saved: "Sorting saved"
       content: "Content"
@@ -24,9 +37,17 @@ en:
       inactive: "Inactive"
       uncategorized: "Uncategorized"
       active_description: "Inactive blocks are hidden from pages."
+      layout_block: "Layout"
+      layout_blocks: "Layout blocks"
+      custom_block_not_found: "Custom block not found. Run rake spina:bootstrap to create it."
     block_categories:
       saved: "Category saved"
       couldnt_be_saved: "Category couldn't be saved"
+    content_blocks:
+      add_block: "Add block"
+      remove: "Remove"
+      empty: 'No content blocks yet. Click "Add block" to get started.'
+      no_template_found: "Unknown block type: %{type}"
     page_blocks:
       title: "Page Blocks"
       add_block: "Add block"
@@ -34,6 +55,7 @@ en:
       added: "Block added to page"
       couldnt_be_added: "Block couldn't be added"
       removed: "Block removed from page"
+      cannot_remove_layout_block: "This layout block cannot be removed from the page."
       sorting_saved: "Sorting saved"
       remove_confirmation: "Remove this block from the page?"
       no_blocks_yet: "No blocks on this page yet. Add blocks from the library to build your page."

data/db/migrate/6_add_custom_block_fields_to_spina_blocks_blocks.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddCustomBlockFieldsToSpinaBlocksBlocks < ActiveRecord::Migration[7.0]
+  def change
+    unless connection.column_exists?(:spina_blocks_blocks, :deletable)
+      add_column(:spina_blocks_blocks, :deletable, :boolean, default: true, null: false)
+    end
+
+    unless connection.column_exists?(:spina_blocks_blocks, :key)
+      add_column(:spina_blocks_blocks, :key, :string)
+      add_index(:spina_blocks_blocks, :key, unique: true, where: "key IS NOT NULL")
+    end
+  end
+end

data/lib/spina/blocks/engine.rb

@@ -12,7 +12,7 @@ module Spina
         end
 
         ::Spina::Theme.class_eval do
-          attr_accessor :block_templates, :block_categories
+          attr_accessor :block_templates, :block_categories, :custom_blocks, :content_block_templates
 
           unless method_defined?(:initialize_without_blocks)
             alias_method :initialize_without_blocks, :initialize
@@ -21,6 +21,8 @@ module Spina
               initialize_without_blocks
               @block_templates = []
               @block_categories = []
+              @custom_blocks = []
+              @content_block_templates = []
             end
           end
         end
@@ -31,11 +33,19 @@ module Spina
           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/utils"),
+            under: "spina/utils",
+            to: "spina/utils"
         end
       end
 
       initializer "spina.blocks.assets.precompile" do |app|
-        app.config.assets.precompile += ["spina/controllers/block_collection_controller.js"] if defined?(Sprockets)
+        app.config.assets.precompile += %w[
+          spina/controllers/block_collection_controller.js
+          spina/controllers/content_blocks_controller.js
+          spina/controllers/nested_content_blocks_controller.js
+          spina/utils/dropdown_position.js
+        ] if defined?(Sprockets)
       end
 
       initializer "spina.blocks.register_parts" do
@@ -43,6 +53,9 @@ module Spina
           ::Spina::Part.register(
             Spina::Parts::BlockReference,
             Spina::Parts::BlockCollection,
+            Spina::Parts::ContentBlocks,
+            Spina::Parts::ContentBlock,
+            Spina::Parts::NestedContentBlocks,
           )
         end
       end

data/lib/spina/blocks/version.rb

@@ -2,6 +2,6 @@
 
 module Spina
   module Blocks
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-blocks
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Konstantin Kanashchuk
@@ -90,6 +90,9 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/spina/controllers/block_collection_controller.js
+- app/assets/javascripts/spina/controllers/content_blocks_controller.js
+- app/assets/javascripts/spina/controllers/nested_content_blocks_controller.js
+- app/assets/javascripts/spina/utils/dropdown_position.js
 - app/controllers/spina/blocks/admin/blocks_controller.rb
 - app/controllers/spina/blocks/admin/categories_controller.rb
 - app/controllers/spina/blocks/admin/page_blocks_controller.rb
@@ -104,9 +107,15 @@ files:
 - app/models/spina/blocks/search_extension.rb
 - app/models/spina/parts/block_collection.rb
 - app/models/spina/parts/block_reference.rb
+- app/models/spina/parts/content_block.rb
+- app/models/spina/parts/content_blocks.rb
+- app/models/spina/parts/nested_content_blocks.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/parts/content_blocks/_fields.html.erb
+- app/views/spina/admin/parts/content_blocks/_form.html.erb
+- app/views/spina/admin/parts/nested_content_blocks/_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
@@ -128,6 +137,7 @@ files:
 - 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
+- db/migrate/6_add_custom_block_fields_to_spina_blocks_blocks.rb
 - lib/generators/spina/blocks/install_generator.rb
 - lib/spina-blocks.rb
 - lib/spina/blocks/engine.rb