phlexi-form 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5efa476cb7e4856462046b6658c996843537b102f807e5c7c08a2d8e88520d11
-  data.tar.gz: 1938daa8358013cee51abd0b4d50188c99459c6b714470002e4ec26a77e0b224
+  metadata.gz: 5cdc4a47adf374d0b808624816ac63ea57fd62241a2be9051188bb2af878fa5f
+  data.tar.gz: 7702abb1fdeed8416dffac18d7d2d9b1bcf27a4ff5dd4df1352970c9fc24f988
 SHA512:
-  metadata.gz: a0b9918b54df47959563f801982e0cbfae8b2a22f21ea2900cb64be952c891b7df7702361255c09063b45a858ed4fc9445911bc73d1766edf3f91ed91000417a
-  data.tar.gz: 73de9965cf5106cefe30081ba2d2a822d725ec203cb26d4d1fd2f2be53b336fd56aa227c2935b85b6d405ddf9a4dca35096f010d98d4724285d9dbfd9c2d8df8
+  metadata.gz: 9597ee8e767850282a7c7d1a9b96153cbdb9ebe939cc026e19f9aa99e2600edf99fb095b92302bf6caf41b35ba391496e5cdbaf7a256c16dd320019f63c260d3
+  data.tar.gz: c70bdee290744b95cb72f0841e9e33b909019b39c0727691510b17b539573ac29884e32a28445e60a00085aaf0efc99b2b6ca5ef81e5b9df4dd4dc159ad7d663

data/lib/phlexi/form/builder.rb

@@ -276,26 +276,6 @@ module Phlexi
         theme_key = attributes.delete(:theme) || theme_key
         mix({class: themed(theme_key, self)}, attributes)
       end
-
-      def determine_initial_value(value)
-        return value unless value == NIL_VALUE
-
-        determine_value_from_association || super
-      end
-
-      def determine_value_from_association
-        return unless association_reflection.present?
-
-        value = object.public_send(key)
-        case association_reflection.macro
-        when :has_many, :has_and_belongs_to_many
-          value&.map { |v| v.public_send(association_reflection.klass.primary_key) }
-        when :belongs_to, :has_one
-          value&.public_send(association_reflection.klass.primary_key)
-        else
-          raise ArgumentError, "Unsupported association type: #{association_reflection.macro}"
-        end
-      end
     end
   end
 end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Form
+    module Components
+      class AssociationBase < Select
+        protected
+
+        delegate :association_reflection, to: :field
+
+        def selected?(option)
+          case association_reflection.macro
+          when :belongs_to, :has_one
+            singular_field_value.to_s == option.to_s
+          when :has_many, :has_and_belongs_to_many
+            collection_field_value.any? { |item| item.to_s == option.to_s }
+          end
+        end
+
+        def singular_field_value
+          @singular_field_value ||= field.value&.public_send(association_reflection.klass.primary_key)
+        end
+
+        def collection_field_value
+          @collection_field_value ||= field.value&.map { |v| v.public_send(association_reflection.klass.primary_key) }
+        end
+
+        def build_attributes
+          build_association_attributes
+          super
+        end
+
+        def build_association_attributes
+          raise NotImplementedError, "#{self.class}#build_association_attributes"
+        end
+      end
+    end
+  end
+end

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

@@ -3,17 +3,10 @@
 module Phlexi
   module Form
     module Components
-      class BelongsTo < Select
+      class BelongsTo < AssociationBase
         protected
 
-        delegate :association_reflection, to: :field
-
-        def build_attributes
-          build_belongs_to_attributes
-          super
-        end
-
-        def build_belongs_to_attributes
+        def build_association_attributes
           attributes.fetch(:input_param) do
             attributes[:input_param] = if association_reflection.respond_to?(:options) && association_reflection.options[:foreign_key]
               association_reflection.options[:foreign_key]

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

@@ -9,34 +9,49 @@ module Phlexi
 
           def build_attributes
             super
