iron-cms 0.6.0 → 0.7.1

data/app/models/iron/fields/block.rb

@@ -45,6 +45,18 @@ module Iron
       result
     end
 
+    def export_value
+      {
+        type: "block",
+        block_handle: block_definition.handle,
+        fields: export_nested_fields
+      }
+    end
+
+    def export_attachments
+      fields.flat_map(&:export_attachments)
+    end
+
     def to_csv_rows
       rows = []
 
@@ -72,5 +84,11 @@ module Iron
 
       content&.truncate(300)
     end
+
+    private
+
+      def export_nested_fields
+        fields.to_h { |f| [ f.definition.handle, f.export_value ] }
+      end
   end
 end

data/app/models/iron/fields/block_list.rb

@@ -13,6 +13,14 @@ module Iron
       blocks.map(&:value)
     end
 
+    def export_value
+      { type: "block_list", value: blocks.map(&:export_value) }
+    end
+
+    def export_attachments
+      blocks.flat_map(&:export_attachments)
+    end
+
     def to_csv_rows
       rows = []
 

data/app/models/iron/fields/boolean.rb

@@ -4,6 +4,10 @@ module Iron
       value_boolean
     end
 
+    def export_value
+      { type: "boolean", value: value_boolean }
+    end
+
     private
 
       def csv_type

data/app/models/iron/fields/date.rb

@@ -4,6 +4,10 @@ module Iron
       value_datetime
     end
 
+    def export_value
+      { type: "date", value: value_datetime&.iso8601 }
+    end
+
     private
 
       def csv_type

data/app/models/iron/fields/file.rb

@@ -8,12 +8,28 @@ module Iron
       file.attached? ? file : nil
     end
 
+    def export_value
+      return { type: "file", value: nil } unless file.attached?
+
+      { type: "file", value: export_attachment_path }
+    end
+
+    def export_attachments
+      return [] unless file.attached?
+
+      [ file.blob ]
+    end
+
     def image?
       file.attached? && file.blob.content_type&.start_with?("image/")
     end
 
     private
 
+      def export_attachment_path
+        "#{entry.id}/#{file.blob.key}_#{file.blob.filename}"
+      end
+
       def definition_restricts_file_type?
         file.attached? &&
         definition.file_scope == "specific" &&

data/app/models/iron/fields/number.rb

@@ -4,6 +4,10 @@ module Iron
       value_float
     end
 
+    def export_value
+      { type: "number", value: value_float }
+    end
+
     private
 
       def csv_type

data/app/models/iron/fields/reference.rb

@@ -11,6 +11,10 @@ module Iron
       end
     end
 
+    def export_value
+      { type: "reference", value: referenced_entry_id }
+    end
+
     private
 
       def csv_type

data/app/models/iron/fields/reference_list.rb

@@ -14,6 +14,10 @@ module Iron
       end
     end
 
+    def export_value
+      { type: "reference_list", value: references.map(&:entry_id) }
+    end
+
     def to_csv_rows
       rows = []
 

data/app/models/iron/fields/rich_text_area.rb

@@ -1,11 +1,31 @@
 module Iron
   class Fields::RichTextArea < Field
+    include ActionView::Helpers::TagHelper
+
     has_rich_text :rich_text
 
     def value
       rich_text&.to_s
     end
 
+    def export_value
+      return { type: "rich_text_area", value: nil } unless rich_text&.body.present?
+
+      html = rich_text.body.render_attachments do |attachment|
+        export_attachment_tag(attachment)
+      end.to_html
+
+      { type: "rich_text_area", value: html }
+    end
+
+    def export_attachments
+      return [] unless rich_text&.body.present?
+
+      rich_text.body.attachables.filter_map do |attachable|
+        attachable.blob if attachable.respond_to?(:blob)
+      end
+    end
+
     def to_csv_rows
       rows = []
 
@@ -24,6 +44,18 @@ module Iron
 
     private
 
+      def export_attachment_tag(attachment)
+        case attachable = attachment.attachable
+        when ActiveStorage::Blob
+          path = "#{entry.id}/#{attachable.key}_#{attachable.filename}"
+          attachable.image? ? tag.img(src: path) : tag.a(attachable.filename, href: path)
+        when ActionText::Attachables::RemoteImage
+          tag.img(src: attachable.url)
+        else
+          attachment.to_html
+        end
+      end
+
       def csv_type
         "rich_text"
       end

