adaptiveconfiguration 1.0.0.beta01 → 1.0.0.beta02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a0689cda0cd8ceb25859afd3c06379667fb296d3a2a90dbf027f00d8fb6454
-  data.tar.gz: cf253ace46d9f2d634a9b578653c16a12e6909c517c53cd19d0b584e17111819
+  metadata.gz: 1c9efb51c751d9e2d5ed9f13cde645e6ad67eb33e657bb5a9942d8bc32ec09da
+  data.tar.gz: 4bb48b03dcecf0ccc32a4a5c107ea149cf006d1d7bf7d9d10fec7e585eb00d6d
 SHA512:
-  metadata.gz: f2af0a82072944057dca43e2c4a294c42cdb140e1433e2fdedd7d353e92df0d97e6e9736b45e00d7e391d7f7bb40336b6b631626e972f7d1e4d10888b3abf0b9
-  data.tar.gz: 04a3bee03bffff23ab8b13157b2e5c7fd589d435f18870f709b4c176342d402fdf6f9bf16ed4734fc7172e5d07385808fda56fcf36287fd170bf5799d8af6a1a
+  metadata.gz: dadebc70156e871f0986e1858080de3c67e411b3a39dae3328962642d39157be221615b9811d7170e6f3c8fbc2f198d4037a14f109015b8cfc17cd6e139c69bf
+  data.tar.gz: 501f930713ec9f0ce6396d5bcb308065c3448b34f845225c20c57e6152306ba7a930a7a67868616394fd0f620d36e988e454aa4d7a89fce2ac88c1e383bebe70

data/adaptiveconfiguration.gemspec

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

data/lib/adaptive_configuration/builder.rb

@@ -11,14 +11,14 @@ module AdaptiveConfiguration
 
     DEFAULT_CONVERTERS = {
 
+      Array       => ->( v ) { Array( v ) },
       Date        => ->( v ) { v.respond_to?( :to_date ) ? v.to_date : Date.parse( v.to_s ) },
       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 ) },
-      Integer     => ->( v ) { Integer( v ) },
-      Float       => ->( v ) { Float( v ) },
       Rational    => ->( v ) { Rational( v ) },
-      Array       => ->( v ) { Array( v ) },
+      Float       => ->( v ) { Float( v ) },
+      Integer     => ->( v ) { Integer( v ) },
       TrueClass   => ->( v ) { 
         case v
         when Numeric 
@@ -47,7 +47,7 @@ module AdaptiveConfiguration
       @converters[ klass ] = block 
     end
 
-    def build!( values = nil, &block )
+    def build( values = nil, &block )
       context = AdaptiveConfiguration::Context.new( 
         values,
         converters: @converters, 
@@ -57,5 +57,11 @@ module AdaptiveConfiguration
       context
     end
 
+    def build!( values = nil, &block )
+      context = self.build( values, &block )
+      context.validate!
+      context
+    end
+
   end
 end

data/lib/adaptive_configuration/context.rb

@@ -1,6 +1,8 @@
 module AdaptiveConfiguration
   class Context < BasicObject
 
+    attr_reader :errors
+
     def initialize( values = nil, definitions:, converters: )
 
       values = values ? values.transform_keys( &:to_sym ) : {}
@@ -8,6 +10,7 @@ module AdaptiveConfiguration
       @converters = converters&.dup 
       @definitions = definitions&.dup 
       @values = {}
+      @errors = []
       
       @definitions.each do | key, definition |
         name = definition[ :as ] || key 
@@ -30,6 +33,14 @@ module AdaptiveConfiguration
 
     end
 
+    def nil?
+      false  
+    end
+
+    def empty?
+      @values.empty?
+    end
+
     def []( key )
       @values[ key ]
     end
@@ -42,12 +53,18 @@ module AdaptiveConfiguration
       @values.each( &block )
     end
 
+
     def merge( hash )
       self.to_h.merge( hash )
     end
 
-    def empty?
-      @values.empty?
+    def valid?
+      __validate_values
+      @errors.empty?
+    end 
+
+    def validate!
+      __validate_values { | error | ::Kernel.raise error }
     end
 
     def to_h
@@ -103,10 +120,10 @@ module AdaptiveConfiguration
               Context.new( converters: @converters, definitions: definition[ :definitions ] )
             context.instance_eval( &block ) if block
             @values[ name ] = context 
-          else
+          else 
             value = args.first
-            value = _convert_value!( definition[ :type ], method, value ) if definition[ :type ] 
-            @values[ name ] = value
+            new_value = definition[ :type ] ? __coerce_value( definition[ :type ], value ) : value
+            @values[ name ] = new_value.nil? ? value : new_value
           end
         else
           @values[ name ] = definition[ :default_assigned ] ? 
@@ -119,7 +136,10 @@ module AdaptiveConfiguration
           else
             values = ::Kernel.method( :Array ).call( args.first )
             if type = definition[ :type ]
-              values = values.map { | v | _convert_value!( type, method, v ) } 
+              values = values.map do | v | 
+                new_value = __coerce_value( type, v )
+                new_value.nil? ? v : new_value
+              end 
             end
             @values[ name ].concat( values )
           end
@@ -142,29 +162,103 @@ module AdaptiveConfiguration
       @definitions.key?( method ) || self.class.instance_methods.include?( method ) 
     end
 
-    private; def _convert_value!( klass, key, value )
-      return value unless klass && value
+  protected 
+    
+    def __coerce_value( types, value )
+
+      return value unless types && !value.nil?
 
-      types =::Kernel.method( :Array ).call( klass ) 
+      types = ::Kernel.method( :Array ).call( types ) 
       result = nil
 
-      types.each do | type |
-        result = 
-          ( ( value.respond_to?( :is_a? ) && value.is_a?( type ) ) ? value : nil ) ||
-          @converters[ klass ].call( value ) rescue nil 
-        break if result 
+      if value.respond_to?( :is_a? )
+        types.each do | type |
+          result = value.is_a?( type ) ? value : nil 
+          break unless result.nil?
+        end
       end
 
       if result.nil?
-        types_names = types.map( &:name ).join( ', ' )
-        ::Kernel.raise ::TypeError, <<~TEXT.gsub( /\s+/, ' ' ).strip
-          The key #{key} expects a value of type #{types_names} but received an 
-          incompatible #{value.class.name}.
-        TEXT
+        types.each do | type |
+          result = @converters[ type ].call( value ) rescue nil
+          break unless result.nil?
+        end
       end
 
       result
     end
 
+    def __validate_values( path = nil, &block )
+
+      path.chomp( '/' ) if path
+      @errors = []
+
+      is_of_matching_types = ::Proc.new do | value, types |
+        type_match = false  
+        ::Kernel.method( :Array ).call( types ).each do | type |
+          type_match = value.is_a?( type )
+          break if type_match
+        end
+        type_match
+      end 
+
+      @definitions.each do | key, definition |
+
+        name = definition[ :as ] || key 
+        value = @values[ name ]
+
+        if definition[ :required ] && 
+           ( !value || ( value.respond_to?( :empty ) && value.empty? ) )
+          
+          error = RequirementUnmetError.new( path: path, key: key )
+          block.call( error ) if block
+          @errors << error 
+        
+        elsif !definition[ :default_assigned ] && !value.nil?
+          
+          unless definition[ :array ]
+
+            if definition[ :type ] == :group
+              value.__validate_values( "#{ ( path || '' ) + ( path ? '/' : '' ) + key.to_s }", &block )
+              @errors.concat( value.errors )
+            else     
+              if definition[ :type ] && value && !definition[ :default_assigned ]
+                unless is_of_matching_types.call( value, definition[ :type ] )
+                  error = IncompatibleTypeError.new( 
+                    path: path, key: key, type: definition[ :type ], value: value
+                  )
+                  block.call( error ) if block
+                  @errors << error 
+                end          
+              end
+            end
+
+          else 
+
+            if definition[ :type ] == :group
+              groups.each do | group |
+                group.__validate_values( "#{ ( path || '' ) + ( path ? '/' : '' ) + key.to_s }", &block )
+                @errors.concat( group.errors )
+              end
+            else
+              if definition[ :type ] && !definition[ :default_assigned ]
+                values = ::Kernel.method( :Array ).call( value )
+                values.each do | v | 
+                  unless is_of_matching_types.call( v, definition[ :type ] )
+                    error = IncompatibleTypeError.new( 
+                      path: path, key: key, type: definition[ :type ], value: v
+                    )
+                    block.call( error ) if block
+                    @errors << error 
+                  end
+                end  
+              end
+            end
+
+          end
+        end
+      end
+    end
+
   end
 end    

data/lib/adaptive_configuration/errors.rb

@@ -0,0 +1,41 @@
+require 'debug'
+
+module AdaptiveConfiguration
+  
+  class Error < StandardError; end
+
+
+  class IncompatibleTypeError < Error
+
+    attr_reader :keypath 
+    attr_reader :key 
+    attr_reader :type
+
+    def initialize( path: nil, key:, type:, value: )
+      
+      path = path ? path.to_s.chomp( '/' ) : nil 
+      @key = key
+      @keypath = path ? ( path + '/' + @key.to_s ) : @key.to_s 
+      @type = type
+      type_text = @type.respond_to?( :join ) ? type.join( ', ' ) : type
+
+      super( "The parameter '#{@keypath}' expects #{type_text} but received incompatible #{value.class.name}." )
+    end
+
+  end
+
+  class RequirementUnmetError < Error
+
+    attr_reader :keypath 
+    attr_reader :key 
+
+    def initialize( path: nil, key:  )
+      path = path ? path.chomp( '/' ) : nil 
+      @key = key
+      @keypath = path ? ( path + '/' + @key.to_s ) : key.to_s    
+      super( "The parameter #{@keypath} is required." )
+    end
+
+  end
+
+end

data/lib/adaptive_configuration.rb

@@ -1,2 +1,3 @@
+require_relative 'adaptive_configuration/errors'
 require_relative 'adaptive_configuration/builder'
 require_relative 'adaptive_configuration/configurable'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptiveconfiguration
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta01
+  version: 1.0.0.beta02
 platform: ruby
 authors:
 - Kristoph Cichocki-Romanov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-29 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,6 +58,7 @@ files:
 - lib/adaptive_configuration/builder.rb
 - lib/adaptive_configuration/configurable.rb
 - lib/adaptive_configuration/context.rb
+- lib/adaptive_configuration/errors.rb
 - lib/adaptive_configuration/group_builder.rb
 homepage: https://github.com/EndlessInternational/adaptive_configuration
 licenses: