safrano 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0108c5a48b2cbd994534ba6732f760dec8f8e8becac690d91b3f1960dd6f7836'
-  data.tar.gz: c9b8c3c8a7f7ac3d7db5a12133ba3fdcd4815df5b3dab1d35bfaf449518f8d2c
+  metadata.gz: 9d1ee63cc31ce50cff784481ce75f5f5581c2b9ff406a18efb516908bbf7c65d
+  data.tar.gz: 5770021472ccce8efb445114d4b4834b4fb0ff31b58f6444654cfb16b5aeb860
 SHA512:
-  metadata.gz: '0068c08576a0d8df023d6990ad691ce73b1d3abd6f3a9cd095b7ae2f9358dc7d33d7ed5d0fdde2503a2829ebeb11ab126961a39d34d12370befbb5814904f7b1'
-  data.tar.gz: cbf6fbdd2d1f4a24ba58b14490dfcfc87e1ffc333ab52b0e334b06742679543a794359f16093f56cc78e7a754724ee3e24f70ec7b7277d3ce6d04af3d1f9ae5f
+  metadata.gz: b1be48927ce7f3b5350ea903fa6ebb514cd6c09a1eafb064b7760c56bb396f02e59cab6e2a2e091ab8c526c77d45e9ff18838728d34d7500b29f611ba98e858b
+  data.tar.gz: 5877c1e41a0bbbcb76d948914a703a24ea8cdf52215815b7c4051c3cfb3807463adfa0144ccce4861dfd988abf8776a002de6353d6343205f3767af02b9ca090

data/lib/odata/batch.rb

@@ -8,54 +8,63 @@ require_relative './common_logger'
 module Safrano
   # Support for OData multipart $batch Requests
   class Request
-    def create_batch_app
-      Batch::MyOApp.new(self)
-    end
-
     def parse_multipart
       @mimep = MIME::Media::Parser.new
       @boundary = media_type_params['boundary']
       @mimep.hook_multipart(media_type, @boundary)
       @mimep.parse_str(body)
     end
+
+    # The top-level (full_req) Request is used like
+    # a Rack App
+    # With this method we get the response of part-requests
+    # app.call(env)  --> full_req.bach_call(part_req)
+
+    def batch_call(part_req)
+      Safrano::Batch::PartRequest.new(part_req, self).process
+    end
+
+    # needed for changeset transaction
+    def db
+      @service.collections.first.db
+    end
   end
 
   module Batch
-    # Mayonaise
-    class MyOApp < Safrano::ServerApp
-      attr_reader :full_req
-      attr_reader :response
-      attr_reader :db
-
-      def initialize(full_req)
+    # Part-Request part of a Batch-Request
+    class PartRequest < Safrano::Request
+      def initialize(part_req, full_req)
+        batch_env(part_req, full_req)
+        @env['HTTP_HOST'] = full_req.env['HTTP_HOST']
+        super(@env, full_req.service_base)
         @full_req = full_req
-        @db = full_req.service.collections.first.db
+        @part_req = part_req
       end
 
       # redefined for $batch
       def before
         headers 'Cache-Control' => 'no-cache'
-        @request.service = @full_req.service
-        headers 'DataServiceVersion' => @request.service.data_service_version
+        @service = @full_req.service
+        headers 'DataServiceVersion' => @service.data_service_version
       end
 
-      def batch_call(part_req)
-        env = batch_env(part_req)
-        env['HTTP_HOST'] = @full_req.env['HTTP_HOST']
+      def process
         began_at = Rack::Utils.clock_time
-        @request = Safrano::Request.new(env)
+
         @response = Safrano::Response.new
 
-        if part_req.level == 2
-          @request.in_changeset = true
-          @request.content_id = part_req.content_id
-          @request.content_id_references = part_req.content_id_references
+        if @part_req.level == 2
+          @in_changeset = true
+          @content_id = @part_req.content_id
+          @content_id_references = @part_req.content_id_references
         end
 
         before
+
         dispatch
 
         status, header, body = @response.finish
+
         # Logging of sub-requests with ODataCommonLogger.
         # A bit hacky but working
         # TODO: test ?
@@ -80,19 +89,19 @@ module Safrano
         converted_headers
       end
 
-      def batch_env(mime_req)
+      def batch_env(mime_req, full_req)
         @env = ::Rack::MockRequest.env_for(mime_req.uri,
                                            method: mime_req.http_method,
                                            input: mime_req.content)
         # Logging of sub-requests
-        @env[Rack::RACK_ERRORS] = @full_req.env[Rack::RACK_ERRORS]
+        @env[Rack::RACK_ERRORS] = full_req.env[Rack::RACK_ERRORS]
         @env.merge! headers_for_env(mime_req.hd)
 
         @env
       end
     end
 
