macron-cms 3.0.0 → 5.0.0

data/app/views/macron/cms/articles/_form.html.erb

@@ -28,13 +28,21 @@
   </div>
 
   <div>
-    <%= form.label :name, "Identifier Name", class: "block text-sm font-semibold text-zinc-900" %>
+    <%= form.label :slug, "Identifier Name", class: "block text-sm font-semibold text-zinc-900" %>
     <div class="mt-1.5">
-      <%= form.text_field :name, placeholder: "Leave blank to generate from title", class: "block w-full rounded-lg border border-zinc-300 px-3.5 py-2 text-zinc-900 shadow-xs placeholder:text-zinc-400 focus:outline-none focus:border-zinc-900 focus:ring-1 focus:ring-zinc-900 text-sm font-mono" %>
+      <%= form.text_field :slug, placeholder: "Leave blank to generate from title", class: "block w-full rounded-lg border border-zinc-300 px-3.5 py-2 text-zinc-900 shadow-xs placeholder:text-zinc-400 focus:outline-none focus:border-zinc-900 focus:ring-1 focus:ring-zinc-900 text-sm font-mono" %>
     </div>
     <p class="mt-1 text-xs text-zinc-500">Optional. Unique identifier used by FriendlyId to generate clean URLs (derived from title if left blank).</p>
   </div>
 
+  <div>
+    <%= form.label :published_at, "Published Date & Time", class: "block text-sm font-semibold text-zinc-900" %>
+    <div class="mt-1.5">
+      <%= form.datetime_local_field :published_at, value: (article.published_at || Time.current).strftime("%Y-%m-%dT%H:%M"), class: "block w-full rounded-lg border border-zinc-300 px-3.5 py-2 text-zinc-900 shadow-xs placeholder:text-zinc-400 focus:outline-none focus:border-zinc-900 focus:ring-1 focus:ring-zinc-900 text-sm" %>
+    </div>
+    <p class="mt-1 text-xs text-zinc-500">Controls article sort order across the site and public publication date.</p>
+  </div>
+
   <div class="pt-6 border-t border-zinc-200 space-y-4">
     <div>
       <h3 class="text-sm font-semibold text-zinc-900">Styling & Background Settings</h3>

data/app/views/macron/cms/articles/_table.html.erb

@@ -5,7 +5,7 @@
         <thead class="bg-zinc-50 text-zinc-700 font-semibold text-xs uppercase tracking-wider">
           <tr>
             <th scope="col" class="px-6 py-3.5">Title</th>
-            <th scope="col" class="px-6 py-3.5">Created At</th>
+            <th scope="col" class="px-6 py-3.5">Published At</th>
             <th scope="col" class="px-6 py-3.5 text-right">Actions</th>
           </tr>
         </thead>
@@ -16,7 +16,7 @@
                 <%= link_to article.title, article_path(article), class: "hover:underline" %>
               </td>
               <td class="px-6 py-4 text-zinc-500 text-xs whitespace-nowrap">
-                <%= article.created_at.strftime("%b %d, %Y") %>
+                <%= (article.published_at || article.created_at).strftime("%b %d, %Y %H:%M") %>
               </td>
               <td class="px-6 py-4 text-right text-xs font-medium whitespace-nowrap">
                 <div class="flex items-center justify-end gap-3 whitespace-nowrap">
@@ -26,7 +26,7 @@
                   <%= link_to "Show", article_path(article), class: "text-zinc-700 hover:text-zinc-900 hover:underline" %>
                   <%= link_to "Edit", edit_article_path(article), class: "text-zinc-700 hover:text-zinc-900 hover:underline" %>
                   <% delete_confirm = "Are you sure you want to delete \"#{article.title}\"?" %>
-                  <%= button_to "Delete", article_path(article), method: :delete, form_class: "inline", onclick: "return confirm(#{delete_confirm.to_json});", data: { turbo_confirm: delete_confirm }, class: "text-rose-600 hover:text-rose-800 hover:underline cursor-pointer" %>
+                  <%= button_to "Delete", article_path(article), method: :delete, form_class: "inline", data: { turbo_confirm: delete_confirm }, class: "text-rose-600 hover:text-rose-800 hover:underline cursor-pointer" %>
                 </div>
               </td>
             </tr>

data/app/views/macron/cms/articles/show.html.erb

@@ -13,6 +13,7 @@
         </span>
       </div>
       <div class="text-xs text-zinc-500 space-y-0.5">
+        <p>Published: <%= (@article.published_at || @article.created_at).strftime("%B %d, %Y at %H:%M UTC") %></p>
         <p>Created: <%= @article.created_at.strftime("%B %d, %Y at %H:%M UTC") %></p>
         <p>Updated: <%= time_ago_in_words(@article.updated_at) %> ago</p>
       </div>
