eac_rails_utils 0.13.3 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7156f5e6b807386aff176fcb1dbe8461f95de94e60292d19d04112e988e440d8
-  data.tar.gz: a5a4b862946e67c883889627de183ab18981fa940a87be7918bfe8216990e1dc
+  metadata.gz: 7137f7331f9f361c5371306a1c2c607495dd3897bef11c887aad02535814c312
+  data.tar.gz: b226cce4f9f3dc400a97426fa13a0d00d5fa2d157fd48bbda07873218832bd45
 SHA512:
-  metadata.gz: aaa6c8a6736f484fc769f892a421b152f2f7eee58d04aca66202cc68ed50aa43823893d22a34627b6361667faa80973f1c7f0aa50bc57a891daf9f0181c3816b
-  data.tar.gz: aac2e1e91726bdee9526d222c9c0db0955a16071bb014ec5a65803c7bda4af684669c264d2ce486c669626a803e1f6da688b076b5b401e544faac653456bba8d
+  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/config/initializers/json.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+def patch_json?
+  require 'json'
+
+  ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.7') &&
+    ::Gem::Version.new(JSON::VERSION) < ::Gem::Version.new('2')
+rescue ::LoadError
+  false
+end
+
+if patch_json?
+  module JSON
+    module_function
+
+    def parse(source, opts = {})
+      Parser.new(source, **opts).parse
+    end
+  end
+end

data/lib/eac_rails_utils/patches/active_model_associations.rb

@@ -1,38 +1,34 @@
 # frozen_string_literal: true
 
-require 'active_model/associations/hooks'
 require 'activemodel/associations'
-
-module EacRailsUtils
-  module Patches
-    module ActiveModelAssociations
-      module ScopeExtensionPatch
-        def add_constraints(scope, owner, association_klass, *extra_args)
-          if extra_args.any?
-            refl = extra_args.first
-            if refl.options[:active_model]
-              target_ids = refl.options[:target_ids]
-              return scope.where(id: owner[target_ids])
-            end
-          end
-
-          super
-        end
-      end
-    end
-  end
-end
+require 'eac_rails_utils/patches/rails_4'
+require 'eac_rails_utils/patches/rails_5_2'
 
 module ActiveModel
   module Associations
     module Hooks
-      def self.init
-        return unless ::Rails.version < '5'
+      class << self
+        def init
+          init_rails_4 if ::EacRailsUtils::Patches::Rails4.enabled?
+          init_rails_5_2 if ::EacRailsUtils::Patches::Rails52.enabled?
+        end
+
+        def init_rails_4
+          ActiveSupport.on_load(:active_record) do
+            ActiveRecord::Associations::AssociationScope.prepend(
+              ::EacRailsUtils::Patches::Rails4::ActiveRecordAssociationsAssociationScope
+            )
+          end
+        end
 
-        ActiveSupport.on_load(:active_record) do
-          ActiveRecord::Associations::AssociationScope.prepend(
-            ::EacRailsUtils::Patches::ActiveModelAssociations::ScopeExtensionPatch
-          )
+        def init_rails_5_2
+          rails_5_2_fix_activemodel_associations_methods
+        end
+
+        def rails_5_2_fix_activemodel_associations_methods
+          %i[belongs_to has_many].each do |method|
+            ::EacRailsUtils::Patches::Rails52::ActiveModelAssociationMethodFix.new(method)
+          end
         end
       end
     end

