qonfig 0.16.0 → 0.17.0

data/lib/qonfig/settings.rb

@@ -272,6 +272,15 @@ class Qonfig::Settings # NOTE: Layout/ClassStructure is disabled only for CORE_M
     value.is_a?(Qonfig::Settings)
   end
 
+  # @param key_path [Array<Symbol, String>]
+  # @return [Boolean]
+  #
+  # @api private
+  # @since 0.17.0
+  def __has_key__(*key_path)
+    __lock__.thread_safe_access { __is_key_exists__(*key_path) }
+  end
+
   private
 
   # @return [Qonfig::Settings::Lock]
@@ -280,6 +289,18 @@ class Qonfig::Settings # NOTE: Layout/ClassStructure is disabled only for CORE_M
   # @since 0.2.0
   attr_reader :__lock__
 
+  # @param key_path [Array<String, Symbol>]
+  # @return [Boolean]
+  #
+  # @api private
+  # @since 0.17.0
+  def __is_key_exists__(*key_path)
+    __deep_access__(*key_path)
+    true
+  rescue Qonfig::UnknownSettingError
+    false
+  end
+
   # @param block [Proc]
   # @return [Enumerable]
   #

data/lib/qonfig/validator/basic.rb

@@ -9,13 +9,21 @@ class Qonfig::Validator::Basic
   # @since 0.13.0
   attr_reader :setting_key_matcher
 
+  # @return [Boolean]
+  #
+  # @api private
+  # @since 0.17.0
+  attr_reader :strict
+
   # @param setting_key_matcher [Qonfig::Settings::KeyMatcher, NilClass]
+  # @param strict [Boolean]
   # @return [void]
   #
   # @api private
   # @since 0.13.0
-  def initialize(setting_key_matcher)
+  def initialize(setting_key_matcher, strict)
     @setting_key_matcher = setting_key_matcher
+    @strict = strict
   end
 
   # @param data_set [Qonfig::DataSet]

data/lib/qonfig/validator/builder/attribute_consistency.rb

@@ -2,11 +2,13 @@
 
 # @api private
 # @since 0.13.0
+# rubocop:disable Metrics/ClassLength
 class Qonfig::Validator::Builder::AttributeConsistency
   class << self
     # @param setting_key_pattern [String, Symbol, NilClass]
     # @param predefined_validator [String, Symbol, NilClass]
     # @param runtime_validation_method [String, Symbol, NilClass]
+    # @param strict [Boolean]
     # @param validation_logic [Proc, NilClass]
     # @return [void]
     #
@@ -16,12 +18,14 @@ class Qonfig::Validator::Builder::AttributeConsistency
       setting_key_pattern,
       predefined_validator,
       runtime_validation_method,
+      strict,
       validation_logic
     )
       new(
         setting_key_pattern,
         predefined_validator,
         runtime_validation_method,
+        strict,
         validation_logic
       ).check!
     end
@@ -39,11 +43,13 @@ class Qonfig::Validator::Builder::AttributeConsistency
     setting_key_pattern,
     predefined_validator,
     runtime_validation_method,
+    strict,
     validation_logic
   )
     @setting_key_pattern = setting_key_pattern
     @predefined_validator = predefined_validator
     @runtime_validation_method = runtime_validation_method
+    @strict = strict
     @validation_logic = validation_logic
   end
 
@@ -54,6 +60,7 @@ class Qonfig::Validator::Builder::AttributeConsistency
   # @api private
   # @since 0.13.0
   def check!
+    consistent_strict_behaviour!
     consistent_method_choice!
     consistent_predefined_validator!
     cosnistent_runtime_validation_method!
@@ -81,6 +88,12 @@ class Qonfig::Validator::Builder::AttributeConsistency
   # @since 0.13.0
   attr_reader :runtime_validation_method
 
+  # @return [Boolean]
+  #
+  # @api private
+  # @since 0.17.0
+  attr_reader :strict
+
   # @return [Proc, NilClass]
   #
   # @api private
@@ -110,6 +123,21 @@ class Qonfig::Validator::Builder::AttributeConsistency
     end
   end
 
