phlexi-form 0.3.0.rc1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f0a5677bd380aa749f9de4f25243f6c7367839c66a3bfe3f59dfae0f1b32ab6
-  data.tar.gz: 9107d443cb28c47c1c0a113af182af3b2b6c0a386451e913447a3b834676bbbe
+  metadata.gz: d20cf0d6ccfcdf3cbb3a05a518b25a9b6176ef827e32f9cab47fddb43391f470
+  data.tar.gz: '0788efe146100a6629f679d913a080ff7cc2039881477bc9ffda16dfe0f6dc9f'
 SHA512:
-  metadata.gz: 0bedfa08fae8602d5cfc632d4907fb12a41c3ac7a64deaad4cc977c82fb3451f976c37e404e449388f6f88127921fe235cec2f42ffedeadc118865c341f924d8
-  data.tar.gz: db75b28ad2166e117054c2f5eccd5e73e0efcfc7de330d17b02e46468cf46d0aa80934ab31fbd273910c9c80a66b1fdff4184ccf88dd3cbb814b758f36023c38
+  metadata.gz: 3e671e22b8daa6e5e243725f79302e26b9b1d5395d92a54013d0aed981bc9eb2dfd756d8214a69446e0328186b339dc21dd3e1853c5236270f048e974c4ae114
+  data.tar.gz: d7441ae010f74f188baf43b6ac90e5cdd49b88563a22261e223b11d3c20de6135e5f610c0f278eaae28d49bc3627df3ec0b3012fe49d5e41626751d15200fd26

data/README.md

@@ -159,14 +159,16 @@ Phlexi::Form supports theming through a flexible theming system:
 
 ```ruby
 class ThemedForm < Phlexi::Form::Base
-  private
-
-  def default_theme
-    {
-      input: "border rounded px-2 py-1",
-      label: "font-bold text-gray-700",
-      # Add more theme options here
-    }
+  class FieldBuilder < FieldBuilder
+    private
+    
+    def default_theme
+      {
+        input: "border rounded px-2 py-1",
+        label: "font-bold text-gray-700",
+        # Add more theme options here
+      }
+    end
   end
 end
 ```

data/gemfiles/default.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    phlexi-form (0.2.0)
+    phlexi-form (0.3.0.rc1)
       activesupport
       phlex (~> 1.11)
       zeitwerk

data/gemfiles/rails_7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    phlexi-form (0.2.0)
+    phlexi-form (0.3.0.rc1)
       activesupport
       phlex (~> 1.11)
       zeitwerk

data/lib/phlexi/form/base.rb

@@ -10,7 +10,7 @@ module Phlexi
     # A form component for building flexible and customizable forms.
     #
     # @example Basic usage
-    #   Phlexi::Form.new(user, action: '/users', method: 'post') do |f|
+    #   Phlexi::Form(user, action: '/users', method: 'post') do
     #     render field(:name).placeholder("Name").input_tag
     #     render field(:email).placeholder("Email").input_tag
     #   end
@@ -22,14 +22,6 @@ module Phlexi
 
       class FieldBuilder < Structure::FieldBuilder; end
 
-      class << self
-        def inherited(subclass)
-          subclass.const_set(:Namespace, Class.new(self::Namespace)) unless subclass.const_defined?(:Namespace)
-          subclass.const_set(:FieldBuilder, Class.new(self::FieldBuilder)) unless subclass.const_defined?(:FieldBuilder)
-          super
-        end
-      end
-
       attr_reader :key, :object
 
       delegate :field, :submit_button, :nest_one, :nest_many, to: :@namespace
@@ -73,18 +65,6 @@ module Phlexi
         instance_exec(&@_content_block) if @_content_block
       end
 
-      # Renders the form tag with its contents.
-      #
-      # @yield The form's content
-      # @return [void]
-      def form_tag(&)
-        form(**form_attributes) do
-          render_hidden_method_field
-          render_authenticity_token if authenticity_token?
-          yield
-        end
-      end
-
       def extract_input(params)
         call unless @_rendered
         @namespace.extract_input(params)
@@ -110,10 +90,11 @@ module Phlexi
         else
           @object = record
           if @key.nil?