-    # Huile d'olive extra
+    # $batch Handler
     class HandlerBase
       TREND = Safrano::Transition.new('', trans: 'transition_end')
       def allowed_transitions
@@ -103,7 +112,8 @@ module Safrano
         Safrano::Transition::RESULT_END
       end
     end
-    # jaune d'oeuf
+
+    # $batch disabled Handler
     class DisabledHandler < HandlerBase
       def odata_post(_req)
         [404, EMPTY_HASH, '$batch is not enabled ']
@@ -113,7 +123,8 @@ module Safrano
         [404, EMPTY_HASH, '$batch is not enabled ']
       end
     end
-    # battre le tout
+
+    # $batch enabled Handler
     class EnabledHandler < HandlerBase
       attr_accessor :boundary
       attr_accessor :mmboundary
@@ -121,8 +132,6 @@ module Safrano
       attr_accessor :parts
       attr_accessor :request
 
-      def initialize; end
-
       # here we are in the Batch handler object, and this POST should
       # normally handle a $batch request
       def odata_post(req)
@@ -130,15 +139,12 @@ module Safrano
 
         if @request.media_type == Safrano::MP_MIXED
 
-          batcha = @request.create_batch_app
           @mult_request = @request.parse_multipart
 
           @mult_request.prepare_content_id_refs
-          @mult_response = Safrano::Response.new
 
-          resp_hdrs, @mult_response.body = @mult_request.get_http_resp(batcha)
+          @mult_request.get_mult_resp(@request)
 
-          [202, resp_hdrs, @mult_response.body[0]]
         else
           [415, EMPTY_HASH, 'Unsupported Media Type']
         end

data/lib/odata/collection_media.rb

@@ -2,6 +2,8 @@
 
 require 'rack'
 require 'fileutils'
+require 'tempfile'
+require 'pathname'
 require_relative './navigation_attribute'
 
 module Safrano
@@ -14,37 +16,60 @@ module Safrano
         Contract::OK
       end
     end
-
     # Simple static File/Directory based media store handler
     # similar to Rack::Static
     # with a flat directory structure
     class Static < Handler
       def initialize(root: nil, mediaklass:)
-        @root = File.absolute_path(root || Dir.pwd)
-        @file_server = ::Rack::File.new(@root)
+        @root = Pathname(File.absolute_path(root || Dir.pwd))
+        @files_class = (::Rack.release[0..2] == '2.0') ? ::Rack::File : ::Rack::Files
         @media_class = mediaklass
-        @media_dir_name = mediaklass.to_s
+        @media_dir_name = Pathname(mediaklass.to_s)
+        @semaphore = Thread::Mutex.new
+
         register
       end
 
       def register
-        @abs_klass_dir = File.absolute_path(@media_dir_name, @root)
+        @abs_klass_dir = @root + @media_dir_name
+        @abs_temp_dir = @abs_klass_dir + 'tmp'
       end
 
       def create_abs_class_dir
         FileUtils.makedirs @abs_klass_dir unless Dir.exist?(@abs_klass_dir)
       end
 
+      def create_abs_temp_dir
+        FileUtils.makedirs @abs_temp_dir unless Dir.exist?(@abs_temp_dir)
+      end
+
       def finalize
         create_abs_class_dir
+        create_abs_temp_dir
+      end
+
+      # see also ...
+      # File activesupport/lib/active_support/core_ext/file/atomic.rb, line 21
+      def atomic_write(file_name)
+        Tempfile.open('', @abs_temp_dir) do |temp_file|
+          temp_file.binmode
+          return_val = yield temp_file
+          temp_file.close
+
+          # Overwrite original file with temp file
+          File.rename(temp_file.path, file_name)
+          return_val
+        end
       end
 
       # minimal working implementation...
-      #  Note: @file_server works relative to @root directory
+      #  Note: files_app works relative to @root directory
       def odata_get(request:, entity:)
         media_env = request.env.dup
         media_env['PATH_INFO'] = filename(entity)
-        fsret = @file_server.call(media_env)
+        # new app instance for each call for thread safety
+        files_app = @files_class.new(@root)
+        fsret = files_app.call(media_env)
         if fsret.first == 200
           # provide own content type as we keep it in the media entity
           fsret[1]['Content-Type'] = entity.content_type
@@ -55,28 +80,23 @@ module Safrano
       # this is relative to @root
       # eg. Photo/1
       def media_path(entity)
-        File.join(@media_dir_name, media_directory(entity))
+        @media_dir_name + media_directory(entity)
       end
 
       # relative to @root
       # eg Photo/1/1
       def filename(entity)