+  # @return [void]
+  #
+  # @raise [Qonfig::ValidatorArgumentError]
+  #
+  # @api private
+  # @since 0.17.0
+  def consistent_strict_behaviour!
+    unless strict.is_a?(TrueClass) || strict.is_a?(FalseClass)
+      raise(
+        Qonfig::ValidatorArgumentError,
+        ':strict should be a boolean'
+      )
+    end
+  end
+
   # @return [void]
   #
   # @raise [Qonfig::ValidatorArgumentError]
@@ -179,3 +207,4 @@ class Qonfig::Validator::Builder::AttributeConsistency
     )
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/qonfig/validator/builder.rb

@@ -29,11 +29,18 @@ class Qonfig::Validator::Builder
   # @since 0.13.0
   NO_PREDEFINED_VALIDATOR = nil
 
+  # @return [Boolean]
+  #
+  # @api private
+  # @since 0.17.0
+  DEFAULT_STRICT_BEHAVIOUR = false
+
   class << self
     # @option setting_key_pattern [String, Symbol, NilClass]
     # @option predefined_validator [String, Symbol, NilClass]
     # @option runtime_validation_method [String, Symbol, NilClass]
     # @option validation_logic [Proc, NilClass]
+    # @option strict [Boolean]
     # @return [Qonfig::Validator::MethodBased, Qonfig::Validator::ProcBased]
     #
     # @api private
@@ -42,20 +49,23 @@ class Qonfig::Validator::Builder
       setting_key_pattern: EMPTY_SETTING_KEY_PATTERN,
       runtime_validation_method: NO_RUNTIME_VALIDATION_METHOD,
       validation_logic: NO_VALIDATION_LOGIC,
+      strict: DEFAULT_STRICT_BEHAVIOUR,
       predefined_validator: NO_PREDEFINED_VALIDATOR
     )
       new(
         setting_key_pattern,
         predefined_validator,
         runtime_validation_method,
+        strict,
         validation_logic
       ).build
     end
   end
 
   # @param setting_key_pattern [String, Symbol, NilClass]
-  # @param predefined_validator [String, Symbol, NilClass]
+  # @param predefined_validator_name [String, Symbol, NilClass]
   # @param runtime_validation_method [String, Symbol, NilClass]
+  # @param strict [Boolean]
   # @param validation_logic [Proc, NilClass]
   # @return [void]
   #
@@ -63,13 +73,15 @@ class Qonfig::Validator::Builder
   # @since 0.13.0
   def initialize(
     setting_key_pattern,
-    predefined_validator,
+    predefined_validator_name,
     runtime_validation_method,
+    strict,
     validation_logic
   )
     @setting_key_pattern = setting_key_pattern
-    @predefined_validator = predefined_validator
+    @predefined_validator_name = predefined_validator_name
     @runtime_validation_method = runtime_validation_method
+    @strict = strict
     @validation_logic = validation_logic
   end
 
@@ -94,7 +106,7 @@ class Qonfig::Validator::Builder
   #
   # @api private
   # @since 0.13.0
-  attr_reader :predefined_validator
+  attr_reader :predefined_validator_name
 
   # @return [String, Symbol, NilClass]
   #
@@ -102,6 +114,12 @@ class Qonfig::Validator::Builder
   # @since 0.13.0
   attr_reader :runtime_validation_method
 
+  # @return [Boolean]
+  #
+  # @api private
+  # @since 0.17.0
+  attr_reader :strict
+
   # @return [Proc, NilClass]
   #
   # @api private
@@ -117,8 +135,9 @@ class Qonfig::Validator::Builder
   def validate_attributes!
     AttributeConsistency.check!(
       setting_key_pattern,
-      predefined_validator,
+      predefined_validator_name,
       runtime_validation_method,
+      strict,
       validation_logic
     )
   end
@@ -129,9 +148,9 @@ class Qonfig::Validator::Builder
   # @since 0.13.0
   def build_validator
     case
-    when predefined_validator      then build_predefined
-    when runtime_validation_method then build_method_based
-    when validation_logic          then build_proc_based
+    when predefined_validator_name then build_predefined_validator
+    when runtime_validation_method then build_method_based_validator
+    when validation_logic          then build_proc_based_validator
     end
   end
 
@@ -147,23 +166,29 @@ class Qonfig::Validator::Builder
   #
   # @api private
   # @since 0.13.0
-  def build_method_based
-    Qonfig::Validator::MethodBased.new(build_setting_key_matcher, runtime_validation_method)
+  def build_method_based_validator
+    Qonfig::Validator::MethodBased.new(
+      build_setting_key_matcher, strict, runtime_validation_method
+    )
   end
 
   # @return [Qonfig::Validator::ProcBased]
   #
   # @api private
   # @since 0.13.0
-  def build_proc_based
-    Qonfig::Validator::ProcBased.new(build_setting_key_matcher, validation_logic)
+  def build_proc_based_validator
+    Qonfig::Validator::ProcBased.new(
+      build_setting_key_matcher, strict, validation_logic
+    )
   end
 
   # @return [Qonfig::Settings::Predefined]
   #
   # @api private
   # @since 0.13.0
-  def build_predefined
-    Qonfig::Validator::Predefined.build(predefined_validator, build_setting_key_matcher)
+  def build_predefined_validator
+    Qonfig::Validator::Predefined.build(
+      predefined_validator_name, build_setting_key_matcher, strict
+    )
   end
 end

data/lib/qonfig/validator/dsl.rb

@@ -33,6 +33,7 @@ module Qonfig::Validator::DSL
   # @param setting_key_pattern [String, Symbol, NilClass]
   # @param predefined [String, Symbol]
   # @option by [String, Symbol, NilClass]
+  # @option stict [Boolean]
   # @param custom_validation [Proc]
   # @return [void]
   #
@@ -40,11 +41,18 @@ module Qonfig::Validator::DSL
   #
   # @api private
   # @since 0.13.0
-  def validate(setting_key_pattern = nil, predefined = nil, by: nil, &custom_validation)
+  def validate(
+    setting_key_pattern = nil,
+    predefined = nil,
+    strict: false,
+    by: nil,
+    &custom_validation
+  )
     validators << Qonfig::Validator::Builder.build(
       setting_key_pattern: setting_key_pattern,
       predefined_validator: predefined,
       runtime_validation_method: by,
+      strict: strict,
       validation_logic: custom_validation
     )
   end

data/lib/qonfig/validator/method_based.rb

@@ -10,13 +10,14 @@ class Qonfig::Validator::MethodBased < Qonfig::Validator::Basic
   attr_reader :runtime_validation_method
 
   # @param setting_key_matcher [Qonfig::Settings::KeyMatcher, NilClass]
+  # @param strict [Boolean]
   # @param runtime_validation_method [String, Symbol]
   # @return [void]
   #
   # @api private
   # @since 0.13.0
-  def initialize(setting_key_matcher, runtime_validation_method)
-    super(setting_key_matcher)
+  def initialize(setting_key_matcher, strict, runtime_validation_method)
+    super(setting_key_matcher, strict)
     @runtime_validation_method = runtime_validation_method
   end
 
@@ -28,6 +29,7 @@ class Qonfig::Validator::MethodBased < Qonfig::Validator::Basic
   def validate_concrete(data_set)
     data_set.settings.__deep_each_setting__ do |setting_key, setting_value|
       next unless setting_key_matcher.match?(setting_key)