-            unless object.respond_to?(:model_name) && object.model_name.respond_to?(:param_key) && object.model_name.param_key.present?
-              raise ArgumentError, "record must respond to #model_name.param_key with a non nil value or set `key` option e.g. Phlexi::Form(record, key: :record)"
+            @key = if object.respond_to?(:model_name) && object.model_name.respond_to?(:param_key) && object.model_name.param_key.present?
+              object.model_name.param_key
+            else
+              object.class.name.demodulize.underscore
             end
-            @key = object.model_name.param_key
           end
         end
         @key = @key.to_sym
@@ -133,6 +114,23 @@ module Phlexi
         attributes.fetch(:accept_charset) { attributes[:accept_charset] = "UTF-8" }
       end
 
+      # Retrieves the form's CSS classes.
+      #
+      # @return [String] The form's CSS classes
+      attr_reader :form_class
+
+      # Renders the form tag with its contents.
+      #
+      # @yield The form's content
+      # @return [void]
+      def form_tag(&)
+        form(**form_attributes) do
+          render_hidden_method_field
+          render_authenticity_token if has_authenticity_token?
+          yield
+        end
+      end
+
       # Determines the form's action URL.
       #
       # @return [String, nil] The form's action URL
@@ -156,16 +154,11 @@ module Phlexi
         ActiveSupport::StringInquirer.new(@form_method)
       end
 
-      # Retrieves the form's CSS classes.
-      #
-      # @return [String] The form's CSS classes
-      attr_reader :form_class
-
       # Checks if the authenticity token should be included.
       #
       # @return [Boolean] True if the authenticity token should be included, false otherwise
-      def authenticity_token?
-        defined?(helpers) && options.fetch(:authenticity_token) { !form_method.get? }
+      def has_authenticity_token?
+        !form_method.get? && ((defined?(helpers) && helpers) || options[:authenticity_token])
       end
 
       # Retrieves the authenticity token.
@@ -221,13 +214,12 @@ module Phlexi
       #
       # @return [Hash] The form attributes
       def form_attributes
-        {
+        mix({
           id: @namespace.dom_id,
-          action: form_action,
-          method: standardized_form_method,
           class: form_class,
-          **attributes
-        }
+          action: form_action,
+          method: standardized_form_method
+        }, attributes)
       end
 
       # Renders the authenticity token if required.

data/lib/phlexi/form/components/base.rb

@@ -23,15 +23,15 @@ module Phlexi
         def append_attribute_classes
           return if attributes[:class] == false
 
