eac_rails_utils 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c4f6d085f9a7e1f6b39c4028498cac28f482540993e73bdadff0b58e6f1e214
-  data.tar.gz: d369558ea68714a4d0dedb89b3af900945be5c57113da0241b5332e818f634d8
+  metadata.gz: 7137f7331f9f361c5371306a1c2c607495dd3897bef11c887aad02535814c312
+  data.tar.gz: b226cce4f9f3dc400a97426fa13a0d00d5fa2d157fd48bbda07873218832bd45
 SHA512:
-  metadata.gz: 591317f786a1edac276ac1ce0ecea5dcacbdfdbbd5635b51cd8e064c45ea921e4b8819bf78b49be0e708d13843843b896ab4e33d8f034e1146cb6584e0a9c798
-  data.tar.gz: 6f9760a2990de21e42b779f22d38aff09fa83b722959f551aff3bace7b9eef7f0db9cb8acb617bd3a5d4f9935e95090546c64de317cd8d68d4503b2d0e11989f
+  metadata.gz: 51cab365aec88b22c1a4765e3537f8b661eff6e06290210b5cd79e4d18f2a07a8de3c7ee059eb5b0809e71359c9c855cbee406f0d94c7a8381de78f45dbdebeb
+  data.tar.gz: b2e42d61fbf1ed64f5297a7762e0bde11522682c12d02e4d9ca864d3000def5d037d512134bbae2ad9e998f4a3567f5326fb81db29e3fe5a9870b1f1926266ce

data/app/helpers/eac_rails_utils/common_form_helper/form_builder/association_select_field.rb

@@ -3,22 +3,51 @@
 module EacRailsUtils
   module CommonFormHelper
     class FormBuilder
-      module AssociationSelectField
-        def association_select_field(field_name, options = {})
-          options = options.dup
-          methods = extract_methods(options)
-          select_options = extract_select_options(options)
-          collection = extract_association_key(field_name, options, :collection, :all)
-          foreign_key =  extract_association_key(field_name, options, :foreign_key,
-                                                 :association_foreign_key)
-          field(field_name, options) do
-            form.collection_select(foreign_key, collection, methods[:value], methods[:text],
-                                   select_options, class: 'form-control')
+      class AssociationSelectField
+        common_constructor :builder, :field_name, :options, default: [{}] do
+          self.options = options.dup
+        end
+
+        delegate :model_instance, to: :builder
+
+        def collection
+          extract_association_key(:collection, *(
+              ::Rails.version < '5' ? [:all] : %i[klass all]
+            ))
+        end
+
+        def foreign_key
+          extract_association_key(:foreign_key, (
+              ::Rails.version < '5' ? :association_foreign_key : :join_foreign_key
+            ))
+        end
+
+        def methods
+          extract_methods(options)
+        end
+
+        def output
+          builder.send(:field, field_name, options) do
+            builder.form.collection_select(foreign_key, collection, methods[:value], methods[:text],
+                                           select_options, class: 'form-control')
           end
         end
 
+        def select_options
+          extract_select_options(options)
+        end
+
         private
 
+        def association_reflection
+          if model_instance.class.respond_to?(:reflect_on_association)
+            model_instance.class.reflect_on_association(field_name)
+          else
+            raise "#{model_instance.class} não possui um método \"reflect_on_association\". " \
+              "Defina explicitamente a opção :#{key}"
+          end
+        end
+
         def extract_methods(options)
           { value: options.delete(:value_method) || :id, text:
               options.delete(:text_method) || :to_s }
@@ -28,14 +57,12 @@ module EacRailsUtils
           options.extract!(:prompt, :include_blank)
         end
 
-        def extract_association_key(field_name, options, key, method)
-          return options.delete(key) if options.key?(key)
-          if model_instance.class.respond_to?(:reflect_on_association)
-            return model_instance.class.reflect_on_association(field_name).send(method)
+        def extract_association_key(key, *methods)
+          if options.key?(key)
+            options.fetch(key)
+          else
+            methods.inject(association_reflection) { |a, e| a.send(e) }
           end
-
-          raise "#{model_instance.class} não possui um método \"reflect_on_association\". " \
-            "Defina explicitamente a opção :#{key}"
         end
       end
     end

data/app/helpers/eac_rails_utils/common_form_helper/form_builder.rb

@@ -8,7 +8,6 @@ module EacRailsUtils
     class FormBuilder
       ::EacRubyUtils.require_sub __FILE__
 
-      include AssociationSelectField
       include CommonTextFields
       include CurrencyField
       include DateField
@@ -27,6 +26,11 @@ module EacRailsUtils
         @field_errors_showed = Set.new
       end
 
+      def association_select_field(field_name, options = {})
+        ::EacRailsUtils::CommonFormHelper::FormBuilder::AssociationSelectField
+          .new(self, field_name, options).output
+      end
+
       def model_instance
         form.object
       end

data/lib/eac_rails_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsUtils
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-associations