@@ -37,7 +38,7 @@
       <% end %>
 
       <% delete_confirm = "Are you sure you want to delete \"#{@article.title}\"?" %>
-      <%= button_to article_path(@article), method: :delete, onclick: "return confirm(#{delete_confirm.to_json});", data: { turbo_confirm: delete_confirm }, class: "inline-flex items-center gap-1.5 rounded-lg border border-rose-200 bg-rose-50 px-3.5 py-2 text-sm font-semibold text-rose-700 hover:bg-rose-100 transition-colors cursor-pointer" do %>
+      <%= button_to article_path(@article), method: :delete, data: { turbo_confirm: delete_confirm }, class: "inline-flex items-center gap-1.5 rounded-lg border border-rose-200 bg-rose-50 px-3.5 py-2 text-sm font-semibold text-rose-700 hover:bg-rose-100 transition-colors cursor-pointer" do %>
         <svg class="w-4 h-4 text-rose-500" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
           <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
         </svg>
@@ -69,6 +70,7 @@
                article: @article,
                article_contents: @article_contents,
                content_types: @content_types,
+               compact: (params[:view] == "compact"),
                newly_added_id: nil,
                updated_id: nil %>
   </div>

data/app/views/macron/cms/content_types/index.html.erb

@@ -23,6 +23,8 @@
             <tr>
               <th scope="col" class="px-6 py-3.5">Name</th>
               <th scope="col" class="px-6 py-3.5">Fields Summary</th>
+              <th scope="col" class="px-6 py-3.5">Convertible To</th>
+              <th scope="col" class="px-6 py-3.5">Featured Image</th>
               <th scope="col" class="px-6 py-3.5">Created At</th>
               <th scope="col" class="px-6 py-3.5 text-right">Actions</th>
             </tr>
@@ -58,6 +60,34 @@
                     <span class="text-zinc-600 italic">No fields defined</span>
                   <% end %>
                 </td>
+                <td class="px-6 py-4 text-zinc-600 text-xs">
+                  <% convertible_names = content_type.normalized_convertible_to %>
+                  <% if convertible_names.any? %>
+                    <div class="flex flex-wrap gap-1.5">
+                      <% convertible_names.each do |target_name| %>
+                        <% target_ct = (@content_types_by_name || {})[target_name] %>
+                        <% if target_ct %>
+                          <%= link_to target_name, content_type_path(target_ct), class: "inline-flex items-center rounded-md bg-emerald-50 px-2 py-0.5 font-mono text-[11px] font-medium text-emerald-800 ring-1 ring-inset ring-emerald-200 hover:bg-emerald-100 transition-colors" %>
+                        <% else %>
+                          <span class="inline-flex items-center rounded-md bg-zinc-100 px-2 py-0.5 font-mono text-[11px] text-zinc-700 ring-1 ring-inset ring-zinc-200">
+                            <%= target_name %>
+                          </span>
+                        <% end %>
+                      <% end %>
+                    </div>
+                  <% else %>
+                    <span class="text-zinc-400">—</span>
+                  <% end %>
+                </td>
+                <td class="px-6 py-4 text-zinc-600 text-xs whitespace-nowrap">
+                  <% if content_type.featured_image? %>
+                    <span class="inline-flex items-center rounded-md bg-emerald-50 px-2 py-0.5 font-mono text-[11px] font-medium text-emerald-800 ring-1 ring-inset ring-emerald-200">
+                      Yes
+                    </span>
+                  <% else %>
+                    <span class="text-zinc-400">—</span>
+                  <% end %>
+                </td>
                 <td class="px-6 py-4 text-zinc-500 text-xs whitespace-nowrap">
                   <%= content_type.created_at.strftime("%b %d, %Y") rescue "—" %>
                 </td>

data/app/views/macron/cms/content_types/show.html.erb

@@ -57,6 +57,40 @@
         <dt class="text-sm font-medium text-zinc-500">Field Count</dt>
         <dd class="mt-1 text-sm text-zinc-900 sm:col-span-2 sm:mt-0"><%= field_list.count %></dd>
       </div>
