eac_config 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f6dfb659545033cf9bd7ad9514ef8328ec32c13af6d3534c8cb884e716a3ee
-  data.tar.gz: a8fa8b10e98000122b2a9e479443d0975d55decf95a060474eaad7ecfa8f4dee
+  metadata.gz: fd6a6d3c5ab71a03c476e9d3237623e6d9911128c27301c73dcaf3fdc3e49e33
+  data.tar.gz: fd1d1139b115073c1f7bcec332dcdbbcd92c9ed7825acff34eaa7c3b76747e04
 SHA512:
-  metadata.gz: 2d4c70a6acb8e033017a646ae5c1c1c3afe1b470fabcb194c8c8177fba8229d17abf13a504e58adf49983161a457a0d11b83ae1bc49a4917f80412672a9f518f
-  data.tar.gz: 383d7fb5e5812d1491dc73104c679b78b25c16b3e353591c3c37b2f467a3e1bd5f84de346bdb79c044a829dea0f7e32c898508dc1bd12bec42e290079efa74ca
+  metadata.gz: c29cc31ab4a5c6a834af31f12986c0e8e3b862d6603d117b7a3ca5792465636693542ae13417764c23fc2b6cfdd834bda7db0915d419157b329aec836fc7d2b2
+  data.tar.gz: 2390811743a6a997ee6d0ec2bba40ca5f27222ac14d352a51eb508e0e345c3f2190a12105bb3e9cfd63dc45052cdbe41d0c3c4df2dcf319103ec00f16db162a1

data/lib/eac_config/entry_path.rb

@@ -7,6 +7,10 @@ module EacConfig
     PART_SEPARATOR = '.'
 
     class << self
+      def assert(source)
+        source.is_a?(self) ? source : new(build_parts(source))
+      end
+
       def build_parts(source)
         return validate_parts!(source.split(PART_SEPARATOR)) if source.is_a?(::String)
         return validate_parts!(source.flat_map { |part| build_parts(part) }) if
@@ -26,8 +30,8 @@ module EacConfig
 
     attr_reader :parts
 
-    def initialize(*parts)
-      @parts = self.class.build_parts(parts).freeze
+    def initialize(parts)
+      @parts = parts.to_a.freeze
     end
   end
 end

data/lib/eac_config/entry_search.rb

@@ -10,13 +10,23 @@ module EacConfig
 
     private
 
+    def result_from_load_path_uncached
+      node.recursive_loaded_nodes.lazy.map { |loaded_node| loaded_node.entry(path) }.find(&:found?)
+    end
+
+    def result_from_self_uncached
+      return nil unless paths_hash.key?(to_paths_hash_key)
+
+      ::EacConfig::Entry.new(node, path, true, paths_hash.fetch(to_paths_hash_key))
+    end
+
+    def result_not_found_uncached
+      ::EacConfig::Entry.new(nil, path, false, nil)
+    end
+
     # @return [EacConfig::Entry]
     def result_uncached
-      if paths_hash.key?(to_paths_hash_key)
-        ::EacConfig::Entry.new(node, path, true, paths_hash.fetch(to_paths_hash_key))
-      else
-        ::EacConfig::Entry.new(nil, path, false, nil)
-      end
+      result_from_self || result_from_load_path || result_not_found
     end
 
     # @return [EacConfig::PathsHash]

data/lib/eac_config/load_nodes_search.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacConfig
+  class LoadNodesSearch
+    common_constructor :root_node do
+      add_next_pending until pending.empty?
+    end
+
+    def result
+      added
+    end
+
+    private
+
+    def added
+      @added ||= []
+    end
+
+    def add_next_pending
+      current = pending.pop
+      current.self_loaded_nodes.each do |loaded_node|
+        next if added.include?(loaded_node)
+
+        added << loaded_node
+        pending.push(loaded_node)
+      end
+    end
+
+    def pending
+      @pending ||= begin
+        r = Queue.new
+        r.push(root_node)
+        r
+      end
+    end
+  end
+end

data/lib/eac_config/node.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_config/entry_path'
+require 'eac_config/load_nodes_search'
+require 'eac_ruby_utils/core_ext'
+
+module EacConfig
+  module Node
+    common_concern do
+      enable_abstract_methods
+      include ::Comparable
+    end
+
+    LOAD_PATH_ENTRY_PATH = ::EacConfig::EntryPath.assert(%w[load_path])
+    LOAD_PATH_PATH_SEPARATOR = ':'
+
+    def entry(path)
+      ::EacConfig::EntrySearch.new(self, ::EacConfig::EntryPath.assert(path)).result
+    end
+
+    # @return [Addressable::URI]
+    def url
+      raise_abstract_method(__method__)
+    end
+
+    # @return [Array<EacConfig::Node>]
+    def self_loaded_nodes
+      ::EacConfig::EntrySearch.new(self, ::EacConfig::EntryPath.assert(LOAD_PATH_ENTRY_PATH))
+                              .result_from_self.if_present([]) do |e|
+        e.value.split(LOAD_PATH_PATH_SEPARATOR).map { |node_path| load_node(node_path) }
+      end
+    end
+
+    # @return [Array<EacConfig::Node>]
+    def recursive_loaded_nodes
+      ::EacConfig::LoadNodesSearch.new(self).result
+    end
+
+    private
+
+    def load_node(node_path)
+      self.class.new(node_path.to_pathname.expand_path(path.parent))
+    end
+  end
+end

data/lib/eac_config/version.rb

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

data/lib/eac_config/yaml_file_node.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
+require 'addressable'
 require 'eac_config/entry'
 require 'eac_config/entry_search'
-require 'eac_config/readable_node'
-require 'eac_config/writeable_node'
+require 'eac_config/node'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/yaml'
 
 module EacConfig
   class YamlFileNode
-    include ::EacConfig::ReadableNode
-    include ::EacConfig::WriteableNode
+    include ::EacConfig::Node
 
     common_constructor :path do
       self.path = path.to_pathname
@@ -20,8 +19,8 @@ module EacConfig
       @data ||= ::EacRubyUtils::Yaml.load_file(path)
     end
 
-    def entry(*path)
-      ::EacConfig::EntrySearch.new(self, ::EacConfig::EntryPath.new(*path)).result
+    def url
+      ::Addressable::URI.parse("file://#{path.expand_path}")
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: eac_config
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  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: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -48,14 +62,13 @@ files:
 - lib/eac_config/entry.rb
 - lib/eac_config/entry_path.rb
 - lib/eac_config/entry_search.rb
-- lib/eac_config/manager.rb
+- lib/eac_config/load_nodes_search.rb
+- lib/eac_config/node.rb
 - lib/eac_config/paths_hash.rb
 - lib/eac_config/paths_hash/entry_key_error.rb
 - lib/eac_config/paths_hash/node.rb
 - lib/eac_config/paths_hash/path_search.rb
-- lib/eac_config/readable_node.rb
 - lib/eac_config/version.rb
-- lib/eac_config/writeable_node.rb
 - lib/eac_config/yaml_file_node.rb
 homepage: 
 licenses: []

data/lib/eac_config/manager.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacConfig
-  class Manager
-    common_constructor :root_node
-
-    # @return [EacConfig::Entry]
-    def entry(*parts)
-      root_node.entry(*parts)
-    end
-  end
-end

data/lib/eac_config/readable_node.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module EacConfig
-  module ReadableNode
-  end
-end

data/lib/eac_config/writeable_node.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module EacConfig
-  module WriteableNode
-  end
-end