eac_config 0.14.3 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2bb825a40b843c079d5972653c7d131b02f53c30f67666385bbd2c09dd1126a
-  data.tar.gz: 9882816c1abb0df01c34ded3300f444671a67614b34aff5acca0dc19d29607a5
+  metadata.gz: 1b74bc1ca4debbeb6a28606a3fe821e428197d5c00074025d071988d822bc7e2
+  data.tar.gz: 87a26f9f8a3db12b5f9a7b46a7d33fb6f5e692cc36e24d4072847772962999d8
 SHA512:
-  metadata.gz: 24599fc13c12ec0edf12ed30a9a66193b8318e920a7e2704cff0282f31bbec5849336629837a2e13205779a86275d939f31ba29213f104ea63c175945558f494
-  data.tar.gz: df2696b6a7929f6f4bd559ba121926d5960858fee7c54cf4e2d6746aa9097b3162322b1eb739e284666bb77a6126a23d9e1b918abdfa801aecb255b58b5ae9b1
+  metadata.gz: 65c80b5c42dce0daba891943b0de0612dcaa5bd7cafabe47694f25b814829c587b52bcd859da85bba8139a0273b81bb6b04d69baca6d138a13f81f7687b6302e
+  data.tar.gz: 18af8f0646a9647b7d1b902531a18ca9ce57f61e05f40a8753a124f99ea13712ed95970fc979a6cb8df1b8c0a52a58416df665c40287095d2c01cb1b410994a8

data/lib/eac_config/entries.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class Entries
-    require_sub __FILE__
-    enable_simple_cache
+    enable_memoized
     common_constructor :root_node, :path do
       self.path = ::EacConfig::EntryPath.assert(path)
     end
@@ -15,20 +11,18 @@ module EacConfig
       "#{self.class}[RootNode: #{root_node}, Path: #{path}]"
     end
 
-    private
-
     # @return [Array<EacConfig::Entries>]
-    def node_entries_uncached
+    memoize def node_entries
       node_entries_from_root + node_entries_from_load_path
     end
 
     # @return [Array<EacConfig::Entries>]
-    def node_entries_from_load_path_uncached
+    memoize def node_entries_from_load_path
       root_node.recursive_loaded_nodes.flat_map { |loaded_node| loaded_node.self_entries(path) }
     end
 
     # @return [Array<EacConfig::Entries>]
-    def node_entries_from_root_uncached
+    memoize def node_entries_from_root
       root_node.self_entries(path)
     end
   end

data/lib/eac_config/entry/not_found_error.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class Entry
     class NotFoundError < ::RuntimeError

data/lib/eac_config/entry.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class Entry
-    require_sub __FILE__
-    enable_simple_cache
+    enable_memoized
     common_constructor :root_node, :path do
       self.path = ::EacConfig::EntryPath.assert(path)
     end
@@ -47,16 +43,16 @@ module EacConfig
 
     private
 
-    def node_entry_uncached
+    memoize def node_entry
       node_entry_from_root || node_entry_from_load_path
     end
 
-    def node_entry_from_load_path_uncached
+    memoize def node_entry_from_load_path
       root_node.recursive_loaded_nodes.lazy.map { |loaded_node| loaded_node.self_entry(path) }
         .find(&:found?)
     end
 
-    def node_entry_from_root_uncached
+    memoize def node_entry_from_root
       e = root_node.self_entry(path)
       e.found? ? e : nil
     end

data/lib/eac_config/entry_path.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class EntryPath
     PART_SEPARATOR = '.'
@@ -41,12 +39,12 @@ module EacConfig
       self.class.new(parts + self.class.assert(other).parts)
     end
 
-    def [](*args)
-      slice(*args)
+    def [](*)
+      slice(*)
     end
 
-    def slice(*args)
-      r = parts.slice(*args)
+    def slice(*)
+      r = parts.slice(*)
       r.is_a?(::Enumerable) ? self.class.new(r) : r
     end
 

data/lib/eac_config/envvars_node/entry.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_config/node_entry'
-require 'eac_ruby_utils/blank_not_blank'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/yaml'
-
 module EacConfig
   class EnvvarsNode
     class Entry < ::EacConfig::NodeEntry
@@ -30,7 +24,7 @@ module EacConfig
         end
       end
 
-      enable_simple_cache
+      enable_memoized
 
       def found?
         ENV.key?(envvar_name)
@@ -46,7 +40,7 @@ module EacConfig
 
       private
 
-      def envvar_name_uncached
+      memoize def envvar_name
         self.class.entry_path_to_envvar_name(path)
       end
     end

data/lib/eac_config/envvars_node.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 require 'addressable'
-require 'eac_config/node'
-require 'eac_ruby_utils/core_ext'
 
 module EacConfig
   # A node that read/write entries from environment variables.
   class EnvvarsNode
-    require_sub __FILE__
     include ::EacConfig::Node
 
     URI = ::Addressable::URI.parse('self://envvars')

data/lib/eac_config/load_nodes_search.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class LoadNodesSearch
     common_constructor :root_node do

data/lib/eac_config/load_path.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class LoadPath
     ENTRY_PATH = ::EacConfig::EntryPath.assert(%w[load_path])

data/lib/eac_config/node.rb

@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_config/entries'
-require 'eac_config/entry'
-require 'eac_config/entry_path'
-require 'eac_config/load_path'
-require 'eac_config/load_nodes_search'
-require 'eac_config/node_entry'
-require 'eac_config/node_uri'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/context'
-
 module EacConfig
   module Node
+    include ::Memoized
+
     class << self
       def context
         @context ||= ::EacRubyUtils::Context.new
@@ -60,13 +52,12 @@ module EacConfig
     end
 
     # @return [Array<EacConfig::Node>]
-    def recursive_loaded_nodes
+    memoize def recursive_loaded_nodes
       ::EacConfig::LoadNodesSearch.new(self).result
     end
 
     # @return [EacConfig::PrefixedPathNode]
     def with_prefix(path_prefix)
-      require 'eac_config/prefixed_path_node'
       ::EacConfig::PrefixedPathNode.new(self, path_prefix)
     end
 

data/lib/eac_config/node_entry.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_config/paths_hash'
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   # A entry which search values only in the source node.
   class NodeEntry
     enable_abstract_methods
-    enable_simple_cache
+    enable_memoized
     common_constructor :node, :path do
       self.path = ::EacConfig::EntryPath.assert(path)
     end

data/lib/eac_config/node_uri/instanciate_single.rb

@@ -4,13 +4,11 @@ module EacConfig
   class NodeUri
     class InstanciateSingle
       acts_as_instance_method
-      enable_simple_cache
+      enable_memoized
       common_constructor :node_uri, :instance_uri
 
       # @return [Array<Class>]
       def available_node_classes
-        require 'eac_config/envvars_node'
-        require 'eac_config/yaml_file_node'
         [::EacConfig::EnvvarsNode, ::EacConfig::YamlFileNode]
       end
 

data/lib/eac_config/node_uri.rb

@@ -2,7 +2,7 @@
 
 module EacConfig
   class NodeUri
-    enable_simple_cache
+    enable_memoized
     common_constructor :source, :loader_uri, default: [nil]
 
     # @return [Array<EacConfig::Node>]
@@ -25,7 +25,7 @@ module EacConfig
       end
     end
 
-    def to_addressable_uncached
+    memoize def to_addressable
       r = ::Addressable::URI.parse(source)
       path = r.path.to_pathname
       r.path = path.expand_path(loader_uri_path_directory).to_path if path.relative?

data/lib/eac_config/old_configs/base.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/blank_not_blank'
-require 'eac_ruby_utils/core_ext'
-require 'eac_config/paths_hash'
-
 module EacConfig
   class OldConfigs
     class Base
-      enable_simple_cache
+      enable_memoized
 
       common_constructor :data, default: [{}] do
         self.data = ::EacConfig::PathsHash.new(data)

data/lib/eac_config/old_configs/file.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_config/old_configs/base'
 require 'yaml'
 
 module EacConfig

data/lib/eac_config/old_configs.rb

@@ -2,15 +2,11 @@
 
 require 'active_support/core_ext/string'
 require 'yaml'
-require 'eac_config/old_configs/file'
-require 'eac_ruby_utils/patches/hash/sym_keys_hash'
-require 'eac_config/paths_hash'
-require 'eac_ruby_utils/simple_cache'
 
 module EacConfig
   # @deprecated Use {EacConfig::YamlFileNode} instead.
   class OldConfigs
-    include ::EacRubyUtils::SimpleCache
+    enable_memoized
 
     attr_reader :configs_key, :options
 
@@ -39,23 +35,17 @@ module EacConfig
       read_entry(entry_key)
     end
 
-    def read_entry(entry_key)
-      file.read(entry_key)
-    end
-
-    delegate :autosave?, to: :file
-
-    private
-
-    attr_accessor :data
-
-    def file_uncached
+    memoize def file
       ::EacConfig::OldConfigs::File.new(
         storage_path, options
       )
     end
 
-    def storage_path_uncached
+    def read_entry(entry_key)
+      file.read(entry_key)
+    end
+
+    memoize def storage_path
       path = options_storage_path || default_storage_path
       return path if ::File.exist?(path) && ::File.size(path).positive?
 
@@ -64,6 +54,12 @@ module EacConfig
       path
     end
 
+    delegate :autosave?, to: :file
+
+    private
+
+    attr_accessor :data
+
     def options_storage_path
       options[:storage_path]
     end

data/lib/eac_config/paths_hash/node.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-require 'eac_config/paths_hash/entry_key_error'
-
 module EacConfig
   class PathsHash
     class Node

data/lib/eac_config/paths_hash.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class PathsHash
-    require_sub __FILE__
-
     class << self
       def parse_entry_key(entry_key) # rubocop:disable Metrics/CyclomaticComplexity
         r = entry_key.to_s.strip

data/lib/eac_config/prefixed_path_node/entry.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_config/node_entry'
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class PrefixedPathNode
     class Entry < ::EacConfig::NodeEntry