+      <div class="px-6 py-4 sm:grid sm:grid-cols-3 sm:gap-4">
+        <dt class="text-sm font-medium text-zinc-500">Convertible To</dt>
+        <dd class="mt-1 text-sm text-zinc-900 sm:col-span-2 sm:mt-0">
+          <% convertible_names = @content_type.normalized_convertible_to %>
+          <% if convertible_names.any? %>
+            <div class="flex flex-wrap gap-1.5">
+              <% convertible_names.each do |target_name| %>
+                <% target_ct = (@convertible_targets_by_name || {})[target_name] %>
+                <% if target_ct %>
+                  <%= link_to target_name, content_type_path(target_ct), class: "inline-flex items-center rounded-md bg-emerald-50 px-2.5 py-0.5 text-xs font-mono font-medium text-emerald-800 ring-1 ring-inset ring-emerald-200 hover:bg-emerald-100 transition-colors" %>
+                <% else %>
+                  <span class="inline-flex items-center rounded-md bg-zinc-100 px-2.5 py-0.5 text-xs font-mono text-zinc-700 ring-1 ring-inset ring-zinc-200">
+                    <%= target_name %>
+                  </span>
+                <% end %>
+              <% end %>
+            </div>
+          <% else %>
+            <span class="text-zinc-500 italic">None</span>
+          <% end %>
+        </dd>
+      </div>
+      <div class="px-6 py-4 sm:grid sm:grid-cols-3 sm:gap-4">
+        <dt class="text-sm font-medium text-zinc-500">Featured Image</dt>
+        <dd class="mt-1 text-sm text-zinc-900 sm:col-span-2 sm:mt-0">
+          <% if @content_type.featured_image? %>
+            <span class="inline-flex items-center rounded-md bg-emerald-50 px-2.5 py-0.5 text-xs font-mono font-medium text-emerald-800 ring-1 ring-inset ring-emerald-200">
+              Yes
+            </span>
+          <% else %>
+            <span class="text-zinc-500 italic">No</span>
+          <% end %>
+        </dd>
+      </div>
       <div class="px-6 py-4 sm:grid sm:grid-cols-3 sm:gap-4">
         <dt class="text-sm font-medium text-zinc-500">Created At</dt>
         <dd class="mt-1 text-sm text-zinc-900 sm:col-span-2 sm:mt-0"><%= @content_type.created_at.to_fs(:long) rescue @content_type.created_at.to_s %></dd>

data/config/routes.rb

@@ -7,6 +7,7 @@ Macron::Cms::Engine.routes.draw do
     resources :article_contents, only: %i[create update destroy] do
       member do
         patch :move
+        patch :convert
       end
       collection do
         patch :reorder
@@ -18,7 +19,17 @@ Macron::Cms::Engine.routes.draw do
   namespace :api do
     namespace :v1 do
       resources :content_types, only: %i[index]
-      resources :articles, only: %i[create show update]
+      resources :articles, only: %i[index create show update destroy] do
+        resources :content_blocks, controller: "article_contents", only: %i[create update destroy] do
+          member do
+            patch :move
+            patch :convert
+          end
+          collection do
+            patch :reorder
+          end
+        end
+      end
     end
   end
 end

data/db/migrate/20261029000001_add_convertible_to_to_macron_cms_contents.rb

@@ -0,0 +1,5 @@
+class AddConvertibleToToMacronCmsContents < ActiveRecord::Migration[8.0]
+  def change
+    add_column :macron_cms_contents, :convertible_to, :jsonb, default: [], null: false
+  end
+end

data/db/migrate/20261029120001_add_featured_image_to_macron_cms_contents.rb

@@ -0,0 +1,5 @@
+class AddFeaturedImageToMacronCmsContents < ActiveRecord::Migration[8.0]
+  def change
+    add_column :macron_cms_contents, :featured_image, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20261029120002_add_featured_image_blob_to_macron_cms_articles.rb

@@ -0,0 +1,8 @@
+class AddFeaturedImageBlobToMacronCmsArticles < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :macron_cms_articles,
+                  :featured_image_blob,
+                  null: true,
+                  foreign_key: { to_table: :active_storage_blobs, on_delete: :nullify }
+  end
+end

data/db/migrate/20261029140000_create_friendly_id_slugs.rb

@@ -0,0 +1,26 @@
+class CreateFriendlyIdSlugs < ActiveRecord::Migration[8.0]
+  def change
+    create_table :friendly_id_slugs do |t|
+      t.string   :slug,           null: false
+      t.integer  :sluggable_id,   null: false
+      t.string   :sluggable_type, limit: 50
+      t.string   :scope
+      t.datetime :created_at
+    end
+
+    add_index :friendly_id_slugs, [ :sluggable_type, :sluggable_id ]
+    add_index :friendly_id_slugs, [ :slug, :sluggable_type ], length: { slug: 140, sluggable_type: 50 }
+    add_index :friendly_id_slugs, [ :slug, :sluggable_type, :scope ], length: { slug: 70, sluggable_type: 50, scope: 70 }, unique: true
+
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL
+          INSERT INTO friendly_id_slugs (slug, sluggable_id, sluggable_type, created_at)
+          SELECT slug, id, 'Macron::Cms::Article', CURRENT_TIMESTAMP
+          FROM macron_cms_articles
+          WHERE slug IS NOT NULL AND slug <> '';
+        SQL
+      end
+    end
+  end
+end

data/db/migrate/20261029150000_remove_name_from_macron_cms_articles.rb