-            @choice_collection = attributes.delete(:choices) || field.choices
             @label_method = attributes.delete(:label_method)
             @value_method = attributes.delete(:value_method)
+            @group_method = attributes.delete(:group_method)
+            @group_label_method = attributes.delete(:group_label_method)
           end
 
           def choices
-            @choices ||= ChoicesMapper.new(@choice_collection, label_method: @label_method, value_method: @value_method)
-          end
-
-          def selected?(option)
-            if attributes[:multiple]
-              field_value.any? { |item| item.to_s == option.to_s }
-            else
-              field_value.to_s == option.to_s
+            @choices ||= begin
+              collection = attributes.delete(:choices) || field.choices
+              build_choice_mapper(collection)
             end
           end
 
-          def field_value
+          def selected?(option)
             if attributes[:multiple]
-              Array(field.value)
+              Array(field.value).any? { |item| item.to_s == option.to_s }
             else
-              field.value
+              field.value.to_s == option.to_s
             end
           end
 
           def normalize_simple_input(input_value)
+            # ensure that choice is in the list
             ([super] & choices.values)[0]
           end
+
+          def build_choice_mapper(collection)
+            if @group_method
+              GroupedChoicesMapper.new(
+                collection,
+                group_method: @group_method,
+                group_label_method: @group_label_method,
+                label_method: @label_method,
+                value_method: @value_method
+              )
+            else
+              SimpleChoicesMapper.new(
+                collection,
+                label_method: @label_method,
+                value_method: @value_method
+              )
+            end
+          end
         end
       end
     end

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

@@ -3,17 +3,10 @@
 module Phlexi
   module Form
     module Components
-      class HasMany < Select
+      class HasMany < AssociationBase
         protected
 
-        delegate :association_reflection, to: :field
-
-        def build_attributes
-          build_has_many_attributes
-          super
-        end
-
-        def build_has_many_attributes
+        def build_association_attributes
           attributes.fetch(:input_param) {
             attributes[:input_param] = :"#{association_reflection.name.to_s.singularize}_ids"
           }

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

@@ -19,8 +19,18 @@ module Phlexi
         protected
 
         def options
-          choices.each do |value, label|
-            option(selected: selected?(value), value: value) { label }
+          if choices.is_a?(GroupedChoicesMapper)
+            choices.each do |group_label, group_choices|
+              optgroup(label: group_label) do
+                group_choices.each do |value, label|
+                  option(selected: selected?(value), value: value) { label }
+                end
+              end
+            end
+          else
+            choices.each do |value, label|
+              option(selected: selected?(value), value: value) { label }
+            end
           end
         end
 

data/lib/phlexi/form/grouped_choices_mapper.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Form
+    class GroupedChoicesMapper
+      include Enumerable
+
+      def initialize(collection, group_method:, group_label_method: :to_s, label_method: nil, value_method: nil)
+        @collection = collection
+        @group_method = group_method
+        @group_label_method = group_label_method
+        @label_method = label_method
+        @value_method = value_method
+      end
+
+      def each(&)
+        grouped_choices.each(&)
+      end
+
+      def grouped_choices
+        @grouped_choices ||= materialize_grouped_choices(@collection)
+      end
+
+      def materialize_grouped_choices(collection)
+        case collection
+        in Hash => hash
+          hash.transform_values { |items| to_choices_mapper(items) }
+        in Array => arr
+          array_to_grouped_hash(arr)
+        in Proc => proc
+          materialize_grouped_choices(proc.call)
+        else
+          record_collection_to_hash
+        end
+      end
+
+      private
+
+      def array_to_grouped_hash(array)
+        sample = array.first
+        if group_method == :last && sample.is_a?(Array) && sample.size == 2
+          array.each_with_object({}) do |(label, items), hash|
+            hash[label.to_s] = to_choices_mapper(items)
+          end
+        else
+          record_collection_to_hash
+        end
+      end
+
+      def record_collection_to_hash
+        @collection.group_by do |item|
+          group = item.public_send(@group_method)
+          group.public_send(@group_label_method).to_s
+        end.transform_values { |items| to_choices_mapper(items) }
+      end
+
+      def to_choices_mapper(items)
+        SimpleChoicesMapper.new(items, label_method: @label_method, value_method: @value_method)
+      end
+    end
+  end
+end

