phlexi-form 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8747d53fec5851c3ad3f78d2c60fecfea530de3b033eb074ee5f4ce41bcd3181
-  data.tar.gz: 51c02f430a3a81a4ee05197463a14aa9b00804c0a5b3a1837f36533b006d9860
+  metadata.gz: 5cdc4a47adf374d0b808624816ac63ea57fd62241a2be9051188bb2af878fa5f
+  data.tar.gz: 7702abb1fdeed8416dffac18d7d2d9b1bcf27a4ff5dd4df1352970c9fc24f988
 SHA512:
-  metadata.gz: 7434f1529fda38b7e02318c01be2fba09a97de755c874d2319730e4118d747a20bac457e7421bb34f0280f7e405079717df55e3d5ba3f32934f51deb1ebf43d7
-  data.tar.gz: 7457a359784b5404fee4a86ecdce99769f7899e080b7148aaff045719d536499efb4c6103c04334675258af94b74dbd10a9acacb7f327fb3a0f5f1508223f5bd
+  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

@@ -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,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/version.rb

@@ -2,6 +2,6 @@
 
 module Phlexi
   module Form
-    VERSION = "0.8.0"
+    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.8.0
+  version: 0.8.1
 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