safrano 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71032a7ee1e048867f3b54f57d920ba772a44f29a3419a598d2206d50e949c7
-  data.tar.gz: d203df34eda2c7aad9385a84e866d273f1a1f37ba981ffdcc8956de9dad35633
+  metadata.gz: '0108c5a48b2cbd994534ba6732f760dec8f8e8becac690d91b3f1960dd6f7836'
+  data.tar.gz: c9b8c3c8a7f7ac3d7db5a12133ba3fdcd4815df5b3dab1d35bfaf449518f8d2c
 SHA512:
-  metadata.gz: d5cb1583e62f42f9007368204d24f101273049c05e75723dbcd7796732d83e1ac29a1515df0a876a2002c212b0da8204c498070104688fd4b493092072e13dee
-  data.tar.gz: 96aa136d330148331b98943807c83b42e466aa7357c8b360b3f5a66843b9472df41015309b2bef19d993bdabf5f4d1d41e983e7082a1f06d34015370bc87a034
+  metadata.gz: '0068c08576a0d8df023d6990ad691ce73b1d3abd6f3a9cd095b7ae2f9358dc7d33d7ed5d0fdde2503a2829ebeb11ab126961a39d34d12370befbb5814904f7b1'
+  data.tar.gz: cbf6fbdd2d1f4a24ba58b14490dfcfc87e1ffc333ab52b0e334b06742679543a794359f16093f56cc78e7a754724ee3e24f70ec7b7277d3ce6d04af3d1f9ae5f

data/lib/odata/complex_type.rb

@@ -81,9 +81,9 @@ module Safrano
       end
 
       # needed for ComplexType result
-      def to_odata_json(_req)
+      def to_odata_json(req)
         t = self.class.klassmod.output_template
-        innerh = _req.service.get_entity_odata_h(entity: @value, template: t)
+        innerh = req.service.get_entity_odata_h(entity: @value, template: t)
         innerj = innerh.to_json
 
         "#{DJ_OPEN}#{innerj}#{DJ_CLOSE}"

data/lib/odata/error.rb

@@ -48,6 +48,13 @@ module Safrano
     end
   end
 
+  # used in function import error handling. cf. func import / do_execute_func
+  def self.with_error(result)
+    if result.respond_to?(:error) && (err = result.error)
+      yield err
+    end
+  end
+
   # base module for HTTP errors, when used as a Error Class
   module ErrorClass
     include ::Safrano::Contract::Invalid
@@ -94,10 +101,20 @@ module Safrano
   # generic http 500 server err
   class ServerError
     extend  ErrorClass
+    include ErrorInstance
     HTTP_CODE = 500
     @msg = 'Server error'
   end
 
+  class ServiceOperationError
+    extend  ErrorClass
+    include ErrorInstance
+    HTTP_CODE = 500
+    def initialize(msg:, sopname: nil)
+      @msg = "Error in service operation #{sopname}: #{msg}"
+    end
+  end
+
   # for outputing Sequel exceptions that we could not prevent
   class SequelExceptionError < ServerError
     include ErrorInstance

data/lib/odata/function_import.rb

@@ -18,6 +18,7 @@ module Safrano
       def initialize(name)
         @name = name
         @http_method = 'GET'
+        @use_contract = false
       end
 
       def allowed_transitions
@@ -52,6 +53,10 @@ module Safrano
       end
       alias auto_query_params auto_query_parameters
 
+      def use_contract
+        @use_contract = true
+      end
+
       def return(klassmod, &proc)
         raise('Please provide a code block') unless block_given?
 
@@ -159,6 +164,18 @@ module Safrano
       def do_execute_func(req)
         with_transition_validated(req) do
           result = @proc.call(**@funcparams)
+
+          # (application-)error handling
+          # the result is an Error object or class
+
+          # Note: Sequel::Error exceptions are already
+          # handled on rack app level (cf. the call methode )
+          Safrano::with_error(result) do |error|
+            @error = error
+            return [nil, :error, @error] # this is return from do_execute_func !
+          end
+
+          # non error case
           [@returning.do_execute_func_result(result, req, @auto_query_params), :run]
         end
       end

data/lib/safrano/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Safrano
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack