tchae 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3223e8b9f142d6df07e3140a7469647fb6b285d4324d8720957ebee438dfdab7
-  data.tar.gz: f0602b5cb2d128f42d097744299e226c504835d231f099f8cace33566033778c
+  metadata.gz: d2ef331e75a9929d29f3348d5fb23316964a25773623eb2d703e802d623e0d92
+  data.tar.gz: 34c124e0e86a1400e895370f89cd94cdf200ad9b9a54d75b386fb841ff2e4675
 SHA512:
-  metadata.gz: 6354b81ae20b79d584d6c6b34e0cdb293f11f6cfebf8e39c2a7dd90f72401af33c8355acba4945ee33c190322c9e4769c7284145a0103eaec57ad070306b4c21
-  data.tar.gz: 5fa9f4da97ca1063e73814dd5c54d4848d1ee08eeea055ea2fe0ca16c6752107c92cf913f3f5ef05ffefca4158c901e84e00387b3fa4aedb556cb8b1a6cc945e
+  metadata.gz: 23ba34c2410bce14ed5bd1e334057a00bfff4376b6c005a84c56056ad7177c7a2f342db3d71e5dee266ae552ef20c833d37f36e69a77af5f1f19ab00d3b69077
+  data.tar.gz: 94512da6a9a16bbafb6ac0be7855e32be3d3ce3bb6eebdcaf345cce820e26f39dd6a828f4ea57a8e4b0dd4d96244401b4b5a8e3bcc16deb50e74016cf001dcb7

data/lib/tchae/core.rb

@@ -5,7 +5,6 @@ class Object
 end
 
 module Tchae
-  EMPTY_ARRAY = [].freeze
 
   def self.Wrapper(handling = ::Tchae::Handling::RAISE)
     MethodValidator.new(handling)
@@ -14,8 +13,8 @@ module Tchae
   #  wrap method with validation, and on invalid,
   #  exit with control flow and retun a wrapped error object
   # on success return a wrapped return object
-  def self.do_method_wrapping_return(obj, wrapper, tea_methodsymb,
-                                     proclmbda, params, kwparms)
+  def self.do_validation_return_wrapper(obj, wrapper, tea_methodsymb,
+                                       proclmbda, params, kwparms)
     unless params.empty?
       if (err = wrapper.args.positional.valid_or_return_error(params))
         return Return(nil, err)
@@ -27,6 +26,35 @@ module Tchae
       end
     end
 
+    unchecked_result = if proclmbda.arity.zero?
+                         obj.__send__(tea_methodsymb)
+                       elsif kwparms.empty?
+                         obj.__send__(tea_methodsymb, *params)
+                       elsif params.empty?
+                         obj.__send__(tea_methodsymb, **kwparms)
+                       else
+                         obj.__send__(tea_methodsymb, *params, **kwparms)
+                       end
+
+    wrapper.result.return_wrapper unchecked_result
+  end
+  
+  #  wrap method with validation, and on invalid,
+  #  exit with control flow and retun a error object
+  # on success return the valid result
+  def self.do_validation_result_or_error(obj, wrapper, tea_methodsymb,
+                                    proclmbda, params, kwparms)
+    unless params.empty?
+      if (err = wrapper.args.positional.valid_or_return_error(params))
+        return err
+      end
+    end
+    unless kwparms.empty?
+      if (err = wrapper.args.keyword.valid_or_return_error(kwparms))
+        return err
+      end
+    end
+
     unchecked_result = if proclmbda.arity.zero?
                          obj.__send__(tea_methodsymb)
                        elsif kwparms.empty?
@@ -43,7 +71,7 @@ module Tchae
   #  wrap method with validation, and on invalid,
   #  exit by raising exception
 
