eac_rails_utils 0.13.1 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a56887267261f2552a66ec8d52a9198be27aedc0dcf17929cd9b37800d90a5
-  data.tar.gz: 8dfae899c7cbde6ea7935e482f1568154ef4d14f7a312740bb71f69bd8f2a20d
+  metadata.gz: b1529b1bebaa871484fb124ed0a9fc52a8bed38eb14419a61b4423392a33a60e
+  data.tar.gz: ca06e07efcce2b7bd6689383a6daa2e2db6a299d20b6ab3aa73cdc8fbad5c364
 SHA512:
-  metadata.gz: c6eafd597cae6299dfcc6b3da6d13cd67ae2c596c275d68c5820464203d6a4828e9d66f85a22a644c52fc272324b5ae95925e3d3cde73fdc1fe99e11ca1e7e80
-  data.tar.gz: 9c413abc77ce04328afef5ad36fae4e45d2f07de827fff960f32942ece93a8e224fa4209ecf8eb4b133d92a287d559c014279d5c7b184dd81a1c59a49ac3928c
+  metadata.gz: 6edd15a5b430f16fe7459e8d0a7aa445440b0349f3af6c6f045d8a555d8870519a2b008976d93806276b729227cf967079387eee1864a1903fc5465a3934edb6
+  data.tar.gz: ac974c20369e17f6dfbe37b8ca1d6f3ddabe3b56494302cfc88beee67d4fa9cdb62faa9eed95d9adc1b680ac9c3d7d9e0379c44056bc9ea2dab76c6e07815a0a

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.1'
+  VERSION = '0.13.5'
 end

metadata

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