data/app/models/iron/fields/text_area.rb

@@ -4,6 +4,10 @@ module Iron
       value_text
     end
 
+    def export_value
+      { type: "text_area", value: value_text }
+    end
+
     private
 
       def csv_type

data/app/models/iron/fields/text_field.rb

@@ -6,6 +6,10 @@ module Iron
       value_string
     end
 
+    def export_value
+      { type: "text_field", value: value_string }
+    end
+
     private
 
       def validate_required_field

data/app/models/iron/user.rb

@@ -6,6 +6,8 @@ module Iron
 
     has_secure_password
     has_many :sessions, dependent: :destroy
+    has_many :exports, class_name: "Iron::Account::Export", dependent: :destroy
+    has_many :imports, class_name: "Iron::Account::Import", dependent: :destroy
 
     normalizes :email_address, with: ->(e) { e.strip.downcase }
 

data/app/views/iron/account/exports/index.html.erb

@@ -0,0 +1,43 @@
+<% content_for :title, "Exports" %>
+
+<div class="">
+  <%= back_button_to "Settings", settings_path %>
+  <div class="flex justify-between items-center">
+    <h1 class="page-title">Exports</h1>
+    <%= link_to "New Export", new_account_export_path, class: "button-primary" %>
+  </div>
+
+  <div class="mt-8">
+    <% if @exports.any? %>
+      <div class="bg-white dark:bg-stone-800/50 rounded-lg shadow-sm divide-y divide-stone-200 dark:divide-stone-700/20 overflow-hidden">
+        <% @exports.each do |export| %>
+          <div class="p-4 flex items-center justify-between">
+            <div>
+              <p class="text-sm font-medium text-stone-900 dark:text-white">
+                <%= export.title %>
+              </p>
+              <p class="text-sm text-stone-500 dark:text-stone-400">
+                <%= export.include_schema? ? "Schema" : "" %><%= export.include_schema? && export.include_content? ? " + " : "" %><%= export.include_content? ? "Content" : "" %>
+              </p>
+            </div>
+            <div class="flex items-center gap-3">
+              <% if export.pending? || export.processing? %>
+                <span class="inline-flex items-center gap-1.5 text-sm text-stone-500">
+                  <div class="animate-spin h-4 w-4 border-2 border-stone-300 border-t-stone-600 rounded-full"></div>
+                  Processing
+                </span>
+              <% elsif export.completed? %>
+                <%= link_to "Download", main_app.rails_blob_path(export.file, disposition: "attachment"), class: "button-secondary text-sm" %>
+              <% elsif export.failed? %>
+                <span class="text-sm text-red-600">Failed</span>
+              <% end %>
+              <%= link_to "View", account_export_path(export), class: "text-sm text-stone-500 hover:text-stone-700" %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    <% else %>
+      <p class="text-sm text-stone-500">No exports yet.</p>
+    <% end %>
+  </div>
+</div>

data/app/views/iron/account/exports/new.html.erb

@@ -0,0 +1,39 @@
+<% content_for :title, "New Export" %>
+
+<div class="">
+  <%= back_button_to "Exports", account_exports_path %>
+  <h1 class="page-title">New Export</h1>
+  <p class="mt-2 text-sm text-stone-500">Select what you want to export from your CMS.</p>
+
+  <%= form_with model: @export, class: "mt-8 max-w-2xl" do |form| %>
+    <fieldset class="mb-6">
+      <legend class="text-sm font-medium mb-3">Select what to export</legend>
+      <div class="space-y-5">
+        <div class="flex gap-3">
+          <div class="flex h-6 shrink-0 items-center">
+            <%= form.check_box :include_schema, aria: { describedby: "include_schema_description" } %>
+          </div>
+          <div class="text-sm/6">
+            <%= form.label :include_schema, "Schema", class: "font-medium text-stone-900 dark:text-white" %>
+            <p id="include_schema_description" class="text-stone-500 dark:text-stone-400">Content types, fields, and block definitions</p>
+          </div>
+        </div>
+
+        <div class="flex gap-3">
+          <div class="flex h-6 shrink-0 items-center">
+            <%= form.check_box :include_content, aria: { describedby: "include_content_description" } %>
+          </div>
+          <div class="text-sm/6">
+            <%= form.label :include_content, "Content", class: "font-medium text-stone-900 dark:text-white" %>
+            <p id="include_content_description" class="text-stone-500 dark:text-stone-400">Entries and uploaded files</p>
+          </div>
+        </div>
+      </div>
+    </fieldset>
+
+    <div class="flex items-center gap-x-3">
+      <%= form.submit "Export", class: "button-primary" %>
+      <%= link_to "Cancel", account_exports_path, class: "button-secondary" %>
+    </div>
+  <% end %>
+</div>