-  def self.do_method_wrapping_raise(obj, wrapper, tea_methodsymb,
+  def self.do_validation_raise(obj, wrapper, tea_methodsymb,
                                     proclmbda, params, kwparms)
 
     wrapper.args.positional.valid_or_raise_exception(params)
@@ -153,11 +181,17 @@ module Tchae
       @valtor.valid_or_raise_exception(result, ::Tchae::ReturnTypeException)
     end
 
-    def valid_or_return_error(result)
+    def return_wrapper(result)
       return Return(result) unless @valtor
 
       @valtor.wrapped_result_or_error(result, ::Tchae::ReturnTypeError)
     end
+    
+    def valid_or_return_error(result)
+      return result unless @valtor
+      @valtor.valid_or_return_error(result, ::Tchae::ReturnTypeError)
+    end
+    
   end
 
   class PositionalArgs < Array
@@ -171,7 +205,8 @@ module Tchae
       @wrapper
     end
 
-    def expect(constraints = EMPTY_ARRAY, &proc)
+#    def expect(constraints = EMPTY_ARRAY, &proc)
+    def expect(*constraints, &proc)
       constraints.each { |inp| push Tchae(inp) }
       instance_exec(&proc) if block_given?
       @wrapper
@@ -247,8 +282,9 @@ module Tchae
   end
   module Handling
     RAISE = :raise_exception
-    RETURN = :return_wrapper
-    ALL = [RAISE, RETURN].freeze
+    RETURN_WRAPPER = :return_wrapper
+    RETURN_RESULT_OR_ERROR = :return_result_or_error
+    ALL = [RAISE, RETURN_WRAPPER, RETURN_RESULT_OR_ERROR].freeze
   end
 end
 
@@ -297,8 +333,11 @@ module Tchae
                     lambda
                   end
 
-      if wrapper.handling == ::Tchae::Handling::RETURN
-        create_valid_or_return_method(methodname, wrapper, &proclmbda)
+      case wrapper.handling 
+      when ::Tchae::Handling::RETURN_WRAPPER
+        create_return_wrapper_method(methodname, wrapper, &proclmbda)
+      when ::Tchae::Handling::RETURN_RESULT_OR_ERROR
+        create_result_or_error_method(methodname, wrapper, &proclmbda)
       else # RAISE
         create_valid_or_raise_method(methodname, wrapper, &proclmbda)
       end
@@ -310,7 +349,7 @@ module Tchae
         tea_methodsymb = "__tea_#{methodname}".to_sym
         define_method "__tea_#{methodname}", proc
         define_method(methodname) do |*params, **kwparms|
-          Tchae.do_method_wrapping_raise(self, wrapper,
+          Tchae.do_validation_raise(self, wrapper,
                                        tea_methodsymb, proc,
                                        params, kwparms)
         end
@@ -319,14 +358,30 @@ module Tchae
       end
     end
 
-    def create_valid_or_return_method(methodname,
+    def create_result_or_error_method(methodname, 
+                                      wrapper= Tchae::NilWrapper, 
+                                      &proc)
+      if block_given?
+        tea_methodsymb = "__tea_#{methodname}".to_sym
+        define_method "__tea_#{methodname}", proc
+        define_method(methodname) do |*params, **kwparms|
+          Tchae.do_validation_result_or_error(self, wrapper,
+                                              tea_methodsymb, proc,
+                                              params, kwparms)
+        end
+      else
+        define_method(methodname) {}
+      end                                
+    end
+    
+    def create_return_wrapper_method(methodname,
                                       wrapper = Tchae::NilWrapper,
                                       &proc)
       if block_given?
         tea_methodsymb = "__tea_#{methodname}".to_sym
         define_method "__tea_#{methodname}", proc
         define_method(methodname) do |*params, **kwparms|
-          Tchae.do_method_wrapping_return(self,
+          Tchae.do_validation_return_wrapper(self,
                                         wrapper,
                                         tea_methodsymb,
                                         proc,
@@ -353,8 +408,11 @@ module Tchae
                     lambda
                   end
 
-      if wrapper.handling == ::Tchae::Handling::RETURN
-        create_valid_or_return_singleton_method(methodname, wrapper, &proclmbda)
+      case wrapper.handling 
+      when ::Tchae::Handling::RETURN_WRAPPER
+        create_return_wrapper_singleton_method(methodname, wrapper, &proclmbda)
+      when ::Tchae::Handling::RETURN_RESULT_OR_ERROR
+        create_result_or_error_singleton_method(methodname, wrapper, &proclmbda)
       else # RAISE
         create_valid_or_raise_singleton_method(methodname, wrapper, &proclmbda)
       end
@@ -366,7 +424,7 @@ module Tchae
         tea_methodsymb = "__tea_#{methodname}".to_sym
         define_singleton_method "__tea_#{methodname}", proc
         define_singleton_method(methodname) do |*params, **kwparms|
-          Tchae.do_method_wrapping_raise(self, wrapper,
+          Tchae.do_validation_raise(self, wrapper,
                                        tea_methodsymb, proc,
                                        params, kwparms)
         end
@@ -374,14 +432,30 @@ module Tchae
         define_singleton_method(methodname) {}
       end
     end
-
-    def create_valid_or_return_singleton_method(methodname,
+    
+    def create_result_or_error_singleton_method(methodname, 
+                                                wrapper= Tchae::NilWrapper, 
+                                                &proc)
+      if block_given?
+        tea_methodsymb = "__tea_#{methodname}".to_sym
+        define_singleton_method "__tea_#{methodname}", proc
+        define_singleton_method(methodname) do |*params, **kwparms|
+          Tchae.do_validation_result_or_error(self, wrapper,
+                                              tea_methodsymb, proc,
+                                              params, kwparms)
+        end
+      else
+        define_singleton_method(methodname) {}
+      end                                          
+    end
+    
+    def create_return_wrapper_singleton_method(methodname,
                                                 wrapper = Tchae::NilWrapper, &proc)
       if block_given?
         tea_methodsymb = "__tea_#{methodname}".to_sym
         define_singleton_method "__tea_#{methodname}", proc
         define_singleton_method(methodname) do |*params, **kwparms|
-          Tchae.do_method_wrapping_return(self, wrapper,
+          Tchae.do_validation_return_wrapper(self, wrapper,
                                         tea_methodsymb, proc,
                                         params, kwparms)
         end
@@ -396,6 +470,7 @@ end
 def Return(result, error = nil)
   Tchae::ResultWrapper.new(result, error)
 end
+
 class Object
   extend Tchae::PI
   include Tchae::PISingleton

data/lib/tchae/version.rb

@@ -1,3 +1,3 @@
 module Tchae
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tchae
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,7 +38,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.51'
-description: Tchae is a lightweight ruby validation library
+description: |-
+  Having to validate method parameters and/or the result of method is a
+  quite common and repetitive task. Tchae is an attempt to capture this task in a small yet generic reuseable library. Tchae provides validated variants of the standard define_method ruby methods , that will create the same method as the standard would create wrapped into validation code.
 email: dev@aithscel.eu
 executables: []
 extensions: []