-        Dir.chdir(abs_path(entity)) do
-          # simple design: one file per directory, and the directory
-          # contains the media entity-id --> implicit link between the media
-          # entity
-          File.join(media_path(entity), Dir.glob('*').max)
-        end
+        media_path(entity) + ressource_version(entity)
       end
 
       # /@root/Photo/1
       def abs_path(entity)
-        File.absolute_path(media_path(entity), @root)
+        @root + media_path(entity)
       end
 
       # absolute filename
       def abs_filename(entity)
-        File.absolute_path(filename(entity), @root)
+        @root + filename(entity)
       end
 
       # this is relative to abs_klass_dir(entity) eg to /@root/Photo
@@ -86,29 +106,31 @@ module Safrano
         entity.media_path_id
       end
 
-      def in_media_directory(entity)
-        mpi = media_directory(entity)
+      # the same as above but absolute
+      def abs_media_directory(entity)
+        @abs_klass_dir + entity.media_path_id
+      end
+
+      # yields the absolute path of media directory
+      # and ensure the directory exists
+      def with_media_directory(entity)
+        mpi = abs_media_directory(entity)
         Dir.mkdir mpi unless Dir.exist?(mpi)
-        Dir.chdir mpi do
-          yield
-        end
+        yield Pathname(mpi)
       end
 
       def odata_delete(entity:)
-        Dir.chdir(@abs_klass_dir) do
-          in_media_directory(entity) do
-            Dir.glob('*').each { |oldf| File.delete(oldf) }
-          end
-        end
+        mpi = abs_media_directory(entity)
+        return unless Dir.exist?(mpi)
+
+        mpi.children.each { |oldp| File.delete(oldp) }
       end
 
       # Here as well, MVP implementation
       def save_file(data:, filename:, entity:)
-        Dir.chdir(@abs_klass_dir) do
-          in_media_directory(entity) do
-            filename = '1'
-            File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
-          end
+        with_media_directory(entity) do |d|
+          filename = d + '1'
+          atomic_write(filename) { |f| IO.copy_stream(data, f) }
         end
       end
 
@@ -116,24 +138,31 @@ module Safrano
       # after each upload, so that clients get informed about new versions
       # of the same media ressource
       def ressource_version(entity)
-        Dir.chdir(@abs_klass_dir) do
-          in_media_directory(entity) do
-            Dir.glob('*').max
-          end
-        end
+        abs_media_directory(entity).children(with_directory = false).max.to_s
       end
 
-      # Here as well, MVP implementation
-      def replace_file(data:, filename:, entity:)
-        Dir.chdir(@abs_klass_dir) do
-          in_media_directory(entity) do
-            version = nil
-            Dir.glob('*').sort.each do |oldf|
-              version = oldf
-              File.delete(oldf)
-            end
-            filename = (version.to_i + 1).to_s
-            File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
+      # Note:  add a new Version and remove the previous one
+      def replace_file(data:, entity:)
+        with_media_directory(entity) do |d|
+          tp = Tempfile.open('', @abs_temp_dir) do |temp_file|
+            temp_file.binmode
+            IO.copy_stream(data, temp_file)
+            temp_file.path
+          end
+
+          # picking new filename and the "move" operation must
+          # be protected
+          @semaphore.synchronize do
+            # new filename =  "version" + 1
+            v = ressource_version(entity)
+            filename = d + (v.to_i + 1).to_s
+
+            # Move temp file to original target file
+            File.rename(tp, filename)
+
+            # remove the previous version
+            filename = d + v
+            File.delete(filename)
           end
         end
       end
@@ -162,42 +191,25 @@ module Safrano
         StaticTree.path_builder(entity.media_path_ids)
       end
 
-      def in_media_directory(entity)
-        mpi = media_directory(entity)
+      # the same as above but absolute
+      def abs_media_directory(entity)
+        @abs_klass_dir + StaticTree.path_builder(entity.media_path_ids)
+      end
+
+      # yields the absolute path of media directory
+      # and ensure the directory exists
+      def with_media_directory(entity)
+        mpi = abs_media_directory(entity)
+
         FileUtils.makedirs mpi unless Dir.exist?(mpi)
-        Dir.chdir(mpi) { yield }
+        yield Pathname(mpi)
       end
 
       def odata_delete(entity:)
-        Dir.chdir(@abs_klass_dir) do
-          in_media_directory(entity) do
-            Dir.glob('*').sort.each { |oldf| File.delete(oldf) if File.file?(oldf) }
-          end
-        end
-      end
+        mpi = abs_media_directory(entity)
+        return unless Dir.exist?(mpi)
 
