eac_rails_utils 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424e322548e7f55ef6044d3c7e4339cd8336b272604d40678c7016b218b69494
-  data.tar.gz: 28dd2d2a83760c49bbb30e0210e2c4aa096be75a77f7edf720cff7700f2cce9c
+  metadata.gz: 3aedeca11ee83d3ba78b7ed6e4018ec11ec5358279ee8aa60aeee9a704b67bc7
+  data.tar.gz: cf7618ee67289bbcfae473c46816562d43ed1054febf31982250b1f4c1db4184
 SHA512:
-  metadata.gz: c7ebba5d2e7736bcefdef37c3a015130047b12ff880b2862e871b3cbd7cd1e9c9ca5bde9ab7d51def8215d4c9049bfeb2cb1a9c2ed072011dd5402e850135d59
-  data.tar.gz: cc57e040cca6a24be309903034e74d7ff63394efd1090191f0c90b8620404ec2f31594fa4d166b40a872aa67481486c6093713722998cb77ad5d04e1298e6cea
+  metadata.gz: ba22996dcb260db19cfc7ea31adf12da8f530220c2426178a50b8fbd50094040aa8bb140d83d7f81b9a1ea987f6c278f0f29c8e3d9793f52e29688e0020801c6
+  data.tar.gz: 538843dd71b2511945bede0711f03390c0620482643b7dd0beb5bbf39fae8a79dc31c723c0a3f318379dca0734d8433b1db3462dbb5f381e6b84a49c5c4a7bfd

data/lib/activemodel/associations.rb

@@ -1,8 +1,8 @@
 require "active_model"
 require "active_record"
 require "active_support"
-require "active_model/associations"
-require "active_model/associations/hooks"
+require "eac_rails_utils/models/tableless_associations"
+require "eac_rails_utils/models/tableless_associations/hooks"
 
 # Load Railtie
 begin
@@ -11,5 +11,5 @@ rescue LoadError
 end
 
 if defined?(Rails)
-  require "active_model/associations/railtie"
+  require "eac_rails_utils/models/tableless_associations/railtie"
 end

data/lib/eac_rails_utils/models/tableless/strict_loading.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRailsUtils
+  module Models
+    class Tableless
+      # For Rails >= '6.1'.
+      module StrictLoading
+        common_concern
+
+        class_methods do
+          def strict_loading?
+            false
+          end
+        end
+
+        # @return [Boolean]
+        def strict_loading?
+          self.class.strict_loading?
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/models/tableless.rb

@@ -8,7 +8,7 @@ module EacRailsUtils
     class Tableless
       include ActiveModel::Model
       include Virtus.model
-      include ActiveModel::Associations
+      include EacRailsUtils::Models::TablelessAssociations
 
       def initialize(values = {})
         super(build_attributes(values))

data/lib/{active_model/associations → eac_rails_utils/models/tableless_associations}/active_record_reflection.rb

@@ -1,4 +1,4 @@
-module ActiveModel::Associations
+module EacRailsUtils::Models::TablelessAssociations
   module ActiveRecordReflection
     extend ActiveSupport::Concern
 

data/lib/{active_model/associations → eac_rails_utils/models/tableless_associations}/association_scope_extension.rb

@@ -1,4 +1,4 @@
-module ActiveModel::Associations
+module EacRailsUtils::Models::TablelessAssociations
   module AssociationScopeExtension
     if ActiveRecord.version >= Gem::Version.new("5.0.0.beta")
       def add_constraints(scope, owner, association_klass, refl, chain_head, chain_tail)

data/lib/{active_model/associations → eac_rails_utils/models/tableless_associations}/autosave_association.rb

@@ -1,4 +1,4 @@
-module ActiveModel::Associations
+module EacRailsUtils::Models::TablelessAssociations
   module AutosaveAssociation
     extend ActiveSupport::Concern
 

data/lib/eac_rails_utils/models/tableless_associations/hooks.rb

@@ -0,0 +1,10 @@
+module EacRailsUtils::Models::TablelessAssociations
+  module Hooks
+    def self.init
+      ActiveSupport.on_load(:active_record) do
+        require 'eac_rails_utils/models/tableless_associations/association_scope_extension'
+        ActiveRecord::Associations::AssociationScope.send(:prepend, EacRailsUtils::Models::TablelessAssociations::AssociationScopeExtension)
+      end
+    end
+  end
+end

data/lib/{active_model/associations → eac_rails_utils/models/tableless_associations}/initialize_extension.rb

@@ -1,4 +1,4 @@
-module ActiveModel::Associations
+module EacRailsUtils::Models::TablelessAssociations
   module InitializeExtension
     extend ActiveSupport::Concern
 