@@ -0,0 +1,6 @@
+class RemoveNameFromMacronCmsArticles < ActiveRecord::Migration[8.0]
+  def change
+    remove_index :macron_cms_articles, :name, unique: true, if_exists: true
+    remove_column :macron_cms_articles, :name, :string
+  end
+end

data/db/migrate/20261029160000_add_published_at_to_macron_cms_articles.rb

@@ -0,0 +1,14 @@
+class AddPublishedAtToMacronCmsArticles < ActiveRecord::Migration[8.0]
+  def up
+    add_column :macron_cms_articles, :published_at, :datetime
+    add_index :macron_cms_articles, :published_at
+
+    Macron::Cms::Article.reset_column_information
+    execute("UPDATE macron_cms_articles SET published_at = created_at WHERE published_at IS NULL")
+  end
+
+  def down
+    remove_index :macron_cms_articles, :published_at, if_exists: true
+    remove_column :macron_cms_articles, :published_at
+  end
+end

data/db/seeds.rb

@@ -51,11 +51,12 @@ articles = [
   }
 ]
 
-articles.each do |data|
-  article = Macron::Cms::Article.find_or_initialize_by(name: data[:title].parameterize)
+articles.each_with_index do |data, index|
+  article = Macron::Cms::Article.find_or_initialize_by(slug: data[:title].parameterize)
   article.title = data[:title]
   article.meta_title = data[:meta_title]
   article.meta_description = data[:meta_description]
+  article.published_at ||= (Time.current - (articles.size - index).days)
   article.save!
 end
 

data/lib/macron/cms/version.rb

@@ -1,5 +1,5 @@
 module Macron
   module Cms
-    VERSION = "3.0.0"
+    VERSION = "5.0.0"
   end
 end

data/lib/tasks/macron/cms_tasks.rake

@@ -24,9 +24,15 @@ namespace :macron do
         content_type_name = File.basename(file, ".*")
         data = YAML.safe_load_file(file, permitted_classes: [ Symbol ], aliases: true) || {}
         fields = data["fields"] || data[:fields] || {}
+        raw_convertible = data["convertible_to"] || data[:convertible_to] || []
+        convertible_to = Array(raw_convertible).filter_map { |v| v.to_s.strip.presence }.uniq
+        raw_featured_image = data.key?("featured_image") ? data["featured_image"] : data[:featured_image]
+        featured_image = ActiveModel::Type::Boolean.new.cast(raw_featured_image) || false
 
         content = Macron::Cms::Content.find_or_initialize_by(name: content_type_name)
         content.fields = fields
+        content.convertible_to = convertible_to
+        content.featured_image = featured_image
         content.save!
 
         puts "Imported content type: #{content_type_name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macron-cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Leonid Medovyy
@@ -161,6 +161,9 @@ files:
 - app/assets/stylesheets/macron/cms/katex.min.css
 - app/assets/tailwind/macron/cms/application.css
 - app/components/macron/cms/widget_component.rb
+- app/controllers/concerns/macron/cms/api_serialization.rb
+- app/controllers/concerns/macron/cms/slug_redirectable.rb
+- app/controllers/macron/cms/api/v1/article_contents_controller.rb
 - app/controllers/macron/cms/api/v1/articles_controller.rb
 - app/controllers/macron/cms/api/v1/base_controller.rb
 - app/controllers/macron/cms/api/v1/content_types_controller.rb
@@ -179,6 +182,7 @@ files:
 - app/models/macron/cms/article.rb
 - app/models/macron/cms/article_content.rb
 - app/models/macron/cms/content.rb
+- app/services/macron/cms/inline_asset_attacher.rb
 - app/services/macron/cms/remote_asset_attacher.rb
 - app/views/layouts/macron/cms/application.html.erb
 - app/views/macron/cms/articles/_content_blocks_section.html.erb
@@ -210,6 +214,12 @@ files:
 - db/migrate/20261028000006_move_payload_to_macron_cms_article_contents.rb
 - db/migrate/20261028000007_add_background_fields_to_macron_cms_articles.rb
 - db/migrate/20261028000008_add_text_color_to_macron_cms_articles.rb
+- db/migrate/20261029000001_add_convertible_to_to_macron_cms_contents.rb
+- db/migrate/20261029120001_add_featured_image_to_macron_cms_contents.rb
+- db/migrate/20261029120002_add_featured_image_blob_to_macron_cms_articles.rb
+- db/migrate/20261029140000_create_friendly_id_slugs.rb
+- db/migrate/20261029150000_remove_name_from_macron_cms_articles.rb
+- db/migrate/20261029160000_add_published_at_to_macron_cms_articles.rb
 - db/seeds.rb
 - lib/generators/macron/cms/content_type/content_type_generator.rb
 - lib/macron/cms.rb