eac_ruby_utils 0.95.2 → 0.96.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e74dec765cecd11cda7fcfba909574ee9358c79bd257da602a447f7ca9d0e21
-  data.tar.gz: 5d1b59a63a0d652700cb3079431c6b5c7ba3b49d993c3d07712ecc042d83ccab
+  metadata.gz: d4035271ba1a01e74ba0ca6f13d95db76783f67d50d002df5c54c0668a5ec160
+  data.tar.gz: ab9d27a5d400c1294c0b0fc245f904ac48fb039085f3366a3c69159045e1ebb7
 SHA512:
-  metadata.gz: f53504f7b9e093892250948b8539c4fce1f4b27623ba802ad1cce0961c444e5055a6f512e698322928f7fc2adb87d4fe1a1f1a702afd5c2aaf86fc5a8a53bbb9
-  data.tar.gz: 9ea207ad6ca0a61fa4ad353c64be5bbd5f7b85a597a5a8b675544091e0e043298ca9077565734106f15a6d9a8a8be21bfc4d6bc14d8959c189f9fed961a86abe
+  metadata.gz: '0830e227136ef0fe56b0ea9e87cd9dfd1c6f5e6e69f6b88f3b51c736ea4305647c3a4fa138417e09bf096d7ba0345aeff8f634fb592f740ee193b68422876189'
+  data.tar.gz: c989244e994c84f953beda82ed0999b00e91a45b355eb148ce4830a5b85bd43d813d9e886ce70f792e5a5f4e4d833928592242615be333042b096cbb59aff37b

data/lib/eac_ruby_utils/immutable/array_accessor.rb

@@ -8,13 +8,26 @@ module EacRubyUtils
   module Immutable
     class ArrayAccessor < ::EacRubyUtils::Immutable::BaseAccessor
       def apply(klass)
+        apply_singular(klass)
+        apply_plural(klass)
+      end
+
+      def apply_plural(klass)
         accessor = self
-        klass.send(:define_method, name) do |value|
-          accessor.immutable_value_set(self, value)
+        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.first)
+          else
+            raise ::ArgumentError, "wrong number of arguments (given #{args.count}, expected 0..1)"
+          end
         end
+      end
 
-        klass.send(:define_method, ::ActiveSupport::Inflector.pluralize(name)) do
-          accessor.immutable_value_get(self)
+      def apply_singular(klass)
+        accessor = self
+        klass.send(:define_method, name) do |value|
+          accessor.immutable_value_push(self, value)
         end
       end
 
@@ -22,11 +35,15 @@ module EacRubyUtils
         super || []
       end
 
-      def immutable_value_set(object, value)
+      def immutable_value_push(object, value)
         duplicate_object(object) do |old_value|
           (old_value || []) + [value]
         end
       end
+
+      def immutable_value_set(object, value)
+        duplicate_object(object) { |_old_value| value }
+      end
     end
   end
 end

data/lib/eac_ruby_utils/require_sub/base.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/require_sub/sub_file'
+
+module EacRubyUtils
+  module RequireSub
+    class Base
+      INCLUDE_MODULES_MAP = {
+        nil => nil,
+        false => nil,
+        true => :include,
+        include: :include,
+        prepend: :prepend
+      }.freeze
+
+      include ::EacRubyUtils::Listable
+      lists.add_symbol :option, :base, :include_modules, :require_dependency
+
+      attr_reader :file, :options
+
+      def initialize(file, options = {})
+        @file = file
+        @options = self.class.lists.option.hash_keys_validate!(options)
+      end
+
+      # @return [Boolean]
+      def active_support_require?
+        options[OPTION_REQUIRE_DEPENDENCY] ? true : false
+      end
+
+      def apply
+        require_sub_files
+        include_modules
+      end
+
+      def base
+        options[OPTION_BASE] || raise('Option :base not setted')
+      end
+
+      def base?
+        options[OPTION_BASE] ? true : false
+      end
+
+      def include_modules
+        sub_files.each(&:include_module)
+      end
+
+      def include_or_prepend_method
+        return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
+        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
+
+        raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
+          " \"#{options[OPTION_INCLUDE_MODULES]}\""
+      end
+
+      def require_sub_files
+        sub_files.each(&:require_file)
+      end
+
+      def sub_files
+        @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
+                         .map { |path| ::EacRubyUtils::RequireSub::SubFile.new(self, path) }
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/require_sub/sub_file.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'active_support/dependencies'
+require 'active_support/inflector'
+
+module EacRubyUtils
+  module RequireSub
+    class SubFile
+      attr_reader :owner, :path
+
+      def initialize(owner, path)
+        @owner = owner
+        @path = path
+      end
+
+      def base_constant
+        return nil unless owner.base?
+
+        owner.base.const_get(constant_name)
+      rescue ::NameError
+        nil
+      end
+
+      def constant_name
+        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
+      end
+
+      def include_module
+        return unless module?
+
+        owner.include_or_prepend_method.if_present do |v|
+          owner.base.send(v, base_constant)
+        end
+      end
+
+      def module?
+        base_constant.is_a?(::Module) && !base_constant.is_a?(::Class)
+      end
+
+      def require_file
+        active_support_require || autoload_require || kernel_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
+      end
+
+      def kernel_require
+        ::Kernel.require(path)
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/require_sub.rb