data/lib/{active_model/associations → eac_rails_utils/models/tableless_associations}/override_methods.rb

@@ -1,4 +1,4 @@
-module ActiveModel::Associations
+module EacRailsUtils::Models::TablelessAssociations
   module OverrideMethods
     extend ActiveSupport::Concern
 

data/lib/eac_rails_utils/models/tableless_associations/railtie.rb

@@ -0,0 +1,7 @@
+module EacRailsUtils::Models::TablelessAssociations
+  class Railtie < ::Rails::Railtie #:nodoc:
+    initializer 'activemodel-associations' do |_|
+      EacRailsUtils::Models::TablelessAssociations::Hooks.init
+    end
+  end
+end

data/lib/eac_rails_utils/models/tableless_associations.rb

@@ -0,0 +1,54 @@
+require 'eac_rails_utils/models/tableless_associations/initialize_extension'
+require 'eac_rails_utils/models/tableless_associations/active_record_reflection'
+require 'eac_rails_utils/models/tableless_associations/autosave_association'
+require 'eac_rails_utils/models/tableless_associations/override_methods'
+require 'active_record/associations/builder/has_many_for_active_model'
+require 'active_record/associations/has_many_for_active_model_association'
+require 'active_support/core_ext/module'
+
+module EacRailsUtils
+  module Models
+    module TablelessAssociations
+      extend ActiveSupport::Concern
+
+      include InitializeExtension
+      include AutosaveAssociation
+      include ActiveRecordReflection
+      include OverrideMethods
+
+      included do
+        mattr_accessor :belongs_to_required_by_default, instance_accessor: false
+      end
+
+      module ClassMethods
+        # define association like ActiveRecord
+        def belongs_to(name, scope = nil, options = {})
+          reflection = ActiveRecord::Associations::Builder::BelongsTo.build(self, name, scope, options)
+          ActiveRecord::Reflection.add_reflection self, name, reflection
+        end
+
+        # define association like ActiveRecord
+        def has_many(name, scope = nil, options = {}, &extension)
+          options.reverse_merge!(active_model: true, target_ids: "#{name.to_s.singularize}_ids")
+          if scope.is_a?(Hash)
+            options.merge!(scope)
+            scope = nil
+          end
+
+          reflection = ActiveRecord::Associations::Builder::HasManyForActiveModel.build(self, name, scope, options, &extension)
+          ActiveRecord::Reflection.add_reflection self, name, reflection
+
+          mixin = generated_association_methods
+          mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{options[:target_ids]}=(other_ids)
+            @#{options[:target_ids]} = other_ids
+            association(:#{name}).reset
+            association(:#{name}).reset_scope
+            @#{options[:target_ids]}
+          end
+          CODE
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/patches/active_model_associations.rb

@@ -4,30 +4,32 @@ require 'activemodel/associations'
 require 'eac_rails_utils/patches/rails_4'
 require 'eac_rails_utils/patches/rails_5_2'
 
-module ActiveModel
-  module Associations
-    module Hooks
-      class << self
-        def init
-          init_rails_4 if ::EacRailsUtils::Patches::Rails4.enabled?
-          init_rails_5_2 if ::EacRailsUtils::Patches::Rails52.enabled?
-        end
+module EacRailsUtils
+  module Models
+    module TablelessAssociations
+      module Hooks
+        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
-            )
+          def init_rails_4
+            ActiveSupport.on_load(:active_record) do
+              ActiveRecord::Associations::AssociationScope.prepend(
+                ::EacRailsUtils::Patches::Rails4::ActiveRecordAssociationsAssociationScope
+              )
+            end
           end
-        end
 
-        def init_rails_5_2
-          rails_5_2_fix_activemodel_associations_methods
-        end
+          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)
+          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.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_model/associations/hooks'
+require 'eac_rails_utils/models/tableless_associations/hooks'
 require 'eac_ruby_utils/require_sub'
 
 module EacRailsUtils

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

@@ -18,7 +18,7 @@ module EacRailsUtils
         private
 
         def the_module
-          ::ActiveModel::Associations::ClassMethods
+          ::EacRailsUtils::Models::TablelessAssociations::ClassMethods
         end
 
         def perform

data/lib/eac_rails_utils/patches/rails_5_2.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_model/associations/hooks'
+require 'eac_rails_utils/models/tableless_associations/hooks'
 require 'eac_ruby_utils/require_sub'
 
 module EacRailsUtils

data/lib/eac_rails_utils/version.rb

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

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.118'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.118.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.118'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.118.1
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
   requirement: !ruby/object:Gem::Requirement
