iron-cms 0.15.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6e038165d19792d4996c7ec0dba52cf3050c9047819f0857274a9d3adb5f190
-  data.tar.gz: 1d6624acb03d0789ed4f7f984b3578237474a179610b4ab20632e89fda7a2e63
+  metadata.gz: bb7869fda3b54d6d01a68d88308c0b958709d4875da820646ca523623a78cce5
+  data.tar.gz: 108a5025a605c9cf7ccd3296c72b3565c8a69fee07d59139db064510aecdd581
 SHA512:
-  metadata.gz: 91535cb2aa2fa21cdfe6b819b231ea70a447ec88145b0123564f84fa47c3e3c1ad4214a446ca59c4f1423496d644c6fb5207e292cc7d686f3bc5ef37ffbf37e2
-  data.tar.gz: 63802328dc8911c7109a661daaf8742461459b3e0b929e73163736c0f86861b7cab9115f3ccb85802b20d0e6983baafc7d5c3a782b2408bf91ea50cffe83a010
+  metadata.gz: 5d6bad5f973d173ac571fe0cdeb976f282fee23f2407dde15c2b66f6b5875f1b2812e91dc0436871adc5183f044ed926fe2172835d3c06d17c53425825c575d4
+  data.tar.gz: 9a8f935b36a195dac33234696888f8736d293e46432442a1ca61fdb28fe460c6115e23bbfd21d7deff1925b4d79a21d2e150b8aa7be36d3357c83e265802bdd5

data/app/assets/builds/iron.css

@@ -2958,6 +2958,9 @@
       }
     }
   }
+  .bg-amber-100 {
+    background-color: var(--color-amber-100);
+  }
   .bg-gray-100 {
     background-color: var(--color-gray-100);
   }
@@ -3341,6 +3344,9 @@
     --tw-tracking: var(--tracking-widest);
     letter-spacing: var(--tracking-widest);
   }
+  .text-amber-600 {
+    color: var(--color-amber-600);
+  }
   .text-current {
     color: currentcolor;
   }
@@ -4212,6 +4218,14 @@
       border-top-color: var(--color-stone-300);
     }
   }
+  .dark\:bg-amber-900\/50 {
+    @media (prefers-color-scheme: dark) {
+      background-color: color-mix(in srgb, oklch(41.4% 0.112 45.904) 50%, transparent);
+      @supports (color: color-mix(in lab, red, red)) {
+        background-color: color-mix(in oklab, var(--color-amber-900) 50%, transparent);
+      }
+    }
+  }
   .dark\:bg-green-500\/10 {
     @media (prefers-color-scheme: dark) {
       background-color: color-mix(in srgb, oklch(72.3% 0.219 149.579) 10%, transparent);
@@ -4339,6 +4353,11 @@
       --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
   }
+  .dark\:text-amber-400 {
+    @media (prefers-color-scheme: dark) {
+      color: var(--color-amber-400);
+    }
+  }
   .dark\:text-green-400 {
     @media (prefers-color-scheme: dark) {
       color: var(--color-green-400);
@@ -4764,87 +4783,89 @@
     }
   }
 }