-      enable_simple_cache
+      enable_memoized
       delegate :found?, :found_node, :secret_value, :value, :value=, :writ_node, to: :full_entry
 
       # @return [EacConfig::EntryPath]
@@ -17,7 +14,7 @@ module EacConfig
       private
 
       # @return [EacConfig::NodeEntry]
-      def full_entry_uncached
+      memoize def full_entry
         node.from_node.entry(full_path)
       end
     end

data/lib/eac_config/prefixed_path_node.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_config/paths_hash'
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class PrefixedPathNode
-    require_sub __FILE__
     include ::EacConfig::Node
+
     common_constructor :from_node, :path_prefix do
       self.path_prefix = ::EacConfig::EntryPath.assert(path_prefix)
     end

data/lib/eac_config/rspec/setup.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/fs/temp'
-require 'eac_config/envvars_node'
-require 'eac_config/node'
-require 'eac_config/yaml_file_node'
-
 module EacConfig
   module Rspec
     module Setup
@@ -37,12 +31,12 @@ module EacConfig
       #   temporary file is used.
       # @param node_builder [Proc] Should return the desired EacConfig node. If not provided, a
       #   EacConfig::YamlFileNode is created.
-      def stub_eac_config_node(target_example = nil, target_file = nil, &node_builder)
+      def stub_eac_config_node(target_example = nil, target_file = nil, &)
         parent_self = self
         (target_example || rspec_config).around do |example|
           parent_self.stub_eac_config_node_on_file(target_file) do |file|
             ::EacConfig::Node
-              .context.on(parent_self.stub_eac_config_node_build(file, &node_builder)) do
+              .context.on(parent_self.stub_eac_config_node_build(file, &)) do
               example.run
             end
           end
@@ -53,11 +47,11 @@ module EacConfig
         node_builder.present? ? node_builder.call(file) : ::EacConfig::YamlFileNode.new(file)
       end
 
-      def stub_eac_config_node_on_file(target_file, &block)
+      def stub_eac_config_node_on_file(target_file, &)
         if target_file
           yield(target_file.to_pathname)
         else
-          ::EacRubyUtils::Fs::Temp.on_file(&block)
+          ::EacRubyUtils::Fs::Temp.on_file(&)
         end
       end
     end

data/lib/eac_config/rspec.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   module Rspec
-    require_sub __FILE__
   end
 end

data/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.14.3'
+  VERSION = '0.15.1'
 end

data/lib/eac_config/yaml_file_node/entry.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_config/node_entry'
-require 'eac_ruby_utils/core_ext'
-
 module EacConfig
   class YamlFileNode
     class Entry < ::EacConfig::NodeEntry
-      enable_simple_cache
+      enable_memoized
 
       def found?
         paths_hash.key?(to_paths_hash_key)

data/lib/eac_config/yaml_file_node/self_entries.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_config/entry_path'
-require 'eac_config/yaml_file_node/entry'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/wildcards'
-
 module EacConfig
   class YamlFileNode
     class SelfEntries

data/lib/eac_config/yaml_file_node.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
 require 'addressable'
-require 'eac_config/node'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/yaml'
 
 module EacConfig
   class YamlFileNode
-    require_sub __FILE__
     include ::EacConfig::Node
-    enable_simple_cache
+
+    enable_memoized
 
     class << self
       def from_uri(uri)
@@ -22,6 +19,17 @@ module EacConfig
     end
     compare_by :path
 
+    memoize def data
+      r = nil
+      if path.file?
+        r = ::EacRubyUtils::Yaml.load_file(path)
+      elsif path.exist?
+        raise("\"#{path}\" is a not a file")
+      end
+
+      r.is_a?(::Hash) ? r : {}
+    end
+
     def persist_data(new_data)
       path.parent.mkpath
       ::EacRubyUtils::Yaml.dump_file(path, new_data)
@@ -36,19 +44,6 @@ module EacConfig
       "#{self.class}[#{path}]"
     end
 
-    private
-
-    def data_uncached
-      r = nil
-      if path.file?
-        r = ::EacRubyUtils::Yaml.load_file(path)
-      elsif path.exist?
-        raise("\"#{path}\" is a not a file")
-      end
-
-      r.is_a?(::Hash) ? r : {}
-    end
-
     require_sub __FILE__, require_mode: :kernel
   end
 end

data/lib/eac_config.rb

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
-module EacConfig
-  require_sub __FILE__
-end
+require 'eac_ruby_base1'
+EacRubyBase1::RootModuleSetup.perform __FILE__

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: eac_config
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.1
 platform: ruby
 authors:
 - Put here the authors
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,50 +15,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.7
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.7
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_utils
+  name: eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.124'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.124'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-description: 
-email: 
+        version: '0.15'
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,10 +89,8 @@ files:
 - lib/eac_config/yaml_file_node.rb
 - lib/eac_config/yaml_file_node/entry.rb
 - lib/eac_config/yaml_file_node/self_entries.rb
-homepage: 
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -103,15 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Put here de description.
 test_files: []