eac_config 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1146b6d7dcccd0749b9ac875dceb8b521e386cc4468ffeab106f33e29e254a85
-  data.tar.gz: b4da054e60c2c5316670d047869ce98c3ca4255fc1df62db9b5ef5f303bdd5e8
+  metadata.gz: fecd4e56674406cf96275edc74b51ee0c908076bf3f991f079ee439a7fd98606
+  data.tar.gz: 33ed9a3d05488a9d06919589432727d6a9e72430234c05bb89e1119ea6b4c05f
 SHA512:
-  metadata.gz: e3c47344815bd911603f54a37581a6be9b7182f87d3b2546e708f903a5da3bb7799da013c189db7a3f3d0572e64b4124562a43f9ebe54c0e88805d12fa94503a
-  data.tar.gz: 5f6ba2fb942129f1b8b5d47ab1e1693d025303f501ebb6e7f0a25109369beaa99dfcc420e08f5d8c50ffb495bf52c287f6491a5d4b11014c1c051f21c4cd272b
+  metadata.gz: cdd3b1bfe2d2e8dce429aa34dde375120f13796106c9145b8abcdfc6cbbb42187f1cf3504e1ec5027aa28afe437311c82fe1b1bf77b0aed195148ea9c57ba60a
+  data.tar.gz: 37807d3bfeae842fb0f43a58cb2f90f1851cee1bd1802437a23cad122c6ab2d5cad896a4125aa45b3da73098863611d9e9575fdd5241d7ce67143bcb9ccbc97a

data/lib/eac_config/entry.rb

@@ -22,7 +22,13 @@ module EacConfig
       node_entry.if_present(&:value)
     end
 
-    delegate :value=, to: :root_node
+    def value=(a_value)
+      write_node.self_entry(path).value = a_value
+    end
+
+    def write_node
+      root_node.write_node || root_node
+    end
 
     private
 

data/lib/eac_config/envvars_node.rb

@@ -0,0 +1,25 @@
+# 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')
+
+    class << self
+      def from_uri(uri)
+        return new if uri == URI
+      end
+    end
+
+    def url
+      URI
+    end
+  end
+end

data/lib/eac_config/envvars_node/entry.rb

@@ -0,0 +1,54 @@
+# 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
+      class << self
+        def entry_path_to_envvar_name(path)
+          ::EacConfig::EntryPath.assert(path).parts.join('_').gsub(/[^a-z0-9_]/i, '')
+                                .gsub(/\A_+/, '').gsub(/_+\z/, '').gsub(/_{2,}/, '_').upcase
+        end
+
+        def from_value(string)
+          return nil if string.nil?
+          return ::EacRubyUtils::Yaml.load(string) if string.start_with?('---')
+
+          string
+        end
+
+        def to_value(object)
+          return nil if object.nil?
+          return object if object.is_a?(String)
+
+          ::EacRubyUtils::Yaml.dump(object)
+        end
+      end
+
+      enable_simple_cache
+
+      def found?
+        ENV.key?(envvar_name)
+      end
+
+      def value
+        self.class.from_value(ENV[envvar_name])
+      end
+
+      def value=(a_value)
+        ENV[envvar_name] = self.class.to_value(a_value)
+      end
+
+      private
+
+      def envvar_name_uncached
+        self.class.entry_path_to_envvar_name(path)
+      end
+    end
+  end
+end

data/lib/eac_config/load_path.rb

@@ -6,17 +6,6 @@ require 'eac_ruby_utils/core_ext'
 module EacConfig
   class LoadPath
     ENTRY_PATH = ::EacConfig::EntryPath.assert(%w[load_path])
-    PATH_SEPARATOR = ':'
-
-    class << self
-      def paths_to_string(paths)
-        paths.map(&:to_s).join(PATH_SEPARATOR)
-      end
-
-      def string_to_paths(string)
-        string.to_s.split(PATH_SEPARATOR)
-      end
-    end
 
     common_constructor :node
 
@@ -26,11 +15,14 @@ module EacConfig
 
     # @return [Array<String>]
     def paths
-      self.class.string_to_paths(entry.value)
+      r = entry.value
+      r.is_a?(::Array) ? r : []
     end
 
     def push(new_path)
-      entry.value = self.class.paths_to_string(paths + [new_path])
+      entry.value = paths + [new_path]
     end
+
+    delegate :to_s, to: :paths
   end
 end

data/lib/eac_config/node.rb

@@ -5,10 +5,13 @@ 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'
 
 module EacConfig
   module Node
+    attr_accessor :write_node
+
     common_concern do
       enable_abstract_methods
       include ::Comparable
@@ -31,7 +34,11 @@ module EacConfig
     # Return a entry which search values only in the self node.
     # @return [EacConfig::NodeEntry]
     def self_entry(path)
-      ::EacConfig::NodeEntry.new(self, path)
+      self_entry_class.new(self, path)
+    end
+
+    def self_entry_class
+      self.class.const_get('Entry')
     end
 
     # @return [Array<EacConfig::Node>]
@@ -47,7 +54,7 @@ module EacConfig
     private
 
     def load_node(node_path)
-      self.class.new(node_path.to_pathname.expand_path(path.parent))
+      ::EacConfig::NodeUri.new(node_path, url).instanciate
     end
   end
 end

data/lib/eac_config/node_entry.rb

@@ -7,33 +7,12 @@ 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
     common_constructor :node, :path do
       self.path = ::EacConfig::EntryPath.assert(path)
     end
 
-    def found?
-      paths_hash.key?(to_paths_hash_key)
-    end
-
-    def value
-      paths_hash[to_paths_hash_key]
-    end
-
-    def value=(a_value)
-      paths_hash[to_paths_hash_key] = a_value
-      node.persist_data(paths_hash.root.to_h)
-    end
-
-    private
-
-    # @return [EacConfig::PathsHash]
-    def paths_hash_uncached
-      ::EacConfig::PathsHash.new(node.data)
-    end
-
-    def to_paths_hash_key
-      path.parts.join('.')
-    end
+    abstract_methods :found?, :value, :value=
   end
 end

data/lib/eac_config/node_uri.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module EacConfig
+  class NodeUri
+    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
+
+    def instanciate
+      available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
+        raise("No class mapped for \"#{to_addressable}\"")
+    end
+
+    delegate :to_s, to: :to_addressable
+
+    private
+
+    def to_addressable_uncached
+      r = ::Addressable::URI.parse(source)
+      path = r.path.to_pathname
+      r.path = path.expand_path(loader_uri_path_directory).to_path if path.relative?
+      r.scheme = 'file' if r.scheme.blank?
+      r
+    end
+
+    def loader_uri_path_directory
+      r = loader_uri.path
+      raise ".loader_uri \"#{loader_uri}\" has no path (Source: \"#{source}\")" if r.blank?
+
+      r.to_pathname.parent
+    end
+  end
+end

data/lib/eac_config/old_configs.rb

@@ -8,6 +8,7 @@ require 'eac_config/paths_hash'
 require 'eac_ruby_utils/simple_cache'
 
 module EacConfig
+  # @deprecated Use {EacConfig::YamlFileNode} instead.
   class OldConfigs
     include ::EacRubyUtils::SimpleCache
 

data/lib/eac_config/version.rb

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

data/lib/eac_config/yaml_file_node.rb

@@ -7,20 +7,27 @@ require 'eac_ruby_utils/yaml'
 
 module EacConfig
   class YamlFileNode
+    require_sub __FILE__
     include ::EacConfig::Node
 
+    class << self
+      def from_uri(uri)
+        return new(uri.to_addressable.path) if uri.to_addressable.scheme == 'file'
+      end
+    end
+
     common_constructor :path do
       self.path = path.to_pathname
     end
 
     def data
-      @data ||= ::EacRubyUtils::Yaml.load_file(assert_path)
+      @data ||= ::EacRubyUtils::Yaml.load_file(assert_path) || {}
     end
 
     def persist_data(new_data)
       path.parent.mkpath
       ::EacRubyUtils::Yaml.dump_file(path, new_data)
-      reset_cache(:data)
+      @data = nil
     end
 
     def url

data/lib/eac_config/yaml_file_node/entry.rb

@@ -0,0 +1,37 @@
+# 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
+
+      def found?
+        paths_hash.key?(to_paths_hash_key)
+      end
+
+      def value
+        paths_hash[to_paths_hash_key]
+      end
+
+      def value=(a_value)
+        paths_hash[to_paths_hash_key] = a_value
+        node.persist_data(paths_hash.root.to_h)
+      end
+
+      private
+
+      # @return [EacConfig::PathsHash]
+      def paths_hash_uncached
+        ::EacConfig::PathsHash.new(node.data)
+      end
+
+      def to_paths_hash_key
+        path.parts.join('.')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -61,10 +61,13 @@ files:
 - lib/eac_config.rb
 - lib/eac_config/entry.rb
 - lib/eac_config/entry_path.rb
+- lib/eac_config/envvars_node.rb
+- lib/eac_config/envvars_node/entry.rb
 - lib/eac_config/load_nodes_search.rb
 - lib/eac_config/load_path.rb
 - lib/eac_config/node.rb
 - lib/eac_config/node_entry.rb
+- lib/eac_config/node_uri.rb
 - lib/eac_config/old_configs.rb
 - lib/eac_config/old_configs/base.rb
 - lib/eac_config/old_configs/file.rb
@@ -74,6 +77,7 @@ files:
 - lib/eac_config/paths_hash/path_search.rb
 - lib/eac_config/version.rb
 - lib/eac_config/yaml_file_node.rb
+- lib/eac_config/yaml_file_node/entry.rb
 homepage: 
 licenses: []
 metadata: {}