-      # Here as well, MVP implementation
-      #      def replace_file(data:, filename:, entity:)
-      #        Dir.chdir(abs_klass_dir(entity)) do
-      #          in_media_directory(entity) do
-      #            Dir.glob('*').each { |oldf| File.delete(oldf) if File.file?(oldf) }
-      #            File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
-      #          end
-      #        end
-      #      end
-      # Here as well, MVP implementation
-      def replace_file(data:, filename:, entity:)
-        Dir.chdir(@abs_klass_dir) do
-          in_media_directory(entity) do
-            version = nil
-            Dir.glob('*').sort.each do |oldf|
-              version = oldf
-              File.delete(oldf)
-            end
-            filename = (version.to_i + 1).to_s
-            File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
-          end
-        end
+        mpi.children.each { |oldp| File.delete(oldp) if File.file?(oldp) }
       end
     end
   end

data/lib/odata/entity.rb

@@ -372,8 +372,7 @@ module Safrano
 
         end
         model.media_handler.replace_file(data: data,
-                                         entity: self,
-                                         filename: filename)
+                                         entity: self)
 
         ARY_204_EMPTY_HASH_ARY
       end

data/lib/odata/function_import.rb

@@ -10,6 +10,21 @@ module Safrano
   end
 
   module FunctionImport
+    # error classes
+    class DefinitionMissing < StandardError
+      def initialize(fnam)
+        msg = "Function import #{fnam}: definition is missing. Provide definition either as a return code block or with .definition(lambda)"
+        super(msg)
+      end
+    end
+    class ProcRedefinition < StandardError
+      def initialize(fnam)
+        msg = "Function import #{fnam}: Block/lambda Redefinition . Provide definition either as a return code block or with .definition(lambda) but not both"
+        super(msg)
+      end
+    end
+
+    # Function import object
     class Function
       @allowed_transitions = [Safrano::TransitionEnd]
       attr_reader :name
@@ -18,7 +33,6 @@ module Safrano
       def initialize(name)
         @name = name
         @http_method = 'GET'
-        @use_contract = false
       end
 
       def allowed_transitions
@@ -53,13 +67,7 @@ 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?
-
         @returning = if klassmod.respond_to? :return_as_instance_descriptor
                        klassmod.return_as_instance_descriptor
                      else
@@ -67,13 +75,35 @@ module Safrano
                        # --> assume it is a Primitive
                        ResultDefinition.asPrimitiveType(klassmod)
                      end
-        @proc = proc
+        # block is optional  since 0.6.7
+        # the function definition can now also be made with .definition(lambda)
+        # consistency check that there is a single definition either as a
+        # return-block    or a definition lambda is made on publish finalise
+
+        if block_given?
+          # proc already defined...
+          raise Redefinition.new(@name) if @proc
+
+          @proc = proc
+        end
+
         self
       end
 
-      def return_collection(klassmod, &proc)
-        raise('Please provide a code block') unless block_given?
+      def definition(lambda)
+        raise('Please provide a lambda') unless lambda
+        # proc already defined...
+        raise ProcRedefinition.new(@name) if @proc
+
+        @proc = lambda
+      end
+
+      # this is called from service.finalize_publishing
+      def check_definition
+        raise DefinitionMissing.new(@name) unless @proc
+      end
 
+      def return_collection(klassmod, lambda: nil, &proc)
         @returning = if klassmod.respond_to? :return_as_collection_descriptor
                        klassmod.return_as_collection_descriptor
                      else
@@ -82,7 +112,14 @@ module Safrano
                        #                       ResultAsPrimitiveTypeColl.new(klassmod)
                        ResultDefinition.asPrimitiveTypeColl(klassmod)
                      end
-        @proc = proc
+        # block is optional  since 0.6.7
+        if block_given?
+          # proc already defined...
+          raise ProcRedefinition.new(@name) if @proc
+
+          @proc = proc
+        end
+
         self
       end
       #      def initialize_params
@@ -156,8 +193,13 @@ module Safrano
       def with_transition_validated(req)
         #        initialize_params
         @params = req.params
-        return yield unless (@error = check_url_func_params)
-
+        unless (@error = check_url_func_params)
+          begin
+            return yield
+          rescue LocalJumpError => e
+            @error = Safrano::ServiceOperationReturnError.new
+          end
+        end
         [nil, :error, @error] if @error
       end
 

data/lib/odata/model_ext.rb

@@ -445,9 +445,9 @@ module Safrano
       end # db_schema.each do |col, props|
 
       # check if key needs casting. Important for later entity-uri generation !
