eac_rails_utils 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38b7d92069d23f67edd417c1271639ccdc5612e9feceb7cd1bb1ede4898995a
-  data.tar.gz: 8a01b9127fdeefb36947ff20ee3f6b912e1a2eb37c614bdf70cae702386465c2
+  metadata.gz: 5c4f6d085f9a7e1f6b39c4028498cac28f482540993e73bdadff0b58e6f1e214
+  data.tar.gz: d369558ea68714a4d0dedb89b3af900945be5c57113da0241b5332e818f634d8
 SHA512:
-  metadata.gz: 9474fb9b74aa4ab2206c977327e4b412384fc5a48ec4fa1c05cb69d42eec636af3db5e96c9fe46c3d2bad2c50a9f4f61ea23a61aab2e58c85418505885335403
-  data.tar.gz: 29927c86f2c9981e83bbe734371b63f2b3d44e3b0b1354e63e266f3dc131e28a679c18501e740ae5e3b86e3093b99127e048b43788fe9b85909dfa5d96aad048
+  metadata.gz: 591317f786a1edac276ac1ce0ecea5dcacbdfdbbd5635b51cd8e064c45ea921e4b8819bf78b49be0e708d13843843b896ab4e33d8f034e1146cb6584e0a9c798
+  data.tar.gz: 6f9760a2990de21e42b779f22d38aff09fa83b722959f551aff3bace7b9eef7f0db9cb8acb617bd3a5d4f9935e95090546c64de317cd8d68d4503b2d0e11989f

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.2'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-15 00:00:00.000000000 Z
+date: 2021-10-24 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.2'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        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: []