phlexi-form 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8747d53fec5851c3ad3f78d2c60fecfea530de3b033eb074ee5f4ce41bcd3181
-  data.tar.gz: 51c02f430a3a81a4ee05197463a14aa9b00804c0a5b3a1837f36533b006d9860
+  metadata.gz: 5436d0872cd013770ac81aecaf6cd805b44762f5bd32bb3d4a95c6f9d3e936d1
+  data.tar.gz: dfddac5493ba78744bcc1956e8a7445579a6599631c4f4c00e74d9aa5f3ecd67
 SHA512:
-  metadata.gz: 7434f1529fda38b7e02318c01be2fba09a97de755c874d2319730e4118d747a20bac457e7421bb34f0280f7e405079717df55e3d5ba3f32934f51deb1ebf43d7
-  data.tar.gz: 7457a359784b5404fee4a86ecdce99769f7899e080b7148aaff045719d536499efb4c6103c04334675258af94b74dbd10a9acacb7f327fb3a0f5f1508223f5bd
+  metadata.gz: 1fe41d20bf2b26c29e71ebb932576a4b49751773f60c1d365cd6ad3f01a70dcda7e6dec894418654718fdf2514d860d92e2fad4d25254bbf7fb65151a5f0fefa
+  data.tar.gz: f32c8922f62bb618034a40dff29554d2171b5b46459c8200388a7162f0072360b5c0091c2fd9bace45923e17b73e086b98b49afe7e2d2be6ff211552f5dd7f47

data/lib/phlexi/form/builder.rb

@@ -175,11 +175,23 @@ module Phlexi
         raise NotImplementedError, "has_one associations are NOT supported"
       end
 
+      def polymorphic_has_one_tag(**, &)
+        # TODO: this requires a grouped_select component
+        # see: Plutonium::Core::Fields::Inputs::PolymorphicBelongsToAssociationInput
+        raise NotImplementedError, "polymorphic has_one associations are not YET supported"
+      end
+
       def has_many_tag(**, &)
         create_component(Components::HasMany, :has_many, **, &)
       end
       alias_method :has_and_belongs_to_many_tag, :has_many_tag
 
+      def polymorphic_has_many_tag(**, &)
+        # TODO: this requires a grouped_select component
+        # see: Plutonium::Core::Fields::Inputs::PolymorphicBelongsToAssociationInput
+        raise NotImplementedError, "polymorphic has_many associations are not YET supported"
+      end
+
       def input_array_tag(**, &)
         create_component(Components::InputArray, :array, **, &)
       end
@@ -276,26 +288,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,64 @@
+# frozen_string_literal: true
+
+module Phlexi
+  module Form
+    module Components
+      class AssociationBase < Select
+        protected
+
+        delegate :association_reflection, to: :field
+
+        def build_association_attributes
+          raise NotImplementedError, "#{self.class}#build_association_attributes"
+        end
+
+        def choices
+          raise NotImplementedError, "#{self.class}#choices"
+        end
+
+        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 choices_from_association(klass)
+          relation = klass.all
+
+          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
+              association_reflection.klass.instance_exec(&association_reflection.scope)
+            end
+          else
+            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?
+            relation = relation.order(order) if relation.respond_to?(:order)
+          end
+
+          relation
+        end
+      end
+    end
+  end
+end

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

@@ -3,17 +3,17 @@
 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
+        def choices
+          @choices ||= begin
+            collection = choices_from_association(association_reflection.klass)
+            build_choice_mapper(collection)
+          end
         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

@@ -24,17 +24,9 @@ module Phlexi
 
           def selected?(option)
             if attributes[:multiple]
-              field_value.any? { |item| item.to_s == option.to_s }
+              Array(field.value).any? { |item| item.to_s == option.to_s }
             else
-              field_value.to_s == option.to_s
-            end
-          end
-
-          def field_value
-            if attributes[:multiple]
-              Array(field.value)
-            else
-              field.value
+              field.value.to_s == option.to_s
             end
           end
 

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

@@ -3,17 +3,17 @@
 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
+        def choices
+          @choices ||= begin
+            collection = choices_from_association(association_reflection.klass)
+            build_choice_mapper(collection)
+          end
         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/grouped_choices_mapper.rb

@@ -17,6 +17,13 @@ module Phlexi
         grouped_choices.each(&)
       end
 
+      # @return [Array<String>] An array of all choice values.
+      def values
+        @values ||= grouped_choices.values.flat_map(&:values)
+      end
+
+      private
+
       def grouped_choices
         @grouped_choices ||= materialize_grouped_choices(@collection)
       end
@@ -34,8 +41,6 @@ module Phlexi
         end
       end
 
-      private
-
       def array_to_grouped_hash(array)
         sample = array.first
         if group_method == :last && sample.is_a?(Array) && sample.size == 2

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

@@ -20,30 +20,7 @@ module Phlexi
             return object.class.defined_enums.fetch(key.to_s).keys if object.class.defined_enums.key?(key.to_s)
           end
 
-          choices_from_association || choices_from_validator
-        end
-
-        def choices_from_association
-          return unless association_reflection
-
-          relation = association_reflection.klass.all
-
-          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
-              association_reflection.klass.instance_exec(&association_reflection.scope)
-            end
-          else
-            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?
-            relation = relation.order(order) if relation.respond_to?(:order)
-          end
-
-          relation
+          choices_from_validator
         end
 
         def choices_from_validator

data/lib/phlexi/form/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.8.0"
+    VERSION = "0.8.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Stefan Froelich
@@ -205,6 +205,7 @@ files:
 - lib/phlexi/form.rb
 - lib/phlexi/form/base.rb
 - lib/phlexi/form/builder.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