phlexi-form 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cdc4a47adf374d0b808624816ac63ea57fd62241a2be9051188bb2af878fa5f
-  data.tar.gz: 7702abb1fdeed8416dffac18d7d2d9b1bcf27a4ff5dd4df1352970c9fc24f988
+  metadata.gz: 5e7202d74e3e085564ee24e9bcfd7c0b983bd7de21166c51131b4adea20e5e43
+  data.tar.gz: dbeef2da87b88a8ed79a227bfbe406eeb8182871638a77b7107d843eaf9555de
 SHA512:
-  metadata.gz: 9597ee8e767850282a7c7d1a9b96153cbdb9ebe939cc026e19f9aa99e2600edf99fb095b92302bf6caf41b35ba391496e5cdbaf7a256c16dd320019f63c260d3
-  data.tar.gz: c70bdee290744b95cb72f0841e9e33b909019b39c0727691510b17b539573ac29884e32a28445e60a00085aaf0efc99b2b6ca5ef81e5b9df4dd4dc159ad7d663
+  metadata.gz: e5c4686b6cd6bdd891a021a1c10a31c58f098065e4c148e07d887ff75b5d6f71d6dc574f00675cf87dad8a84dd7b09a92da1c9b452d4308678008b6ec642ff48
+  data.tar.gz: 04252d73419ca890ff4aa8c3ebc18a730041f7e5971e3e640fd2a16db91952725ae4b033fd9f0aa68dc4df9fbdb3ac09273e27c04517aedb2222184f85df9d38

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

@@ -8,6 +8,14 @@ module Phlexi
 
         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
@@ -30,8 +38,25 @@ module Phlexi
           super
         end
 
-        def build_association_attributes
-          raise NotImplementedError, "#{self.class}#build_association_attributes"
+        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

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

@@ -6,6 +6,13 @@ module Phlexi
       class BelongsTo < AssociationBase
         protected
 
+        def choices
+          @choices ||= begin
+            collection = choices_from_association(association_reflection.klass)
+            build_choice_mapper(collection)
+          end
+        end
+
         def build_association_attributes
           attributes.fetch(:input_param) do
             attributes[:input_param] = if association_reflection.respond_to?(:options) && association_reflection.options[:foreign_key]

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

@@ -6,6 +6,13 @@ module Phlexi
       class HasMany < AssociationBase
         protected
 
+        def choices
+          @choices ||= begin
+            collection = choices_from_association(association_reflection.klass)
+            build_choice_mapper(collection)
+          end
+        end
+
         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.1"
+    VERSION = "0.8.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlexi-form
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Stefan Froelich