qonfig 0.20.0 → 0.21.0

data/lib/qonfig/loaders/basic.rb

@@ -21,7 +21,7 @@ class Qonfig::Loaders::Basic
       nil # NOTE: consciously return nil (for clarity)
     end
 
-    # @param file_path [String]
+    # @param file_path [String, Pathname]
     # @option fail_on_unexist [Boolean]
     # @return [Object]
     #

data/lib/qonfig/plugins/pretty_print.rb

@@ -8,9 +8,12 @@ class Qonfig::Plugins::PrettyPrint < Qonfig::Plugins::Abstract
     #
     # @api private
     # @since 0.19.0
+    # @version 0.21.0
     def install!
       require_relative 'pretty_print/mixin'
       require_relative 'pretty_print/data_set'
+      require_relative 'pretty_print/settings'
+      require_relative 'pretty_print/compacted'
     end
   end
 end

data/lib/qonfig/plugins/pretty_print/compacted.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# @api public
+# @since 0.21.0
+class Qonfig::Compacted
+  # @api private
+  # @since 0.21.0
+  include ::Qonfig::Plugins::PrettyPrint::CompactedConfigMixin
+end

data/lib/qonfig/plugins/pretty_print/data_set.rb

@@ -2,8 +2,9 @@
 
 # @api public
 # @since 0.19.0
+# @version 0.21.0
 class Qonfig::DataSet
   # @api public
-  # @since 0.19.0
-  include Qonfig::Plugins::PrettyPrint::Mixin
+  # @since 0.21.0
+  include Qonfig::Plugins::PrettyPrint::DataSetMixin
 end

data/lib/qonfig/plugins/pretty_print/mixin.rb

@@ -2,21 +2,80 @@
 
 # @api private
 # @since 0.19.0
-module Qonfig::Plugins::PrettyPrint::Mixin
-  # @param pp [?] Suitable for Ruby's PP module
-  # @return [void]
-  #
-  # @api public
-  # @since 0.19.0
-  def pretty_print(pp)
-    pp.object_address_group(self) do
-      pp.seplist(keys, proc { pp.text(',') }) do |key|
-        pp.breakable(' ')
-        pp.group(1) do
-          pp.text(key)
-          pp.text(':')
-          pp.breakable
-          pp.pp(self[key])
+class Qonfig::Plugins::PrettyPrint
+  # @api private
+  # @since 0.21.0
+  module DataSetMixin
+    # @param pp [?] Suitable for Ruby's PP module
+    # @return [void]
+    #
+    # @api public
+    # @since 0.19.0
+    def pretty_print(pp)
+      pp.object_address_group(self) do
+        pp.seplist(keys, proc { pp.text(',') }) do |key|
+          pp.breakable(' ')
+          pp.group(1) do
+            pp.text(key)
+            pp.text(':')
+            pp.breakable
+            pp.pp(self[key])
+          end
+        end
+      end
+    end
+  end
+
+  # @api private
+  # @since 0.21.0
+  module CompactedConfigMixin
+    # @param pp [?] Suitable for Ruby's PP module
+    # @return [void]
+    #
+    # @api public
+    # @since 0.21.0
+    def pretty_print(pp)
+      pp.object_address_group(self) do
+        pp.seplist(@____data_set____.keys, ::Kernel.proc { pp.text(',') }) do |key|
+          pp.breakable(' ')
+          pp.group(1) do
+            pp.text(key)
+            pp.text(':')
+            pp.breakable
+            pp.pp(@____data_set____[key])
+          end
+        end
+      end
+    end
+
+    # @return [Integer]
+    #
+    # @see Object#object_id
+    # @see BasicObject#__id__
+    #
+    # @api public
+    # @since 0.21.0
+    alias_method :object_id, :__id__
+  end
+
+  # @api private
+  # @since 0.21.0
+  module SettingsMixin
+    # @param pp [?] Suitable for Ruby's PP module
+    # @return [void]
+    #
+    # @api public
+    # @since 0.21.0
+    def pretty_print(pp)
+      pp.object_address_group(self) do
+        pp.seplist(__keys__, proc { pp.text(',') }) do |key|
+          pp.breakable(' ')
+          pp.group(1) do
+            pp.text(key)
+            pp.text(':')
+            pp.breakable
+            pp.pp(self[key])
+          end
         end
       end
     end

data/lib/qonfig/plugins/pretty_print/settings.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# @api private
+# @since 0.21.0
+class Qonfig::Settings
+  # @api private
+  # @since 0.21.0
+  include Qonfig::Plugins::PrettyPrint::SettingsMixin
+end

data/lib/qonfig/plugins/toml/data_set.rb

@@ -20,13 +20,15 @@ class Qonfig::DataSet
   # @param file_path [String]
   # @option strict [Boolean]
   # @option expose [NilClass, String, Symbol] Environment key
+  # @param configuration [Block]
   # @return [void]
   #
   # @see Qonfig::DataSet#load_from_file
   #
   # @api public
   # @since 0.17.0
-  def load_from_toml(file_path, strict: true, expose: nil)
-    load_from_file(file_path, format: :toml, strict: strict, expose: expose)
+  # @version 0.21.0
+  def load_from_toml(file_path, strict: true, expose: nil, &configuration)
+    load_from_file(file_path, format: :toml, strict: strict, expose: expose, &configuration)
   end
 end

data/lib/qonfig/settings.rb

@@ -151,8 +151,9 @@ class Qonfig::Settings # NOTE: Layout/ClassStructure is disabled only for CORE_M
   #
   # @api public
   # @since 0.1.0
+  # @version 0.21.0
   def []=(key, value)
-    __lock__.thread_safe_access { __set_value__(key, value) }
+    __lock__.thread_safe_access { __assign_value__(key, value) }
   end
 
   # @param settings_map [Hash]
@@ -489,6 +490,32 @@ class Qonfig::Settings # NOTE: Layout/ClassStructure is disabled only for CORE_M
     __options__[key]
   end
 
+  # @param key [String, Symbol]
+  # @param value [Any]
+  # @return [void]
+  #
+  # @api private
+  # @since 0.21.0
+  # rubocop:disable Naming/RescuedExceptionsVariableName
+  def __assign_value__(key, value)
+    key = __indifferently_accessable_option_key__(key)
+    __set_value__(key, value)
+  rescue Qonfig::UnknownSettingError => initial_error
+    key_set = __parse_dot_notated_key__(key)
+
+    # NOTE: key is not dot-notaed and original key does not exist
+    raise(initial_error) if key_set.size == 1
+
+    begin
+      setting_value = __get_value__(key_set.first)
+      required_key = key_set[1..-1].join(DOT_NOTATION_SEPARATOR)
+      setting_value[required_key] = value # NOTE: pseudo-recoursive assignment
+    rescue Qonfig::UnknownSettingError
+      raise(initial_error)
+    end
+  end
+  # rubocop:enable Naming/RescuedExceptionsVariableName
+
   # @param key [String, Symbol]
   # @param value [Object]
   # @return [void]

data/lib/qonfig/settings/builder.rb

@@ -4,6 +4,23 @@
 # @since 0.2.0
 module Qonfig::Settings::Builder
   class << self
+    # @param data_set [Qonfig::DataSet]
+    # @param assignements [Block]
+    # @yield [settings, validator]
+    # @yieldparam settings [Qonfig::DataSet::Settings]
+    # @yieldparam validator [Qonfig::Validation::Validators::Composite]
+    # @return [void]
+    #
+    # @api private
+    # @since 0.21.0
+    def build(data_set, &assignements)
+      validator = build_validator(data_set)
+      settings = build_definitions(data_set)
+      yield(settings, validator)
+      validator.validate!
+      build_state(data_set)
+    end
+
     # @param data_set [Qonfig::DataSet]
     # @return [Qonfig::Settings]
     #
@@ -30,16 +47,23 @@ module Qonfig::Settings::Builder
 
     private
 
