eac_ruby_utils 0.94.2 → 0.95.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6123804bfe63fb8449caccf2c037cc3e226c9d2859894feea80b5487fc472187
-  data.tar.gz: d47032f60cbd693dcd7ec2cfa72dcaf1c7c1bc69abd8354126f272a11a452702
+  metadata.gz: 9e74dec765cecd11cda7fcfba909574ee9358c79bd257da602a447f7ca9d0e21
+  data.tar.gz: 5d1b59a63a0d652700cb3079431c6b5c7ba3b49d993c3d07712ecc042d83ccab
 SHA512:
-  metadata.gz: d2edf68d551b316ba760f7c7c89a03b6b85262e9e6843506f7346d9f92a883cfe43a2efd591a497389bdde11dee9bcc19b5443aa4ba7e130d167ecfec047e9b8
-  data.tar.gz: 11fd72d374f34a61bba2d856ccfae437dc97010e8f2b074a6cb6f4ed2867a9f1f8515e073b4986b93518dd7b7d04a9293b71b5934d8d09582c66acb4e494f37b
+  metadata.gz: f53504f7b9e093892250948b8539c4fce1f4b27623ba802ad1cce0961c444e5055a6f512e698322928f7fc2adb87d4fe1a1f1a702afd5c2aaf86fc5a8a53bbb9
+  data.tar.gz: 9ea207ad6ca0a61fa4ad353c64be5bbd5f7b85a597a5a8b675544091e0e043298ca9077565734106f15a6d9a8a8be21bfc4d6bc14d8959c189f9fed961a86abe

data/lib/eac_ruby_utils/common_constructor.rb

@@ -68,12 +68,12 @@ module EacRubyUtils
 
     def setup_class_attr_readers(klass)
       klass.send(:attr_reader, *args)
-      klass.send(:public, *args)
+      klass.send(:public, *args) if args.any?
     end
 
     def setup_class_attr_writers(klass)
       klass.send(:attr_writer, *args)
-      klass.send(:private, *args.map { |a| "#{a}=" })
+      klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
     end
 
     def setup_class_initialize(klass)

data/lib/eac_ruby_utils/core_ext.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/locales/from_all_gems'
 require 'eac_ruby_utils/patches'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext'

data/lib/eac_ruby_utils/locales/from_all_gems.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/locales/from_gem'
+::EacRubyUtils::Locales::FromGem.include_all

data/lib/eac_ruby_utils/locales/from_gem.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'i18n'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/object/to_pathname'
+
+module EacRubyUtils
+  module Locales
+    class FromGem
+      class << self
+        def include_all(i18n_obj = nil)
+          ::Gem::Specification.each { |gemspec| new(gemspec, i18n_obj).include }
+        end
+      end
+
+      LOCALES_DIR_SUBPATH = 'locale'
+      LOCALES_FILES_GLOB_PATTERNS = %w[*.yaml *.yml].freeze
+
+      common_constructor :gemspec, :i18n_obj, default: [nil] do
+        self.i18n_obj ||= ::I18n
+      end
+
+      # @return [Boolean]
+      delegate :exist?, to: :path
+
+      # @return [Pathname, nil]
+      def include
+        return nil unless exist?
+
+        ::I18n.load_path += paths_to_load.map(&:to_path)
+        path
+      end
+
+      # @return [Pathname]
+      def path
+        gemspec.gem_dir.to_pathname.join(LOCALES_DIR_SUBPATH)
+      end
+
+      # @return [Pathname]
+      def paths_to_load
+        return [] unless exist?
+
+        LOCALES_FILES_GLOB_PATTERNS.inject([]) { |a, e| a + path.glob(e) }
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/locales/module_i18n_translate.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/common_constructor'
+require 'i18n'
+
+module EacRubyUtils
+  module Locales
+    class ModuleI18nTranslate
+      TRANSLATE_LOCALE_KEY = :__locale
+
+      common_constructor :the_module, :entry_suffix, :values, default: [{}]
+
+      def ancestor_i18n_translate(ancestor)
+        t = self.class.new(ancestor, entry_suffix, values)
+        t.exists? ? t.i18n_translate : nil
+      end
+
+      def ancestors_i18n_translate
+        the_module.ancestors.lazy.map { |v| ancestor_i18n_translate(v) }.find(&:present?)
+      end
+
+      def exists?
+        ::I18n.exists?(i18n_key)
+      end
+
+      def i18n_key
+        "#{module_entry_prefix}.#{entry_suffix}"
+      end
+
+      def i18n_options
+        values.except(TRANSLATE_LOCALE_KEY)
+      end
+
+      def i18n_translate
+        ::I18n.translate(i18n_key, i18n_options)
+      end
+
+      def locale
+        values[TRANSLATE_LOCALE_KEY]
+      end
+
+      def module_entry_prefix
+        the_module.name.underscore.gsub('/', '.')
+      end
+
+      def on_locale(&block)
+        if locale.present?
+          on_present_locale(&block)
+        else
+          block.call
+        end
+      end
+
+      def result
+        on_locale do
+          ancestors_i18n_translate || i18n_translate
+        end
+      end
+
+      private
+
+      def on_present_locale(&block)
+        old_locale = ::I18n.locale
+        begin
+          ::I18n.locale = locale
+          block.call
+        ensure
+          ::I18n.locale = old_locale
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/locales.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module EacRubyUtils
+  module Locales
+    ::EacRubyUtils.require_sub __FILE__
+  end
+end