@@ -1,134 +1,11 @@
 # frozen_string_literal: true
 
-require 'active_support/inflector'
-require 'active_support/dependencies'
-require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/require_sub/base'
 
 module EacRubyUtils
   class << self
     def require_sub(file, options = {})
-      ::EacRubyUtils::RequireSub.new(file, options).apply
-    end
-  end
-
-  class RequireSub
-    INCLUDE_MODULES_MAP = {
-      nil => nil,
-      false => nil,
-      true => :include,
-      include: :include,
-      prepend: :prepend
-    }.freeze
-
-    include ::EacRubyUtils::Listable
-    lists.add_symbol :option, :base, :include_modules, :require_dependency
-
-    attr_reader :file, :options
-
-    def initialize(file, options = {})
-      @file = file
-      @options = self.class.lists.option.hash_keys_validate!(options)
-    end
-
-    def apply
-      require_sub_files
-      include_modules
-    end
-
-    def base
-      options[OPTION_BASE] || raise('Option :base not setted')
-    end
-
-    def base?
-      options[OPTION_BASE] ? true : false
-    end
-
-    def include_modules
-      sub_files.each(&:include_module)
-    end
-
-    def include_or_prepend_method
-      return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
-        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
-
-      raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
-         " \"#{options[OPTION_INCLUDE_MODULES]}\""
-    end
-
-    def require_sub_files
-      sub_files.each(&:require_file)
-    end
-
-    def sub_files
-      @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
-                       .map { |path| SubFile.new(self, path) }
-    end
-
-    class SubFile
-      attr_reader :owner, :path
-
-      def initialize(owner, path)
-        @owner = owner
-        @path = path
-      end
-
-      def base_constant
-        return nil unless owner.base?
-
-        owner.base.const_get(constant_name)
-      rescue ::NameError
-        nil
-      end
-
-      def constant_name
-        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
-      end
-
-      def include_module
-        return unless module?
-
-        owner.include_or_prepend_method.if_present do |v|
-          owner.base.send(v, base_constant)
-        end
-      end
-
-      def include_or_prepend_method
-        return :include if owner.options[OPTION_INCLUDE_MODULES]
-        return :prepend if owner.options[OPTION_PREPEND_MODULES]
-
-        nil
-      end
-
-      def module?
-        base_constant.is_a?(::Module) && !base_constant.is_a?(::Class)
-      end
-
-      def require_file
-        active_support_require || autoload_require || kernel_require
-      end
-
-      private
-
-      def active_support_require
-        return false unless owner.options[OPTION_REQUIRE_DEPENDENCY]
-
-        ::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
-      end
-
-      def kernel_require
-        ::Kernel.require(path)
-      end
+      ::EacRubyUtils::RequireSub::Base.new(file, options).apply
     end
   end
 end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.95.2
+  version: 0.96.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -241,6 +241,8 @@ files:
 - lib/eac_ruby_utils/recursive_builder.rb
 - lib/eac_ruby_utils/regexp_parser.rb
 - lib/eac_ruby_utils/require_sub.rb
+- lib/eac_ruby_utils/require_sub/base.rb
+- lib/eac_ruby_utils/require_sub/sub_file.rb
 - lib/eac_ruby_utils/rspec.rb
 - lib/eac_ruby_utils/rspec/default_setup.rb
 - lib/eac_ruby_utils/rspec/setup.rb