-.card {
-  background-color: var(--color-white);
-  @media (prefers-color-scheme: dark) {
-    background-color: color-mix(in srgb, oklch(26.8% 0.007 34.298) 50%, transparent);
-    @supports (color: color-mix(in lab, red, red)) {
-      background-color: color-mix(in oklab, var(--color-stone-800) 50%, transparent);
+@layer components {
+  .card {
+    background-color: var(--color-white);
+    @media (prefers-color-scheme: dark) {
+      background-color: color-mix(in srgb, oklch(26.8% 0.007 34.298) 50%, transparent);
+      @supports (color: color-mix(in lab, red, red)) {
+        background-color: color-mix(in oklab, var(--color-stone-800) 50%, transparent);
+      }
     }
-  }
-  overflow: hidden;
-  border-radius: var(--radius-xl);
-  --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
-  --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
-  box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-  --tw-ring-color: color-mix(in oklab, var(--color-stone-900) 5%, transparent);
-  @media (prefers-color-scheme: dark) {
-    --tw-ring-color: color-mix(in srgb, #fff 10%, transparent);
-    @supports (color: color-mix(in lab, red, red)) {
-      --tw-ring-color: color-mix(in oklab, var(--color-white) 10%, transparent);
+    overflow: hidden;
+    border-radius: var(--radius-xl);
+    --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+    --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
+    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    --tw-ring-color: color-mix(in oklab, var(--color-stone-900) 5%, transparent);
+    @media (prefers-color-scheme: dark) {
+      --tw-ring-color: color-mix(in srgb, #fff 10%, transparent);
+      @supports (color: color-mix(in lab, red, red)) {
+        --tw-ring-color: color-mix(in oklab, var(--color-white) 10%, transparent);
+      }
     }
   }
-}
-.card-list {
-  :where(& > :not(:last-child)) {
-    --tw-divide-y-reverse: 0;
-    border-bottom-style: var(--tw-border-style);
-    border-top-style: var(--tw-border-style);
-    border-top-width: calc(1px * var(--tw-divide-y-reverse));
-    border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
+  .card-list {
+    :where(& > :not(:last-child)) {
+      --tw-divide-y-reverse: 0;
+      border-bottom-style: var(--tw-border-style);
+      border-top-style: var(--tw-border-style);
+      border-top-width: calc(1px * var(--tw-divide-y-reverse));
+      border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
+    }
+    :where(& > :not(:last-child)) {
+      border-color: var(--color-stone-100);
+    }
+    @media (prefers-color-scheme: dark) {
+      :where(& > :not(:last-child)) {
+        border-color: color-mix(in srgb, oklch(37.4% 0.01 67.558) 30%, transparent);
+        @supports (color: color-mix(in lab, red, red)) {
+          border-color: color-mix(in oklab, var(--color-stone-700) 30%, transparent);
+        }
+      }
+    }
   }
-  :where(& > :not(:last-child)) {
-    border-color: var(--color-stone-100);
+  .card:not(.card-list):has(.card-link) {
+    position: relative;
+    transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
+    transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+    transition-duration: var(--tw-duration, var(--default-transition-duration));
   }
-  @media (prefers-color-scheme: dark) {
-    :where(& > :not(:last-child)) {
-      border-color: color-mix(in srgb, oklch(37.4% 0.01 67.558) 30%, transparent);
+  .card:not(.card-list):has(.card-link:hover) {
+    background-color: var(--color-stone-50);
+    @media (prefers-color-scheme: dark) {
+      background-color: color-mix(in srgb, oklch(37.4% 0.01 67.558) 30%, transparent);
       @supports (color: color-mix(in lab, red, red)) {
-        border-color: color-mix(in oklab, var(--color-stone-700) 30%, transparent);
+        background-color: color-mix(in oklab, var(--color-stone-700) 30%, transparent);
       }
     }
   }
-}
-.card:not(.card-list):has(.card-link) {
-  position: relative;
-  transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
-  transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
-  transition-duration: var(--tw-duration, var(--default-transition-duration));
-}
-.card:not(.card-list):has(.card-link:hover) {
-  background-color: var(--color-stone-50);
-  @media (prefers-color-scheme: dark) {
-    background-color: color-mix(in srgb, oklch(37.4% 0.01 67.558) 30%, transparent);
-    @supports (color: color-mix(in lab, red, red)) {
-      background-color: color-mix(in oklab, var(--color-stone-700) 30%, transparent);
-    }
+  .card-link::after {
+    content: "";
+    position: absolute;
+    inset: 0;
   }
-}
-.card-link::after {
-  content: "";
-  position: absolute;
-  inset: 0;
-}
-.card-item {
-  padding-inline: calc(var(--spacing) * 5);
-  padding-block: calc(var(--spacing) * 2.5);
-  transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
-  transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
-  transition-duration: var(--tw-duration, var(--default-transition-duration));
-}
-.card-item:has(.card-link) {
-  position: relative;
-  &:hover {
-    @media (hover: hover) {
-      background-color: var(--color-stone-50);
-    }
+  .card-item {
+    padding-inline: calc(var(--spacing) * 5);
+    padding-block: calc(var(--spacing) * 2.5);
+    transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
+    transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+    transition-duration: var(--tw-duration, var(--default-transition-duration));
   }
-  @media (prefers-color-scheme: dark) {
+  .card-item:has(.card-link) {
+    position: relative;
     &:hover {
       @media (hover: hover) {
-        background-color: color-mix(in srgb, oklch(37.4% 0.01 67.558) 30%, transparent);
-        @supports (color: color-mix(in lab, red, red)) {
-          background-color: color-mix(in oklab, var(--color-stone-700) 30%, transparent);
+        background-color: var(--color-stone-50);
+      }
+    }
+    @media (prefers-color-scheme: dark) {
+      &:hover {
+        @media (hover: hover) {
+          background-color: color-mix(in srgb, oklch(37.4% 0.01 67.558) 30%, transparent);
+          @supports (color: color-mix(in lab, red, red)) {
+            background-color: color-mix(in oklab, var(--color-stone-700) 30%, transparent);
+          }
         }
       }
     }
@@ -6920,6 +6941,14 @@ dialog.modal {
     text-overflow: ellipsis;
     white-space: nowrap;
   }
+  .selection-list-description {
+    font-size: var(--text-xs);
+    line-height: var(--tw-leading, var(--text-xs--line-height));
+    color: var(--color-stone-400);
+    @media (prefers-color-scheme: dark) {
+      color: var(--color-stone-500);
+    }
+  }
   .selection-list-handle {
     font-family: var(--font-mono);
     font-size: var(--text-xs);

data/app/assets/tailwind/iron/components/card.css

@@ -1,33 +1,35 @@
-.card {
-  @apply bg-white dark:bg-stone-800/50;
-  @apply rounded-xl shadow-sm overflow-hidden;
-  @apply ring-1 ring-stone-900/5 dark:ring-white/10;
-}
+@layer components {
+  .card {
+    @apply bg-white dark:bg-stone-800/50;
+    @apply rounded-xl shadow-sm overflow-hidden;
+    @apply ring-1 ring-stone-900/5 dark:ring-white/10;
+  }
 
-.card-list {
-  @apply divide-y divide-stone-100 dark:divide-stone-700/30;
-}
+  .card-list {
+    @apply divide-y divide-stone-100 dark:divide-stone-700/30;
+  }
 
-.card:not(.card-list):has(.card-link) {
-  @apply relative transition-colors;
-}
+  .card:not(.card-list):has(.card-link) {
+    @apply relative transition-colors;
+  }
 
-.card:not(.card-list):has(.card-link:hover) {
-  @apply bg-stone-50 dark:bg-stone-700/30;
-}
+  .card:not(.card-list):has(.card-link:hover) {
+    @apply bg-stone-50 dark:bg-stone-700/30;
+  }
 
-.card-link::after {
-  content: "";
-  position: absolute;
-  inset: 0;
-}
+  .card-link::after {
+    content: "";
+    position: absolute;
+    inset: 0;
+  }
 
-.card-item {
-  @apply px-5 py-2.5;
-  @apply transition-colors;
-}
+  .card-item {
+    @apply px-5 py-2.5;
+    @apply transition-colors;
+  }
 
-.card-item:has(.card-link) {
-  @apply relative;
-  @apply hover:bg-stone-50 dark:hover:bg-stone-700/30;
+  .card-item:has(.card-link) {
+    @apply relative;
+    @apply hover:bg-stone-50 dark:hover:bg-stone-700/30;
+  }
 }

data/app/assets/tailwind/iron/components/selection-list.css

@@ -26,6 +26,10 @@
     @apply flex-1 min-w-0 truncate;
   }
 
+  .selection-list-description {
+    @apply text-xs text-stone-400 dark:text-stone-500;
+  }
+
   .selection-list-handle {
     @apply text-xs text-stone-400 dark:text-stone-500 font-mono;
     @apply shrink-0;

data/app/controllers/concerns/iron/api/cursor_pagination.rb

@@ -0,0 +1,51 @@
+module Iron
+  module Api
+    module CursorPagination
+      extend ActiveSupport::Concern
+
+      DEFAULT_PER_PAGE = 25
+      MAX_PER_PAGE = 100
+
+      private
+
+        def paginate(scope)
+          per_page = (params[:per_page].presence || DEFAULT_PER_PAGE).to_i.clamp(1, MAX_PER_PAGE)
+          ordered = scope.order(updated_at: :desc, id: :desc)
+
+          records = if params[:after].present?
+            cursor = decode_cursor(params[:after])
+            ordered.where(
+              "(iron_entries.updated_at, iron_entries.id) < (?, ?)", cursor[:updated_at], cursor[:id]
+            ).limit(per_page + 1)
+          else
+            ordered.limit(per_page + 1)
+          end
+
+          has_more = records.size > per_page
+          records = records.first(per_page)
+          next_cursor = has_more ? encode_cursor(records.last) : nil
+
+          OpenStruct.new(
+            records: records,
+            pagination: OpenStruct.new(
+              per_page: per_page,
+              next_cursor: next_cursor,
+              has_more: has_more
+            )
+          )
+        end
+
+        def encode_cursor(record)
+          Base64.urlsafe_encode64("#{record.updated_at.iso8601(6)},#{record.id}", padding: false)
+        end
+
+        def decode_cursor(cursor)
+          decoded = Base64.urlsafe_decode64(cursor)
+          updated_at_str, id_str = decoded.split(",", 2)
+          { updated_at: Time.zone.parse(updated_at_str), id: id_str.to_i }
+        rescue ArgumentError
+          { updated_at: Time.current, id: 0 }
+        end
+    end
+  end
+end

data/app/controllers/concerns/iron/api/locale_resolution.rb

@@ -0,0 +1,23 @@
+module Iron
+  module Api
+    module LocaleResolution
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_locale
+      end
+
+      private
+
+        def set_locale
+          Current.locale = resolve_locale
+        end
+
+        def resolve_locale
+          if params[:locale].present?
+            Locale.find_by(code: params[:locale])
+          end || Locale.default
+        end
+    end
+  end
+end

data/app/controllers/concerns/iron/api/token_authentication.rb

@@ -0,0 +1,29 @@
+module Iron
+  module Api
+    module TokenAuthentication
+      extend ActiveSupport::Concern
+
+      included do
+        include ActionController::HttpAuthentication::Token::ControllerMethods
+
+        before_action :authenticate_integration
+      end
+
+      private
+
+        def authenticate_integration
+          authenticate_with_http_token do |token|
+            integration = Integration.find_by(token: token)
+            return head(:unauthorized) unless integration
+            return head(:unauthorized) if integration.expired?
+
+            user = integration.user
+            return head(:unauthorized) unless user&.active?
+
+            Current.user = user
+            integration.touch(:last_used_at)
+          end || head(:unauthorized)
+        end
+    end
+  end
+end

data/app/controllers/concerns/iron/authorization.rb

@@ -4,6 +4,10 @@ module Iron
 
     private
 
+      def ensure_can_write
+        head :forbidden unless Current.user.can_write?
+      end
+
       def ensure_can_administer
         head :forbidden unless Current.user.can_administer?
       end

data/app/controllers/iron/api/base_controller.rb

@@ -0,0 +1,18 @@
+module Iron
+  module Api
+    class BaseController < ActionController::API
+      include ActiveStorage::SetCurrent
+      include TokenAuthentication, LocaleResolution, Authorization
+
+      rate_limit to: 60, within: 1.minute
+
+      rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+
+      private
+
+        def render_not_found
+          render json: { error: "Not found" }, status: :not_found
+        end
+    end
+  end
+end

data/app/controllers/iron/api/content_controller.rb

@@ -0,0 +1,75 @@
+module Iron
+  module Api
+    class ContentController < BaseController
+      include CursorPagination
+
+      before_action :set_content_type
+      before_action :set_entry, only: %i[show update destroy]
+      before_action :ensure_can_write, only: %i[create update destroy]
+      before_action :ensure_collection_content_type, only: :create
+
+      def index
+        if params.key?(:route)
+          @entry = @content_type.entries.find_by!(route: params[:route])
+          render :show
+        else
+          @collection = paginate(@content_type.entries)
+        end
+      end
+
+      def show
+      end
+
+      def create
+        @entry = @content_type.entries.build
+        @entry.route = params[:route] if params.key?(:route)
+        @entry.assign_content(content_params)
+
+        if @entry.save
+          render :show, status: :created, location: api_content_url(handle: @content_type.handle, id: @entry.id)
+        else
+          render json: @entry.content_errors, status: :unprocessable_entity
+        end
+      end
+
+      def update
+        @entry.route = params[:route] if params.key?(:route)
+        @entry.assign_content(content_params)
+
+        if @entry.save
+          render :show
+        else
+          render json: @entry.content_errors, status: :unprocessable_entity
+        end
+      end
+
+      def destroy
+        @entry.destroy!
+        head :no_content
+      end
+
+      private
+
+        def set_content_type
+          @content_type = ContentType.find_by!(handle: params[:handle])
+        end
+
+        def set_entry
+          @entry = if params[:id].blank?
+            raise ActiveRecord::RecordNotFound unless @content_type.single?
+            @content_type.entry
+          else
+            @content_type.entries.find(params[:id])
+          end
+        end
+
+        def content_params
+          params.fetch(:content, {}).permit!.to_h
+        end
+
+        def ensure_collection_content_type
+          head :method_not_allowed unless @content_type.collection?
+        end
+    end
+  end
+end

data/app/controllers/iron/api/openapi_controller.rb

@@ -0,0 +1,22 @@
+module Iron
+  module Api
+    class OpenapiController < BaseController
+      skip_before_action :authenticate_integration
+
+      def show
+        spec = Rails.cache.fetch(cache_key, expires_in: 1.hour) do
+          OpenapiSpec.new.to_h
+        end
+
+        render json: spec
+      end
+
+      private
+
+        def cache_key
+          latest = [ ContentType, FieldDefinition, BlockDefinition ].filter_map { |m| m.maximum(:updated_at) }.max
+          "iron/openapi/#{latest&.to_i}"
+        end
+    end
+  end
+end

data/app/controllers/iron/api/search_controller.rb

@@ -0,0 +1,15 @@
+module Iron
+  module Api
+    class SearchController < BaseController
+      include CursorPagination
+
+      def show
+        return render json: { error: "Missing required parameter: q" }, status: :bad_request if params[:q].blank?
+
+        scope = Entry.search(params[:q], locale: Current.locale)
+          .includes(:fields, content_type: :field_definitions)
+        @collection = paginate(scope)
+      end
+    end
+  end
+end

data/app/controllers/iron/api/uploads_controller.rb

@@ -0,0 +1,17 @@
+module Iron
+  module Api
+    class UploadsController < BaseController
+      before_action :ensure_can_write
+
+      def create
+        blob = ActiveStorage::Blob.create_and_upload!(
+          io: params.require(:file),
+          filename: params[:file].original_filename,
+          content_type: params[:file].content_type
+        )
+
+        render json: { signed_id: blob.signed_id }, status: :created
+      end
+    end
+  end
+end

data/app/controllers/iron/passwords_controller.rb

@@ -3,14 +3,14 @@ module Iron
     layout "iron/authentication"
     allow_unauthenticated_access
     before_action :require_email_configuration, only: %i[ new create ]
-    before_action :set_user_by_token, only: %i[ edit update ]
+    before_action :set_person_by_token, only: %i[ edit update ]
 
     def new
     end
 
     def create
-      if user = User.active.find_by(email_address: params[:email_address])
-        Iron::PasswordsMailer.reset(user).deliver_later
+      if (person = Person.find_by(email_address: params[:email_address])) && person.active?
+        Iron::PasswordsMailer.reset(person.user).deliver_later
       end
 
       redirect_to sign_in_url, notice: t("iron.passwords.notifications.reset_instructions_sent")
@@ -20,7 +20,7 @@ module Iron
     end
 
     def update
-      if @user.update(params.permit(:password, :password_confirmation))
+      if @person.update(params.permit(:password, :password_confirmation))
         redirect_to sign_in_url, notice: t("iron.passwords.notifications.reset_success")
       else
         redirect_to edit_password_url(params[:token]), alert: t("iron.passwords.alerts.passwords_mismatch")
@@ -34,9 +34,10 @@ module Iron
         end
       end
 
-      def set_user_by_token
-        @user = User.find_by_password_reset_token!(params[:token])
-        redirect_to new_password_url, alert: t("iron.passwords.alerts.reset_link_invalid") unless @user.active?
+      def set_person_by_token
+        @person = Person.find_by_password_reset_token!(params[:token])
+        @user = @person.user
+        redirect_to new_password_url, alert: t("iron.passwords.alerts.reset_link_invalid") unless @person.active?
       rescue ActiveSupport::MessageVerifier::InvalidSignature
         redirect_to new_password_url, alert: t("iron.passwords.alerts.reset_link_invalid")
       end

data/app/controllers/iron/sessions/transfers_controller.rb

@@ -9,8 +9,10 @@ module Iron
       end
 
       def update
-        if (user = User.find_by_transfer_id(params[:id])) && user.active?
-          start_new_session_for user
+        person = Person.find_by_transfer_id(params[:id])
+
+        if person&.active?
+          start_new_session_for person.user
           redirect_to after_authentication_url
         else
           redirect_to sign_in_url, alert: "Transfer link is invalid or has expired."

data/app/controllers/iron/sessions_controller.rb

@@ -10,8 +10,10 @@ module Iron
     end
 
     def create
-      if user = User.active.authenticate_by(params.permit(:email_address, :password))
-        start_new_session_for user
+      person = Person.authenticate_by(params.permit(:email_address, :password))
+
+      if person&.active?
+        start_new_session_for person.user
         redirect_to after_authentication_url
       else
         redirect_to sign_in_url, alert: "Try another email address or password."