dynamicschema 1.0.0.beta03 → 1.0.0.beta04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5685a6ff1c79676a075f3f7f2cd5863c35466a402c79f3af46c2e164eb37581a
-  data.tar.gz: 374fbd61c218c4dc4bc6620d18fa3a973d197aa96032c6c2998bb4d3ed8da378
+  metadata.gz: 2bbda4319f58741ceca992dec756544aeaa8f9b293afa0bee507ba94636405f4
+  data.tar.gz: 67283d904c6d84994d724d2e5a934332f78661bfa1173b0e0a6b4026a1b0a788
 SHA512:
-  metadata.gz: 80c7ae562b99ddabf6fe6220a995d845beda151c13683aff13891c47e089700579cb7a099b08a4ac789569ab0499612c2f467222661082b1794cbb75d424a1d9
-  data.tar.gz: 2da0f6cf54388b6e2e5d3f3ac05214c6f3ea27c8c763fb1ac9a84bbbddbad92d21b29db328c70388653ffd4317a409a58b0165323626e2e2ea2988b188df14c3
+  metadata.gz: 2fa81eb8ff0e153e2d9900eea14f26dbdc71ce90bb1b4595c9091330da1d8f6c7fdcd0fa2e8273a64346c08f5baca9a4d2519db7e67b35ea20da6d49a1adde16
+  data.tar.gz: 3d86d903925519d2813c379d528ada3a678e80cdf3c24287697c19ab0b3fb9ad9062f21c36bc219f5dceef384fb19bcc1208117416e964906e5cee5b4d9ae7db

data/README.md

@@ -194,7 +194,7 @@ schema = DynamicSchema.define do
   chat_options do
     model String, default: 'claude-3'
     max_tokens Integer, default: 1024
-    temperature, Float, default: 0.5, in: 0..1
+    temperature Float, default: 0.5, in: 0..1
     stream [ TrueClass, FalseClass ]
   end
 end

data/dynamicschema.gemspec

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

data/lib/dynamic_schema/builder.rb

@@ -15,7 +15,7 @@ module DynamicSchema
     end
 
     def define( &block )
-      self.schema = Resolver.new( self.schema ).resolve( &block ).schema 
+      self.schema = Resolver.new( self.schema ).resolve( &block )._schema 
       self
     end 
 

data/lib/dynamic_schema/builder_methods/validation.rb

@@ -61,7 +61,7 @@ module DynamicSchema
               if criteria[ :type ] == Object
                 traverse_and_validate_values( 
                   values[ name ],
-                  schema: criteria[ :schema ] ||= criteria[ :resolver ].schema,
+                  schema: criteria[ :schema ] ||= criteria[ :resolver ]._schema,
                   path: "#{ ( path || '' ) + ( path ? '/' : '' ) + key.to_s }", 
                   &block 
                 )
@@ -80,7 +80,7 @@ module DynamicSchema
                 groups.each do | group |
                   traverse_and_validate_values(
                     group, 
-                    schema: criteria[ :schema ] ||= criteria[ :resolver ].schema,
+                    schema: criteria[ :schema ] ||= criteria[ :resolver ]._schema,
                     path: "#{ ( path || '' ) + ( path ? '/' : '' ) + key.to_s }", 
                     &block 
                   )

data/lib/dynamic_schema/receiver.rb

@@ -197,7 +197,7 @@ module DynamicSchema
           Receiver.new( 
             attributes,
             converters: @converters, 
-            schema: criteria[ :schema ] ||= criteria[ :resolver ].schema 
+            schema: criteria[ :schema ] ||= criteria[ :resolver ]._schema 
           )
       end
       value.instance_eval( &block ) if block
@@ -213,7 +213,7 @@ module DynamicSchema
         receiver = Receiver.new( 
           a,
           converters: @converters, 
-          schema: criteria[ :schema ] ||= criteria[ :resolver ].schema 
+          schema: criteria[ :schema ] ||= criteria[ :resolver ]._schema 
         )
         receiver.instance_eval( &block ) if block
         receiver

data/lib/dynamic_schema/resolver.rb

@@ -22,7 +22,8 @@ module DynamicSchema
       self
     end
         
-    def schema 
+    def _schema 
+
       if !@resolved && @block 
         @resolved_blocks << @block unless @resolved_blocks.include?( @block )
         self.instance_eval( &@block ) 
@@ -31,6 +32,29 @@ module DynamicSchema
       @schema 
     end
 
+    def _value( name, options )
+      name = name.to_sym
+      ::Kernel.raise ::NameError, "The name '#{name}' is reserved and cannot be used for parameters." \
+        if ::DynamicSchema::Receiver.instance_methods.include?( name )
+  
+      _validate_in!( name, options[ :type ], options[ :in ] ) if options[ :in ] 
+      
+      @schema[ name ] = options
+      self
+    end
+
+    def _object( name, options = {}, &block )
+      name = name.to_sym
+      ::Kernel.raise ::NameError, "The name '#{name}' is reserved and cannot be used for parameters." \
+        if ::DynamicSchema::Receiver.instance_methods.include?( name )
+
+      @schema[ name ] = options.merge( {
+        type: ::Object,
+        resolver: Resolver.new( resolved_blocks: @resolved_blocks ).resolve( &block )
+      } )    
+      self
+    end
+
     def method_missing( method, *args, &block )
       first = args.first
       options = nil
@@ -58,9 +82,9 @@ module DynamicSchema
 
       type = options[ :type ]
       if type == ::Object || type.nil? && block 
-        _append_object( method, options, &block )
+        _object( method, options, &block )
       else 
-        _append_value( method, options )
+        _value( method, options )
       end
     
     end
@@ -92,27 +116,6 @@ module DynamicSchema
   
   private
 
-    def _append_value( name, options )
-      ::Kernel.raise ::NameError, "The name '#{name}' is reserved and cannot be used for parameters." \
-        if ::DynamicSchema::Receiver.instance_methods.include?( name )
-  
-      _validate_in!( name, options[ :type ], options[ :in ] ) if options[ :in ] 
-      
-      @schema[ name ] = options
-      self
-    end
-
-    def _append_object( name, options = {}, &block )
-      ::Kernel.raise ::NameError, "The name '#{name}' is reserved and cannot be used for parameters." \
-        if ::DynamicSchema::Receiver.instance_methods.include?( name )
-
-      @schema[ name ] = options.merge( {
-        type: ::Object,
-        resolver: Resolver.new( resolved_blocks: @resolved_blocks ).resolve( &block )
-      } )    
-      self
-    end
-
     def _validate_in!( name, type, in_option )
       ::Kernel.raise ::TypeError,
             "The parameter '#{name}' includes the :in option but it does not respond to 'include?'." \

metadata

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