adaptiveconfiguration 1.0.0.beta04 → 1.0.0.beta06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a11fad3ccce7d331a27190c743c44688ad95900a7cc8f168a4fdcb824b625bce
-  data.tar.gz: aa7ed25488d182dcaf59ec3f2f0a6442c9004660d9c22b8b1ba73b0e730b190c
+  metadata.gz: 2e6d7ffc7756d8ea2cb2d685ef00ca01561d232c99852516b38b7bf1ce72cb66
+  data.tar.gz: bb716f63caf1e4fec6a90da636a30a4bcfc7b546f610d548f275bb630780f2bc
 SHA512:
-  metadata.gz: 82df20c8476433d0cec6cb10df0242b5b2b9acfe426741727871f67bde4b46b1bff4e3ab56c1bd8553284d5336074f48abad92ba30f3cc4ef2f27ca41e5b2429
-  data.tar.gz: c83a76b55815d78ddc19cce6a118ce6ce26f4c3a4288837e40ee9b565db1d13c329d8dfed04ef1f42923d76b703d20742b73de652a4857fd2f9b0f158e64c850
+  metadata.gz: fbb8df8e89fab329b3ca8464a8088c0617b800ab981be36cae596debb7f29a26b2768520665926d2a30148074f981d59dbbade409932b5c02407efdcb600b5cc
+  data.tar.gz: ae9e3c1d6fde00f4136edf6e4cc9cb85e621170f78ba52c86211bb1121e3bfe20e9e76fb606bd009e218957c0a6260a127e03342c494cb733d4803d2ad8973ec

data/adaptiveconfiguration.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do | spec |
 
   spec.name          = 'adaptiveconfiguration'
-  spec.version       = '1.0.0.beta04'
+  spec.version       = '1.0.0.beta06'
   spec.authors       = [ 'Kristoph Cichocki-Romanov' ]
   spec.email         = [ 'rubygems.org@kristoph.net' ]
 

data/lib/adaptive_configuration/builder.rb

@@ -16,6 +16,7 @@ module AdaptiveConfiguration
       Time        => ->( v ) { v.respond_to?( :to_time ) ? v.to_time : Time.parse( v.to_s ) },
       URI         => ->( v ) { URI.parse( v.to_s ) },
       String      => ->( v ) { String( v ) },
+      Symbol      => ->( v ) { v.respond_to?( :to_sym ) ? v.to_sym : nil },
       Rational    => ->( v ) { Rational( v ) },
       Float       => ->( v ) { Float( v ) },
       Integer     => ->( v ) { Integer( v ) },

data/lib/adaptive_configuration/context.rb

@@ -1,12 +1,14 @@
 module AdaptiveConfiguration
   class Context < BasicObject
 
+    include ::PP::ObjectMixin if defined?( ::PP )
+
     attr_reader :errors
 
     def initialize( values = nil, definitions:, converters: )
+      raise ArgumentError, 'The Scaffold initialitization attributes must be a Hash pr Hash-like.'\
+        unless values.nil? || ( values.respond_to?( :[] ) && values.respond_to?( :key? ) )
 
-      values = values ? values.transform_keys( &:to_sym ) : {}
-      
       @converters = converters&.dup 
       @definitions = definitions&.dup 
       @values = {}
@@ -14,21 +16,13 @@ module AdaptiveConfiguration
       
       @definitions.each do | key, definition |
         name = definition[ :as ] || key 
-        if definition[ :type ] == :group
-          context = Context.new( 
-            values[ key ] || {},
-            converters: @converters, definitions: definition[ :definitions ], 
-          )
-          @values[ name ] = context unless context.empty?
-        elsif definition.key?( :default )
-          @values[ name ] = definition[ :array ] ? 
-            ::Kernel.method( :Array ).call( definition[ :default ] ) : 
-            definition[ :default ]
-          # note: this is needed to know when an array paramter which was initially assigned
+        if definition.key?( :default )
+          self.__send__( key, definition[ :default ] )
+          # note: this is needed to know when an array parameter which was initially assigned
           #       to a default should be replaced rather than appended
           definition[ :default_assigned ] = true
         end
-        self.__send__( key, values[ key ] ) if values[ key ]
+        self.__send__( key, values[ key ] ) if values && values.key?( key ) 
       end
 
     end
@@ -41,6 +35,10 @@ module AdaptiveConfiguration
       @values.empty?
     end
 
+    def key?( key )
+      @values.key?( key )
+    end
+
     def []( key )
       @values[ key ]
     end
@@ -93,7 +91,13 @@ module AdaptiveConfiguration
     end
 
     def inspect
-      @values.inspect
+      { values: @values, definitions: @definitions }.inspect 
+    end
+
+    if defined?( ::PP )
+      def pretty_print( pp )
+        pp.pp( { values: @values, definitions: @definitions } )
+      end
     end
 
     def class
@@ -107,20 +111,23 @@ module AdaptiveConfiguration
     alias :kind_of? :is_a?
 
     def method_missing( method, *args, &block )
-
+    
       if @definitions.key?( method )
-
         definition = @definitions[ method ]
         name = definition[ :as ] || method
 
         unless definition[ :array ] 
           if definition[ :type ] == :group
-            context = 
-              @values[ name ] || Context.new( 
-                args.first,
-                converters: @converters, 
-                definitions: definition[ :definitions ] 
-              )
+            argument = args.first 
+            context = @values[ name ]
+            if context.nil? || argument  
+              context = 
+                Context.new( 
+                  argument,
+                  converters: @converters, 
+                  definitions: definition[ :definitions ] 
+                )
+            end
             context.instance_eval( &block ) if block
             @values[ name ] = context 
           else 
@@ -133,13 +140,17 @@ module AdaptiveConfiguration
             ::Array.new : 
             @values[ name ] || ::Array.new
           if definition[ :type ] == :group
-            context = Context.new( 
-              args.first,
-              converters: @converters, 
-              definitions: definition[ :definitions ] 
-            )
-            context.instance_eval( &block ) if block
-            @values[ name ] << context 
+            values = [ args.first ].flatten
+            values = values.map do | v |
+              context = Context.new( 
+                v,
+                converters: @converters, 
+                definitions: definition[ :definitions ] 
+              )
+              context.instance_eval( &block ) if block
+              context
+            end
+            @values[ name ].concat( values ) 
           else
             values = ::Kernel.method( :Array ).call( args.first )
             if type = definition[ :type ]
@@ -243,6 +254,7 @@ module AdaptiveConfiguration
           else 
 
             if definition[ :type ] == :group
+              groups = ::Kernel.method( :Array ).call( value )
               groups.each do | group |
                 group.__validate_values( "#{ ( path || '' ) + ( path ? '/' : '' ) + key.to_s }", &block )
                 @errors.concat( group.errors )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptiveconfiguration
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta04
+  version: 1.0.0.beta06
 platform: ruby
 authors:
 - Kristoph Cichocki-Romanov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec