phlexi-form 0.3.0.rc1 → 0.4.0

data/lib/phlexi/form/theme.rb

@@ -0,0 +1,160 @@
+module Phlexi
+  module Form
+    class Theme < Phlexi::Field::Theme
+      def self.theme
+        @theme ||= {
+          # == Base
+          base: nil,
+          hint: nil,
+          error: nil,
+          full_error: :error,
+          wrapper: nil,
+          inner_wrapper: nil,
+          button: nil,
+          submit_button: :button,
+
+          # == Label
+          label: nil,
+          invalid_label: nil,
+          valid_label: nil,
+          neutral_label: nil,
+
+          # == Input
+          input: nil,
+          valid_input: nil,
+          invalid_input: nil,
+          neutral_input: nil,
+
+          # String
+          string: :input,
+          valid_string: :valid_input,
+          invalid_string: :invalid_input,
+          neutral_string: :neutral_input,
+
+          # Email
+          email: :input,
+          valid_email: :valid_input,
+          invalid_email: :invalid_input,
+          neutral_email: :neutral_input,
+
+          # Password
+          password: :input,
+          valid_password: :valid_input,
+          invalid_password: :invalid_input,
+          neutral_password: :neutral_input,
+
+          # Phone
+          phone: :input,
+          valid_phone: :valid_input,
+          invalid_phone: :invalid_input,
+          neutral_phone: :neutral_input,
+
+          # Color
+          color: :input,
+          valid_color: :valid_input,
+          invalid_color: :invalid_input,
+          neutral_color: :neutral_input,
+
+          # Url
+          url: :input,
+          valid_url: :valid_input,
+          invalid_url: :invalid_input,
+          neutral_url: :neutral_input,
+
+          # Search
+          search: :input,
+          valid_search: :valid_input,
+          invalid_search: :invalid_input,
+          neutral_search: :neutral_input,
+
+          # Number
+          number: :input,
+          valid_number: :valid_input,
+          invalid_number: :invalid_input,
+          neutral_number: :neutral_input,
+
+          # Date
+          date: :input,
+          valid_date: :valid_input,
+          invalid_date: :invalid_input,
+          neutral_date: :neutral_input,
+
+          # Time
+          time: :input,
+          valid_time: :valid_input,
+          invalid_time: :invalid_input,
+          neutral_time: :neutral_input,
+
+          # DateTime
+          datetime: :input,
+          valid_datetime: :valid_input,
+          invalid_datetime: :invalid_input,
+          neutral_datetime: :neutral_input,
+
+          # Checkbox
+          checkbox: :input,
+          valid_checkbox: :valid_input,
+          invalid_checkbox: :invalid_input,
+          neutral_checkbox: :neutral_input,
+
+          # Boolean
+          boolan: :checkbox,
+          valid_boolan: :valid_checkbox,
+          invalid_boolan: :invalid_checkbox,
+          neutral_boolan: :neutral_checkbox,
+
+          # Textarea
+          textarea: :input,
+          valid_textarea: :valid_input,
+          invalid_textarea: :invalid_input,
+          neutral_textarea: :neutral_input,
+
+          # Hstore
+          hstore: :textarea,
+          valid_hstore: :valid_textarea,
+          invalid_hstore: :invalid_textarea,
+          neutral_hstore: :neutral_textarea,
+
+          # Select
+          select: :input,
+          valid_select: :valid_input,
+          invalid_select: :invalid_input,
+          neutral_select: :neutral_input,
+
+          # File
+          file: :input,
+          valid_file: :valid_input,
+          invalid_file: :invalid_input,
+          neutral_file: :neutral_input
+
+        }.freeze
+      end
+
+      # Resolves the theme for a component based on its current validity state
+      #
+      # This method determines the validity state of the field (valid, invalid, or neutral)
+      # and returns the corresponding theme by prepending the state to the component name.
+      #
+      # @param property [Symbol, String] The base theme property to resolve
+      # @return [String, nil] The resolved validity-specific theme or nil if not found
+      #
+      # @example Resolving a validity theme
+      #   # Assuming the field has errors and the theme includes { invalid_input: "error-class" }
+      #   resolve_validity_theme(:input)
+      #   # => "error-class"
+      def resolve_validity_theme(property, field)
+        return unless field
+
+        validity_property = if field.has_errors?
+          :"invalid_#{property}"
+        elsif field.object_valid?
+          :"valid_#{property}"
+        else
+          :"neutral_#{property}"
+        end
+
+        resolve_theme(validity_property)
+      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.4.0"
   end
 end

