safrano 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac4c570c39b0419c702aef0756ce4c9687916436d5198f768d8dfdedb9bc5fd
-  data.tar.gz: 3aac760ce6b4bd5e89750e1540024f531593a4cc627663025322cb0e32d60417
+  metadata.gz: '0108c5a48b2cbd994534ba6732f760dec8f8e8becac690d91b3f1960dd6f7836'
+  data.tar.gz: c9b8c3c8a7f7ac3d7db5a12133ba3fdcd4815df5b3dab1d35bfaf449518f8d2c
 SHA512:
-  metadata.gz: f1e89de14fdacfcd3db0893d0b9e9d00c929da0ba74268d623b235955ed9437e21d2a61454d710886d71aa819625c7ffa8b8f894a69684eace27d51c34d1f05e
-  data.tar.gz: 954b7c8e764a4c415ba28f34063d7f142876de691cf99c4ce8fc97ad994b2e3adb5faf680cdf4bd7af14b30b6d9a2769fd78fa45ce1b8cc27c7f004bb67a7d51
+  metadata.gz: '0068c08576a0d8df023d6990ad691ce73b1d3abd6f3a9cd095b7ae2f9358dc7d33d7ed5d0fdde2503a2829ebeb11ab126961a39d34d12370befbb5814904f7b1'
+  data.tar.gz: cbf6fbdd2d1f4a24ba58b14490dfcfc87e1ffc333ab52b0e334b06742679543a794359f16093f56cc78e7a754724ee3e24f70ec7b7277d3ce6d04af3d1f9ae5f

data/lib/odata/complex_type.rb

@@ -81,8 +81,12 @@ module Safrano
       end
 
       # needed for ComplexType result
-      def to_odata_json(_req)
-        "#{DJ_OPEN}#{@value.odata_h.to_json}#{DJ_CLOSE}"
+      def to_odata_json(req)
+        t = self.class.klassmod.output_template
+        innerh = req.service.get_entity_odata_h(entity: @value, template: t)
+        innerj = innerh.to_json
+
+        "#{DJ_OPEN}#{innerj}#{DJ_CLOSE}"
       end
 
       # wrapper
@@ -105,7 +109,6 @@ module Safrano
       end
 
       def to_odata_json(req)
-        #        "#{DJ_OPEN}#{{ RESULTSK => coll.map { |c| c.odata_h } }.to_json}#{DJ_CLOSE}"
         template = self.class.klassmod.output_template
         # TODO: Error handling if database contains binary BLOB data that cant be
         # interpreted as UTF-8 then JSON will fail here
@@ -226,7 +229,7 @@ module Safrano
     end
 
     def self.type_name
-      @namespace ? "#{@namespace}.#{self}" : to_s
+      namespace ? "#{namespace}.#{self}" : to_s
     end
 
     def initialize

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/filter/token.rb

@@ -69,7 +69,7 @@ module Safrano
                         :Literal
                       when 14
                         :unmatchedQuote
-                end
+                      end
                 yield tok, typ
                 break
               end

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/odata/request/json.rb

@@ -14,12 +14,9 @@ module Safrano
 
       def self.cast_values_in(resd, typ)
         typ.db_schema.each do |f, props|
-          metadata = typ.cols_metadata[f]
-
           case props[:type]
           when :datetime, :date
             fstr = f.to_s
-            # resd[fstr] = Time.parse(resd[f]) if resd[fstr]
             resd[fstr] = Sequel.datetime_class.from_edm_json(resd[fstr]) if resd[fstr]
           end
         end
@@ -48,7 +45,7 @@ module Safrano
 
       if (defered = resd[:__deferred])
         defered.symbolize_keys!
-      elsif meta = resd[:__metadata]
+      elsif (meta = resd[:__metadata])
         meta.symbolize_keys!
 
         # type is normally namespaced !  --> split.last is the class
@@ -101,7 +98,7 @@ module Safrano
 
       if (defered = resd[:__deferred])
         defered.symbolize_keys!
-      elsif meta = resd[:__metadata]
+      elsif (meta = resd[:__metadata])
         meta.symbolize_keys!
 
         typ = get_class_from_meta(meta)

data/lib/safrano/service.rb

@@ -337,7 +337,7 @@ module Safrano
     end
 
     def function_import(name_p)
-      name = "#{name_p}"
+      name = name_p.to_s
       funcimp = Safrano::FunctionImport(name)
       @function_imports[name] = funcimp
       @function_import_keys << name
@@ -366,7 +366,7 @@ module Safrano
 
     # need to be sorted by size too
     def set_funcimports_sorted
-      @function_import_keys.sort_by! { |k| k.size }.reverse!
+      @function_import_keys.sort_by!(&:size).reverse!
     end
     # to be called at end of publishing block to ensure we get the right names
     # and additionally build the list of valid attribute path's used

data/lib/safrano/version.rb

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

metadata

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