-      if primary_key.is_a? Symbol # single key field
-        @pk_castfunc = @casted_cols[primary_key]
-      end
+      return unless primary_key.is_a? Symbol # single key field
+
+      @pk_castfunc = @casted_cols[primary_key]
     end # build_casted_cols(service)
 
     def finalize_publishing(service)
@@ -516,7 +516,6 @@ module Safrano
 
         @iuk_rgx_parts.transform_values! { |v| /\A#{v}\z/ }
 
-        @entity_id_url_regexp = KEYPRED_URL_REGEXP
       else
         @pk_names = [primary_key.to_s]
         @pk_cast_from_string = nil
@@ -543,9 +542,9 @@ module Safrano
                         end
                       end
         @iuk_rgx = /\A\s*#{kvpredicate}\s*\z/
-        # @entity_id_url_regexp =   /\A\(\s*#{kvpredicate}\s*\)(.*)/.freeze
-        @entity_id_url_regexp = KEYPRED_URL_REGEXP
       end
+      # @entity_id_url_regexp =   /\A\(\s*#{kvpredicate}\s*\)(.*)/.freeze
+      @entity_id_url_regexp = KEYPRED_URL_REGEXP      
     end
 
     def prepare_fields
@@ -673,7 +672,7 @@ module Safrano
 
         mid.split(/\s*,\s*/).each do |midpart|
           mval = nil
-          mpk, mrgx = scan_rgx_parts.find do |_pk, rgx|
+          mpk, _mrgx = scan_rgx_parts.find do |_pk, rgx|
             if (md = rgx.match(midpart))
               mval = md[1]
             end
@@ -753,7 +752,8 @@ module Safrano
           # json is default content type so we dont need to specify it here again
           # TODO quirks array mode !
           # [201, EMPTY_HASH, new_entity.to_odata_post_json(service: req.service)]
-          [201, { 'Location' => new_entity.uri }, new_entity.to_odata_create_json(request: req)]
+          [201, { Safrano::LOCATION => new_entity.uri },
+           new_entity.to_odata_create_json(request: req)]
         else # TODO: other formats
           415
         end

data/lib/odata/request/json.rb

@@ -1,9 +1,15 @@
 require 'json'
 require 'time'
-
+require 'base64'
 # client parsing functionality to ease testing
 
 module Safrano
+  module RFC2047
+    def self.encode(str)
+      "=?utf-8?b?#{Base64.strict_encode64(str)}?="
+    end
+  end
+
   module OData
     # this is used to parse inbound json payload on POST / PUT & co
     # it does not do symbolize but proper (hopefully) type casting when needed

data/lib/safrano/core.rb

@@ -13,10 +13,10 @@ module Safrano
 
   # some prominent constants... probably already defined elsewhere eg in Rack
   # but lets KISS
-  CONTENT_TYPE = 'Content-Type'
-  CONTENT_LENGTH = 'Content-Length'
-  LOCATION = 'Location'
-  CTT_TYPE_LC = 'content-type'
+  CONTENT_TYPE = 'content-type'
+  CONTENT_LENGTH = 'content-length'
+  LOCATION = 'location'
+
   TEXTPLAIN_UTF8 = 'text/plain;charset=utf-8'
   APPJSON = 'application/json'
   APPXML = 'application/xml'

data/lib/safrano/multipart.rb

@@ -113,8 +113,8 @@ module MIME
       MPS = 'multipart/'
       MP_RGX1 = %r{^(digest|mixed);\s*boundary="(.*)"}.freeze
       MP_RGX2 = %r{^(digest|mixed);\s*boundary=(.*)}.freeze
-      #      APP_HTTP_RGX = %r{^application/http}.freeze
       APP_HTTP = 'application/http'
+
       def new_content
         @target =
           if @target_ct.start_with?(MPS) &&
@@ -142,12 +142,12 @@ module MIME
           @lines = inpstr.readlines(@sep)
         else
           # rack input wrapper only has gets but not readlines
-          sepsave = $INPUT_RECORD_SEPARATOR
-          $INPUT_RECORD_SEPARATOR = @sep
-          while (line = inpstr.gets)
-            @lines << line
-          end
-          $INPUT_RECORD_SEPARATOR = sepsave
+          # BUT the rack SPEC says it only supports gets without argument!
+          # --> finally we end up using read and split into lines...
+          # normally should be ok for $batch POST payloads
+
+          # inpstr.read should be a String
+          @lines = inpstr.read.lines(@sep)
 
         end
         # tmp hack for test-tools that convert CRLF in payload to LF :-(
@@ -319,7 +319,7 @@ module MIME
           def addline(line)
             @body_lines << line
           end
-        end
+        end # Parser
 
         attr_reader :boundary
 
@@ -369,12 +369,12 @@ module MIME
           @hd[CTT_TYPE_LC] = "#{Safrano::MP_MIXED}; boundary=#{@boundary}"
         end
 
-        def get_http_resp(batcha)
-          get_response(batcha)
-          [@response.hd, @response.unparse(true)]
+        def get_mult_resp(full_req)
+          get_response(full_req)
+          [202, @response.hd, @response.unparse(true)]
         end
 
-        def get_response(batcha)
+        def get_response(full_req)
           @response = self.class.new(::SecureRandom.uuid)
           @response.set_multipart_header
           if @level == 1 # changeset need their own global transaction
@@ -382,9 +382,10 @@ module MIME
             # and will be flagged with in_changeset=true
             # and this will finally be used to skip the transaction
             # of the changes
-            batcha.db.transaction do
+
+            full_req.db.transaction do
               begin
-                @response.content = @content.map { |part| part.get_response(batcha) }
+                @response.content = @content.map { |part| part.get_response(full_req) }
               rescue Sequel::Rollback => e
                 # one of the changes of the changeset has failed
                 # --> provide a dummy empty response for the change-parts
@@ -394,7 +395,7 @@ module MIME
               end
             end
           else
-            @response.content = @content.map { |prt| prt.get_response(batcha) }
+            @response.content = @content.map { |part| part.get_response(full_req) }
           end
           @response
         end
@@ -450,6 +451,7 @@ module MIME
       class HttpResp < Media
         attr_accessor :status
         attr_accessor :content
+        attr_accessor :rack_resp
 
         APPLICATION_HTTP_11 = ['Content-Type: application/http',
                                "Content-Transfer-Encoding: binary#{CRLF}",
@@ -558,9 +560,9 @@ module MIME
           @content = other.content
         end
 
-        def get_response(batchapp)
-          # self.content should be the request
-          rack_resp = batchapp.batch_call(@content)
+        def get_response(full_req)
+          # self.content should be the part-request
+          rack_resp = full_req.batch_call(@content)
           @response = MIME::Content::Application::HttpResp.new
           @response.status = rack_resp[0]
           @response.hd = rack_resp[1]

data/lib/safrano/rack_app.rb

@@ -6,143 +6,33 @@ require_relative 'request'
 require_relative 'response'
 
 module Safrano
-  # handle GET PUT etc
-  module MethodHandlers
-    def odata_options
-      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
-             .if_valid do |_context|
-        # cf. stackoverflow.com/questions/22924678/sinatra-delete-response-headers
-        headers.delete('Content-Type')
-        @response.headers.delete('Content-Type')
-        @response.headers['Content-Type'] = ''
-        [200, EMPTY_HASH, '']
-      end
-    end
-
-    def odata_delete
-      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
-             .if_valid { |context| context.odata_delete(@request) }
-    end
-
-    def odata_put
-      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
-             .if_valid { |context| context.odata_put(@request) }
-    end
-
-    def odata_patch
-      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
-             .if_valid { |context| context.odata_patch(@request) }
-    end
-
-    def odata_get
-      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
-             .if_valid { |context| context.odata_get(@request) }
-    end
-
-    def odata_post
-      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
-             .if_valid { |context| context.odata_post(@request) }
-    end
-
-    def odata_head
-      [200, EMPTY_HASH, [EMPTY_STRING]]
-    end
-  end
-
-  # the main Rack server app. Source: the Rack docu/examples and partly
-  # inspired from Sinatra
+  # Note there is a strong 1 to 1 relation between an app instance
+  # and a published service. --> actually means also
+  # we only support on service per App-class because publishing is
+  # made on app class level
   class ServerApp
-    METHODS_REGEXP = Regexp.new('HEAD|OPTIONS|GET|POST|PATCH|MERGE|PUT|DELETE').freeze
-    NOCACHE_HDRS = { 'Cache-Control' => 'no-cache',
-                     'Expires' => '-1',
-                     'Pragma' => 'no-cache' }.freeze
-    DATASERVICEVERSION = 'DataServiceVersion'
-    include MethodHandlers
-
-    def before
-      @request.service_base = self.class.get_service_base
-
-      @request.negotiate_service_version.tap_valid do
-        myhdrs = NOCACHE_HDRS.dup
-        myhdrs[DATASERVICEVERSION] = @request.service.data_service_version
-        headers myhdrs
-      end
-    end
-
-    # dispatch for all methods requiring parsing of the path
-    # with walker (ie. allmost all excepted HEAD)
-    def dispatch_with_walker
-      @walker = @request.create_odata_walker
-      case @request.request_method
-      when 'GET'
-        odata_get
-      when 'POST'
-        odata_post
-      when 'DELETE'
-        odata_delete
-      when 'OPTIONS'
-        odata_options
-      when 'PUT'
-        odata_put
-      when 'PATCH', 'MERGE'
-        odata_patch
-      else
-        raise Error
-      end
-    end
-
-    def dispatch_error(err)
-      @response.status, rsph, @response.body = err.odata_get(@request)
-      headers rsph
-    end
-
-    def dispatch
-      req_ret = if @request.request_method !~ METHODS_REGEXP
-                  [404, EMPTY_HASH, ['Did you get lost?']]
-                elsif @request.request_method == 'HEAD'
-                  odata_head
-                else
-                  dispatch_with_walker
-                end
-      @response.status, rsph, @response.body = req_ret
-      headers rsph
+    def initialize
+      # just get back the service base instance object
+      # that was saved on class level and save it here
+      # so it's not needed to call self.class.service
+      @service_base = self.class.get_service_base
     end
 
     def call(env)
-      # for thread safety
-      dup._call(env)
-    end
-
-    def _call(env)
-      begin
-        @request = Safrano::Request.new(env)
-        @response = Safrano::Response.new
-
-        before.tap_error { |err| dispatch_error(err) }
-              .tap_valid { |_res| dispatch }
-
-      # handle remaining Sequel errors that we couldnt prevent with our
-      # own pre-checks
-      rescue Sequel::Error => e
-        dispatch_error(SequelExceptionError.new(e))
-      end
-      @response.finish
-    end
-
-    # Set multiple response headers with Hash.
-    def headers(hash = nil)
-      @response.headers.merge! hash if hash
-      @response.headers
+      Safrano::Request.new(env, @service_base).process
     end
 
+    #  needed for testing only ? try to remove this
     def self.enable_batch
       @service_base.enable_batch
     end
 
+    # needed for testing only ? try to remove this
     def self.path_prefix(path_pr)
       @service_base.path_prefix path_pr
     end
 
+    # needed for testing only ? try to remove this
     def self.get_service_base
       @service_base
     end
@@ -157,6 +47,7 @@ module Safrano
       sbase = Safrano::ServiceBase.new
       sbase.instance_eval(&block) if block_given?
       sbase.finalize_publishing
+      # save published service base instance on App-Class level
       set_servicebase(sbase)
     end
   end

data/lib/safrano/request.rb

@@ -4,6 +4,49 @@ require 'rack'
 require 'rfc2047'
 
 module Safrano
+  # handle GET PUT etc
+  module MethodHandlers
+    def odata_options
+      @walker.finalize.tap_error { |err| return err.odata_get(self) }
+             .if_valid do |_context|
+        # cf. stackoverflow.com/questions/22924678/sinatra-delete-response-headers
+        headers.delete('Content-Type')
+        @response.headers.delete('Content-Type')
+        @response.headers['Content-Type'] = ''
+        [200, EMPTY_HASH, '']
+      end
+    end
+
+    def odata_delete
+      @walker.finalize.tap_error { |err| return err.odata_get(self) }
+             .if_valid { |context| context.odata_delete(self) }
+    end
+
+    def odata_put
+      @walker.finalize.tap_error { |err| return err.odata_get(self) }
+             .if_valid { |context| context.odata_put(self) }
+    end
+
+    def odata_patch
+      @walker.finalize.tap_error { |err| return err.odata_get(self) }
+             .if_valid { |context| context.odata_patch(self) }
+    end
+
+    def odata_get
+      @walker.finalize.tap_error { |err| return err.odata_get(self) }
+             .if_valid { |context| context.odata_get(self) }
+    end
+
+    def odata_post
+      @walker.finalize.tap_error { |err| return err.odata_get(self) }
+             .if_valid { |context| context.odata_post(self) }
+    end
+
+    def odata_head
+      [200, EMPTY_HASH, [EMPTY_STRING]]
+    end
+  end
+
   # monkey patch deactivate Rack/multipart because it does not work on simple
   # OData $batch requests when the content-length
   # is not passed
@@ -13,6 +56,11 @@ module Safrano
     HEADER_VAL_WITH_PAR = /(?:#{HEADER_VAL_RAW})\s*(?:;#{HEADER_PARAM})*/.freeze
     ON_CGST_ERROR = (proc { |r| raise(Sequel::Rollback) if r.in_changeset })
 
+    METHODS_REGEXP = Regexp.new('HEAD|OPTIONS|GET|POST|PATCH|MERGE|PUT|DELETE').freeze
+    NOCACHE_HDRS = { 'Cache-Control' => 'no-cache',
+                     'Expires' => '-1',
+                     'Pragma' => 'no-cache' }.freeze
+    DATASERVICEVERSION = 'DataServiceVersion'
     # borowed from Sinatra
     class AcceptEntry
       attr_accessor :params
@@ -87,6 +135,82 @@ module Safrano
     # content-id references map
     attr_accessor :content_id_references
 
+    include MethodHandlers
+
+    def initialize(env, service_base)
+      super(env)
+      @service_base = service_base
+    end
+
+    # process the request and return finished response
+    def process
+      begin
+        @response = Safrano::Response.new
+
+        before.tap_error { |err| dispatch_error(err) }
+              .tap_valid { |_res| dispatch }
+
+      # handle remaining Sequel errors that we couldnt prevent with our
+      # own pre-checks
+      rescue Sequel::Error => e
+        dispatch_error(SequelExceptionError.new(e))
+      end
+      @response.finish
+    end
+
+    def before
+      negotiate_service_version.tap_valid do
+        myhdrs = NOCACHE_HDRS.dup
+        myhdrs[DATASERVICEVERSION] = @service.data_service_version
+        headers myhdrs
+      end
+    end
+
+    # dispatch for all methods requiring parsing of the path
+    # with walker (ie. allmost all excepted HEAD)
+    def dispatch_with_walker
+      @walker = create_odata_walker
+      case request_method
+      when 'GET'
+        odata_get
+      when 'POST'
+        odata_post
+      when 'DELETE'
+        odata_delete
+      when 'OPTIONS'
+        odata_options
+      when 'PUT'
+        odata_put
+      when 'PATCH', 'MERGE'
+        odata_patch
+      else
+        raise Error
+      end
+    end
+
+    def dispatch_error(err)
+      @response.status, rsph, @response.body = err.odata_get(self)
+      headers rsph
+    end
+
+    def dispatch
+      req_ret = if request_method !~ METHODS_REGEXP
+                  [404, EMPTY_HASH, ['Did you get lost?']]
+                elsif request_method == 'HEAD'
+                  odata_head
+                else
+                  dispatch_with_walker
+                end
+      @response.status, rsph, @response.body = req_ret
+      headers rsph
+    end
+
+    # Set multiple response headers with Hash.
+    def headers(hash = nil)
+      @response.headers.merge! hash if hash
+      @response.headers
+    end
+
     # stores the newly created entity for the current content-id of
     # the processed request
     def register_content_id_ref(new_entity)
@@ -213,6 +337,7 @@ module Safrano
     MIN_DTSV_PARSE_ERROR = Safrano::BadRequestError.new(
       'MinDataServiceVersion could not be parsed'
     ).freeze
+
     def get_minversion
       if (rqv = env['HTTP_MINDATASERVICEVERSION'])
         if (m = DATASERVICEVERSION_RGX.match(rqv))
@@ -234,6 +359,7 @@ module Safrano
     MAX_LT_MIN_DTSV_ERROR = Safrano::BadRequestError.new(
       'MinDataServiceVersion is larger as MaxDataServiceVersion'
     ).freeze
+
     def negotiate_service_version
       get_maxversion.if_valid do |maxv|
         get_minversion.if_valid do |minv|

data/lib/safrano/service.rb

@@ -375,7 +375,7 @@ module Safrano
     def finalize_publishing
       # build the cmap
       @cmap = {}
-      @collections.each do |klass|
+      @collections&.each do |klass|
         @cmap[klass.entity_set_name] = klass
         # set namespace needed to have qualified type name
         copy_namespace_to(klass)
@@ -393,7 +393,7 @@ module Safrano
       set_uribase
 
       # finalize the uri's and include NoMappingBeforeOutput or MappingBeforeOutput as needed
-      @collections.each do |klass|
+      @collections&.each do |klass|
         klass.finalize_publishing(self)
 
         klass.build_uri(@uribase)
@@ -448,9 +448,14 @@ module Safrano
         Safrano::Filter::DateTimeLit.include Safrano::Filter::DateTimeDefault
         Safrano::Filter::DateTimeOffsetLit.include Safrano::Filter::DateTimeDefault
       end
+
+      # check function import definition
+      function_imports.each_value { |func| func.check_definition }
     end
 
     def execute_deferred_iblocks
+      return unless @collections
+
       @collections.each do |k|
         k.instance_eval(&k.deferred_iblock) if k.deferred_iblock
       end
@@ -460,6 +465,8 @@ module Safrano
     ## evaluated after '@collections' is filled !
     # A regexp matching all allowed base entities (eg product|categories )
     def base_url_regexp
+      return unless @collections
+
       @collections.map(&:entity_set_name).join('|')
     end
 

data/lib/safrano/version.rb

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

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rfc2047
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement