inline_forms 8.1.21 → 8.1.42

data/app/assets/stylesheets/inline_forms_fonts.css.erb

@@ -0,0 +1,39 @@
+/*
+ * Self-hosted fonts for inline_forms, served through Sprockets (ERB) so
+ * asset_path emits correct digested URLs in every environment.
+ *
+ * - Open Sans v44 latin 400 / 400 italic: replaces the external
+ *   `@import url(http://fonts.googleapis.com/...)` that lived in
+ *   inline_forms.scss / devise.scss (insecure scheme + runtime third-party
+ *   dependency). Files live in app/assets/fonts/.
+ * - Foundation Icons v3 (MIT, ZURB): the @font-face moved here from
+ *   _foundation_icons.scss because the Dart Sass-built CSS is served from
+ *   /assets/inline_forms/inline_forms.css, so its relative font reference
+ *   resolved to /assets/inline_forms/foundation-icons.woff and 404'd; the
+ *   fonts' real logical paths are flat (/assets/foundation-icons.*).
+ */
+
+@font-face {
+  font-family: "Open Sans";
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(<%= asset_path("opensans-v44-latin-regular.woff2") %>) format("woff2");
+}
+
+@font-face {
+  font-family: "Open Sans";
+  font-style: italic;
+  font-weight: 400;
+  font-display: swap;
+  src: url(<%= asset_path("opensans-v44-latin-italic.woff2") %>) format("woff2");
+}
+
+@font-face {
+  font-family: "foundation-icons";
+  src: url(<%= asset_path("foundation-icons.woff") %>) format("woff"),
+       url(<%= asset_path("foundation-icons.ttf") %>) format("truetype"),
+       url(<%= asset_path("foundation-icons.svg") %>#fontcustom) format("svg");
+  font-weight: normal;
+  font-style: normal;
+}

data/app/controllers/inline_forms_application_controller.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class InlineFormsApplicationController < ActionController::Base
   protect_from_forgery
   # `layout 'devise' if :devise_controller?` was wrong: `:devise_controller?` is a
@@ -7,10 +8,14 @@ class InlineFormsApplicationController < ActionController::Base
   # defaults to `layouts/inline_forms` (actions may still override via `render`).
   layout ->(controller) { controller.devise_controller? ? "devise" : "inline_forms" }
 
-  # limit available locales by setting this. Override in applicaton_controller.
-  I18n.available_locales = [ :en, :nl, :pp ]
+  # NOTE (8.1.31): this class no longer clobbers I18n.available_locales.
+  # It used to hard-assign `[ :en, :nl, :pp ]` at class-load time, which ran
+  # *after* the host app's initializers in development (classes load lazily)
+  # and silently stomped any `config.i18n.available_locales` the app set.
+  # Configure available locales in the app: config/application.rb
+  #   config.i18n.available_locales = [:en, :nl, :pp]
 
-  #set the locale based on the subdomain
+  # set the locale based on the subdomain
   def set_locale
     I18n.locale = extract_locale_from_subdomain || I18n.default_locale
   end
@@ -21,5 +26,4 @@ class InlineFormsApplicationController < ActionController::Base
     return nil if locale.nil?
     I18n.available_locales.include?(locale.to_sym) ? locale.to_s : nil
   end
-
 end

data/app/controllers/inline_forms_controller.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 # == Generic controller for the inline_forms plugin.
 # === Usage
 # If you have an Example class, make an ExampleController
@@ -28,7 +29,7 @@ class InlineFormsController < ApplicationController
 
   before_action :getKlass
 
-  load_and_authorize_resource :except => :revert, :no_params => true if cancan_enabled?
+  load_and_authorize_resource except: :revert, no_params: true if cancan_enabled?
   # :index shows a list of all objects from class @Klass, using will_paginate,
   # including a link to 'new', that allows you to create a new record.
   def index
@@ -56,7 +57,7 @@ class InlineFormsController < ApplicationController
       @objects = @objects.merge(@Klass.inline_forms_search(params[:search]))
     end
     @objects = @objects.where(fk_conditions) if fk_conditions
-    @objects = @objects.paginate(:page => params[:page])
+    @objects = @objects.paginate(page: params[:page])
     respond_to do |format|
       # `not_accessible_through_html?` is about preventing direct top-level
       # HTML CRUD on this resource (e.g. /photos when only Apartment is the
@@ -136,8 +137,13 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, form_element |
+      # Skip a row whose column is not migrated yet (model edited, migration
+      # not run). Writing it would raise; the new form shows it as a pending
+      # placeholder and does not submit a value for it.
+      next if InlineForms.attribute_pending_migration?(@object, attribute, form_element)
+
       InlineForms.assert_plain_text_column!(object: @object, attribute: attribute, form_element: form_element)
-      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
+      send("#{form_element}_update", @object, attribute) unless form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
     end
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
@@ -150,20 +156,26 @@ class InlineFormsController < ApplicationController
     end
 
     if @object.save
-      flash.now[:success] = t('success', :message => @object.class.model_name.human)
+      flash.now[:success] = t("success", message: @object.class.model_name.human)
       @objects = cancan_enabled? ? @Klass.accessible_by(current_ability) : @Klass.all
       @objects = @objects.merge(@Klass.inline_forms_list) if @Klass.respond_to?(:inline_forms_list)
       if fk_conditions.nil? && params[:search].present? && @Klass.respond_to?(:inline_forms_search)
         @objects = @objects.merge(@Klass.inline_forms_search(params[:search]))
       end
       @objects = @objects.where(fk_conditions) if fk_conditions
-      @objects = @objects.paginate(:page => params[:page])
+      @objects = @objects.paginate(page: params[:page])
+      created_object = @object
       @object = nil
       respond_to do |format|
-        format.html { render_list_frame_after_save } if html_list_flow_allowed?
+        if html_list_flow_allowed?
+          if open_created_row?(created_object, attributes)
+            format.turbo_stream { render_created_row_open_streams(created_object) }
+          end
+          format.html { render_list_frame_after_save }
+        end
       end
     else
-      flash.now[:header] = ["Kan #{@object.class.to_s.underscore} niet aanmaken."]
+      flash.now[:header] = [ "Kan #{@object.class.to_s.underscore} niet aanmaken." ]
       flash.now[:error] = @object.errors.to_a
       respond_to do |format|
         @object.inline_forms_attribute_list = attributes
@@ -179,8 +191,18 @@ class InlineFormsController < ApplicationController
     @form_element = params[:form_element]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
+    # Defense-in-depth: the UI renders a pending field as a read-only
+    # placeholder (never links to edit/update), but a hand-crafted request
+    # could still target a column that is not migrated yet. Refuse cleanly
+    # instead of 500ing on the missing column.
+    if InlineForms.attribute_pending_migration?(@object, @attribute, @form_element)
+      respond_to do |format|
+        format.html { render "inline_forms/field_pending", layout: "turbo_rails/frame", status: :unprocessable_entity }
+      end
+      return
+    end
     InlineForms.assert_plain_text_column!(object: @object, attribute: @attribute, form_element: @form_element)
-    send("#{@form_element.to_s}_update", @object, @attribute)
+    send("#{@form_element}_update", @object, @attribute)
     # Branch on the actual save result. Previously the return value of
     # `@object.save` was ignored and `field_show` was rendered
     # unconditionally from the in-memory `@object`. When a save failed
@@ -262,7 +284,7 @@ class InlineFormsController < ApplicationController
   def destroy
     @update_span = params[:update]
     @object = referenced_object
-    if current_user.role? :superadmin
+    if destroy_permitted?
       @object.destroy
       # Capture after destroy: `.last` before destroy was the latest *update*
       # (e.g. a plain_text_area edit), so undo reified the pre-edit state.
@@ -291,7 +313,9 @@ class InlineFormsController < ApplicationController
     @version = PaperTrail::Version.find(params[:id])
     @parent = revert_authorization_subject(@version)
     authorize!(:revert, @parent || @Klass) if cancan_enabled?
-    return head :forbidden unless current_user.role? :superadmin
+    # Same gate as :destroy (see destroy_permitted?): superadmin when the host
+    # has the Devise+roles system, otherwise no extra gate beyond CanCan.
+    return head :forbidden unless destroy_permitted?
     return head :not_found unless @parent
 
     @object = @version.reify(
@@ -343,6 +367,19 @@ class InlineFormsController < ApplicationController
 
   private
 
+  # Hard-destroy gate. Generated apps restrict destroy to a Devise user with
+  # `role?(:superadmin)` (Role model + roles HABTM). Hosts without that role
+  # system (e.g. the engine's test/dummy harness, or apps using a different
+  # auth stack) have no gatekeeper here beyond CanCan's
+  # `load_and_authorize_resource`; pre-8.1.27 this crashed with
+  # `NoMethodError` on `nil.role?` instead of deciding either way.
+  def destroy_permitted?
+    user = respond_to?(:current_user, true) ? current_user : nil
+    return true unless user.respond_to?(:role?)
+
+    user.role?(:superadmin)
+  end
+
   # Persist a reified *primary* record (Apartment, Photo, ...) for +revert+.
   #
   # +reify+ on a +destroy+ version returns a record with +new_record? == true+
@@ -459,13 +496,13 @@ class InlineFormsController < ApplicationController
     row_html = render_to_string(
       "inline_forms/row_close",
       layout: false,
-      formats: [:html],
+      formats: [ :html ],
       locals: { update_span: row_id, object: @parent, inline_forms_turbo_row: true }
     )
     versions_html = render_to_string(
       "inline_forms/versions_panel",
       layout: false,
-      formats: [:html],
+      formats: [ :html ],
       locals: { update_span: versions_id, object: @parent, inline_forms_turbo_row: true }
     )
     render turbo_stream: [
@@ -523,6 +560,44 @@ class InlineFormsController < ApplicationController
     render "inline_forms/create_list_frame", layout: associated_list_frame_layout
   end
 
+  # "Open after create" (stuff/2026-07-10-nested-creation-options.md, Option A).
+  #
+  # An `:associated` (has_many) panel only exists on a persisted record, so the
+  # new form hides it and the user historically had to find and reopen the
+  # record to add children. When a *top-level* create succeeds for a class
+  # whose attribute list has an `:associated` panel, respond with Turbo
+  # Streams that refresh the list *and* open the new record's row, landing the
+  # user where the nested panel (and its "new" link) is immediately usable.
+  #
+  # Nested creates are excluded (they already return to the parent's panel),
+  # and requests without a turbo-stream Accept header fall through to the
+  # plain list-frame response.
+  def open_created_row?(created_object, attributes)
+    return false if @parent_class.present?
+    attributes.any? { |_attribute, form_element, *| form_element.to_sym == :associated }
+  end
+
+  def render_created_row_open_streams(created_object)
+    list_frame_id = @update_span
+    @ul_needed = true
+    list_html = render_to_string(partial: "inline_forms/list", formats: [ :html ])
+
+    row_id = helpers.inline_forms_row_turbo_frame_id(created_object)
+    @object = created_object
+    @update_span = row_id
+    @inline_forms_turbo_row = true
+    row_html = render_to_string("inline_forms/row_show", layout: false, formats: [ :html ])
+
+    # Streams apply in order: the first inserts the fresh list (containing the
+    # new record's closed row frame), the second swaps that row open. If the
+    # new record sorted onto another page, the second replace finds no target
+    # and degrades silently to today's list-refresh behavior.
+    render turbo_stream: [
+      turbo_stream.replace(list_frame_id, list_html),
+      turbo_stream.replace(row_id, row_html)
+    ]
+  end
+
   def associated_list_frame_layout
     # Use full inline_forms chrome so the swapped frame is styled; Turbo extracts
     # the matching <turbo-frame id="…"> from the response body.
@@ -579,7 +654,7 @@ class InlineFormsController < ApplicationController
   # Get the class from the controller name.
   # CountryController < InlineFormsController, so what class are we?
   # TODO think about this a bit more.
-  def getKlass #:doc:
+  def getKlass # :doc:
     @Klass = self.controller_name.classify.constantize
     InlineForms.validate_plain_text_configuration_for!(@Klass)
     @Klass
@@ -596,5 +671,4 @@ class InlineFormsController < ApplicationController
   def revert_params
     params.require(:id).permit(:update)
   end
-
 end

data/app/helpers/inline_forms_helper.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 module InlineFormsHelper
   include InlineForms::FormElements::HelperIncludes
 
@@ -6,6 +7,46 @@ module InlineFormsHelper
     InlineForms::VERSION
   end
 
+  # Pattern 1 preset theming (8.1.29; stuff/user-preferences-and-theming.md).
+  # Emits the <body> theme class. The host's user model opts in by responding
+  # to #inline_forms_theme with one of the preset names shipped in _theme.scss
+  # (default | dark | sepia | high-contrast); installer-generated user models
+  # store an integer `theme` column and map it. Anonymous users, or hosts
+  # without the method, get the default palette.
+  def inline_forms_body_theme_class
+    user = respond_to?(:current_user) ? current_user : nil
+    theme = user.inline_forms_theme.to_s if user.respond_to?(:inline_forms_theme)
+    theme = "default" if theme.blank? || !theme.match?(/\A[a-z][a-z-]*\z/)
+    "theme-#{theme}"
+  end
+
+  # Pattern 2 theming (8.1.32): per-user color overrides as an inline <style>
+  # in <head>. The host's user model opts in by responding to
+  # #inline_forms_color_overrides with a hash of `--if-color-` suffix => hex,
+  # e.g. { 'primary' => '#2563eb', 'accent' => '#7c3aed' }. Every key and
+  # value is re-validated here before interpolation (never trust a column
+  # edited outside the app), and the rules are scoped to the current theme
+  # class so they win the cascade over the preset palette (same specificity,
+  # later in the document).
+  def inline_forms_user_color_overrides_style
+    user = respond_to?(:current_user) ? current_user : nil
+    return unless user.respond_to?(:inline_forms_color_overrides)
+
+    overrides = user.inline_forms_color_overrides
+    return if overrides.blank?
+
+    rules = overrides.filter_map do |key, value|
+      next unless key.to_s.match?(/\A[a-z][a-z-]*\z/)
+      next unless value.to_s.match?(/\A#\h{6}\z/i)
+
+      "--if-color-#{key}: #{value};"
+    end
+    return if rules.empty?
+
+    css = "body.#{inline_forms_body_theme_class} { #{rules.join(' ')} }"
+    content_tag(:style, css.html_safe, id: "inline_forms_user_color_overrides")
+  end
+
   # Returns versions for `object`, merged with versions of any associated
   # `ActionText::RichText` records (Rails `has_rich_text :foo` declarations).
   #
@@ -181,7 +222,7 @@ module InlineFormsHelper
 
   # link to versions list
   def link_to_versions_list(path_to_versions_list, object, update_span, html_class = "button new_button", turbo_row: true)
-    if can? :list_versions, object
+    if cancan_disabled? || can?(:list_versions, object)
       if defined?(PaperTrail) && object.respond_to?(:versions)
         path = send(path_to_versions_list, object, update: update_span)
         opts = { class: html_class, title: t("inline_forms.view.list_versions") }
@@ -250,14 +291,14 @@ module InlineFormsHelper
   # Pass +from_callee:+ +__callee__+ from the enclosing +*_show+ method so the edit route receives the correct form element name.
   # When +turbo_frame:+ is true the link targets +_self+; otherwise it targets the
   # field frame id (+css_class_id+) so edit works without a surrounding +_show+ wrap.
-  def link_to_inline_edit(object, attribute, attribute_value='', from_callee:, turbo_frame: false)
+  def link_to_inline_edit(object, attribute, attribute_value = "", from_callee:, turbo_frame: false)
     form_element = InlineForms.form_element_string_from_callee(from_callee)
     attribute_value = attribute_value.to_s
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     value = h(attribute_value) + ("&nbsp;" * spaces).html_safe
     css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
     use_turbo_frame = turbo_frame || (@inline_forms_turbo_field == true)
-    if (cancan_disabled? rescue true) || ( can? :update, object, attribute )
+    if (cancan_disabled? rescue true) || (can? :update, object, attribute)
       # some problem with concerns makes this function not available when called direct. FIXME
       link_opts = if use_turbo_frame
         { data: { turbo: true, turbo_frame: "_self" } }
@@ -267,9 +308,9 @@ module InlineFormsHelper
       link_to value,
         edit_polymorphic_path(
           object,
-          :attribute => attribute.to_s,
-          :form_element => form_element,
-          :update => css_class_id ),
+          attribute: attribute.to_s,
+          form_element: form_element,
+          update: css_class_id),
         link_opts
     else
       h(attribute_value)
@@ -280,16 +321,16 @@ module InlineFormsHelper
   def locale_url(request, locale)
     subdomains = request.subdomains
     # if there are no subdomains, prepend the locale to the domain
-    return request.protocol + [ locale, request.domain ].join('.') + request.port_string if subdomains.empty?
+    return request.protocol + [ locale, request.domain ].join(".") + request.port_string if subdomains.empty?
     # if there is a subdomain, find out if it's an available locale and strip it
     subdomains.shift if I18n.available_locales.include?(subdomains.first.to_sym)
     # if there are no subdomains, prepend the locale to the domain
-    return request.protocol + [ locale, request.domain ].join('.') + request.port_string if subdomains.empty?
+    return request.protocol + [ locale, request.domain ].join(".") + request.port_string if subdomains.empty?
     # else return the rest
-    request.protocol + [ locale, subdomains.join('.'), request.domain ].join('.') + request.port_string
+    request.protocol + [ locale, subdomains.join("."), request.domain ].join(".") + request.port_string
   end
 
-  def translated_attribute(object,attribute)
+  def translated_attribute(object, attribute)
     t("activerecord.attributes.#{object.class.name.underscore}.#{attribute}")
     #          "activerecord.attributes.#{attribute}",
     #          "attributes.#{attribute}" ] )
@@ -333,19 +374,22 @@ module InlineFormsHelper
 
     attributes = @inline_forms_attribute_list || object.inline_forms_attribute_list # if we do this as a form_element, @inline.. is nil!!!
     values = attributes.assoc(attribute.to_sym)[2]
-    raise t("fatal.no_values_defined_in", @Klass, attribute) if values.nil?
+    # (was `raise t("fatal.no_values_defined_in", @Klass, attribute)` — Rails'
+    # translate takes a key plus keyword interpolations, so the raise itself
+    # crashed with ArgumentError instead of reporting the real problem.)
+    raise "inline_forms: no values defined in #{object.class} for #{attribute} (add a values hash to the inline_forms_attribute_list row)" if values.nil?
     if values.is_a?(Hash)
       temp = Array.new
-      values.to_a.each do |k,v|
+      values.to_a.each do |k, v|
         temp << [ k, t(v) ]
       end
-      values = temp.sort {|a,b| a[0]<=>b[0]}
+      values = temp.sort { |a, b| a[0]<=>b[0] }
     else
       temp = Array.new
       values.to_a.each_index do |i|
         temp << [ i, t(values.to_a[i]) ]
       end
-      values = temp.sort {|a,b| a[1]<=>b[1]}
+      values = temp.sort { |a, b| a[1]<=>b[1] }
     end
     values
   end
@@ -359,5 +403,4 @@ module InlineFormsHelper
     user = user_class.find_by(id: id)
     user.nil? ? "Unknown" : user.name
   end
-
 end

data/app/models/concerns/inline_forms/soft_deletable.rb

@@ -1,18 +1,18 @@
 module InlineForms::SoftDeletable
   extend ActiveSupport::Concern
 
-# you need to put this in the model:
-#  include InlineForms::SoftDeletable
-#  enum deleted: { active: 1, deleted: 2 }
+  # you need to put this in the model:
+  #  include InlineForms::SoftDeletable
+  #  enum deleted: { active: 1, deleted: 2 }
 
-# you need a migration like this:
-# class AddDeletedAtColumnToUser < ActiveRecord::Migration[6.0]
-#   def change
-#     add_column :users, :deleted_at, :datetime, default: nil
-#     add_column :users, :deleted, :integer, default: 1
-#     add_column :users, :deleted_by, :integer, default: nil
-#   end
-# end
+  # you need a migration like this:
+  # class AddDeletedAtColumnToUser < ActiveRecord::Migration[6.0]
+  #   def change
+  #     add_column :users, :deleted_at, :datetime, default: nil
+  #     add_column :users, :deleted, :integer, default: 1
+  #     add_column :users, :deleted_by, :integer, default: nil
+  #   end
+  # end
 
   def soft_deletable?
     true
@@ -31,5 +31,4 @@ module InlineForms::SoftDeletable
     self.deleted_at = nil
     save
   end
-
 end

data/app/validators/curacao_id_number_validator.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-class CuracaoIdNumberValidator < ActiveModel::EachValidator
 
+class CuracaoIdNumberValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value =~ /^[0-9]{10}$/
       year  = value[0..3].to_i
@@ -10,14 +10,13 @@ class CuracaoIdNumberValidator < ActiveModel::EachValidator
       begin
         DateTime.civil(year, month, day)
       rescue ArgumentError
-        record.errors.add(attribute.to_sym, options[:message] || "not a valid date" )
+        record.errors.add(attribute.to_sym, options[:message] || "not a valid date")
       end
     else
-      record.errors.add(attribute.to_sym, options[:message] || "is not a number" )
+      record.errors.add(attribute.to_sym, options[:message] || "is not a number")
     end
   end
-
 end
 
-#"moet bestaan uit tien cijfers (bijvoorbeeld 1983040812)."
-#"moet een datum zijn."
+# "moet bestaan uit tien cijfers (bijvoorbeeld 1983040812)."
+# "moet een datum zijn."

data/app/validators/is_curacao_phone_validator.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
+
 # == usage:
 # in your model, add:
 #  validates :email, :presence => true, :is_email_address => true;
 # taken from http://lindsaar.net/2010/1/31/validates_rails_3_awesome_is_true
 # (It's probably a fake regex but hey, it looks legit.)
 class IsCuracaoPhoneValidator < ActiveModel::EachValidator
-
   def error_message
     "is geen geldig Curaçao telefoon nummer."
   end
@@ -16,8 +16,7 @@ class IsCuracaoPhoneValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
     unless value =~ /[4-8][0-9]{6}/
-      record.errors[attribute] << (options[:message] || error_message )
+      record.errors[attribute] << (options[:message] || error_message)
     end
   end
-
 end

data/app/validators/is_email_address_validator.rb

@@ -1,4 +1,5 @@
 # -*- encoding : binary -*-
+
 # == usage:
 # in your model, add:
 #  validates :email, :presence => true, :is_email_address => true;
@@ -25,11 +26,10 @@ class IsEmailAddressValidator < ActiveModel::EachValidator
   def error_message
     "is not a valid email address."
   end
-  
+
   def validate_each(record, attribute, value)
     unless value =~ EmailAddress
-      record.errors[attribute] << (options[:message] || error_message )
+      record.errors[attribute] << (options[:message] || error_message)
     end
   end
-
 end

data/app/validators/must_be_a_value_validator.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
+
 # == usage:
 # in your model, add:
 #  validates :sex, :must_be_a_value => true;
-# 
+#
 #  this checks against the objects attribute_values
 class MustBeAValueValidator < ActiveModel::EachValidator
-
   def error_message
     "is geen geldige keuze."
   end
@@ -16,7 +16,7 @@ class MustBeAValueValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     values = attribute_values(record, attribute)
     if values.assoc(value).nil?
-      record.errors[attribute] << (options[:message] || error_message )
+      record.errors[attribute] << (options[:message] || error_message)
     end
   end
 
@@ -48,16 +48,16 @@ class MustBeAValueValidator < ActiveModel::EachValidator
     raise "No Values defined in #{@Klass}, #{attribute}" if values.nil?
     if values.is_a?(Hash)
       temp = Array.new
-      values.to_a.each do |k,v|
+      values.to_a.each do |k, v|
         temp << [ k, v ]
       end
-      values = temp.sort {|a,b| a[0]<=>b[0]}
+      values = temp.sort { |a, b| a[0]<=>b[0] }
     else
       temp = Array.new
       values.to_a.each_index do |i|
         temp << [ i, values.to_a[i] ]
       end
-      values = temp.sort {|a,b| a[1]<=>b[1]}
+      values = temp.sort { |a, b| a[1]<=>b[1] }
     end
     values
   end

data/app/views/inline_forms/_new.html.erb

@@ -42,7 +42,10 @@
     <% attributes.each do | attribute, form_element | -%>
       <% unless form_element.to_sym == :associated || (cancan_enabled? && cannot?(:read, @object, attribute)) -%>
         <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
-        <% if form_element && form_element.to_sym == :header %>
+        <% if InlineForms.attribute_pending_migration?(@object, attribute, form_element) %>
+          <%= render partial: "inline_forms/pending_migration_row",
+                locals: { object: @object, attribute: attribute } %>
+        <% elsif form_element && form_element.to_sym == :header %>
           <div class="row form_element_header" >
             <div class='large-12 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
               <%= @object.human_attribute_name(attribute) -%>

data/app/views/inline_forms/_pending_migration_row.html.erb

@@ -0,0 +1,15 @@
+<%# Rendered in place of a field whose column does not exist yet (the model
+    file has the attribute_list row but its migration has not run). Read-only,
+    harmless, self-explanatory — see InlineForms.attribute_pending_migration?. %>
+<div class="row pending_migration_row <%= cycle('odd', 'even') %>">
+  <div class='medium-5 large-5 column'>
+    <%= render partial: "inline_forms/attribute_label",
+          locals: { object: object, attribute: attribute } -%>
+  </div>
+  <div class='medium-7 large-7 column'>
+    <span class="pending_migration_notice">
+      <%= t("inline_forms.pending_migration.notice",
+            default: "pending migration \u2014 run rails db:migrate") -%>
+    </span>
+  </div>
+</div>

data/app/views/inline_forms/_show.html.erb

@@ -23,7 +23,10 @@
     <% attributes.each do | attribute, form_element | -%>
       <% if cancan_disabled? || can?(:read, @object, attribute) %>
         <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
-        <% if form_element == :header %>
+        <% if InlineForms.attribute_pending_migration?(@object, attribute, form_element) %>
+          <%= render partial: "inline_forms/pending_migration_row",
+                locals: { object: @object, attribute: attribute } %>
+        <% elsif form_element == :header %>
           <div class="row form_element_header">
             <div class='large-12 column' >
               <%= @object.class.human_attribute_name(attribute) -%>
@@ -86,7 +89,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% if can? :list_versions, @object  %>
+    <% if cancan_disabled? || can?(:list_versions, @object) %>
       <% css_class_id = inline_forms_versions_turbo_frame_id(@object) -%>
       <turbo-frame id="<%= css_class_id -%>">
         <%= render "versions" %>

data/app/views/inline_forms/field_pending.html.erb

@@ -0,0 +1,10 @@
+<%# Turbo-frame response for a forced field request (show/edit/update) against
+    an attribute whose column does not exist yet. The UI never links here (the
+    row renders as a pending placeholder in _show), so this is defense-in-depth
+    for a hand-crafted request during the pre-migrate window. %>
+<turbo-frame id="<%= @update_span %>">
+  <span class="pending_migration_notice">
+    <%= t("inline_forms.pending_migration.notice",
+          default: "pending migration \u2014 run rails db:migrate") -%>
+  </span>
+</turbo-frame>

data/app/views/layouts/application.html.erb

@@ -7,11 +7,13 @@
       <%= t('inline_forms.general.application_title') %> v<%= InlineForms::VERSION %>
     </title>
     <%= stylesheet_link_tag "application" %>
-    <%= stylesheet_link_tag "https://unpkg.com/trix@1.3.1/dist/trix.css" %>
+    <%= stylesheet_link_tag "inline_forms_fonts" %>
+    <%= stylesheet_link_tag "trix" %>
+    <%= inline_forms_user_color_overrides_style %>
     <%= csrf_meta_tags %>
   </head>
 
-  <body>
+  <body class="<%= inline_forms_body_theme_class %>">
     <%= yield %>
     <%= javascript_include_tag "application" %>
     <%# Turbo (Hotwire) is loaded as an ES module so it does not collide with %>
@@ -21,6 +23,7 @@
       import { Turbo } from "<%= asset_path('turbo.min.js') %>"
       window.Turbo = Turbo
     </script>
-    <%= javascript_include_tag "https://unpkg.com/trix@1.3.1/dist/trix.js" %>
+    <%# Trix 2 (vendored; no CDN). Self-registers its custom elements on load. %>
+    <%= javascript_include_tag "trix.min" %>
   </body>
 </html>