@@ -220,15 +198,6 @@ files:
 - config/initializers/json.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
-- lib/active_model/associations.rb
-- lib/active_model/associations/active_record_reflection.rb
-- lib/active_model/associations/association_scope_extension.rb
-- lib/active_model/associations/autosave_association.rb
-- lib/active_model/associations/hooks.rb
-- lib/active_model/associations/initialize_extension.rb
-- lib/active_model/associations/override_methods.rb
-- lib/active_model/associations/railtie.rb
-- lib/active_model/associations/version.rb
 - lib/active_record/associations/builder/has_many_for_active_model.rb
 - lib/active_record/associations/has_many_for_active_model_association.rb
 - lib/activemodel/associations.rb
@@ -243,6 +212,16 @@ files:
 - lib/eac_rails_utils/models/tableless/attributes.rb
 - lib/eac_rails_utils/models/tableless/build_attributes.rb
 - lib/eac_rails_utils/models/tableless/columns.rb
+- lib/eac_rails_utils/models/tableless/strict_loading.rb
+- lib/eac_rails_utils/models/tableless_associations.rb
+- lib/eac_rails_utils/models/tableless_associations/active_record_reflection.rb
+- lib/eac_rails_utils/models/tableless_associations/association_scope_extension.rb
+- lib/eac_rails_utils/models/tableless_associations/autosave_association.rb
+- lib/eac_rails_utils/models/tableless_associations/hooks.rb
+- lib/eac_rails_utils/models/tableless_associations/initialize_extension.rb
+- lib/eac_rails_utils/models/tableless_associations/override_methods.rb
+- lib/eac_rails_utils/models/tableless_associations/railtie.rb
+- lib/eac_rails_utils/models/tableless_associations/version.rb
 - lib/eac_rails_utils/models/test_utils.rb
 - lib/eac_rails_utils/models/validations.rb
 - lib/eac_rails_utils/patches.rb

data/lib/active_model/associations/hooks.rb

@@ -1,10 +0,0 @@
-module ActiveModel::Associations
-  module Hooks
-    def self.init
-      ActiveSupport.on_load(:active_record) do
-        require 'active_model/associations/association_scope_extension'
-        ActiveRecord::Associations::AssociationScope.send(:prepend, ActiveModel::Associations::AssociationScopeExtension)
-      end
-    end
-  end
-end

data/lib/active_model/associations/railtie.rb

@@ -1,7 +0,0 @@
-module ActiveModel::Associations
-  class Railtie < ::Rails::Railtie #:nodoc:
-    initializer 'activemodel-associations' do |_|
-      ActiveModel::Associations::Hooks.init
-    end
-  end
-end

data/lib/active_model/associations.rb

@@ -1,52 +0,0 @@
-require 'active_model/associations/initialize_extension'
-require 'active_model/associations/active_record_reflection'
-require 'active_model/associations/autosave_association'
-require 'active_model/associations/override_methods'
-require 'active_record/associations/builder/has_many_for_active_model'
-require 'active_record/associations/has_many_for_active_model_association'
-require 'active_support/core_ext/module'
-
-module ActiveModel
-  module Associations
-    extend ActiveSupport::Concern
-
-    include InitializeExtension
-    include AutosaveAssociation
-    include ActiveRecordReflection
-    include OverrideMethods
-
-    included do
-      mattr_accessor :belongs_to_required_by_default, instance_accessor: false
-    end
-
-    module ClassMethods
-      # define association like ActiveRecord
-      def belongs_to(name, scope = nil, options = {})
-        reflection = ActiveRecord::Associations::Builder::BelongsTo.build(self, name, scope, options)
-        ActiveRecord::Reflection.add_reflection self, name, reflection
-      end
-
-      # define association like ActiveRecord
-      def has_many(name, scope = nil, options = {}, &extension)
-        options.reverse_merge!(active_model: true, target_ids: "#{name.to_s.singularize}_ids")
-        if scope.is_a?(Hash)
-          options.merge!(scope)
-          scope = nil
-        end
-
-        reflection = ActiveRecord::Associations::Builder::HasManyForActiveModel.build(self, name, scope, options, &extension)
-        ActiveRecord::Reflection.add_reflection self, name, reflection
-
-        mixin = generated_association_methods
-        mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
-          def #{options[:target_ids]}=(other_ids)
-            @#{options[:target_ids]} = other_ids
-            association(:#{name}).reset
-            association(:#{name}).reset_scope
-            @#{options[:target_ids]}
-          end
-        CODE
-      end
-    end
-  end
-end