-          attributes[:class] = tokens(
+          default_classes = tokens(
             component_name,
-            attributes[:class],
             -> { attributes[:required] } => "required",
             -> { !attributes[:required] } => "optional",
             -> { field.has_errors? } => "invalid",
             -> { attributes[:readonly] } => "readonly",
             -> { attributes[:disabled] } => "disabled"
           )
+          attributes[:class] = tokens(default_classes, attributes[:class])
         end
 
         def component_name

data/lib/phlexi/form/components/collection_checkboxes.rb

@@ -10,7 +10,7 @@ module Phlexi
 
         def view_template
           div(**attributes.slice(:id, :class)) do
-            field.multi(option_mapper.values) do |builder|
+            field.repeated(option_mapper.values) do |builder|
               render builder.hidden_field_tag if builder.index == 0
 
               field = builder.field(

data/lib/phlexi/form/components/collection_radio_buttons.rb

@@ -9,7 +9,7 @@ module Phlexi
 
         def view_template
           div(**attributes.slice(:id, :class)) do
-            field.multi(option_mapper.values) do |builder|
+            field.repeated(option_mapper.values) do |builder|
               render builder.hidden_field_tag if builder.index == 0
 
               field = builder.field(

data/lib/phlexi/form/components/concerns/extracts_input.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Form
+    module Components
+      module Concerns
+        module ExtractsInput
+          # Collects parameters matching the input field's param key.
+          #
+          # @param params [Hash] the parameters to collect from.
+          # @return [Hash] the collected parameters.
+          def extract_input(params)
+            # # Handles multi parameter attributes
+            # # https://www.cookieshq.co.uk/posts/rails-spelunking-date-select
+            # # https://www.cookieshq.co.uk/posts/multiparameter-attributes
+
+            # # Matches
+            # # - parameter
+            # # - parameter(1)
+            # # - parameter(2)
+            # # - parameter(1i)
+            # # - parameter(2f)
+            # regex = /^#{param}(\(\d+[if]?\))?$/
+            # keys = params.select { |key, _| regex.match?(key) }.keys
+            # params.slice(*keys)
+
+            params ||= {}
+            {input_param => normalize_input(params[field.key])}
+          end
+
+          protected
+
+          def build_attributes
+            super
+            @input_param = attributes.delete(:input_param) || field.key
+          end
+
+          def input_param
+            @input_param
+          end
+
+          def normalize_input(input_value)
+            normalize_simple_input(input_value)
+          end
+
+          def normalize_simple_input(input_value)
+            input_value.to_s.presence
+          end
+        end
+      end
+    end
+  end
+end

data/lib/phlexi/form/components/concerns/handles_input.rb

@@ -5,46 +5,16 @@ module Phlexi
     module Components
       module Concerns
         module HandlesInput
-          # Collects parameters matching the input field's param key.
-          #
-          # @param params [Hash] the parameters to collect from.
-          # @return [Hash] the collected parameters.
-          def extract_input(params)
-            # # Handles multi parameter attributes
-            # # https://www.cookieshq.co.uk/posts/rails-spelunking-date-select
-            # # https://www.cookieshq.co.uk/posts/multiparameter-attributes
-
-            # # Matches
-            # # - parameter
-            # # - parameter(1)
-            # # - parameter(2)
-            # # - parameter(1i)
-            # # - parameter(2f)
-            # regex = /^#{param}(\(\d+[if]?\))?$/
-            # keys = params.select { |key, _| regex.match?(key) }.keys
-            # params.slice(*keys)
-
-            params ||= {}
-            {input_param => normalize_input(params[field.key])}
-          end
+          include Phlexi::Form::Components::Concerns::ExtractsInput
 
           protected
 
           def build_attributes
             super
-            @input_param = attributes.delete(:input_param) || field.key
-          end
-
-          def input_param
-            @input_param
-          end
-
-          def normalize_input(input_value)
-            normalize_simple_input(input_value)
-          end
 
-          def normalize_simple_input(input_value)
-            input_value.to_s.presence
+            # only overwrite id if it was set in Base
+            attributes[:id] = field.dom.id if attributes[:id] == "#{field.dom.id}_#{component_name}"
+            attributes[:name] = field.dom.name
           end
         end
       end

data/lib/phlexi/form/components/concerns/submits_form.rb

@@ -5,6 +5,14 @@ module Phlexi
     module Components
       module Concerns
         module SubmitsForm
+          include Phlexi::Form::Components::Concerns::ExtractsInput
+
+          def extract_input(params)
+            {}
+          end
+
+          protected
+
           def submit_type_value
             if field.object.respond_to?(:persisted?)
               field.object.persisted? ? :update : :create

data/lib/phlexi/form/components/error.rb

@@ -13,7 +13,7 @@ module Phlexi
         private
 
         def render?
-          field.show_errors? && field.has_errors?
+          field.show_errors?
         end
       end
     end

data/lib/phlexi/form/components/file_input.rb

@@ -14,6 +14,7 @@ module Phlexi
         def build_input_attributes
           attributes[:type] = :file
           super
+          # ensure we are always setting it to false
           attributes[:value] = false
         end
 

data/lib/phlexi/form/components/hint.rb

@@ -13,7 +13,7 @@ module Phlexi
         private
 
         def render?
-          field.hint.present? && (!field.show_errors? || !field.has_errors?)
+          field.show_hint?
         end
       end
     end

data/lib/phlexi/form/components/input.rb

@@ -15,17 +15,13 @@ module Phlexi
         def build_attributes
           super
 
-          # only overwrite id if it was set in Base
-          attributes[:id] = field.dom.id if attributes[:id] == "#{field.dom.id}_#{component_name}"
-
-          attributes[:name] = field.dom.name
           attributes[:value] = field.dom.value
 
           build_input_attributes
         end
 
         def build_input_attributes
-          attributes.fetch(:type) { attributes[:type] = field.inferred_input_type }
+          attributes.fetch(:type) { attributes[:type] = field.inferred_input_component_subtype }
           attributes.fetch(:disabled) { attributes[:disabled] = field.disabled? }
 
           case attributes[:type]

data/lib/phlexi/form/components/input_array.rb

@@ -9,7 +9,7 @@ module Phlexi
 
         def view_template
           div(**attributes.slice(:id, :class)) do
-            field.multi(values.length) do |builder|
+            field.repeated(values.length) do |builder|
               render builder.hidden_field_tag if builder.index == 0
 
               field = builder.field(

data/lib/phlexi/form/components/select.rb

@@ -31,9 +31,6 @@ module Phlexi
         def build_attributes
           super
 
-          attributes[:id] = field.dom.id
-          attributes[:name] = field.dom.name
-
           build_select_attributes
         end
 

data/lib/phlexi/form/components/textarea.rb

@@ -4,6 +4,8 @@ module Phlexi
   module Form
     module Components
       class Textarea < Base
+        include Concerns::HandlesInput
+
         def view_template
           textarea(**attributes) { field.dom.value }
         end
@@ -13,9 +15,6 @@ module Phlexi
         def build_attributes
           super
 
-          attributes[:id] = field.dom.id
-          attributes[:name] = field.dom.name
-
           build_textarea_attributes
         end
 

data/lib/phlexi/form/field_options/associations.rb

@@ -6,8 +6,8 @@ module Phlexi
       module Associations
         protected
 
-        def reflection
-          @reflection ||= find_association_reflection
+        def association_reflection
+          @association_reflection ||= find_association_reflection
         end
 
         def find_association_reflection

data/lib/phlexi/form/field_options/collection.rb

@@ -20,19 +20,19 @@ module Phlexi
         end
 
         def collection_value_from_association
-          return unless reflection
+          return unless association_reflection
 
-          relation = reflection.klass.all
+          relation = association_reflection.klass.all
 
-          if reflection.respond_to?(:scope) && reflection.scope
-            relation = if reflection.scope.parameters.any?
-              reflection.klass.instance_exec(object, &reflection.scope)
+          if association_reflection.respond_to?(:scope) && association_reflection.scope
+            relation = if association_reflection.scope.parameters.any?
+              association_reflection.klass.instance_exec(object, &association_reflection.scope)
             else
-              reflection.klass.instance_exec(&reflection.scope)
+              association_reflection.klass.instance_exec(&association_reflection.scope)
             end
           else
-            order = reflection.options[:order]
-            conditions = reflection.options[:conditions]
+            order = association_reflection.options[:order]
+            conditions = association_reflection.options[:conditions]
             conditions = object.instance_exec(&conditions) if conditions.respond_to?(:call)
 
             relation = relation.where(conditions) if relation.respond_to?(:where) && conditions.present?

data/lib/phlexi/form/field_options/errors.rb

@@ -21,10 +21,14 @@ module Phlexi
           object_with_errors? || !object && has_custom_error?
         end
 
-        def show_errors?
+        def can_show_errors?
           options[:error] != false
         end
 
+        def show_errors?
+          can_show_errors? && has_errors?
+        end
+
         def valid?
           !has_errors? && has_value?
         end
@@ -66,11 +70,11 @@ module Phlexi
         end
 
         def errors_on_association
-          reflection ? object.errors[reflection.name] : []
+          association_reflection ? object.errors[association_reflection.name] : []
         end
 
         def full_errors_on_association
-          reflection ? object.errors.full_messages_for(reflection.name) : []
+          association_reflection ? object.errors.full_messages_for(association_reflection.name) : []
         end
 
         def has_custom_error?

data/lib/phlexi/form/field_options/hints.rb

@@ -14,7 +14,11 @@ module Phlexi
         end
 
         def has_hint?
-          options[:hint] != false && hint.present?
+          hint.present?
+        end
+
+        def show_hint?
+          has_hint? && !show_errors?
         end
       end
     end

data/lib/phlexi/form/field_options/inferred_types.rb

@@ -10,20 +10,22 @@ module Phlexi
           @inferred_db_type ||= infer_db_type
         end
 
-        def inferred_input_component
-          @inferred_input_component ||= infer_input_component
+        # This will give you the component type e.g. input, textarea, select
+        def inferred_component_type
+          @inferred_component_type ||= infer_component_type
         end
 
-        def inferred_input_type
-          @inferred_input_type ||= infer_input_type(inferred_input_component)
+        # This will give you the subtype of the input component e.g input type="text|date|checkbox" etc
+        def inferred_input_component_subtype
+          @inferred_input_component_subtype ||= infer_input_component_subtype(inferred_component_type)
         end
 
         private
 
         # this returns the element type
-        # one of :input, :textarea, :select, :botton
-        def infer_input_component
-          return :select unless collection.blank?
+        # one of :input, :textarea, :select
+        def infer_component_type
+          return :select unless collection.nil?
 
           case inferred_db_type
           when :text, :json, :jsonb, :hstore
@@ -35,7 +37,7 @@ module Phlexi
 
         # this only applies when input_component is `:input`
         # resolves the type attribute of input components
-        def infer_input_type(component)
+        def infer_input_component_subtype(component)
           case inferred_db_type
           when :string
             infer_string_input_type(key)
@@ -64,7 +66,7 @@ module Phlexi
           if object.class.respond_to?(:attribute_types)
             # ActiveModel::Attributes
             custom_type = object.class.attribute_types[key.to_s]
-            return custom_type.type if custom_type
+            return custom_type.type if custom_type&.type
           end
 
           # Check if object responds to the key
@@ -81,8 +83,10 @@ module Phlexi
           case value
           when Integer
             :integer
-          when Float, BigDecimal
+          when Float
             :float
+          when BigDecimal
+            :decimal
           when TrueClass, FalseClass
             :boolean
           when Date

data/lib/phlexi/form/field_options/multiple.rb

@@ -16,7 +16,7 @@ module Phlexi
         private
 
         def calculate_multiple_field_value
-          return true if reflection&.macro == :has_many
+          return true if association_reflection&.macro == :has_many
           return true if multiple_field_array_attribute?
 
           check_multiple_field_from_validators

data/lib/phlexi/form/field_options/required.rb

@@ -24,7 +24,7 @@ module Phlexi
         end
 
         def required_by_validators?
-          (attribute_validators + reflection_validators).any? { |v| v.kind == :presence && valid_validator?(v) }
+          (attribute_validators + association_reflection_validators).any? { |v| v.kind == :presence && valid_validator?(v) }
         end
 
         def required_by_default?

data/lib/phlexi/form/field_options/validators.rb

@@ -14,8 +14,8 @@ module Phlexi
           object.class.validators_on(key)
         end
 
-        def reflection_validators
-          reflection ? object.class.validators_on(reflection.name) : []
+        def association_reflection_validators
+          association_reflection ? object.class.validators_on(association_reflection.name) : []
         end
 
         def valid_validator?(validator)

data/lib/phlexi/form/structure/dom.rb

@@ -5,7 +5,7 @@ module Phlexi
     module Structure
       # Generates DOM IDs, names, etc. for a Field, Namespace, or Node based on
       # norms that were established by Rails. These can be used outsidef or Rails in
-      # other Ruby web frameworks since it has now dependencies on Rails.
+      # other Ruby web frameworks since it has no dependencies on Rails.
       class DOM
         def initialize(field:)
           @field = field
@@ -17,7 +17,7 @@ module Phlexi
           @field.value.to_s
         end
 
-        # Walks from the current node to the parent node, grabs the names, and seperates
+        # Walks from the current node to the parent node, grabs the names, and separates
         # them with a `_` for a DOM ID.
         def id
           @id ||= begin

data/lib/phlexi/form/structure/field_builder.rb

@@ -57,28 +57,28 @@ module Phlexi
         #
         # @param attributes [Hash] Additional attributes for the label.
         # @return [Components::Label] The label component.
-        def label_tag(**attributes)
-          create_component(Components::Label, :label, **attributes)
+        def label_tag(**, &)
+          create_component(Components::Label, :label, **, &)
         end
 
         # Creates an input tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the input.
         # @return [Components::Input] The input component.
-        def input_tag(**attributes)
-          create_component(Components::Input, :input, **attributes)
+        def input_tag(**, &)
+          create_component(Components::Input, :input, **, &)
         end
 
-        def file_input_tag(**attributes)
-          create_component(Components::FileInput, :file, **attributes)
+        def file_input_tag(**, &)
+          create_component(Components::FileInput, :file, **, &)
         end
 
         # Creates a checkbox tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the checkbox.
         # @return [Components::Checkbox] The checkbox component.
-        def checkbox_tag(**attributes)
-          create_component(Components::Checkbox, :checkbox, **attributes)
+        def checkbox_tag(**, &)
+          create_component(Components::Checkbox, :checkbox, **, &)
         end
 
         # Creates collection checkboxes for the field.
@@ -86,16 +86,16 @@ module Phlexi
         # @param attributes [Hash] Additional attributes for the collection checkboxes.
         # @yield [block] The block to be executed for each checkbox.
         # @return [Components::CollectionCheckboxes] The collection checkboxes component.
-        def collection_checkboxes_tag(**attributes, &)
-          create_component(Components::CollectionCheckboxes, :collection_checkboxes, **attributes, &)
+        def collection_checkboxes_tag(**, &)
+          create_component(Components::CollectionCheckboxes, :collection_checkboxes, **, &)
         end
 
         # Creates a radio button tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the radio button.
         # @return [Components::RadioButton] The radio button component.
-        def radio_button_tag(**attributes)
-          create_component(Components::RadioButton, :radio, **attributes)
+        def radio_button_tag(**, &)
+          create_component(Components::RadioButton, :radio, **, &)
         end
 
         # Creates collection radio buttons for the field.
@@ -103,52 +103,52 @@ module Phlexi
         # @param attributes [Hash] Additional attributes for the collection radio buttons.
         # @yield [block] The block to be executed for each radio button.
         # @return [Components::CollectionRadioButtons] The collection radio buttons component.
-        def collection_radio_buttons_tag(**attributes, &)
-          create_component(Components::CollectionRadioButtons, :collection_radio_buttons, **attributes, &)
+        def collection_radio_buttons_tag(**, &)
+          create_component(Components::CollectionRadioButtons, :collection_radio_buttons, **, &)
         end
 
         # Creates a textarea tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the textarea.
         # @return [Components::Textarea] The textarea component.
-        def textarea_tag(**attributes)
-          create_component(Components::Textarea, :textarea, **attributes)
+        def textarea_tag(**, &)
+          create_component(Components::Textarea, :textarea, **, &)
         end
 
         # Creates a select tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the select.
         # @return [Components::Select] The select component.
-        def select_tag(**attributes)
-          create_component(Components::Select, :select, **attributes)
+        def select_tag(**, &)
+          create_component(Components::Select, :select, **, &)
         end
 
-        def input_array_tag(**attributes)
-          create_component(Components::InputArray, :array, **attributes)
+        def input_array_tag(**, &)
+          create_component(Components::InputArray, :array, **, &)
         end
 
         # Creates a hint tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the hint.
         # @return [Components::Hint] The hint component.
-        def hint_tag(**attributes)
-          create_component(Components::Hint, :hint, **attributes)
+        def hint_tag(**, &)
+          create_component(Components::Hint, :hint, **, &)
         end
 
         # Creates an error tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the error.
         # @return [Components::Error] The error component.
-        def error_tag(**attributes)
-          create_component(Components::Error, :error, **attributes)
+        def error_tag(**, &)
+          create_component(Components::Error, :error, **, &)
         end
 
         # Creates a full error tag for the field.
         #
         # @param attributes [Hash] Additional attributes for the full error.
         # @return [Components::FullError] The full error component.
-        def full_error_tag(**attributes)
-          create_component(Components::FullError, :full_error, **attributes)
+        def full_error_tag(**, &)
+          create_component(Components::FullError, :full_error, **, &)
         end
 
         # Wraps the field with additional markup.
@@ -158,17 +158,18 @@ module Phlexi
         # @yield [block] The block to be executed within the wrapper.
         # @return [Components::Wrapper] The wrapper component.
         def wrapped(inner: {}, **attributes, &)
-          wrapper_class = attributes.delete(:class) || themed(attributes.delete(:theme) || :wrapper)
-          inner[:class] = inner.delete(:class) || themed(inner.delete(:theme) || :inner_wrapper)
-          Components::Wrapper.new(self, class: wrapper_class, inner: inner, **attributes, &)
+          attributes = apply_component_theme(attributes, :wrapper)
+          inner = apply_component_theme(inner, :inner_wrapper)
+          Components::Wrapper.new(self, inner: inner, **attributes, &)
         end
 
-        # Creates a multi-value field collection.
+        # Creates a repeated field collection.
         #
-        # @param range [Integer, #to_a] The range of keys for each field. If an integer is passed, keys will begin from 1.
+        # @param range [Integer, #to_a] The range of keys for each field.
+        #   If an integer (e.g. 6) is passed, it is converted to a range = 1..6
         # @yield [block] The block to be executed for each item in the collection.
         # @return [FieldCollection] The field collection.
-        def multi(range = nil, &)
+        def repeated(range = nil, &)
           FieldCollection.new(field: self, range: range, &)
         end
 
@@ -176,31 +177,37 @@ module Phlexi
         #
         # @param attributes [Hash] Additional attributes for the submit.
         # @return [Components::SubmitButton] The submit button component.
-        def submit_button_tag(**attributes, &)
-          create_component(Components::SubmitButton, :submit_button, **attributes, &)
+        def submit_button_tag(**, &)
+          create_component(Components::SubmitButton, :submit_button, **, &)
         end
 
         def extract_input(params)
-          raise "field##{dom.name} did not define an input component" unless @field_input_component
+          raise "field##{dom.name} did not define an input component" unless @field_input_extractor
 
-          @field_input_component.extract_input(params)
+          @field_input_extractor.extract_input(params)
         end
 
         protected
 
-        def create_component(component_class, theme_key, **attributes)
-          if component_class.include?(Phlexi::Form::Components::Concerns::HandlesInput)
-            raise "input component already defined: #{@field_input_component.inspect}" if @field_input_component
+        def create_component(component_class, theme_key, **attributes, &)
+          attributes = mix(input_attributes, attributes) if component_class.include?(Phlexi::Form::Components::Concerns::HandlesInput)
+          component = component_class.new(self, **apply_component_theme(attributes, theme_key), &)
+          if component_class.include?(Components::Concerns::ExtractsInput)
+            raise "input component already defined: #{@field_input_extractor.inspect}" if @field_input_extractor
 
-            attributes = input_attributes.deep_merge(attributes)
-            @field_input_component = component_class.new(self, class: component_class_for(theme_key, attributes), **attributes)
-          else
-            component_class.new(self, class: component_class_for(theme_key, attributes), **attributes)
+            @field_input_extractor = component
           end
+
+          component
         end
 
-        def component_class_for(theme_key, attributes)
-          attributes.delete(:class) || themed(attributes.key?(:theme) ? attributes.delete(:theme) : theme_key)
+        def apply_component_theme(attributes, theme_key)
+          theme_key = attributes.delete(:theme) || theme_key
+          if attributes.key?(:class!)
+            attributes
+          else
+            mix({class: themed(theme_key)}, attributes)
+          end
         end
 
         def has_value?
@@ -210,24 +217,24 @@ module Phlexi
         def determine_initial_value(value)
           return value unless value == NIL_VALUE
 
-          determine_from_association || determine_value_from_object
+          determine_value_from_association || determine_value_from_object
         end
 
         def determine_value_from_object
           object.respond_to?(key) ? object.public_send(key) : nil
         end
 
-        def determine_from_association
-          return nil unless reflection.present?
+        def determine_value_from_association
+          return nil unless association_reflection.present?
 
           value = object.public_send(key)
-          case reflection.macro
+          case association_reflection.macro
           when :has_many, :has_and_belongs_to_many
-            value&.map { |v| v.public_send(reflection.klass.primary_key) }
+            value&.map { |v| v.public_send(association_reflection.klass.primary_key) }
           when :belongs_to, :has_one
-            value&.public_send(reflection.klass.primary_key)
+            value&.public_send(association_reflection.klass.primary_key)
           else
-            raise ArgumentError, "Unsupported association type: #{reflection.macro}"
+            raise ArgumentError, "Unsupported association type: #{association_reflection.macro}"
           end
         end
       end

data/lib/phlexi/form/structure/field_collection.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "phlex"
+
 module Phlexi
   module Form
     module Structure
@@ -7,6 +9,8 @@ module Phlexi
         include Enumerable
 
         class Builder
+          include Phlex::Helpers
+
           attr_reader :key, :index
 
           def initialize(key, field, index)
@@ -15,8 +19,9 @@ module Phlexi
             @index = index
           end
 
-          def field(**)
-            @field.class.new(key, input_attributes: @field.input_attributes, **, parent: @field).tap do |field|
+          def field(**options)
+            options = mix({input_attributes: @field.input_attributes}, options)
+            @field.class.new(key, **options, parent: @field).tap do |field|
               yield field if block_given?
             end
           end

data/lib/phlexi/form/structure/namespace.rb

@@ -3,13 +3,18 @@
 module Phlexi
   module Form
     module Structure
-      # A Namespace maps and object to values, but doesn't actually have a value itself. For
+      # A Namespace maps an object to values, but doesn't actually have a value itself. For
       # example, a `User` object or ActiveRecord model could be passed into the `:user` namespace.
-      # To access the values on a Namespace, the `field` can be called for single values.
       #
-      # Additionally, to access namespaces within a namespace, such as if a `User has_many :addresses` in
-      # ActiveRecord, the `namespace` method can be called which will return another Namespace object and
-      # set the current Namespace as the parent.
+      # To access single values on a Namespace, #field can be used.
+      #
+      # To access nested objects within a namespace, two methods are available:
+      #
+      # 1. #nest_one: Used for single nested objects, such as if a `User belongs_to :profile` in
+      #    ActiveRecord. This method returns another Namespace object.
+      #
+      # 2. #nest_many: Used for collections of nested objects, such as if a `User has_many :addresses` in
+      #    ActiveRecord. This method returns a NamespaceCollection object.
       class Namespace < Structure::Node
         include Enumerable
 
@@ -29,8 +34,8 @@ module Phlexi
           end
         end
 
-        def submit_button(key = nil, **attributes, &)
-          field(key || SecureRandom.hex).submit_button_tag(**attributes, &)
+        def submit_button(key = :submit_button, **, &)
+          field(key).submit_button_tag(**, &)
         end
 
         # Creates a `Namespace` child instance with the parent set to the current instance, adds to
@@ -41,9 +46,9 @@ module Phlexi
         # form like this:
         #
         # ```ruby
-        # Superform :user, object: User.new do |form|
-        #   form.nest_one :permission do |permission|
-        #     form.field :role
+        # Phlexi::Form(User.new, as: :user) do
+        #   nest_one :profile do |profile|
+        #     render profile.field(:gender).input_tag
         #   end
         # end
         # ```
@@ -56,10 +61,10 @@ module Phlexi
         # an enumerable or array of `Address` classes:
         #
         # ```ruby
-        # Phlexi::Form.new User.new do |form|
-        #   render form.field(:email).input_tag
-        #   render form.field(:name).input_tag
-        #   form.nest_many :addresses do |address|
+        # Phlexi::Form(User.new) do
+        #   render field(:email).input_tag
+        #   render field(:name).input_tag
+        #   nest_many :addresses do |address|
         #     render address.field(:street).input_tag
         #     render address.field(:state).input_tag
         #     render address.field(:zip).input_tag

data/lib/phlexi/form/structure/namespace_collection.rb

@@ -32,7 +32,7 @@ module Phlexi
 
         # Builds and memoizes namespaces for the collection.
         #
-        # @return [Array<Hash>] An array of namespace hashes.
+        # @return [Array<Namespace>] An array of namespace objects.
         def namespaces
           @namespaces ||= @collection.map.with_index do |object, key|
             build_namespace(key, object: object)

data/lib/phlexi/form/structure/node.rb

@@ -3,15 +3,25 @@
 module Phlexi
   module Form
     module Structure
-      # Superclass for Namespace and Field classes. Not much to it other than it has a `name`
-      # and `parent` node attribute. Think of it as a tree.
+      # Superclass for Namespace and Field classes. Represents a node in the form tree structure.
+      #
+      # @attr_reader [Symbol] key The node's key
+      # @attr_reader [Node, nil] parent The node's parent in the tree structure
       class Node
         attr_reader :key, :parent
 
+        # Initializes a new Node instance.
+        #
+        # @param key [Symbol, String] The key for the node
+        # @param parent [Node, nil] The parent node
         def initialize(key, parent:)
-          @key = key.to_s.to_sym
+          @key = :"#{key}"
           @parent = parent
         end
+
+        def inspect
+          "<#{self.class.name} key=#{key.inspect} parent=#{id.inspect} />"
+        end
       end
     end
   end

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.3.0.rc1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc1
+  version: 0.3.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -194,6 +194,7 @@ files:
 - lib/phlexi/form/components/checkbox.rb
 - lib/phlexi/form/components/collection_checkboxes.rb
 - lib/phlexi/form/components/collection_radio_buttons.rb
+- lib/phlexi/form/components/concerns/extracts_input.rb
 - lib/phlexi/form/components/concerns/handles_array_input.rb
 - lib/phlexi/form/components/concerns/handles_input.rb
 - lib/phlexi/form/components/concerns/has_options.rb
@@ -260,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Build forms in Rails