data/lib/eac_ruby_utils/method_class.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/introspection'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/module/common_concern'
+require 'eac_ruby_utils/patches/string/inflector'
+
+module EacRubyUtils
+  module MethodClass
+    common_concern do
+      ::EacRubyUtils::MethodClass::Setup.new(self)
+    end
+
+    class Setup
+      common_constructor :method_class do
+        perform
+      end
+
+      def perform
+        the_setup = self
+        sender_module.define_method(method_name) do |*args, &block|
+          the_setup.method_class.new(self, *args, &block).result
+        end
+      end
+
+      def method_name
+        method_class.name.demodulize.underscore.variableize
+      end
+
+      def sender_module
+        method_class.module_parent
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/patches/module/i18n_translate.rb

@@ -1,32 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'i18n'
+require 'eac_ruby_utils/locales/module_i18n_translate'
 
 class Module
-  TRANSLATE_LOCALE_KEY = :__locale
-
   def i18n_translate(entry_suffix, values = {})
-    on_i18n_locale(values.delete(TRANSLATE_LOCALE_KEY)) do
-      ::I18n.translate(i18n_translate_entry_full(entry_suffix), values)
-    end
-  end
-
-  def i18n_translate_entry_full(entry_suffix)
-    "#{i18n_translate_entry_self_prefix}.#{entry_suffix}"
-  end
-
-  def i18n_translate_entry_self_prefix
-    name.underscore.gsub('/', '.')
-  end
-
-  def on_i18n_locale(locale)
-    old_locale = ::I18n.locale
-    begin
-      ::I18n.locale = locale
-      yield
-    ensure
-      ::I18n.locale = old_locale
-    end
+    ::EacRubyUtils::Locales::ModuleI18nTranslate.new(self, entry_suffix, values).result
   end
 end

data/lib/eac_ruby_utils/patches/module/method_class.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+
+class Module
+  def enable_method_class
+    ::EacRubyUtils.patch(self, ::EacRubyUtils::MethodClass)
+  end
+end

data/lib/eac_ruby_utils/require_sub.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/inflector'
+require 'active_support/dependencies'
 require 'eac_ruby_utils/listable'
 
 module EacRubyUtils
@@ -11,6 +12,14 @@ module EacRubyUtils
   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
 
@@ -26,56 +35,100 @@ module EacRubyUtils
       include_modules
     end
 
-    private
+    def base
+      options[OPTION_BASE] || raise('Option :base not setted')
+    end
 
-    def active_support_require(path)
-      return false unless options[OPTION_REQUIRE_DEPENDENCY]
+    def base?
+      options[OPTION_BASE] ? true : false
+    end
 