data/app/views/iron/account/exports/show.html.erb

@@ -0,0 +1,40 @@
+<% content_for :title, @export.title %>
+<%= turbo_stream_from @export %>
+
+<div class="">
+  <%= back_button_to "Exports", account_exports_path %>
+  <h1 class="page-title"><%= @export.title %></h1>
+
+  <div class="mt-8 max-w-2xl">
+    <div class="bg-white shadow-sm sm:rounded-lg dark:bg-stone-800/50 dark:shadow-none dark:outline dark:-outline-offset-1 dark:outline-white/10">
+      <div class="px-4 py-5 sm:p-6">
+        <% if @export.pending? || @export.processing? %>
+          <div class="flex items-center gap-3">
+            <div class="animate-spin h-5 w-5 border-2 border-stone-300 border-t-stone-600 rounded-full dark:border-stone-600 dark:border-t-stone-300"></div>
+            <h3 class="text-base font-semibold text-stone-900 dark:text-white">Generating export...</h3>
+          </div>
+
+        <% elsif @export.completed? %>
+          <h3 class="text-base font-semibold text-stone-900 dark:text-white">Export complete</h3>
+          <div class="mt-2 text-sm text-stone-500 dark:text-stone-400">
+            <p>
+              Exported:
+              <%= @export.include_schema? ? "Schema" : "" %><%= @export.include_schema? && @export.include_content? ? " and " : "" %><%= @export.include_content? ? "Content" : "" %>
+            </p>
+          </div>
+          <div class="mt-4">
+            <%= link_to "Download", main_app.rails_blob_path(@export.file, disposition: "attachment"), class: "button-primary" %>
+          </div>
+
+        <% elsif @export.failed? %>
+          <h3 class="text-base font-semibold text-stone-900 dark:text-white">Export failed</h3>
+          <% if @export.error_message.present? %>
+            <div class="mt-2 text-sm text-stone-500 dark:text-stone-400">
+              <p><%= @export.error_message %></p>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/iron/account/imports/index.html.erb

@@ -0,0 +1,43 @@
+<% content_for :title, "Imports" %>
+
+<div class="">
+  <%= back_button_to "Settings", settings_path %>
+  <div class="flex justify-between items-center">
+    <h1 class="page-title">Imports</h1>
+    <%= link_to "New Import", new_account_import_path, class: "button-primary" %>
+  </div>
+
+  <div class="mt-8">
+    <% if @imports.any? %>
+      <div class="bg-white dark:bg-stone-800/50 rounded-lg shadow-sm divide-y divide-stone-200 dark:divide-stone-700/20 overflow-hidden">
+        <% @imports.each do |import| %>
+          <div class="p-4 flex items-center justify-between">
+            <div>
+              <p class="text-sm font-medium text-stone-900 dark:text-white">
+                <%= import.title %>
+              </p>
+              <p class="text-sm text-stone-500 dark:text-stone-400">
+                <%= import.include_schema? ? "Schema" : "" %><%= import.include_schema? && import.include_content? ? " + " : "" %><%= import.include_content? ? "Content" : "" %>
+              </p>
+            </div>
+            <div class="flex items-center gap-3">
+              <% if import.pending? || import.processing? %>
+                <span class="inline-flex items-center gap-1.5 text-sm text-stone-500">
+                  <div class="animate-spin h-4 w-4 border-2 border-stone-300 border-t-stone-600 rounded-full"></div>
+                  Processing
+                </span>
+              <% elsif import.completed? %>
+                <span class="text-sm text-green-600">Completed</span>
+              <% elsif import.failed? %>
+                <span class="text-sm text-red-600">Failed</span>
+              <% end %>
+              <%= link_to "View", account_import_path(import), class: "text-sm text-stone-500 hover:text-stone-700" %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    <% else %>
+      <p class="text-sm text-stone-500">No imports yet.</p>
+    <% end %>
+  </div>
+</div>

