eac_rails_utils 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7156f5e6b807386aff176fcb1dbe8461f95de94e60292d19d04112e988e440d8
-  data.tar.gz: a5a4b862946e67c883889627de183ab18981fa940a87be7918bfe8216990e1dc
+  metadata.gz: 843754871487598961a71d16871da8c3556d9d0097f0869838311d56c4e82df8
+  data.tar.gz: e5a72c9640c9c6aba5f720bbb1204371c0f63ffdf5309f497e537b0a74406721
 SHA512:
-  metadata.gz: aaa6c8a6736f484fc769f892a421b152f2f7eee58d04aca66202cc68ed50aa43823893d22a34627b6361667faa80973f1c7f0aa50bc57a891daf9f0181c3816b
-  data.tar.gz: aac2e1e91726bdee9526d222c9c0db0955a16071bb014ec5a65803c7bda4af684669c264d2ce486c669626a803e1f6da688b076b5b401e544faac653456bba8d
+  metadata.gz: eb890220eb07ca6a06e54a31d877779c043070b502d1a724236e5ea82c07839508487fe6effa5197d48928d1103eff5fd56d81dd8d54a3138a7c5404bf52057d
+  data.tar.gz: 94d56786e02f5fd2c3d3d4a7b42cb36ea9d601bf1e89828a1670477f36ce7d36e8d164b3028c709bbdca8f7123aa8971cadd2d03861179e7b0cdde4cc70fe679

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsUtils
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 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.13.4
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-09-05 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: []
@@ -195,6 +195,10 @@ 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/version.rb
 homepage: 
 licenses: []