data/lib/eac_rails_utils/patches/rails_4/active_record_associations_association_scope.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'activemodel/associations'
+
+module EacRailsUtils
+  module Patches
+    module Rails4
+      module ActiveRecordAssociationsAssociationScope
+        def add_constraints(scope, owner, association_klass, *extra_args)
+          if extra_args.any?
+            refl = extra_args.first
+            if refl.options[:active_model]
+              target_ids = refl.options[:target_ids]
+              return scope.where(id: owner[target_ids])
+            end
+          end
+
+          super
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/patches/rails_4.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'active_model/associations/hooks'
+require 'eac_ruby_utils/require_sub'
+
+module EacRailsUtils
+  module Patches
+    module Rails4
+      ::EacRubyUtils.require_sub __FILE__
+
+      class << self
+        def enabled?
+          ::Rails.version < '5'
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/patches/rails_5_2/active_model_association_method_fix.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'activemodel/associations'
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsUtils
+  module Patches
+    module Rails52
+      class ActiveModelAssociationMethodFix
+        common_constructor :method_name do
+          perform
+        end
+
+        def original_method_new_name
+          "original_#{method_name}".to_sym
+        end
+
+        private
+
+        def the_module
+          ::ActiveModel::Associations::ClassMethods
+        end
+
+        def perform
+          patch = self
+          the_module.class_eval do
+            alias_method patch.original_method_new_name, patch.method_name
+            remove_method patch.method_name
+
+            define_method patch.method_name do |name, scope = nil, **options, &extension|
+              send(patch.original_method_new_name, name, scope, options, &extension)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/patches/rails_5_2.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'active_model/associations/hooks'
+require 'eac_ruby_utils/require_sub'
+
+module EacRailsUtils
+  module Patches
+    module Rails52
+      ::EacRubyUtils.require_sub __FILE__
+
+      class << self
+        def enabled?
+          ::Rails.version >= '5.2'
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/rspec/setup/models_utils.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsUtils
+  module Rspec
+    module Setup
+      module ModelsUtils
+        def model_record_attribute_test(record_variable, attribute, valid, value)
+          context("when #{record_variable}.#{attribute} == #{value}") do
+            before do
+              send(record_variable).send("#{attribute}=", value)
+            end
+
+            it "#{record_variable} should be {valid ? '' : 'not '}valid" do
+              expect(send(record_variable).valid?).to send("be_#{valid ? 'truthy' : 'falsy'}"),
+                                                      send(record_variable).errors.messages
+            end
+          end
+        end
+
+        def model_record_values_attribute_test(record_variable, attribute, valid, values)
+          values.each do |value|
+            model_record_attribute_test(record_variable, attribute, valid, value)
+          end
+        end
+
+        def model_record_valid_invalid_values_attribute_test(record_variable, attribute,
+                                                             valid_values, invalid_values)
+          {
+            false => invalid_values,
+            true => valid_values
+          }.each do |valid, values|
+            model_record_values_attribute_test(record_variable, attribute, valid, values)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/rspec/setup.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsUtils
+  module Rspec
+    module Setup
+      require_sub __FILE__
+
+      def self.extended(setup_obj)
+        setup_obj.rspec_config.extend(::EacRailsUtils::Rspec::Setup::ModelsUtils)
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/rspec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacRailsUtils
+  module Rspec
+    require 'eac_ruby_utils/require_sub'
+    ::EacRubyUtils.require_sub(__FILE__)
+  end
+end

data/lib/eac_rails_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsUtils
-  VERSION = '0.13.3'
+  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.13.3
+  version: 0.14.1
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-associations
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 description: 
 email: 
 executables: []
@@ -162,6 +162,7 @@ files:
 - app/validators/eac_rails_utils/cpf_validator.rb
 - app/validators/eac_rails_utils/no_presence_validator.rb
 - config/initializers/assets.rb
+- config/initializers/json.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - lib/assets/images/sort_asc.png
@@ -195,6 +196,13 @@ files:
 - lib/eac_rails_utils/patches.rb
 - lib/eac_rails_utils/patches/action_controller_base.rb
 - lib/eac_rails_utils/patches/active_model_associations.rb
+- lib/eac_rails_utils/patches/rails_4.rb
+- lib/eac_rails_utils/patches/rails_4/active_record_associations_association_scope.rb
+- lib/eac_rails_utils/patches/rails_5_2.rb
+- lib/eac_rails_utils/patches/rails_5_2/active_model_association_method_fix.rb
+- lib/eac_rails_utils/rspec.rb
+- lib/eac_rails_utils/rspec/setup.rb
+- lib/eac_rails_utils/rspec/setup/models_utils.rb
 - lib/eac_rails_utils/version.rb
 homepage: 
 licenses: []