eac_config 0.13.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a6f32e20faefd54b3f85d008539d97fd3298cd6fe8b1118f321a8bdd3f0e9c9
-  data.tar.gz: 75d5c1c5691aacfec07532f102011119bf41e9991997d1a2c86cb201a271894a
+  metadata.gz: 7129c57e10676ddf2fd7b418aa21de384634e1ee9a3b1b5086524f62fa2a84fd
+  data.tar.gz: 61af2046de4dd5d3325fe1719b7ddb3e62e4134497a20ef0b923ceb5ebabee65
 SHA512:
-  metadata.gz: 144d2b6323592b447ef0b89a24845789ec88153c244209a723fa7aa62b3005bb7c8d8d2b5ad34b4f7f539c33cfcc3c06c9f2230ab6e8aa10b8b28bdb75cf347d
-  data.tar.gz: 3e807e994d32698e4a5ab8ea74a44846cfad0bf71923e15a534d8ae1eeaf2d4c9876fb498c317d12b16496190fe07aae87f8968c0521d352a2bdf3a71629c3e8
+  metadata.gz: 6f04f61ae7c90c57ed1fbc492a894ccf525fe8aa47ebbf6dbe665fd0289615d67c66b2f09b3f99f51b5b72c7a2961da7971ec74139a9f25773548bd70a3e2ed7
+  data.tar.gz: b4284d78053b22cf34e9134d3d1529b0079d46cfca98ebb3ae7abefd87062f019c1e9acf46ad9173517457e4c3c8a09b0b894237d8d9b9b1d7ac9b6caeec03a8

data/lib/eac_config/node.rb

@@ -56,7 +56,7 @@ module EacConfig
 
     # @return [Array<EacConfig::Node>]
     def self_loaded_nodes
-      load_path.paths.map { |node_path| load_node(node_path) }
+      load_path.paths.flat_map { |node_path| load_nodes(node_path) }
     end
 
     # @return [Array<EacConfig::Node>]
@@ -72,7 +72,9 @@ module EacConfig
 
     private
 
-    def load_node(node_path)
+    # @param node_path [String]
+    # @return [Array<EacConfig::Node>]
+    def load_nodes(node_path)
       ::EacConfig::NodeUri.new(node_path, url).instanciate
     end
   end

data/lib/eac_config/node_uri/instanciate_single.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EacConfig
+  class NodeUri
+    class InstanciateSingle
+      acts_as_instance_method
+      enable_simple_cache
+      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
+
+      # @return [EacConfig::Node]
+      def result
+        available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
+          raise("No class mapped for \"#{to_addressable}\"")
+      end
+
+      # @return [Addressable::URI]
+      def to_addressable
+        instance_uri.to_uri
+      end
+    end
+  end
+end

data/lib/eac_config/node_uri.rb

@@ -5,21 +5,26 @@ module EacConfig
     enable_simple_cache
     common_constructor :source, :loader_uri, default: [nil]
 
-    def available_node_classes
-      require 'eac_config/envvars_node'
-      require 'eac_config/yaml_file_node'
-      [::EacConfig::EnvvarsNode, ::EacConfig::YamlFileNode]
-    end
-
+    # @return [Array<EacConfig::Node>]
     def instanciate
-      available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
-        raise("No class mapped for \"#{to_addressable}\"")
+      instance_uris.map { |uri| instanciate_single(uri) }
     end
 
     delegate :to_s, to: :to_addressable
 
     private
 
+    # @return [Array<Addressable::URI>]
+    def instance_uris
+      if to_addressable.scheme == 'file'
+        ::Pathname.glob(to_addressable.path).map do |found_path|
+          ::Addressable::URI.new(scheme: 'file', path: found_path.to_path)
+        end
+      else
+        [to_addressable]
+      end
+    end
+
     def to_addressable_uncached
       r = ::Addressable::URI.parse(source)
       path = r.path.to_pathname
@@ -34,5 +39,7 @@ module EacConfig
 
       r.to_pathname.parent
     end
+
+    require_sub __FILE__, require_mode: :kernel
   end
 end

data/lib/eac_config/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_config
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -19,7 +19,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.8.5
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +82,7 @@ files:
 - lib/eac_config/node.rb
 - lib/eac_config/node_entry.rb
 - lib/eac_config/node_uri.rb
+- lib/eac_config/node_uri/instanciate_single.rb
 - lib/eac_config/old_configs.rb
 - lib/eac_config/old_configs/base.rb
 - lib/eac_config/old_configs/file.rb