phlexi-form 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a7276cdcf4ce230a7396395fc8cc45e74379cfe1c06572f5dddff5dc73b82c
-  data.tar.gz: 40b9ac83c60d2505b2b5e2769bfc5e4006e73bb62aabfe569e6dccdf57434334
+  metadata.gz: 2929255d72fb1d3f8c2c810d16b349c94123b21bd0ed4c80254e32ca7051f0e9
+  data.tar.gz: 5f9cd0ca0770fb4826dc5d3f38707aac0d29a0a8990634085f3e2c7a68531200
 SHA512:
-  metadata.gz: 236052d396b6df4b91abf7dfecc7a4fb983a7ed9d3362cae1488f60ce7d8b92df3921a3bded6d56e7eb7024ae9e9e2df515dcbca4e5addb3da8fa8e875f30b14
-  data.tar.gz: c5cc9a4cba56e14b7a70d5a5a5ab90ccdb25373ea01662720cdc55205491676136681f3e5a3f2a41593e9e78f3e0f7068bd307768a4c9f256cbd74372cef9107
+  metadata.gz: b2824b0ef3da11028f88d8ab0b03e98e73f1e594a1817d32f740194727ff37668d4f7a359af09742c4f2397ee44b765a0c3999952bd941054ff2ab268f4bb28e
+  data.tar.gz: d7dafb70c5bea0fde0f922fc02d4cc8583763e1bfe334538a4b971a416a0154dbbf8c4718692d88b2731a2870f58c191ceb71f2fc10bb017214239411543ffb3

data/lib/phlexi/form/base.rb

@@ -49,6 +49,7 @@ module Phlexi
       def initialize(record, action: nil, method: nil, attributes: {}, **options)
         @form_action = action
         @form_method = method
+        @dom_id = attributes.delete(:id)
         @attributes = attributes
         @namespace_klass = options.delete(:namespace_klass) || default_namespace_klass
         @builder_klass = options.delete(:builder_klass) || default_builder_klass
@@ -135,7 +136,7 @@ module Phlexi
       #
       # @return [void]
       def initialize_namespace
-        @namespace = namespace_klass.root(key, object: object, builder_klass: builder_klass)
+        @namespace = namespace_klass.root(key, object: object, builder_klass: builder_klass, dom_id: @dom_id)
       end
 
       # Initializes form attributes.
@@ -183,15 +184,18 @@ module Phlexi
       #
       # @return [ActiveSupport::StringInquirer] The form's HTTP method
       def form_method
-        @form_method ||= (object_form_method || "get").to_s.downcase
-        ActiveSupport::StringInquirer.new(@form_method)
+        @form_method ||= object_form_method || :get
+      end
+
+      def inquirable_form_method
+        ActiveSupport::StringInquirer.new(form_method.to_s.downcase)
       end
 
       # Checks if the authenticity token should be included.
       #
       # @return [Boolean] True if the authenticity token should be included, false otherwise
       def has_authenticity_token?
-        !form_method.get? && ((defined?(helpers) && helpers) || options[:authenticity_token])
+        !inquirable_form_method.get? && ((defined?(helpers) && helpers) || options[:authenticity_token])
       end
 
       # Retrieves the authenticity token.
@@ -233,14 +237,14 @@ module Phlexi
       #
       # @return [Boolean] True if the form method is standard, false otherwise
       def standard_form_method?
-        form_method.get? || form_method.post?
+        inquirable_form_method.get? || inquirable_form_method.post?
       end
 
       # Returns the standardized form method for the HTML form tag.
       #
       # @return [String] The standardized form method
       def standardized_form_method
-        standard_form_method? ? form_method : "post"
+        standard_form_method? ? form_method : :post
       end
 
       # Generates the form attributes hash.

data/lib/phlexi/form/builder.rb

@@ -43,8 +43,8 @@ module Phlexi
       #
       # @param attributes [Hash] Additional attributes for the input.
       # @return [Components::Input] The input component.
-      def input_tag(**, &)
-        create_component(Components::Input, :input, **, &)
+      def input_tag(theme: :input, **, &)
+        create_component(Components::Input, theme, **, &)
       end
 
       def string_tag(**, &)
@@ -252,8 +252,14 @@ module Phlexi
       protected
 
       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), &)
+        theme_attributes = apply_component_theme(attributes, theme_key)
+        extra_attributes = if component_class.include?(Phlexi::Form::Components::Concerns::HandlesInput)
+          input_attributes
+        else
+          {}
+        end
+        attributes = mix(theme_attributes, extra_attributes, attributes)
+        component = component_class.new(self, **attributes, &)
         if component_class.include?(Components::Concerns::ExtractsInput)
           raise "input component already defined: #{@field_input_extractor.inspect}" if @field_input_extractor
 
@@ -264,10 +270,10 @@ module Phlexi
       end
 
       def apply_component_theme(attributes, theme_key)
-        return attributes if attributes.key?(:class!)
+        return {} if attributes.key?(:class!)
 
         theme_key = attributes.delete(:theme) || theme_key
-        mix({class: themed(theme_key, self)}, attributes)
+        {class: themed(theme_key, self)}
       end
 
       def determine_initial_value(value)
@@ -276,12 +282,8 @@ module Phlexi
         determine_value_from_association || super
       end
 
-      def determine_value_from_object
-        object.respond_to?(key) ? object.public_send(key) : nil
-      end
-
       def determine_value_from_association
-        return nil unless association_reflection.present?
+        return unless association_reflection.present?
 
         value = object.public_send(key)
         case association_reflection.macro

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

@@ -20,6 +20,8 @@ module Phlexi
             association_reflection.polymorphic? ? :"polymorphic_#{association_reflection.macro}" : association_reflection.macro
           when :attachment, :binary
             :file
+          when :citext
+            infer_string_field_type || :string
           when :date, :time, :datetime, :boolean, :hstore
             inferred_field_type
           else

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

@@ -17,7 +17,7 @@ module Phlexi
             end
           else
             input = each_with_object({}) do |child, hash|
-              hash.merge! child.extract_input(params[key])
+              hash.merge! child.extract_input(params[key]) if params
             end
             {key => input}
           end

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.4.4"
+    VERSION = "0.4.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-06 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex