open_config 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d71d6739c8e500a9bcc4958df2b7d5e81c443fc19901fe9bc6cd674189ce0102
-  data.tar.gz: df4528bd3534c6f31cbd860b61b74cd8959aecd5e7752e2ee2d618c302cf5845
+  metadata.gz: 7485c04b85ec19a76557a59fa05580e389331654256034244355f7170f0c40ee
+  data.tar.gz: 005d269f4976b68b409d066191b084bed432ee56ea68778a9f9ad40e45c83180
 SHA512:
-  metadata.gz: 6d8208dc85d7d864f75a0518d57f0d820023cdecb2c713618f869fcea352f33bc932bb92a590772ec6b22239d5dbfe5f6d19343cafe5ef2bbd72f1200f4fdce1
-  data.tar.gz: 5e39057cd68d5310f6efa12739da7c96311bf0cf0e8f73f5a5e3bce9900bb7b071e41a403de6fd6144cc9da515534d2f503e49f2b5b1f7b531f5010ad9147909
+  metadata.gz: bdfce39a72ffb67790e54a84a9bc0c5f1257ce81baeb28fcef4061798b992ecc6dfcfca8e13267f0b6b67a408ad4c0289cfd6bc94b1c614dc41b86d57190d7a8
+  data.tar.gz: bc6fcf31e3082f58112750eb39ca6d7d2d3d2b643190651b98fc200f27cedc96ba49a56085a2bef05e9feba482a71fd1907a4c70b915dc0bff72b7afbd953210

data/lib/open_config/files/base.rb

@@ -1,41 +1,33 @@
 # frozen_string_literal: true
 
-module OpenConfig
-  class Base
-    attr_reader :file_path
-
-    def initialize(root: Dir.pwd, file:)
-      @file_path = File.join(root, file)
-    end
-
-    def method_missing(method_name, *arguments, &block)
-      return super unless configuration_method?(method_name)
+require 'delegate'
 
-      tree.public_send(method_name, *arguments, &block)
+module OpenConfig
+  class Base < DelegateClass(Node)
+    def initialize(path)
+      @path = path
+      super(build_config)
     end
 
-    def respond_to_missing?(method_name, include_private = false)
-      configuration_method?(method_name) || super
+    def ==(other)
+      return false unless other.kind_of?(OpenConfig::Base)
+      table! == other.table!
     end
 
     private
 
-    def configuration_method?(method_name)
-      tree.respond_to?(method_name)
-    end
-
-    def tree
-      @tree ||= parse_file(read_file)
+    def build_config
+      parse_file(read_file)
     end
 
     def parse_file(_file_content)
-      raise NotImplementedError, 'Subclassed must implement #parse_file'
+      raise NotImplementedError, 'Subclasses must implement #parse_file'
     end
 
     def read_file
-      raise OpenConfig::Errors::FileNotFound, file_path unless File.exists?(file_path)
+      raise OpenConfig::Errors::FileNotFound, @path unless File.exists?(@path)
 
-      File.new(file_path).read
+      File.read(@path)
     end
   end
 end

data/lib/open_config/files/json.rb

@@ -3,11 +3,11 @@
 require 'json'
 
 module OpenConfig
-  class JSON < OpenConfig::Base
+  class JSON < Base
     private
 
     def parse_file(file_content)
-      ::JSON.parse(file_content, object_class: OpenStruct)
+      ::JSON.parse(file_content, object_class: OpenConfig::Node)
     end
   end
 end

data/lib/open_config/files/yaml.rb

@@ -5,19 +5,23 @@ require 'json'
 require 'erb'
 
 module OpenConfig
-  class YAML < OpenConfig::Base
+  class YAML < Base
     private
 
     def parse_file(file_content)
-      ::JSON.parse(build_json(file_content), object_class: OpenStruct)
+      ::JSON.parse(load_yaml(file_content).to_json, object_class: OpenConfig::Node)
     end
 
-    def build_json(file_content)
-      ::YAML.safe_load(load_erb(file_content)).to_json
+    def load_yaml(file_content)
+      begin
+        ::YAML.load(compile(file_content), aliases: true)
+      rescue ArgumentError
+        ::YAML.load(compile(file_content))
+      end
     end
 
-    def load_erb(file_content)
-      ::ERB.new(file_content).result
+    def compile(file_content)
+      defined?(::ERB) ? ::ERB.new(file_content).result : file_content
     end
   end
 end

data/lib/open_config/files.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'files/base'
-require_relative 'files/yaml'
-require_relative 'files/json'
+require 'open_config/files/base'
+require 'open_config/files/yaml'
+require 'open_config/files/json'

data/lib/open_config/node.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module OpenConfig
+  class Node < OpenStruct
+    def fetch(name, *args, &block)
+      begin
+        name = name.to_sym
+      rescue NoMethodError
+        raise! TypeError, "#{name} is not a symbol nor a string"
+      end
+
+      table.fetch(name, *args, &block)
+    end
+
+    def to_h
+      super.transform_values do |value|
+        value.instance_of?(self.class) ? value.to_h : value
+      end
+    end
+
+    def pretty_print(q)
+      q.object_group self do
+        q.nest(1) do
+          q.breakable
+          q.seplist(table, nil, :each) do |key, value|
+            q.group do
+              q.text key.to_s
+              q.text ': '
+              q.pp value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/open_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenConfig
-  VERSION = '1.2.0'
+  VERSION = '2.0.0'
 end

data/lib/open_config.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'open_config/version'
-require_relative 'open_config/errors'
-require_relative 'open_config/files'
+require 'open_config/version'
+require 'open_config/node'
+require 'open_config/files'
+require 'open_config/errors'
 
 module OpenConfig
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: open_config
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Egor Iskrenkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
-dependencies: []
+date: 2022-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.8'
 description: 
 email:
 - egor@iskrenkov.me
@@ -23,6 +65,7 @@ files:
 - lib/open_config/files/base.rb
 - lib/open_config/files/json.rb
 - lib/open_config/files/yaml.rb
+- lib/open_config/node.rb
 - lib/open_config/version.rb
 homepage: https://github.com/eiskrenkov/open_config
 licenses:
@@ -36,14 +79,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Building OpenStruct trees from configuration files