data/app/views/iron/account/imports/new.html.erb

@@ -0,0 +1,52 @@
+<% content_for :title, "Import Data" %>
+
+<div class="">
+  <%= back_button_to "Imports", account_imports_path %>
+  <h1 class="page-title">Import Data</h1>
+  <p class="mt-2 text-sm text-stone-500">Upload a file to import your CMS data.</p>
+
+  <%= form_with model: @import, multipart: true, class: "mt-8 max-w-2xl" do |form| %>
+    <fieldset class="mb-6">
+      <legend class="text-sm font-medium mb-3">Select what to import</legend>
+      <div class="space-y-5">
+        <div class="flex gap-3">
+          <div class="flex h-6 shrink-0 items-center">
+            <%= form.check_box :include_schema, aria: { describedby: "include_schema_description" } %>
+          </div>
+          <div class="text-sm/6">
+            <%= form.label :include_schema, "Schema", class: "font-medium text-stone-900 dark:text-white" %>
+            <p id="include_schema_description" class="text-stone-500 dark:text-stone-400">Content types, fields, and block definitions</p>
+          </div>
+        </div>
+
+        <div class="flex gap-3">
+          <div class="flex h-6 shrink-0 items-center">
+            <%= form.check_box :include_content, aria: { describedby: "include_content_description" } %>
+          </div>
+          <div class="text-sm/6">
+            <%= form.label :include_content, "Content", class: "font-medium text-stone-900 dark:text-white" %>
+            <p id="include_content_description" class="text-stone-500 dark:text-stone-400">Entries and uploaded files</p>
+          </div>
+        </div>
+      </div>
+    </fieldset>
+
+    <div class="field-group">
+      <div class="field">
+        <%= form.label :file, "File" %>
+        <div>
+          <%= form.file_field :file,
+              accept: ".zip",
+              required: true,
+              class: "input" %>
+          <p class="mt-2 text-sm text-stone-500">Select a file exported from Iron CMS</p>
+        </div>
+      </div>
+    </div>
+
+    <div class="mt-6 flex items-center gap-x-3">
+      <%= form.submit "Import", class: "button-primary" %>
+      <%= link_to "Cancel", account_imports_path, class: "button-secondary" %>
+    </div>
+  <% end %>
+</div>

data/app/views/iron/account/imports/show.html.erb

@@ -0,0 +1,37 @@
+<% content_for :title, @import.title %>
+<%= turbo_stream_from @import %>
+
+<div class="">
+  <%= back_button_to "Imports", account_imports_path %>
+  <h1 class="page-title"><%= @import.title %></h1>
+
+  <div class="mt-8 max-w-2xl">
+    <div class="bg-white shadow-sm sm:rounded-lg dark:bg-stone-800/50 dark:shadow-none dark:outline dark:-outline-offset-1 dark:outline-white/10">
+      <div class="px-4 py-5 sm:p-6">
+        <% if @import.pending? || @import.processing? %>
+          <div class="flex items-center gap-3">
+            <div class="animate-spin h-5 w-5 border-2 border-stone-300 border-t-stone-600 rounded-full dark:border-stone-600 dark:border-t-stone-300"></div>
+            <h3 class="text-base font-semibold text-stone-900 dark:text-white">Importing...</h3>
+          </div>
+
+        <% elsif @import.completed? %>
+          <h3 class="text-base font-semibold text-stone-900 dark:text-white">Import complete</h3>
+          <div class="mt-2 text-sm text-stone-500 dark:text-stone-400">
+            <p>
+              Imported:
+              <%= @import.include_schema? ? "Schema" : "" %><%= @import.include_schema? && @import.include_content? ? " and " : "" %><%= @import.include_content? ? "Content" : "" %>
+            </p>
+          </div>
+
+        <% elsif @import.failed? %>
+          <h3 class="text-base font-semibold text-stone-900 dark:text-white">Import failed</h3>
+          <% if @import.error_message.present? %>
+            <div class="mt-2 text-sm text-stone-500 dark:text-stone-400">
+              <p><%= @import.error_message %></p>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/iron/content_types/index.html.erb

@@ -3,14 +3,7 @@
 <div class="space-y-8">
   <div class="flex justify-between items-center">
     <h1 class="page-title">Content Types</h1>