-      ::Kernel.require_dependency(path)
-      true
+    def include_modules
+      sub_files.each(&:include_module)
     end
 
-    def autoload_require(path)
-      return false unless base?
+    def include_or_prepend_method
+      return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
+        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
 
-      basename = ::File.basename(path, '.*')
-      return false if basename.start_with?('_')
+      raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
+         " \"#{options[OPTION_INCLUDE_MODULES]}\""
+    end
 
-      base.autoload ::ActiveSupport::Inflector.camelize(basename), path
-      true
+    def require_sub_files
+      sub_files.each(&:require_file)
     end
 
-    def include_modules
-      return unless options[OPTION_INCLUDE_MODULES]
+    def sub_files
+      @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
+                       .map { |path| SubFile.new(self, path) }
+    end
 
-      base.constants.each do |constant_name|
-        constant = base.const_get(constant_name)
-        next unless constant.is_a?(::Module) && !constant.is_a?(::Class)
+    class SubFile
+      attr_reader :owner, :path
 
-        base.include(constant)
+      def initialize(owner, path)
+        @owner = owner
+        @path = path
       end
-    end
 
-    def base
-      options[OPTION_BASE] || raise('Option :base not setted')
-    end
+      def base_constant
+        return nil unless owner.base?
 
-    def base?
-      options[OPTION_BASE] ? true : false
-    end
+        owner.base.const_get(constant_name)
+      rescue ::NameError
+        nil
+      end
 
-    def kernel_require(path)
-      ::Kernel.require(path)
-    end
+      def constant_name
+        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
+      end
 
-    def require_sub_files
-      Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort.each do |path|
-        require_sub_file(path)
+      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
-    end
 
-    def require_sub_file(path)
-      active_support_require(path) || autoload_require(path) || kernel_require(path)
+      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/ruby/on_clean_environment.rb

@@ -1,15 +1,27 @@
 # frozen_string_literal: true
 
+require 'bundler'
+
 module EacRubyUtils
   module Ruby
     class << self
       # Executes a block in an environment when the variables BUNDLE* and RUBY* are removed.
       def on_clean_environment
-        on_clean_envvars('BUNDLE', 'RUBY') { yield }
+        bundler_with_unbundled_env do
+          on_clean_envvars('BUNDLE', 'RUBY') { yield }
+        end
       end
 
       private
 
+      def bundler_with_unbundled_env(&block)
+        if ::Bundler.respond_to?(:with_unbundled_env)
+          ::Bundler.with_unbundled_env(&block)
+        else
+          ::Bundler.with_clean_env(&block)
+        end
+      end
+
       def on_clean_envvars(*start_with_vars)
         old_values = envvars_starting_with(start_with_vars)
         old_values.each_key { |k| ENV.delete(k) }

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.94.2
+  version: 0.95.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-04 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +174,11 @@ files:
 - lib/eac_ruby_utils/listable/symbol_list.rb
 - lib/eac_ruby_utils/listable/value.rb
 - lib/eac_ruby_utils/local_time_zone.rb
+- lib/eac_ruby_utils/locales.rb
+- lib/eac_ruby_utils/locales/from_all_gems.rb
+- lib/eac_ruby_utils/locales/from_gem.rb
+- lib/eac_ruby_utils/locales/module_i18n_translate.rb
+- lib/eac_ruby_utils/method_class.rb
 - lib/eac_ruby_utils/options_consumer.rb
 - lib/eac_ruby_utils/patch.rb
 - lib/eac_ruby_utils/patches.rb
@@ -187,6 +206,7 @@ files:
 - lib/eac_ruby_utils/patches/module/i18n_translate.rb
 - lib/eac_ruby_utils/patches/module/immutable.rb
 - lib/eac_ruby_utils/patches/module/listable.rb
+- lib/eac_ruby_utils/patches/module/method_class.rb
 - lib/eac_ruby_utils/patches/module/patch.rb
 - lib/eac_ruby_utils/patches/module/require_sub.rb
 - lib/eac_ruby_utils/patches/module/simple_cache.rb