eac_ruby_utils 0.111.0 → 0.113.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a889ac2d4aac725fd91d963d4ca90a7179ae513c033edcd7c6f3bb4bfe73f0ce
-  data.tar.gz: 46453cd0a6bc65f8f7b1533b6bcd7d70e52c75d9af0caffb2fcad84fcc90ccfb
+  metadata.gz: 3e7deaaf568625e32fc58c45b43ef41e125924595707b3a2ca2ea394d9dc4393
+  data.tar.gz: 4af93c26f87f2918f36cc18b2ad5e3cefa8d6fe6a21bb09282f0112bd2138182
 SHA512:
-  metadata.gz: a47d0a6561ce05b2f973900271848ae78039697beda431d9981c491fec73a7c7efe0be2cf054d19a222ec4f7f4bb7a86eb8608406820ae82a6c942f49e0db2e4
-  data.tar.gz: 9087ea886ee2d028a9701c45466d67d2cc450b6f1da6a301e65aca41bcf4d19a52a199342cb62806a953838d31be4c7a743a3ba206162e40b90a996fe4f44988
+  metadata.gz: 8144e44599f8dc4b5299a3353e79fc51fa558bcb085e1d8a46d0f40182d06b9c0481f56a4a8b464bddf00a52c67c97d3846875489f90f24d0eba8e87b5ed4384
+  data.tar.gz: 657df0404c6f3060e756198aeeb1181b210b7d18564e4b58437a5d79601e3c62d1f2d5bdb686b221b434c2ad81322817798ea329b77b94c2b110c189631055e0

data/lib/eac_ruby_utils/immutable/hash_accessor.rb

@@ -7,35 +7,46 @@ module EacRubyUtils
   module Immutable
     class HashAccessor < ::EacRubyUtils::Immutable::BaseAccessor
       def apply(klass)
-        apply_get(klass)
-        apply_set(klass)
+        apply_plural(klass)
+        apply_singular(klass)
       end
 
       def immutable_value_get(object)
         super || {}
       end
 
-      def immutable_value_set(object, key, value)
-        duplicate_object(object) do |old_value|
-          (old_value || {}).merge(key => value)
-        end
+      def immutable_value_get_single(object, key)
+        immutable_value_get(object)[key]
+      end
+
+      def immutable_value_set(object, new_hash)
+        duplicate_object(object) { |_old_value| new_hash }
+      end
+
+      def immutable_value_set_single(object, key, value)
+        immutable_value_set(object, immutable_value_get(object).merge(key => value))
       end
 
       private
 
-      def apply_get(klass)
+      def apply_plural(klass)
         accessor = self
-        klass.send(:define_method, ::ActiveSupport::Inflector.pluralize(name)) do
-          accessor.immutable_value_get(self)
+        klass.send(:define_method, ::ActiveSupport::Inflector.pluralize(name)) do |*args|
+          case args.count
+          when 0 then next accessor.immutable_value_get(self)
+          when 1 then next accessor.immutable_value_set(self, args[0])
+          else
+            raise ::ArgumentError, "wrong number of arguments (given #{args.count}, expected 0..1)"
+          end
         end
       end
 
-      def apply_set(klass)
+      def apply_singular(klass)
         accessor = self
         klass.send(:define_method, name) do |*args|
           case args.count
-          when 1 then next accessor.immutable_value_get(self, args[0])
-          when 2 then next accessor.immutable_value_set(self, *args[0..1])
+          when 1 then next accessor.immutable_value_get_single(self, args[0])
+          when 2 then next accessor.immutable_value_set_single(self, *args[0..1])
           else
             raise ::ArgumentError, "wrong number of arguments (given #{args.count}, expected 1..2)"
           end

data/lib/eac_ruby_utils/require_sub/base.rb

@@ -15,13 +15,17 @@ module EacRubyUtils
       }.freeze
 
       include ::EacRubyUtils::Listable
-      lists.add_symbol :option, :base, :include_modules, :require_dependency
+      lists.add_symbol :option, :base, :include_modules, :require_dependency, :require_mode
+      lists.add_symbol :require_mode, :active_support, :autoload, :kernel
 
       attr_reader :file, :options
 
       def initialize(file, options = {})
         @file = file
         @options = self.class.lists.option.hash_keys_validate!(options)
+        return unless options[OPTION_REQUIRE_MODE]
+
+        self.class.lists.require_mode.value_validate!(options[OPTION_REQUIRE_MODE])
       end
 
       # @return [Boolean]
@@ -54,6 +58,15 @@ module EacRubyUtils
           " \"#{options[OPTION_INCLUDE_MODULES]}\""
       end
 
+      # @return [Symbol]
+      def require_mode
+        return options[OPTION_REQUIRE_MODE] if options[OPTION_REQUIRE_MODE]
+        return REQUIRE_MODE_ACTIVE_SUPPORT if active_support_require?
+        return REQUIRE_MODE_AUTOLOAD if base?
+
+        REQUIRE_MODE_KERNEL
+      end
+
       def require_sub_files
         sub_files.each(&:require_file)
       end

data/lib/eac_ruby_utils/require_sub/sub_file.rb

@@ -38,26 +38,17 @@ module EacRubyUtils
       end
 
       def require_file
-        active_support_require || autoload_require || kernel_require
+        send("#{owner.require_mode}_require")
       end
 
       private
 
       def active_support_require
-        return false unless owner.active_support_require?
-
         ::Kernel.require_dependency(path)
-        true
       end
 
       def autoload_require
-        return false unless owner.base?
-
-        basename = ::File.basename(path, '.*')
-        return false if basename.start_with?('_')
-
-        owner.base.autoload ::ActiveSupport::Inflector.camelize(basename), path
-        true
+        owner.base.autoload ::ActiveSupport::Inflector.camelize(::File.basename(path, '.*')), path
       end
 
       def kernel_require

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.111.0'
+  VERSION = '0.113.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.111.0
+  version: 0.113.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,7 +39,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement