configature 0.3.4 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a224ef00f9af60ae0ba0763ccd95aa3fa1f96a0a2d1bc9065fd9901c9654334e
-  data.tar.gz: fe233997b912aa51af9345f21aecb7401e957d8f3a9e3a1791ed143c7c8ca6f7
+  metadata.gz: '080afc9a5e1852192d430bb691b87260cbd9dbb5dedc5cd6803d4fb78aa2cb7e'
+  data.tar.gz: 294737d6d91bd078c95c7e7a908f088081a2c4143f5f4cba682034e09a915098
 SHA512:
-  metadata.gz: 9ea6242794f99d7cafe567d80a1ed8b1baa5ec25329e7bdacd9e246f7e0775d8347acaad5d570e904a6707fef9ffef2d593468c1e4c9ffc3c69cb1c452211bd6
-  data.tar.gz: 5b0af76af2347583a90091cc0717d2ecfe40a8c581032f438c7729a2ddbedadc0da867d5b3c87217df8b1185d4b82e717ae095c495b2cc5f56ea2f5c501787b7
+  metadata.gz: 602be0de3c36b974b2ce6af817c6e352fbdee38010fe1006b7a21dc5842af615f49adfd3f3503ad8f6d787f14e47feefae00cf4a0541cb00254d5299cd1c3dbc
+  data.tar.gz: 1e6d62685d3beab2bdf9ccdcca98943ce3a766cff07d2f2cf8dcb8d569cc9b5fb4326ebebd4392c5f5293c85d2b508429ab6f56a7fcf2057a2b6f3f203e49557

data/.travis.yml

@@ -3,10 +3,8 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.8
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-  - jruby-9.2.9.0
-before_install: gem install bundler -v 2.1.4
+- 2.6.7
+- 2.7.3
+- 3.0.1
+before_install:
+- gem install bundler

data/Gemfile

@@ -3,8 +3,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in configature.gemspec
 gemspec
 
+ruby '>= 2.6.0'
+
 group :development do
   gem 'rake'
   gem 'bundler'
   gem 'rspec'
+  gem 'rspec-core'
 end

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    configature (0.3.3)
+    configature (0.3.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
 
 PLATFORMS
   ruby
@@ -30,6 +30,10 @@ DEPENDENCIES
   configature!
   rake
   rspec
+  rspec-core
+
+RUBY VERSION
+   ruby 3.0.1p64
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.7

data/lib/configature/config.rb

@@ -7,9 +7,9 @@ require_relative './namespace'
 
 class Configature::Config < Configature::Data
   # == Constants ============================================================
-  
+
   # == Properties ===========================================================
-  
+
   # == Class Methods ========================================================
 
   def self.config_dir
@@ -21,7 +21,9 @@ class Configature::Config < Configature::Data
   end
 
   def self.namespace(name, file: nil, env_suffix: '', extends: nil, &block)
-    namespace = self.namespaces[name] = Configature::Namespace.new(name, env_suffix: env_suffix, extends: extends && self.namespaces[extends]).tap do |n|
+    extends &&= self.namespaces[extends]
+
+    namespace = self.namespaces[name] = Configature::Namespace.new(name, env_suffix: env_suffix, extends: extends).tap do |n|
       case (block&.arity)
       when nil
         nil
@@ -32,7 +34,7 @@ class Configature::Config < Configature::Data
       end
     end
 
-    file = file&.to_s || name.to_s
+    file = (file || extends&.config_name || name).to_s
 
     if (file and !file.include?('.'))
       file += '.yml'
@@ -42,11 +44,9 @@ class Configature::Config < Configature::Data
       iv = :"@#{name}"
 
       singleton_class.send(:define_method, name) do
-        config_path = File.expand_path(file, self.config_dir)
-
-        config = Configature::Support.yaml_if_exist(config_path)
-
-        instance_variable_get(iv) or instance_variable_set(iv, namespace.__instantiate(source: config))
+        instance_variable_get(iv) or instance_variable_set(iv, namespace.__instantiate(
+          source: Configature::Support.yaml_if_exist(File.expand_path(file, self.config_dir))
+        ))
       end
     end
   end
@@ -54,15 +54,17 @@ class Configature::Config < Configature::Data
   def self.namespaces
     @namespaces ||= { }
   end
-  
+
   # == Instance Methods =====================================================
 
-  def initialize(config_dir: nil, env: ENV)
+  def initialize(config_dir: nil, path: nil, env: ENV, data: nil)
     super(
       self.class.namespaces.map do |name, namespace|
-        config_path = File.expand_path('%s.yml' % name, config_dir || self.class.config_dir)
+        config = data || begin
+          path ||= File.expand_path('%s.yml' % namespace.config_name, config_dir || self.class.config_dir)
 
-        config = Configature::Support.yaml_if_exist(config_path)
+          Configature::Support.yaml_if_exist(path)
+        end
 
         [
           name,

data/lib/configature/data.rb

@@ -19,8 +19,8 @@ class Configature::Data < OpenStruct
   # == Instance Methods =====================================================
 
   def to_h
-    super.transform_values do |v|
-      self.class.hashify(v)
-    end
+    super.map do |k, v|
+      [ k, self.class.hashify(v) ]
+    end.to_h
   end
 end

data/lib/configature/namespace.rb

@@ -40,6 +40,7 @@ class Configature::Namespace
   # == Properties ===========================================================
 
   attr_reader :name
+  attr_reader :config_name
   attr_reader :env_name_prefix
   attr_reader :namespaces
   attr_reader :parameters
@@ -53,18 +54,25 @@ class Configature::Namespace
     @extends = extends
     @env = extends&.instance_variable_get(:@env)
     @env_default = extends&.instance_variable_get(:@env_default)
-    @namespaces = extends ? extends.namespaces.dup : { }
-    @parameters = extends ? extends.parameters.dup : { }
+    @namespaces = extends&.namespaces&.dup || { }
+    @parameters = extends&.parameters&.dup || { }
     @env_suffix = env_suffix
     @env_name_prefix = name ? Configature::Support.extend_env_prefix(env_name_prefix, name) : ''
 
+    @config_name = extends&.config_name || name
+
     yield(self) if (block_given?)
   end
 
   def namespace(name, env_suffix: '', extends: nil, &block)
     name = name.to_sym
 
-    @namespaces[name] = self.class.new(name, env_suffix: env_suffix, extends: extends && self.namespaces[extends], env_name_prefix: @env_name_prefix).tap do |n|
+    @namespaces[name] = self.class.new(
+      name,
+      env_suffix: env_suffix,
+      extends: extends && self.namespaces[extends],
+      env_name_prefix: @env_name_prefix
+    ).tap do |n|
       case (block&.arity)
       when nil
         nil

data/lib/configature/support.rb

@@ -5,10 +5,9 @@ module Configature::Support
 
   def yaml_if_exist(path)
     return unless (File.exist?(path))
-    
-    # FIX: Use safe_load if safe_load supports aliases
+
     File.open(path) do |f|
-      YAML.load(f)
+      YAML.safe_load(f, aliases: true) or { }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configature
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - Scott Tadman
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies: []
 description: Assists in the creation of config files from example templates and can
   identify when some customization is necessary.
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Configuration file auto-generator