inline_forms 8.1.21 → 8.1.42

data/lib/inline_forms/attribute_list.rb

@@ -0,0 +1,191 @@
+# -*- encoding : utf-8 -*-
+
+module InlineForms
+  # A structured, mutable view over a model's `inline_forms_attribute_list`.
+  #
+  # The list has always been (and remains) an Array of positional rows:
+  #
+  #   [ :name,      :text_field ]
+  #   [ :priority,  :dropdown_with_values, { 1 => 'low', 2 => 'high' } ]
+  #   [ :priority2, :dropdown_with_values, { 1 => 'low', 2 => 'high' }, [ 2 ] ]
+  #
+  # where index 0 is the attribute, index 1 the form element, index 2 an
+  # optional values hash, and index 3 an optional disabled-options array.
+  #
+  # Every downstream consumer relies on that shape: the views destructure
+  # `|attribute, form_element|`, and the helpers/validator fetch the values
+  # hash positionally with `list.assoc(attr)[2]`. `AttributeList` therefore
+  # *subclasses Array* and keeps rows as plain arrays — so an `AttributeList`
+  # IS a valid attribute list everywhere the old literal array was, with zero
+  # migration. What it adds is a small DSL/API for building and editing the
+  # list procedurally (append / insert / remove / move / replace) instead of
+  # hand-editing an array literal or regex-surgery on model source.
+  #
+  # Build fresh:
+  #
+  #   InlineForms::AttributeList.build do
+  #     header :basics
+  #     field  :name,     :text_field
+  #     field  :priority, :dropdown_with_values, values: { 1 => 'low', 2 => 'high' }
+  #     info   :created_at, :updated_at
+  #   end
+  #
+  # Wrap and edit an existing list (what generators / the staging pipeline do):
+  #
+  #   InlineForms::AttributeList.wrap(model.inline_forms_attribute_list)
+  #     .insert_after(:name, :internal_note, :text_field)
+  #     .remove(:legacy_field)
+  #
+  # Mutating methods return self, so calls chain.
+  class AttributeList < Array
+    # Build a list from a block evaluated in the list's context.
+    def self.build(&block)
+      list = new
+      list.instance_eval(&block) if block
+      list
+    end
+
+    # Return `rows` as an AttributeList without copying when it already is one.
+    def self.wrap(rows)
+      return rows if rows.is_a?(self)
+
+      new(rows || [])
+    end
+
+    # -- builder / append -------------------------------------------------
+
+    # Append a row. `values` becomes index 2, `disabled` index 3 (disabled
+    # requires values, since the slot is positional).
+    def field(name, form_element, values: nil, disabled: nil)
+      push(build_row(name, form_element, values, disabled))
+      self
+    end
+    alias add field
+
+    # Append a `:header` pseudo-row (no column, no form element behavior).
+    def header(name)
+      field(name, :header)
+    end
+
+    # Append one or more read-only `:info` rows.
+    def info(*names)
+      names.each { |n| field(n, :info) }
+      self
+    end
+
+    # -- insertion --------------------------------------------------------
+
+    def insert_after(anchor, name, form_element, values: nil, disabled: nil)
+      insert_relative(anchor, 1, build_row(name, form_element, values, disabled))
+    end
+
+    def insert_before(anchor, name, form_element, values: nil, disabled: nil)
+      insert_relative(anchor, 0, build_row(name, form_element, values, disabled))
+    end
+
+    # -- removal ----------------------------------------------------------
+
+    # Remove every row for `name`. Idempotent: absent name is a no-op.
+    def remove(name)
+      sym = name.to_sym
+      reject! { |row| row_name(row) == sym }
+      self
+    end
+
+    # -- reordering -------------------------------------------------------
+
+    def move_after(name, anchor)
+      relocate(name, anchor, 1)
+    end
+
+    def move_before(name, anchor)
+      relocate(name, anchor, 0)
+    end
+
+    # -- replacement ------------------------------------------------------
+
+    # Swap the form element (and optional values/disabled) for an existing
+    # attribute, preserving its position. No-op if the attribute is absent.
+    def replace_element(name, form_element, values: nil, disabled: nil)
+      idx = index_of(name)
+      return self unless idx
+
+      self[idx] = build_row(name, form_element, values, disabled)
+      self
+    end
+
+    # -- queries ----------------------------------------------------------
+
+    def index_of(name)
+      sym = name.to_sym
+      index { |row| row_name(row) == sym }
+    end
+
+    def include_attribute?(name)
+      !index_of(name).nil?
+    end
+
+    def row_for(name)
+      sym = name.to_sym
+      find { |row| row_name(row) == sym }
+    end
+
+    # The form element symbol for `name`, or nil.
+    def form_element_for(name)
+      row = row_for(name)
+      row && row[1]
+    end
+
+    # The values hash for `name` (row index 2), or nil.
+    def values_for(name)
+      row = row_for(name)
+      row && row[2]
+    end
+
+    def names
+      map { |row| row_name(row) }
+    end
+
+    private
+
+    def row_name(row)
+      first = row.respond_to?(:first) ? row.first : nil
+      first&.to_sym
+    end
+
+    def build_row(name, form_element, values, disabled)
+      raise ArgumentError, "disabled: requires values: (the row slot is positional)" if !disabled.nil? && values.nil?
+
+      row = [ name.to_sym, form_element.to_sym ]
+      row << values unless values.nil?
+      row << disabled unless disabled.nil?
+      row
+    end
+
+    def insert_relative(anchor, offset, row)
+      idx = index_of(anchor)
+      raise ArgumentError, "insert anchor :#{anchor} not found in attribute list" unless idx
+
+      insert(idx + offset, row)
+      self
+    end
+
+    def relocate(name, anchor, offset)
+      row = row_for(name)
+      raise ArgumentError, "move target :#{name} not found in attribute list" unless row
+      raise ArgumentError, "cannot move :#{name} relative to itself" if name.to_sym == anchor.to_sym
+
+      remove(name)
+      idx = index_of(anchor)
+      raise ArgumentError, "move anchor :#{anchor} not found in attribute list" unless idx
+
+      insert(idx + offset, row)
+      self
+    end
+  end
+
+  # Convenience entry point mirroring AttributeList.build.
+  def self.attribute_list(&block)
+    AttributeList.build(&block)
+  end
+end

data/lib/inline_forms/form_element_from_callee.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 module InlineForms
   # Maps +__callee__+ from a +*_show+ helper to the +params[:form_element]+ string
   # (e.g. +:text_field_show+ → +"text_field"+).

data/lib/inline_forms/form_element_registry.rb

@@ -3,38 +3,38 @@
 module InlineForms
   module FormElementRegistry
     ENTRIES = {
-      :audio_field => :string,
-      :check_box => :boolean,
-      :check_list => :no_migration,
-      :date_select => :date,
-      :decimal_field => :decimal,
-      :devise_password_field => :string,
-      :dropdown => :belongs_to,
-      :dropdown_with_integers => :integer,
-      :dropdown_with_other => :belongs_to,
-      :dropdown_with_values => :integer,
-      :dropdown_with_values_with_stars => :integer,
-      :file_field => :string,
-      :header => :string,
-      :image_field => :string,
-      :info => :string,
-      :integer_field => :integer,
-      :money_field => :integer,
-      :month_select => :integer,
-      :month_year_picker => :date,
-      :multi_image_field => :string,
-      :plain_text => :text,
-      :plain_text_area => :text,
-      :question_list => :no_migration,
-      :radio_button => :integer,
-      :rich_text => :no_migration,
-      :scale_with_integers => :integer,
-      :scale_with_values => :integer,
-      :simple_file_field => :string,
-      :slider_with_values => :integer,
-      :text_area => :text,
-      :text_field => :string,
-      :time_select => :time,
+      audio_field: :string,
+      check_box: :boolean,
+      check_list: :no_migration,
+      color_field: :string,
+      date_select: :date,
+      decimal_field: :decimal,
+      devise_password_field: :string,
+      dropdown: :belongs_to,
+      dropdown_with_integers: :integer,
+      dropdown_with_other: :belongs_to,
+      dropdown_with_values: :integer,
+      dropdown_with_values_with_stars: :integer,
+      file_field: :string,
+      header: :string,
+      image_field: :string,
+      info: :string,
+      integer_field: :integer,
+      money_field: :integer,
+      month_select: :integer,
+      month_year_picker: :date,
+      multi_image_field: :string,
+      plain_text: :text,
+      plain_text_area: :text,
+      radio_button: :integer,
+      rich_text: :no_migration,
+      scale_with_integers: :integer,
+      scale_with_values: :integer,
+      simple_file_field: :string,
+      slider_with_values: :integer,
+      text_area: :text,
+      text_field: :string,
+      time_select: :time
     }.freeze
 
     def self.apply!

