ultra_config 0.11.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52234a8d4ae01dd19e6828c14d09a2af1acab2e3
-  data.tar.gz: 2ad472cfa2349d68b08159f46794ffa6ca471cf5
+SHA256:
+  metadata.gz: 0fdcef2c29aaf00fdacd4189c1b156e7308083d50061b58ec11ab26dd5f1aaf2
+  data.tar.gz: 52ecb944f849b9cc33e7913cc72e13e6802bfb34e77c64cd5876627f9bd3fb5d
 SHA512:
-  metadata.gz: f195f6529ae3f645dee2e71535b22849b759763662f9b2675370fd020b0e92d77c834c857341c6042b66dfac270f24231b00899f79e582b3404b3f87652d8235
-  data.tar.gz: b8f9d9b9bf802db40187d93865dd3e5414b97f165e7369357f03ef23f6321401241d6e969a570d10344d99c94d0588c779aa75dfa77557901812dd662911f1f5
+  metadata.gz: 89e667c687f45e8db12dcf5bfb2da6a1d03a2240adc337e5ab97f07d8256f00835a1bd1612738a25d89bca891e7259ea7243f70a8f6a39a2214a10c1ad88516e
+  data.tar.gz: 72b0d0d90766f0234e030f34bd44db68fcf9a45f5c2d257db5c1baa208fef8d5bf1990b818357e857570aafa97b067335970663575e6cf7e9fd375022c55efab

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      with:
+        ruby-version: 2.6
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/lib/ultra_config/config.rb

@@ -7,10 +7,12 @@ module UltraConfig
 
     attr_reader :value
 
-    def initialize(options = {}, &block)
+    def initialize(name, parents, options = {}, &block)
+      @name = name
+      @parents = parents
       @config_block = block
 
-      @value = options[:default] || nil
+      @value = options[:default].nil? ? nil : options[:default]
       @sanitize = options[:sanitize] || false
       @error_msg = options[:error_msg]
     end
@@ -21,7 +23,7 @@ module UltraConfig
       type_safety(Settings.type_safety) unless @type_safety_checked
       @value = @intermediate_value
     rescue UltraConfig::Validation::ValidationError
-      raise UltraConfig::Validation::ValidationError.new(msg: @error_msg)
+      raise UltraConfig::Validation::ValidationError.new(@error_msg, @parents + [@name], sanitize? ? '*****' : @intermediate_value)
     ensure
       @type_safety_checked = false
       @intermediate_value = nil

data/lib/ultra_config/namespace.rb

@@ -1,13 +1,18 @@
+require 'logger'
+
 require_relative 'config'
 
 module UltraConfig
   class Namespace
     class ObjectNotFoundError < StandardError; end
 
+    attr_accessor :logger
     attr_reader :objects
 
-    def initialize(&block)
+    def initialize(parents = [], &block)
       @configuration = [block]
+      @parents = parents
+
       reset
     end
 
@@ -21,12 +26,12 @@ module UltraConfig
     end
 
     def namespace(name, &block)
-      @objects[name] = Namespace.new(&block)
+      @objects[name] = Namespace.new(@parents + [name], &block)
       define_singleton_method(name) { @objects[name] }
     end
 
     def config(name, options = {}, &block)
-      @objects[name] = Config.new(options, &block)
+      @objects[name] = Config.new(name, @parents, options, &block)
       define_singleton_method("#{name}=") { |value| @objects[name].value = value }
       define_singleton_method(name) { @objects[name].value }
     end
@@ -53,6 +58,21 @@ module UltraConfig
       hash
     end
 
+    def merge_hash!(hash, parents = [])
+      hash.each do |k, v|
+        options = send_chain(parents)
+        if options.objects[k.to_sym].is_a?(Config)
+          options.send("#{k}=", v)
+        elsif options.objects[k.to_sym].is_a?(Namespace)
+          merge_hash!(v, parents + [k])
+        else
+          logger.warn { "received an unknown config #{k} with value #{v} and parents: #{parents}" }
+        end
+      end
+
+      self
+    end
+
     def to_sanitized_h
       hash = {}
       @objects.each do |name, object|
@@ -73,5 +93,18 @@ module UltraConfig
     def method_missing(m)
       raise ObjectNotFoundError
     end
+
+    private
+
+    # Send a chain of methods to an object
+    # @param arr [Array] list of methods to send to object
+    # @return [Object] result of method chain
+    def send_chain(arr)
+      arr.inject(self) {|obj, arr| obj.send(arr) }
+    end
+
+    def logger
+      @logger ||= (logger || Logger.new(IO::NULL))
+    end
   end
 end

data/lib/ultra_config/validation.rb

@@ -4,9 +4,15 @@ module UltraConfig
   module Validation
     include Boolean
 
-    class ValidationError < StandardError;
-      def initialize(msg: nil)
-        super
+    class ValidationError < StandardError
+      attr_reader :config
+      attr_reader :value
+
+      def initialize(msg = nil, config = [], value = nil)
+        @value = value
+        @config = config.join('.')
+
+        super(msg)
       end
     end
 

data/ultra_config.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'ultra_config'
-  spec.version       = '0.11.0'
+  spec.version       = '0.14.0'
   spec.authors       = ['Gregory Kuruc']
   spec.email         = ['gjk910327@gmail.com']
 
@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bump", "~> 0.1"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ultra_config
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Gregory Kuruc
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,13 +66,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - gjk910327@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -75,7 +90,7 @@ homepage: https://github.com/SpyMachine/UltraConfig
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Provides a simple way to define a configuration with validation
 test_files: []