spina-blocks 0.2.0 → 0.3.1

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.1"
   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.1
 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,41 @@ 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/concerns/spina/parts/block_filterable.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/_new_block_modal_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 +137,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,15 +144,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