+      next if !strict && setting_value.nil?
 
       raise(
         Qonfig::ValidationError,

data/lib/qonfig/validator/predefined/common.rb

@@ -10,13 +10,14 @@ class Qonfig::Validator::Predefined::Common < Qonfig::Validator::Basic
   attr_reader :validation
 
   # @param setting_key_matcher [Qonfig::Settings::KeyMatcher]
+  # @param strict [Boolean]
   # @param validation [Proc]
   # @return [void]
   #
   # @api private
   # @since 0.13.0
-  def initialize(setting_key_matcher, validation)
-    super(setting_key_matcher)
+  def initialize(setting_key_matcher, strict, validation)
+    super(setting_key_matcher, strict)
     @validation = validation
   end
 
@@ -30,6 +31,7 @@ class Qonfig::Validator::Predefined::Common < Qonfig::Validator::Basic
   def validate_concrete(data_set)
     data_set.settings.__deep_each_setting__ do |setting_key, setting_value|
       next unless setting_key_matcher.match?(setting_key)
+      next if !strict && setting_value.nil?
 
       raise(
         Qonfig::ValidationError,

data/lib/qonfig/validator/predefined/registry.rb

@@ -42,7 +42,6 @@ class Qonfig::Validator::Predefined::Registry
   # @since 0.13.0
   def resolve(name)
     thread_safe do
-      # rubocop:disable Style/RedundantBegin
       begin
         validators.fetch(indifferently_accessable_name(name))
       rescue KeyError
@@ -51,7 +50,6 @@ class Qonfig::Validator::Predefined::Registry
           "Predefined validator with name '#{name}' does not exist."
         )
       end
-      # rubocop:enable Style/RedundantBegin
     end
   end
 

data/lib/qonfig/validator/predefined/registry_control_mixin.rb

@@ -32,12 +32,13 @@ module Qonfig::Validator::Predefined::RegistryControlMixin
 
   # @param name [String, Symbol]
   # @param setting_key_matcher [Qonfig::Setting::KeyMatcher]
+  # @param strict [Boolean]
   # @return [Qonfig::Validator::Predefined::Common]
   #
   # @api private
   # @since 0.13.0
-  def build(name, setting_key_matcher)
+  def build(name, setting_key_matcher, strict)
     validation = registry.resolve(name)
-    Qonfig::Validator::Predefined::Common.new(setting_key_matcher, validation)
+    Qonfig::Validator::Predefined::Common.new(setting_key_matcher, strict, validation)
   end
 end

data/lib/qonfig/validator/proc_based.rb

@@ -10,13 +10,14 @@ class Qonfig::Validator::ProcBased < Qonfig::Validator::Basic
   attr_reader :validation
 
   # @param setting_key_matcher [Qonfig::Settings::KeyMatcher, NilClass]
+  # @param strict [Boolean]
   # @param vaidation [Proc]
   # @return [void]
   #
   # @api private
   # @since 0.13.0
-  def initialize(setting_key_matcher, validation)
-    super(setting_key_matcher)
+  def initialize(setting_key_matcher, strict, validation)
+    super(setting_key_matcher, strict)
     @validation = validation
   end
 
@@ -30,6 +31,7 @@ class Qonfig::Validator::ProcBased < Qonfig::Validator::Basic
   def validate_concrete(data_set)
     data_set.settings.__deep_each_setting__ do |setting_key, setting_value|
       next unless setting_key_matcher.match?(setting_key)
+      next if !strict && setting_value.nil?
 
       raise(
         Qonfig::ValidationError,

data/lib/qonfig/version.rb

@@ -5,5 +5,5 @@ module Qonfig
   #
   # @api public
   # @since 0.1.0
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

data/qonfig.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls',        '~> 0.8'
   spec.add_development_dependency 'simplecov',        '~> 0.16'
   spec.add_development_dependency 'rspec',            '~> 3.8'
-  spec.add_development_dependency 'armitage-rubocop', '~> 0.74'
+  spec.add_development_dependency 'armitage-rubocop', '~> 0.76'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qonfig
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.76'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.76'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,18 +137,21 @@ files:
 - lib/qonfig.rb
 - lib/qonfig/command_set.rb
 - lib/qonfig/commands.rb
-- lib/qonfig/commands/add_nested_option.rb
-- lib/qonfig/commands/add_option.rb
 - lib/qonfig/commands/base.rb
-- lib/qonfig/commands/compose.rb
-- lib/qonfig/commands/expose_json.rb
-- lib/qonfig/commands/expose_self.rb
-- lib/qonfig/commands/expose_yaml.rb
-- lib/qonfig/commands/load_from_env.rb
-- lib/qonfig/commands/load_from_env/value_converter.rb
-- lib/qonfig/commands/load_from_json.rb
-- lib/qonfig/commands/load_from_self.rb
-- lib/qonfig/commands/load_from_yaml.rb
+- lib/qonfig/commands/definition.rb
+- lib/qonfig/commands/definition/add_nested_option.rb
+- lib/qonfig/commands/definition/add_option.rb
+- lib/qonfig/commands/definition/compose.rb
+- lib/qonfig/commands/definition/expose_json.rb
+- lib/qonfig/commands/definition/expose_self.rb
+- lib/qonfig/commands/definition/expose_yaml.rb
+- lib/qonfig/commands/definition/load_from_env.rb
+- lib/qonfig/commands/definition/load_from_env/value_converter.rb
+- lib/qonfig/commands/definition/load_from_json.rb
+- lib/qonfig/commands/definition/load_from_self.rb
+- lib/qonfig/commands/definition/load_from_yaml.rb
+- lib/qonfig/commands/instantiation.rb
+- lib/qonfig/commands/instantiation/values_file.rb
 - lib/qonfig/configurable.rb
 - lib/qonfig/data_set.rb
 - lib/qonfig/data_set/class_builder.rb
@@ -157,6 +160,7 @@ files:
 - lib/qonfig/errors.rb
 - lib/qonfig/loaders.rb
 - lib/qonfig/loaders/basic.rb
+- lib/qonfig/loaders/dynamic.rb
 - lib/qonfig/loaders/end_data.rb
 - lib/qonfig/loaders/json.rb
 - lib/qonfig/loaders/yaml.rb
@@ -169,7 +173,9 @@ files:
 - lib/qonfig/plugins/toml/commands/load_from_toml.rb
 - lib/qonfig/plugins/toml/data_set.rb
 - lib/qonfig/plugins/toml/dsl.rb
+- lib/qonfig/plugins/toml/errors.rb
 - lib/qonfig/plugins/toml/loaders.rb
+- lib/qonfig/plugins/toml/loaders/dynamic.rb
 - lib/qonfig/plugins/toml/loaders/toml.rb
 - lib/qonfig/plugins/toml/tomlrb_fixes.rb
 - lib/qonfig/plugins/toml/uploaders/toml.rb

data/lib/qonfig/commands/load_from_env/value_converter.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module Qonfig
-  # @api private
-  # @since 0.2.0
-  module Commands::LoadFromENV::ValueConverter
-    # @return [Regexp]
-    #
-    # @api private
-    # @since 0.2.0
-    INTEGER_PATTERN = /\A\d+\z/.freeze
-
-    # @return [Regexp]
-    #
-    # @api private
-    # @since 0.2.0
-    FLOAT_PATTERN = /\A\d+\.\d+\z/.freeze
-
-    # @return [Regexp]
-    #
-    # @api private
-    # @since 0.2.0
-    TRUE_PATTERN = /\A(t|true)\z/i.freeze
-
-    # @return [Regexp]
-    #
-    # @api private
-    # @since 0.2.0
-    FALSE_PATTERN = /\A(f|false)\z/i.freeze
-
-    # @return [Regexp]
-    #
-    # @api private
-    # @since 0.2.0
-    ARRAY_PATTERN = /\A[^'"].*\s*,\s*.*[^'"]\z/.freeze
-
-    # @return [Regexp]
-    #
-    # @api private
-    # @since 0.2.0
-    QUOTED_STRING_PATTERN = /\A['"].*['"]\z/.freeze
-
-    class << self
-      # @param env_data [Hash]
-      # @return [void]
-      #
-      # @api private
-      # @since 0.2.0
-      def convert_values!(env_data)
-        env_data.each_pair do |key, value|
-          env_data[key] = convert_value(value)
-        end
-      end
-
-      private
-
-      # @param value [Object]
-      # @return [Object]
-      #
-      # @api private
-      # @since 0.2.0
-      def convert_value(value)
-        return value unless value.is_a?(String)
-
-        case value
-        when INTEGER_PATTERN
-          Integer(value)
-        when FLOAT_PATTERN
-          Float(value)
-        when TRUE_PATTERN
-          true
-        when FALSE_PATTERN
-          false
-        when ARRAY_PATTERN
-          value.split(/\s*,\s*/).map(&method(:convert_value))
-        when QUOTED_STRING_PATTERN
-          value.gsub(/(\A['"]|['"]\z)/, '')
-        else
-          value
-        end
-      end
-    end
-  end
-end