-    <div class="flex items-center gap-2">
-      <%= link_to "Export",
-      export_schema_path,
-      class: "button-secondary",
-      data: { turbo: false } %>
-      <%= link_to "Import", schema_path, class: "button-secondary" %>
-      <%= link_to "New Content Type", new_content_type_path, class: "button-primary" %>
-    </div>
+    <%= link_to "New Content Type", new_content_type_path, class: "button-primary" %>
   </div>
 
   <div

data/app/views/iron/entries/fields/_file.html.erb

@@ -20,8 +20,8 @@
       bg-stone-700
     "
   >
-    <% if field.file.attached? && field.valid? %>
-      <%= image_tag field.file,
+    <% if field.file.attached? && field.file.blob.persisted? && field.valid? %>
+      <%= image_tag main_app.url_for(field.file),
       class: "h-full w-full object-cover object-center",
       data: {
         file_upload_target: "preview",
@@ -36,7 +36,7 @@
       >
     <% end %>
   </div>
-  <%= builder.label :file, "Change", class: "btn mt-2" %>
+  <%= builder.label :file, "Change", class: "button-primary mt-2" %>
   <%= builder.file_field :file,
                      class: "hidden",
                      accept:

data/app/views/iron/settings/show.html.erb

@@ -32,20 +32,13 @@
   </div>
 
   <div class="bg-white dark:bg-stone-800/50 rounded-lg shadow-sm p-6 max-w-96">
-    <h2 class="text-lg font-semibold mb-4">Content Management</h2>
+    <h2 class="text-lg font-semibold mb-4">Data Management</h2>
     <p class="text-sm text-stone-600 dark:text-stone-400 mb-4">
-      Export content entries and their files or import an archive from another instance.
+      Export and import your CMS data.
     </p>
     <div class="flex flex-col gap-2">
-      <%= link_to "Export Content",
-        export_content_path,
-        class: "button-primary",
-        data: {
-          turbo: false,
-        } %>
-      <%= link_to "Import Content",
-        new_content_path,
-        class: "button-secondary" %>
+      <%= link_to "Export Data", account_exports_path, class: "button-secondary" %>
+      <%= link_to "Import Data", account_imports_path, class: "button-secondary" %>
     </div>
   </div>
 </div>

data/config/routes.rb

@@ -16,15 +16,9 @@ Iron::Engine.routes.draw do
   get "entries/search", to: "entries#search"
   resources :icons, only: [ :index ]
 
-  resource :schema, only: [] do
-    get :export, on: :member
-    get :new, on: :member
-    post :import, on: :member
-  end
-
-  resource :content, only: [ :new ] do
-    get :export, on: :collection
-    post :import, on: :collection
+  namespace :account do
+    resources :exports, only: %i[index new create show]
+    resources :imports, only: %i[index new create show]
   end
 
   resources :block_definitions do

data/db/migrate/20251209103109_create_iron_account_exports.rb

@@ -0,0 +1,13 @@
+class CreateIronAccountExports < ActiveRecord::Migration[8.1]
+  def change
+    create_table :iron_account_exports do |t|
+      t.references :user, null: false, foreign_key: { to_table: :iron_users }
+      t.string :status, default: "pending", null: false
+      t.boolean :include_schema, default: true, null: false
+      t.boolean :include_content, default: true, null: false
+      t.datetime :completed_at
+      t.string :error_message
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20251209103110_create_iron_account_imports.rb

@@ -0,0 +1,13 @@
+class CreateIronAccountImports < ActiveRecord::Migration[8.1]
+  def change
+    create_table :iron_account_imports do |t|
+      t.references :user, null: false, foreign_key: { to_table: :iron_users }
+      t.string :status, default: "pending", null: false
+      t.boolean :include_schema, default: true, null: false
+      t.boolean :include_content, default: true, null: false
+      t.datetime :completed_at
+      t.string :error_message
+      t.timestamps
+    end
+  end
+end

data/lib/iron/version.rb

@@ -1,3 +1,3 @@
 module Iron
-  VERSION = "0.6.0"
+  VERSION = "0.7.1"
 end

data/lib/iron.rb

@@ -2,7 +2,7 @@ require "iron/version"
 require "iron/engine"
 require "iron/sdk"
 require "iron/global_id/instance_scoped_locator"
-require "iron/test_fixtures"
+require "zip"
 
 module Iron
   # Your code goes here...