data/lib/inline_forms/form_elements/color_field_helper.rb

@@ -0,0 +1,44 @@
+# -*- encoding : utf-8 -*-
+module InlineForms
+  module FormElements
+    module ColorFieldHelper
+      module_eval(<<~'INLINE_FORMS_FORM_ELEMENT', __FILE__, __LINE__ + 1)
+    # -*- encoding : utf-8 -*-
+    
+    # color_field (8.1.32): hex color stored as "#rrggbb" in a string column,
+    # edited with the native <input type="color"> picker. Introduced for the
+    # per-user theme color overrides (Pattern 2), usable anywhere.
+    def color_field_show(object, attribute)
+      value = object.send(attribute).to_s
+      display =
+        if value.match?(/\A#\h{6}\z/)
+          # Swatch + hex text. The value is validated above, so the inline
+          # style cannot carry anything but the color.
+          ("<span class='color_swatch' style='display:inline-block;width:1em;height:1em;" \
+           "vertical-align:-0.15em;border:1px solid #8888;background-color:#{value};'></span> " \
+           "#{value}").html_safe
+        else
+          "<i class='fi-plus'></i>".html_safe
+        end
+      link_to_inline_edit object, attribute, display, from_callee: __callee__
+    end
+    
+    def color_field_edit(object, attribute)
+      css_id = 'color_field_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.to_s
+      current = object.send(attribute).to_s
+      current = "#000000" unless current.match?(/\A#\h{6}\z/)
+      color_field_tag attribute, current, :id => css_id, :class => 'color_field'
+    end
+    
+    def color_field_update(object, attribute)
+      raw = params[attribute.to_sym].to_s.strip.downcase
+      object[attribute.to_sym] = raw.match?(/\A#\h{6}\z/) ? raw : nil
+    end
+    
+    def color_field_info(object, attribute)
+      object.send(attribute).to_s
+    end
+      INLINE_FORMS_FORM_ELEMENT
+    end
+  end
+end

data/lib/inline_forms/form_elements/date_helper.rb

@@ -10,9 +10,12 @@ module InlineForms
       link_to_inline_edit object, attribute, object.send(attribute).nil? ? "<i class='fi-plus'></i>".html_safe : object.send(attribute).to_date.strftime("%d-%m-%Y"), from_callee: __callee__
     end
     
+    # Native <input type="date"> (8.1.25; replaces jQuery UI datepicker).
+    # The browser shows a locale-formatted date but always submits ISO 8601
+    # (YYYY-MM-DD), which Active Record casts directly.
     def date_select_edit(object, attribute)
       css_id = 'datepicker_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.to_s
-      out = text_field_tag attribute, ( object.send(attribute).nil? ? "" : object.send(attribute).to_date.strftime("%d-%m-%Y") ), :id => css_id, :class =>'datepicker'
+      date_field_tag attribute, ( object.send(attribute).nil? ? "" : object.send(attribute).to_date.strftime("%F") ), :id => css_id, :class => 'date_select'
     end
     
     def date_select_update(object, attribute)

data/lib/inline_forms/form_elements/dropdown_with_other_helper.rb

@@ -19,124 +19,38 @@ module InlineForms
       link_to_inline_edit object, attribute, attribute_value, from_callee: __callee__
     end
     
+    # Native combobox (8.1.26; replaces the jQuery UI autocomplete widget and
+    # its inline <script>): a text input backed by a <datalist> of the existing
+    # records. Typing a listed presentation picks that record; any other text
+    # becomes the free-form "other" value. The old hidden <select> is gone --
+    # dropdown_with_other_update never read the posted foreign key anyway (it
+    # re-derives it by name lookup from the submitted text).
     def dropdown_with_other_edit(object, attribute)
       attribute = attribute.to_s
       foreign_key = object.class.reflect_on_association(attribute.to_sym).options[:foreign_key] || attribute.foreign_key.to_sym
       o = attribute.camelcase.constantize
       values = o.all
       values = o.accessible_by(current_ability) if cancan_enabled?
-      values.each do |v|
-        v.name = v._presentation
-      end
-      # values.sort_by(&:name)
     
-      collection = values.map {|v|[v.name, v.id]}
-      collection << [object[attribute + '_other'], 0] unless object[attribute + '_other'].nil? || object[attribute + '_other'].empty?
-      out = '<div class="ui-widget">'
-      out << select('_' + object.class.to_s.underscore, foreign_key.to_sym, collection, {selected: object[foreign_key.to_sym]}, {id: '_' + object.class.to_s.underscore + '_' + object.id.to_s + '_'  + foreign_key.to_s})
-      out << '</div>
-      <script>
-        (function( $ ) {
-        $.widget( "custom.combobox", {
-          _create: function() {
-            this.wrapper = $( "<span>" )
-              .addClass( "custom-combobox" )
-              .insertAfter( this.element );
-     
-            this.element.hide();
-            this._createAutocomplete();
-            this._createShowAllButton();
-          },
-     
-          _createAutocomplete: function() {
-            var selected = this.element.children( ":selected" ),
-              value = selected.val() ? selected.text() : "";
-     
-            this.input = $( "<input name=\''
-            
-        out << '_' + object.class.to_s.underscore + '[' + attribute + '_other]' 
-            
-            out << '\'>" )
-              .appendTo( this.wrapper )
-              .val( value )
-              .attr( "title", "" )
-              .addClass( "custom-combobox-input ui-widget ui-widget-content ui-state-default ui-corner-left" )
-              .autocomplete({
-                delay: 0,
-                minLength: 0,
-                source: $.proxy( this, "_source" )
-              })
-              .tooltip({
-                tooltipClass: "ui-state-highlight"
-              });
-     
-            this._on( this.input, {
-              autocompleteselect: function( event, ui ) {
-                ui.item.option.selected = true;
-                this._trigger( "select", event, {
-                  item: ui.item.option
-                });
-              }
-            });
-          },
-     
-          _createShowAllButton: function() {
-            var input = this.input,
-              wasOpen = false;
-     
-            $( "<a>" )
-              .attr( "tabIndex", -1 )
-              .attr( "title", "Show All Items" )
-              .tooltip()
-              .appendTo( this.wrapper )
-              .button({
-                icons: {
-                  primary: "ui-icon-triangle-1-s"
-                },
-                text: false
-              })
-              .removeClass( "ui-corner-all" )
-              .addClass( "custom-combobox-toggle ui-corner-right" )
-              .mousedown(function() {
-                wasOpen = input.autocomplete( "widget" ).is( ":visible" );
-              })
-              .click(function() {
-                input.focus();
-     
-                // Close if already visible
-                if ( wasOpen ) {
-                  return;
-                }
-     
-                // Pass empty string as value to search for, displaying all results
-                input.autocomplete( "search", "" );
-              });
-          },
-     
-          _source: function( request, response ) {
-            var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
-            response( this.element.children( "option" ).map(function() {
-              var text = $( this ).text();
-              if ( this.value && ( !request.term || matcher.test(text) ) )
-                return {
-                  label: text,
-                  value: text,
-                  option: this
-                };
-            }) );
-          },
-        });
-      })( jQuery );
-     
-      $(function() {
-        $( "'
-        out << '#_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.foreign_key.to_s 
-        out << '" ).combobox();
-      });
-      </script>'
-      out.html_safe
-      
-      
+      current =
+        if object[foreign_key].to_i == 0
+          object[attribute + '_other'].to_s
+        else
+          (object.send(attribute)._presentation rescue '')
+        end
+    
+      input_name  = '_' + object.class.to_s.underscore + '[' + attribute + '_other]'
+      input_id    = '_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + foreign_key.to_s
+      datalist_id = input_id + '_options'
+    
+      options = values.map { |v| content_tag(:option, nil, value: v._presentation) }.join.html_safe
+    
+      text_field_tag(input_name, current,
+                     id: input_id,
+                     list: datalist_id,
+                     class: 'dropdown_with_other',
+                     autocomplete: 'off') +
+        content_tag(:datalist, options, id: datalist_id)
     end
     
     def dropdown_with_other_update(object, attribute)
@@ -148,9 +62,7 @@ module InlineForms
       lookup_model = attribute.camelcase.constantize
       name_field = 'name_' + I18n.locale.to_s
       name_field = 'name' unless lookup_model.new.respond_to? name_field
-      puts 'XXXXXXXXXXXXXXXXXXXX ' + name_field.inspect
       match = lookup_model.where(name_field.to_sym => other).first # problem if there are dupes!
-      puts 'XXXXXXXXXXXXXXXXXXXX ' + match.inspect
       match.nil? ? object[foreign_key] = 0 : object[foreign_key] = match.id # problem if there is a record with id: 0 !
       match.nil? ? object[attribute + '_other'] = other : object[attribute + '_other'] = nil  
     end

data/lib/inline_forms/form_elements/month_year_picker_helper.rb

@@ -10,14 +10,25 @@ module InlineForms
       link_to_inline_edit object, attribute, object.send(attribute).nil? ? "<i class='fi-plus'></i>".html_safe : object.send(attribute).strftime("%B %Y"), from_callee: __callee__
     end
     
+    # Native <input type="month"> (8.1.25; replaces the jQuery UI month/year
+    # datepicker hack). Submits ISO "YYYY-MM"; stored as the first of month.
     def month_year_picker_edit(object, attribute)
       css_id = 'datepicker_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.to_s
-      out = text_field_tag attribute, ( object.send(attribute).nil? ? "" : object.send(attribute).strftime("%B %Y") ), :id => css_id, :class =>'datepicker datepicker-month-year'
+      month_field_tag attribute, ( object.send(attribute).nil? ? "" : object.send(attribute).strftime("%Y-%m") ), :id => css_id, :class => 'month_year_picker'
     end
     
     def month_year_picker_update(object, attribute)
       raw = params[attribute.to_sym].to_s
-      object[attribute.to_sym] = raw.empty? ? nil : Date.parse(raw).strftime("%F").to_s
+      object[attribute.to_sym] =
+        if raw.empty?
+          nil
+        elsif raw.match?(/\A\d{4}-\d{2}\z/)
+          # <input type="month"> value; Date.parse would raise on it.
+          Date.strptime(raw, "%Y-%m").strftime("%F")
+        else
+          # Legacy "September 2026" style (pre-8.1.25 clients / tests).
+          Date.parse(raw).strftime("%F")
+        end
     rescue Date::Error
       object[attribute.to_sym] = nil
     end

data/lib/inline_forms/form_elements/multi_image_field_helper.rb

@@ -5,25 +5,37 @@ module InlineForms
       module_eval(<<~'INLINE_FORMS_FORM_ELEMENT', __FILE__, __LINE__ + 1)
     # -*- encoding : utf-8 -*-
     
+    # A `mount_uploaders` (plural) column returns an *array* of uploaders; the
+    # pre-8.1.28 code called `.url` on that array and raised NoMethodError the
+    # moment a multi_image_field actually held images. Render every image
+    # (using the `palm` thumb version when the uploader defines one), and keep
+    # accepting a bare single uploader for backward compatibility.
     def multi_image_field_show(object, attribute)
       o = object.send(attribute)
       msg = "<i class='fi-plus'></i>".html_safe
       if o.send(:present?)
-        if o.respond_to? :palm
-          msg = image_tag(o.send(:palm).send(:url))
-        else
-          msg = image_tag(o.send(:url))
+        uploads = o.is_a?(Array) ? o : [o]
+        rendered = uploads.filter_map do |u|
+          next unless u.respond_to?(:url) && u.url.present?
+          u.respond_to?(:palm) ? image_tag(u.palm.url) : image_tag(u.url)
         end
+        msg = safe_join(rendered) unless rendered.empty?
       end
       link_to_inline_edit object, attribute, msg, from_callee: __callee__
     end
     
+    # `name="gallery[]"`: file_field_tag with `multiple:` does not add the []
+    # itself, and without it Rack keeps only the last file — the update then
+    # stored a single image. With [] the params value is an array, which is
+    # what a mount_uploaders (plural) setter expects.
     def multi_image_field_edit(object, attribute)
-      file_field_tag attribute, multiple: true, class: 'input_text_field multi_image_field'
+      file_field_tag "#{attribute}[]", multiple: true, class: 'input_text_field multi_image_field'
     end
     
     def multi_image_field_update(object, attribute)
-      object.send(attribute.to_s + '=', params[attribute.to_sym])
+      files = params[attribute.to_sym]
+      return if files.blank?
+      object.send(attribute.to_s + '=', Array(files))
     end
       INLINE_FORMS_FORM_ELEMENT
     end