+    # @param data_set [Qonfig::DataSet]
+    # @return [Qonfig::Validation::Validators::Composite]
+    #
+    # @api private
+    # @since 0.21.0
+    def build_validator(data_set)
+      Qonfig::Validation::Validators::Composite.new(data_set)
+    end
+
     # @param data_set [Qonfig::DataSet]
     # @return [Qonfig::Settings::Callbacks]
     #
     # @api private
     # @since 0.13.0
     def build_mutation_callbacks(data_set)
-      validation_callback = proc { data_set.validate! }
-
       Qonfig::Settings::Callbacks.new.tap do |callbacks|
-        callbacks.add(validation_callback)
+        callbacks.add(Qonfig::Settings::Callbacks::Validation.new(data_set))
       end
     end
   end

data/lib/qonfig/settings/callbacks.rb

@@ -3,6 +3,8 @@
 # @api private
 # @since 0.13.0
 class Qonfig::Settings::Callbacks
+  require_relative 'callbacks/validation'
+
   # @api private
   # @since 0.13.0
   include Enumerable

data/lib/qonfig/settings/callbacks/validation.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# @api private
+# @since 0.21.0
+class Qonfig::Settings::Callbacks::Validation
+  # @param data_set [Qonfig::DataSet]
+  # @return [void]
+  #
+  # @api private
+  # @since 0.21.0
+  def initialize(data_set)
+    @data_set = data_set
+  end
+
+  # @return [void]
+  #
+  # @api private
+  # @since 0.21.0
+  def call
+    data_set.validate!
+  end
+
+  private
+
+  # @return [Qonfig::DataSet]
+  #
+  # @api private
+  # @since 0.21.0
+  attr_reader :data_set
+end

data/lib/qonfig/settings/key_matcher.rb

@@ -61,6 +61,14 @@ class Qonfig::Settings::KeyMatcher
     @pattern_matcher    = build_pattern_matcher(scope_pattern)
   end
 
+  # @return [Boolean]
+  #
+  # @api private
+  # @since 0.21.0
+  def generic?
+    scope_pattern == GENERIC_PART_PATTERN || scope_pattern == INFINITE_PART_PATTERN
+  end
+
   # @param setting_key_pattern [String]
   # @return [Boolean]
   #

data/lib/qonfig/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qonfig
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -154,11 +154,14 @@ files:
 - lib/qonfig/commands/instantiation.rb
 - lib/qonfig/commands/instantiation/freeze_state.rb
 - lib/qonfig/commands/instantiation/values_file.rb
+- lib/qonfig/compacted.rb
+- lib/qonfig/compacted/constructor.rb
 - lib/qonfig/configurable.rb
 - lib/qonfig/data_set.rb
 - lib/qonfig/data_set/class_builder.rb
 - lib/qonfig/data_set/lock.rb
 - lib/qonfig/dsl.rb
+- lib/qonfig/dsl/inheritance.rb
 - lib/qonfig/errors.rb
 - lib/qonfig/imports.rb
 - lib/qonfig/imports/abstract.rb
@@ -177,8 +180,10 @@ files:
 - lib/qonfig/plugins/abstract.rb
 - lib/qonfig/plugins/access_mixin.rb
 - lib/qonfig/plugins/pretty_print.rb
+- lib/qonfig/plugins/pretty_print/compacted.rb
 - lib/qonfig/plugins/pretty_print/data_set.rb
 - lib/qonfig/plugins/pretty_print/mixin.rb
+- lib/qonfig/plugins/pretty_print/settings.rb
 - lib/qonfig/plugins/registry.rb
 - lib/qonfig/plugins/toml.rb
 - lib/qonfig/plugins/toml/commands/definition/expose_toml.rb
@@ -194,6 +199,7 @@ files:
 - lib/qonfig/settings.rb
 - lib/qonfig/settings/builder.rb
 - lib/qonfig/settings/callbacks.rb
+- lib/qonfig/settings/callbacks/validation.rb
 - lib/qonfig/settings/key_guard.rb
 - lib/qonfig/settings/key_matcher.rb
 - lib/qonfig/settings/lock.rb