data/lib/phlexi/form/{choices_mapper.rb → simple_choices_mapper.rb}

@@ -2,31 +2,31 @@
 
 module Phlexi
   module Form
-    # ChoicesMapper is responsible for converting a collection of objects into a hash of options
+    # SimpleChoicesMapper is responsible for converting a collection of objects into a hash of options
     # suitable for form controls, such as `select > options`.
     # Both values and labels are converted to strings.
     #
     # @example Basic usage
     #   collection = [["First", 1], ["Second", 2]]
-    #   mapper = ChoicesMapper.new(collection)
+    #   mapper = SimpleChoicesMapper.new(collection)
     #   mapper.each { |value, label| puts "#{value}: #{label}" }
     #
     # @example Using with ActiveRecord objects
     #   users = User.all
-    #   mapper = ChoicesMapper.new(users)
+    #   mapper = SimpleChoicesMapper.new(users)
     #   mapper.each { |id, name| puts "#{id}: #{name}" }
     #
     # @example Array access with different value types
-    #   mapper = ChoicesMapper.new([["Integer", 1], ["String", "2"], ["Symbol", :three]])
+    #   mapper = SimpleChoicesMapper.new([["Integer", 1], ["String", "2"], ["Symbol", :three]])
     #   puts mapper["1"]      # Output: "Integer"
     #   puts mapper["2"]      # Output: "String"
     #   puts mapper["three"]  # Output: "Symbol"
     #
     # @note This class is thread-safe as it doesn't maintain mutable state.
-    class ChoicesMapper
+    class SimpleChoicesMapper
       include Enumerable
 
-      # Initializes a new ChoicesMapper instance.
+      # Initializes a new SimpleChoicesMapper instance.
       #
       # @param collection [#call, #to_a] The collection to be mapped.
       # @param label_method [Symbol, nil] The method to call on each object to get the label.
@@ -93,9 +93,9 @@ module Phlexi
         else
           array_to_hash(Array(collection))
         end
-      rescue ArgumentError
-        # Rails.logger.warn("Unhandled inclusion collection type: #{e}")TODO
-        {}
+        # rescue ArgumentError
+        #   # Rails.logger.warn("Unhandled inclusion collection type: #{e}")TODO
+        #   {}
       end
 
       # Converts an array to a hash using detected or specified methods.

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.7.2"
+    VERSION = "0.8.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - Stefan Froelich
@@ -205,7 +205,7 @@ files:
 - lib/phlexi/form.rb
 - lib/phlexi/form/base.rb
 - lib/phlexi/form/builder.rb
-- lib/phlexi/form/choices_mapper.rb
+- lib/phlexi/form/components/association_base.rb
 - lib/phlexi/form/components/base.rb
 - lib/phlexi/form/components/belongs_to.rb
 - lib/phlexi/form/components/checkbox.rb
@@ -231,6 +231,7 @@ files:
 - lib/phlexi/form/components/submit_button.rb
 - lib/phlexi/form/components/textarea.rb
 - lib/phlexi/form/components/wrapper.rb
+- lib/phlexi/form/grouped_choices_mapper.rb
 - lib/phlexi/form/html.rb
 - lib/phlexi/form/options/autofocus.rb
 - lib/phlexi/form/options/choices.rb
@@ -247,6 +248,7 @@ files:
 - lib/phlexi/form/options/required.rb
 - lib/phlexi/form/options/step.rb
 - lib/phlexi/form/options/validators.rb
+- lib/phlexi/form/simple_choices_mapper.rb
 - lib/phlexi/form/structure/field_collection.rb
 - lib/phlexi/form/structure/manages_fields.rb
 - lib/phlexi/form/structure/namespace.rb