data/lib/phlexi/form.rb

@@ -2,6 +2,7 @@
 
 require "zeitwerk"
 require "phlex"
+require "phlexi-field"
 require "active_support/core_ext/object/blank"
 
 module Phlexi
@@ -11,21 +12,17 @@ module Phlexi
       loader.inflector.inflect(
         "phlexi-form" => "Phlexi",
         "phlexi" => "Phlexi",
-        "dom" => "DOM"
+        "html" => "HTML"
       )
       loader.push_dir(File.expand_path("..", __dir__))
       loader.ignore(File.expand_path("../generators", __dir__))
       loader.setup
     end
 
-    COMPONENT_BASE = (defined?(::ApplicationComponent) ? ::ApplicationComponent : Phlex::HTML)
-
-    NIL_VALUE = :__i_phlexi_form_nil_value_i__
-
     class Error < StandardError; end
   end
 end
 
 def Phlexi.Form(...)
-  Phlexi::Form::Base.new(...)
+  Phlexi::Form::Base.inline(...)
 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.4.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: phlexi-field
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -190,10 +204,12 @@ files:
 - lib/phlexi-form.rb
 - lib/phlexi/form.rb
 - lib/phlexi/form/base.rb
+- lib/phlexi/form/builder.rb
 - lib/phlexi/form/components/base.rb
 - 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
@@ -210,31 +226,27 @@ files:
 - lib/phlexi/form/components/submit_button.rb
 - lib/phlexi/form/components/textarea.rb
 - lib/phlexi/form/components/wrapper.rb
-- lib/phlexi/form/field_options/associations.rb
-- lib/phlexi/form/field_options/autofocus.rb
-- lib/phlexi/form/field_options/collection.rb
-- lib/phlexi/form/field_options/disabled.rb
-- lib/phlexi/form/field_options/errors.rb
-- lib/phlexi/form/field_options/hints.rb
-- lib/phlexi/form/field_options/inferred_types.rb
-- lib/phlexi/form/field_options/labels.rb
-- lib/phlexi/form/field_options/length.rb
-- lib/phlexi/form/field_options/limit.rb
-- lib/phlexi/form/field_options/min_max.rb
-- lib/phlexi/form/field_options/multiple.rb
-- lib/phlexi/form/field_options/pattern.rb
-- lib/phlexi/form/field_options/placeholder.rb
-- lib/phlexi/form/field_options/readonly.rb
-- lib/phlexi/form/field_options/required.rb
-- lib/phlexi/form/field_options/themes.rb
-- lib/phlexi/form/field_options/validators.rb
+- lib/phlexi/form/html.rb
 - lib/phlexi/form/option_mapper.rb
-- lib/phlexi/form/structure/dom.rb
-- lib/phlexi/form/structure/field_builder.rb
+- lib/phlexi/form/options/autofocus.rb
+- lib/phlexi/form/options/collection.rb
+- lib/phlexi/form/options/disabled.rb
+- lib/phlexi/form/options/errors.rb
+- lib/phlexi/form/options/hints.rb
+- lib/phlexi/form/options/inferred_types.rb
+- lib/phlexi/form/options/length.rb
+- lib/phlexi/form/options/limit.rb
+- lib/phlexi/form/options/max.rb
+- lib/phlexi/form/options/min.rb
+- lib/phlexi/form/options/pattern.rb
+- lib/phlexi/form/options/readonly.rb
+- lib/phlexi/form/options/required.rb
+- lib/phlexi/form/options/step.rb
+- lib/phlexi/form/options/validators.rb
 - lib/phlexi/form/structure/field_collection.rb
 - lib/phlexi/form/structure/namespace.rb
 - lib/phlexi/form/structure/namespace_collection.rb
-- lib/phlexi/form/structure/node.rb
+- lib/phlexi/form/theme.rb
 - lib/phlexi/form/version.rb
 - sig/phlexi/form.rbs
 homepage: https://github.com/radioactive-labs/phlexi-form
@@ -260,7 +272,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

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Phlexi
-  module Form
-    module FieldOptions
-      module Associations
-        protected
-
-        def reflection
-          @reflection ||= find_association_reflection
-        end
-
-        def find_association_reflection
-          if object.class.respond_to?(:reflect_on_association)
-            object.class.reflect_on_association(key)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Phlexi
-  module Form
-    module FieldOptions
-      module Hints
-        def hint(hint = nil)
-          if hint.nil?
-            options[:hint]
-          else
-            options[:hint] = hint
-            self
-          end
-        end
-
-        def has_hint?
-          options[:hint] != false && hint.present?
-        end
-      end
-    end
-  end
-end

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

@@ -1,155 +0,0 @@
-# frozen_string_literal: true
-
-require "bigdecimal"
-
-module Phlexi
-  module Form
-    module FieldOptions
-      module InferredTypes
-        def inferred_db_type
-          @inferred_db_type ||= infer_db_type
-        end
-
-        def inferred_input_component
-          @inferred_input_component ||= infer_input_component
-        end
-
-        def inferred_input_type
-          @inferred_input_type ||= infer_input_type(inferred_input_component)
-        end
-
-        private
-
-        # this returns the element type
-        # one of :input, :textarea, :select, :botton
-        def infer_input_component
-          return :select unless collection.blank?
-
-          case inferred_db_type
-          when :text, :json, :jsonb, :hstore
-            :textarea
-          else
-            :input
-          end
-        end
-
-        # this only applies when input_component is `:input`
-        # resolves the type attribute of input components
-        def infer_input_type(component)
-          case inferred_db_type
-          when :string
-            infer_string_input_type(key)
-          when :integer, :float, :decimal
-            :number
-          when :date
-            :date
-          when :datetime
-            :datetime
-          when :time
-            :time
-          when :boolean
-            :checkbox
-          else
-            :text
-          end
-        end
-
-        def infer_db_type
-          if object.class.respond_to?(:columns_hash)
-            # ActiveRecord object
-            column = object.class.columns_hash[key.to_s]
-            return column.type if column
-          end
-
-          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
-          end
-
-          # Check if object responds to the key
-          if object.respond_to?(key)
-            # Fallback to inferring type from the value
-            return infer_db_type_from_value(object.send(key))
-          end
-
-          # Default to string if we can't determine the type
-          :string
-        end
-
-        def infer_db_type_from_value(value)
-          case value
-          when Integer
-            :integer
-          when Float, BigDecimal
-            :float
-          when TrueClass, FalseClass
-            :boolean
-          when Date
-            :date
-          when Time, DateTime
-            :datetime
-          else
-            :string
-          end
-        end
-
-        def infer_string_input_type(key)
-          key = key.to_s.downcase
-
-          return :password if is_password_field?
-
-          custom_type = custom_string_input_type(key)
-          return custom_type if custom_type
-
-          if has_validators?
-            infer_string_input_type_from_validations
-          else
-            :text
-          end
-        end
-
-        def custom_string_input_type(key)
-          custom_mappings = {
-            /url$|^link|^site/ => :url,
-            /^email/ => :email,
-            /^search/ => :search,
-            /phone|tel(ephone)?/ => :tel,
-            /^time/ => :time,
-            /^date/ => :date,
-            /^number|_count$|_amount$/ => :number,
-            /^color/ => :color
-          }
-
-          custom_mappings.each do |pattern, type|
-            return type if key.match?(pattern)
-          end
-
-          nil
-        end
-
-        def infer_string_input_type_from_validations
-          if attribute_validators.find { |v| v.kind == :numericality }
-            :number
-          elsif attribute_validators.find { |v| v.kind == :format && v.options[:with] == URI::MailTo::EMAIL_REGEXP }
-            :email
-          else
-            :text
-          end
-        end
-
-        def is_password_field?
-          key = self.key.to_s.downcase
-
-          exact_matches = ["password"]
-          prefixes = ["encrypted_"]
-          suffixes = ["_password", "_digest", "_hash"]
-
-          exact_matches.include?(key) ||
-            prefixes.any? { |prefix| key.start_with?(prefix) } ||
-            suffixes.any? { |suffix| key.end_with?(suffix) }
-        end
-      end
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Phlexi
-  module Form
-    module FieldOptions
-      module Labels
-        def label(label = nil)
-          if label.nil?
-            options[:label] = options.fetch(:label) { calculate_label }
-          else
-            options[:label] = label
-            self
-          end
-        end
-
-        private
-
-        def calculate_label
-          if object.class.respond_to?(:human_attribute_name)
-            object.class.human_attribute_name(key.to_s, {base: object})
-          else
-            key.to_s.humanize
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-module Phlexi
-  module Form
-    module FieldOptions
-      module MinMax
-        def min(min_value = nil)
-          if min_value.nil?
-            options[:min] = options.fetch(:min) { calculate_min }
-          else
-            options[:min] = min_value
-            self
-          end
-        end
-
-        def max(max_value = nil)
-          if max_value.nil?
-            options[:max] = options.fetch(:max) { calculate_max }
-          else
-            options[:max] = max_value
-            self
-          end
-        end
-
-        def step
-          1 if min || max
-        end
-
-        private
-
-        def calculate_min
-          if (numericality_validator = find_numericality_validator)
-            get_min_from_validator(numericality_validator)
-          end
-        end
-
-        def calculate_max
-          if (numericality_validator = find_numericality_validator)
-            get_max_from_validator(numericality_validator)
-          end
-        end
-
-        def find_numericality_validator
-          find_validator(:numericality)
-        end
-
-        def get_min_from_validator(validator)
-          options = validator.options
-          min = if options.key?(:greater_than)
-            {value: options[:greater_than], exclusive: true}
-          elsif options.key?(:greater_than_or_equal_to)
-            {value: options[:greater_than_or_equal_to], exclusive: false}
-          end
-          evaluate_and_adjust_min(min)
-        end
-
-        def get_max_from_validator(validator)
-          options = validator.options
-          max = if options.key?(:less_than)
-            {value: options[:less_than], exclusive: true}
-          elsif options.key?(:less_than_or_equal_to)
-            {value: options[:less_than_or_equal_to], exclusive: false}
-          end
-          evaluate_and_adjust_max(max)
-        end
-
-        def evaluate_and_adjust_min(min)
-          return nil unless min
-
-          value = evaluate_numericality_validator_option(min[:value])
-          min[:exclusive] ? value + 1 : value
-        end
-
-        def evaluate_and_adjust_max(max)
-          return nil unless max
-
-          value = evaluate_numericality_validator_option(max[:value])
-          max[:exclusive] ? value - 1 : value
-        end
-
-        def evaluate_numericality_validator_option(option)
-          case option
-          when Proc
-            option.arity.zero? ? option.call : option.call(object)
-          else
-            option
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module Phlexi
-  module Form
-    module FieldOptions
-      module Multiple
-        def multiple?
-          options[:multiple] = options.fetch(:multiple) { calculate_multiple_field_value }
-        end
-
-        def multiple!(multiple = true)
-          options[:multiple] = multiple
-          self
-        end
-
-        private
-
-        def calculate_multiple_field_value
-          return true if reflection&.macro == :has_many
-          return true if multiple_field_array_attribute?
-
-          check_multiple_field_from_validators
-        end
-
-        def multiple_field_array_attribute?
-          return false unless object.class.respond_to?(:columns_hash)
-
-          column = object.class.columns_hash[key.to_s]
-          return false unless column
-
-          case object.class.connection.adapter_name.downcase
-          when "postgresql"
-            column.array? || (column.type == :string && column.sql_type.include?("[]"))
-          end # || object.class.attribute_types[key.to_s].is_a?(ActiveRecord::Type::Serialized)
-        rescue
-          # Rails.logger.warn("Error checking multiple field array attribute: #{e.message}")
-          false
-        end
-
-        def check_multiple_field_from_validators
-          inclusion_validator = find_validator(:inclusion)
-          length_validator = find_validator(:length)
-
-          return false unless inclusion_validator || length_validator
-
-          check_multiple_field_inclusion_validator(inclusion_validator) ||
-            check_multiple_field_length_validator(length_validator)
-        end
-
-        def check_multiple_field_inclusion_validator(validator)
-          return false unless validator
-          in_option = validator.options[:in]
-          return false unless in_option.is_a?(Array)
-
-          validator.options[:multiple] == true || (multiple_field_array_attribute? && in_option.size > 1)
-        end
-
-        def check_multiple_field_length_validator(validator)
-          return false unless validator
-          validator.options[:maximum].to_i > 1 if validator.options[:maximum]
-        end
-      end
-    end
-  end
-end