safrano 0.4.3 → 0.4.4

data/lib/safrano/rack_app.rb

@@ -1,72 +1,47 @@
-#!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rack'
-require_relative '../odata/walker.rb'
-require_relative 'request.rb'
-require_relative 'response.rb'
+require_relative '../odata/walker'
+require_relative 'request'
+require_relative 'response'
 
-module OData
+module Safrano
   # handle GET PUT etc
   module MethodHandlers
     def odata_options
-      # cf. stackoverflow.com/questions/22924678/sinatra-delete-response-headers
-
-      x = if @walker.status == :end
-            headers.delete('Content-Type')
-            @response.headers.delete('Content-Type')
-            [200, EMPTY_HASH, '']
-          else
-            odata_error
-          end
-      @response.headers['Content-Type'] = ''
-      x
-    end
-
-    def odata_error
-      return @walker.error.odata_get(@request) unless @walker.error.nil?
-
-      # this is too critical; raise a real Exception
-      raise 'Walker construction failed with a unknown Error '
+      @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
-      if @walker.status == :end
-        @walker.end_context.odata_delete(@request)
-      else
-        odata_error
-      end
+      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
+             .if_valid { |context| context.odata_delete(@request) }
     end
 
     def odata_put
-      if @walker.status == :end
-        @walker.end_context.odata_put(@request)
-      else
-        odata_error
-      end
+      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
+             .if_valid { |context| context.odata_put(@request) }
     end
 
     def odata_patch
-      if @walker.status == :end
-        @walker.end_context.odata_patch(@request)
-      else
-        odata_error
-      end
+      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
+             .if_valid { |context| context.odata_patch(@request) }
     end
 
     def odata_get
-      if @walker.status == :end
-        @walker.end_context.odata_get(@request)
-      else
-        odata_error
-      end
+      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
+             .if_valid { |context| context.odata_get(@request) }
     end
 
     def odata_post
-      if @walker.status == :end
-        @walker.end_context.odata_post(@request)
-      else
-        odata_error
-      end
+      @walker.finalize.tap_error { |err| return err.odata_get(@request) }
+             .if_valid { |context| context.odata_post(@request) }
     end
 
     def odata_head
@@ -83,18 +58,15 @@ module OData
                      'Pragma' => 'no-cache' }.freeze
     DATASERVICEVERSION = 'DataServiceVersion'.freeze
     include MethodHandlers
+
     def before
       @request.service_base = self.class.get_service_base
 
-      neg_error = @request.negotiate_service_version
-
-      raise RuntimeError if neg_error
-
-      return false unless @request.service
-
-      myhdrs = NOCACHE_HDRS.dup
-      myhdrs[DATASERVICEVERSION] = @request.service.data_service_version
-      headers myhdrs
+      @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
@@ -119,6 +91,11 @@ module OData
       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?']]
@@ -132,13 +109,23 @@ module OData
     end
 
     def call(env)
-      @request = OData::Request.new(env)
-      @response = OData::Response.new
+      # for thread safety
+      dup._call(env)
+    end
 
-      before
+    def _call(env)
+      begin
+        @request = Safrano::Request.new(env)
+        @response = Safrano::Response.new
 
-      dispatch
+        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
 
@@ -167,10 +154,22 @@ module OData
     end
 
     def self.publish_service(&block)
-      sbase = OData::ServiceBase.new
+      sbase = Safrano::ServiceBase.new
       sbase.instance_eval(&block) if block_given?
       sbase.finalize_publishing
       set_servicebase(sbase)
     end
   end
 end
+
+# deprecated
+# REMOVE 0.6
+module OData
+  class ServerApp < Safrano::ServerApp
+    def self.publish_service(&block)
+      ::Safrano::Deprecation.deprecate('OData::ServerApp',
+                                       'Use Safrano::ServerApp instead')
+      super
+    end
+  end
+end

data/lib/safrano/{odata_rack_builder.rb → rack_builder.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'rack'
 require 'rack/cors'
 
 module Rack
-  module OData
+  module Safrano
     # just a Wrapper to ensure (force?) that mandatory middlewares are acutally
     # used
     class Builder < ::Rack::Builder
@@ -15,3 +17,18 @@ module Rack
     end
   end
 end
+
+# deprecated
+# REMOVE 0.6
+module Rack
+  module OData
+    class Builder < ::Rack::Safrano::Builder
+      def initialize(default_app = nil, &block)
+        ::Safrano::Deprecation.deprecate('Rack::OData::Builder',
+                                         'Use Rack::Safrano::Builder instead')
+
+        super
+      end
+    end
+  end
+end

data/lib/safrano/request.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'rack'
 require 'rfc2047'
 
-module OData
+module Safrano
   # monkey patch deactivate Rack/multipart because it does not work on simple
   # OData $batch requests when the content-length
   # is not passed
@@ -15,6 +17,7 @@ module OData
     class AcceptEntry
       attr_accessor :params
       attr_reader :entry
+
       def initialize(entry)
         params = entry.scan(HEADER_PARAM).map! do |s|
           key, value = s.strip.split('=', 2)
@@ -94,7 +97,9 @@ module OData
     end
 
     def create_odata_walker
-      @env['safrano.walker'] = @walker = Walker.new(@service, path_info, @content_id_references)
+      @env['safrano.walker'] = @walker = Walker.new(@service,
+                                                    path_info,
+                                                    @content_id_references)
     end
 
     def accept
@@ -157,44 +162,97 @@ module OData
       end
     end
 
-    def negotiate_service_version
-      maxv = if (rqv = env['HTTP_MAXDATASERVICEVERSION'])
-               OData::ServiceBase.parse_data_service_version(rqv)
-             else
-               OData::MAX_DATASERVICE_VERSION
-             end
-      return OData::BadRequestError if maxv.nil?
-      # client request an too old version --> 501
-      return OData::NotImplementedError if maxv < OData::MIN_DATASERVICE_VERSION
-
-      minv = if (rqv = env['HTTP_MINDATASERVICEVERSION'])
-               OData::ServiceBase.parse_data_service_version(rqv)
-             else
-               OData::MIN_DATASERVICE_VERSION
-             end
-      return OData::BadRequestError if minv.nil?
-      # client request an too new version --> 501
-      return OData::NotImplementedError if minv > OData::MAX_DATASERVICE_VERSION
-      return OData::BadRequestError if minv > maxv
-
-      v = if (rqv = env['HTTP_DATASERVICEVERSION'])
-            OData::ServiceBase.parse_data_service_version(rqv)
+    # input is the       DataServiceVersion request header string, eg.
+    # '2.0;blabla' ---> Version -> 2
+    DATASERVICEVERSION_RGX = /\A([1234])(?:\.0);*\w*\z/.freeze
+
+    MAX_DTSV_PARSE_ERROR = Safrano::BadRequestError.new(
+      'MaxDataServiceVersion could not be parsed'
+    ).freeze
+    def get_maxversion
+      if (rqv = env['HTTP_MAXDATASERVICEVERSION'])
+        if (m = DATASERVICEVERSION_RGX.match(rqv))
+          # client request an too old version --> 501
+          if (maxv = m[1]) < Safrano::MIN_DATASERVICE_VERSION
+            Safrano::VersionNotImplementedError
           else
-            OData::MAX_DATASERVICE_VERSION
+            Contract.valid(maxv)
           end
+        else
+          MAX_DTSV_PARSE_ERROR
+        end
+      else
+        # not provided in request header --> take ours
+        Safrano::CV_MAX_DATASERVICE_VERSION
+      end
+    end
 
-      return OData::BadRequestError if v.nil?
-      return OData::NotImplementedError if v > OData::MAX_DATASERVICE_VERSION
-      return OData::NotImplementedError if v < OData::MIN_DATASERVICE_VERSION
-
-      @service = nil
-      @service = case maxv
-                 when '1'
-                   @service_base.v1
-                 when '2', '3', '4'
-                   @service_base.v2
-                 end
-      nil
+    DTSV_PARSE_ERROR = Safrano::BadRequestError.new(
+      'DataServiceVersion could not be parsed'
+    ).freeze
+    def get_version
+      if (rqv = env['HTTP_DATASERVICEVERSION'])
+        if (m = DATASERVICEVERSION_RGX.match(rqv))
+          # client request an too new version --> 501
+          if ((v = m[1]) > Safrano::MAX_DATASERVICE_VERSION) or
+             (v < Safrano::MIN_DATASERVICE_VERSION)
+            Safrano::VersionNotImplementedError
+          else
+            Contract.valid(v)
+          end
+        else
+          DTSV_PARSE_ERROR
+        end
+      else
+        # not provided in request header --> take our maxv
+        Safrano::CV_MAX_DATASERVICE_VERSION
+      end
+    end
+
+    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))
+          # client request an too new version --> 501
+          if (minv = m[1]) > Safrano::MAX_DATASERVICE_VERSION
+            Safrano::VersionNotImplementedError
+          else
+            Contract.valid(minv)
+          end
+        else
+          MIN_DTSV_PARSE_ERROR
+        end
+      else
+        # not provided in request header --> take ours
+        Safrano::CV_MIN_DATASERVICE_VERSION
+      end
+    end
+
+    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|
+          return MAX_LT_MIN_DTSV_ERROR if minv > maxv
+
+          get_version.if_valid do |v|
+            @service = nil
+            @service = case maxv
+                       when '1'
+                         @service_base.v1
+                       when '2', '3', '4'
+                         @service_base.v2
+                       else
+                         return Safrano::VersionNotImplementedError
+                       end
+
+            Contract::OK
+          end # valid get_version
+        end # valid get_minversion
+      end # valid get_maxversion
     end
   end
 end

data/lib/safrano/response.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'rack'
 
 # monkey patch deactivate Rack/multipart because it does not work on simple
 # OData $batch requests when the content-length is not passed
-module OData
+module Safrano
   # borrowed fro Sinatra
   # The response object. See Rack::Response and Rack::Response::Helpers for
   # more info:
@@ -12,7 +14,7 @@ module OData
     DROP_BODY_RESPONSES = [204, 205, 304].freeze
     def initialize(*)
       super
-      headers['Content-Type'] ||= 'text/html'
+      headers[CONTENT_TYPE] ||= APPJSON_UTF8
     end
 
     def body=(value)

data/lib/safrano/sequel_join_by_paths.rb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require_relative '../sequel/plugins/join_by_paths.rb'
+require_relative '../sequel/plugins/join_by_paths'
 
 Sequel::Model.plugin Sequel::Plugins::JoinByPaths

data/lib/safrano/service.rb

@@ -1,14 +1,20 @@
-require 'rexml/document'
-require 'odata/relations.rb'
-require 'odata/batch.rb'
-require 'odata/error.rb'
-require 'odata/filter/sequel.rb'
+# frozen_string_literal: true
 
-module OData
+require 'rexml/document'
+require 'odata/relations'
+require 'odata/batch'
+require 'odata/complex_type'
+require 'odata/function_import'
+require 'odata/error'
+require 'odata/filter/sequel'
+require 'set'
+require 'odata/collection'
+
+module Safrano
   # this module has all methods related to expand/defered output preparation
   # and will be included in Service class
   module ExpandHandler
-    PATH_SPLITTER = %r{\A(\w+)\/?(.*)\z}.freeze
+    PATH_SPLITTER = %r{\A(\w+)/?(.*)\z}.freeze
     DEFERRED = '__deferred'.freeze
     URI = 'uri'.freeze
 
@@ -16,25 +22,6 @@ module OData
       { DEFERRED => { URI => "#{entity_uri}/#{attrib}" } }
     end
 
-    # split expand argument into first and rest part
-    def split_entity_expand_arg(exp_one)
-      if exp_one.include?('/')
-        m = PATH_SPLITTER.match(exp_one)
-        cur_exp = m[1].strip
-        rest_exp = m[2]
-        # TODO: check errorhandling
-        raise OData::ServerError if cur_exp.nil?
-
-        k_s = cur_exp
-
-      else
-        k_s = exp_one.strip
-        rest_exp = nil
-      end
-      k = k_s.to_sym
-      yield k, k_s, rest_exp
-    end
-
     # default v2
     # overriden in ServiceV1
     RESULTS_K = 'results'.freeze
@@ -43,11 +30,7 @@ module OData
       array.map! do |w|
         get_entity_odata_h(entity: w, template: template)
       end
-      if icount
-        { RESULTS_K => array, COUNT_K => icount }
-      else
-        { RESULTS_K => array }
-      end
+      icount ? { RESULTS_K => array, COUNT_K => icount } : { RESULTS_K => array }
     end
 
     # handle $links ... Note: $expand seems to be ignored when $links
@@ -66,8 +49,10 @@ module OData
         case elmt
         when :all_values
           hres.merge! entity.casted_values
+
         when :selected_vals
           hres.merge! entity.casted_values(arg)
+
         when :expand_e
 
           arg.each do |attr, templ|
@@ -79,6 +64,7 @@ module OData
                            EMPTYH
                          end
           end
+
         when :expand_c
           arg.each do |attr, templ|
             next unless  (encoll = entity.send(attr))
@@ -87,6 +73,7 @@ module OData
             hres[attr] = get_coll_odata_h(array: encoll, template: templ)
             # else error ?
           end
+
         when :deferr
           euri = entity.uri
           arg.each do |attr|
@@ -99,7 +86,7 @@ module OData
   end
 end
 
-module OData
+module Safrano
   # xml namespace constants needed for the output of XML service and
   # and metadata
   module XMLNS
@@ -115,17 +102,18 @@ module OData
 end
 
 # Link to Model
-module OData
+module Safrano
   MAX_DATASERVICE_VERSION = '2'.freeze
   MIN_DATASERVICE_VERSION = '1'.freeze
+  CV_MAX_DATASERVICE_VERSION = Contract.valid(MAX_DATASERVICE_VERSION).freeze
+  CV_MIN_DATASERVICE_VERSION = Contract.valid(MIN_DATASERVICE_VERSION).freeze
   include XMLNS
   # Base class for service. Subclass will be for V1, V2 etc...
   class ServiceBase
     include Safrano
     include ExpandHandler
 
-    XML_PREAMBLE = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>' + \
-                   "\r\n".freeze
+    XML_PREAMBLE = %Q(<?xml version="1.0" encoding="utf-8" standalone="yes"?>\r\n).freeze
 
     # This is just a hash of entity Set Names to the corresponding Class
     # Example
@@ -148,6 +136,9 @@ module OData
     attr_accessor :meta
     attr_accessor :batch_handler
     attr_accessor :relman
+    attr_accessor :complex_types
+    attr_accessor :function_imports
+
     # Instance attributes for specialized Version specific Instances
     attr_accessor :v1
     attr_accessor :v2
@@ -161,37 +152,31 @@ module OData
       #  because of the version subclasses that dont use "super" initialise
       # (todo: why not??)
       @meta = ServiceMeta.new(self)
-      @batch_handler = OData::Batch::DisabledHandler.new
-      @relman = OData::RelationManager.new
+      @batch_handler = Safrano::Batch::DisabledHandler.new
+      @relman = Safrano::RelationManager.new
+      @complex_types = Set.new
+      @function_imports = {}
       @cmap = {}
       instance_eval(&block) if block_given?
     end
 
-    DATASERVICEVERSION_RGX = /\A([1234])(?:\.0);*\w*\z/.freeze
     TRAILING_SLASH = %r{/\z}.freeze
     DEFAULT_PATH_PREFIX = '/'.freeze
-    DEFAULT_SERVER_URL = 'http://localhost:9494'
-
-    # input is the       DataServiceVersion request header string, eg.
-    # '2.0;blabla' ---> Version -> 2
-    def self.parse_data_service_version(inp)
-      m = DATASERVICEVERSION_RGX.match(inp)
-      m[1] if m
-    end
+    DEFAULT_SERVER_URL = 'http://localhost:9494'.freeze
 
     def enable_batch
-      @batch_handler = OData::Batch::EnabledHandler.new
+      @batch_handler = Safrano::Batch::EnabledHandler.new
       (@v1.batch_handler = @batch_handler) if @v1
       (@v2.batch_handler = @batch_handler) if @v2
     end
 
     def enable_v1_service
-      @v1 = OData::ServiceV1.new
+      @v1 = Safrano::ServiceV1.new
       copy_attribs_to @v1
     end
 
     def enable_v2_service
-      @v2 = OData::ServiceV2.new
+      @v2 = Safrano::ServiceV2.new
       copy_attribs_to @v2
     end
 
@@ -225,12 +210,10 @@ module OData
     def set_uribase
       @uribase = if @xpath_prefix.empty?
                    @xserver_url
+                 elsif @xpath_prefix[0] == '/'
+                   "#{@xserver_url}#{@xpath_prefix}"
                  else
-                   if @xpath_prefix[0] == '/'
-                     @xserver_url + @xpath_prefix
-                   else
-                     @xserver_url + '/' + @xpath_prefix
-                   end
+                   "#{@xserver_url}/#{@xpath_prefix}"
                  end
       (@v1.uribase = @uribase) if @v1
       (@v2.uribase = @uribase) if @v2
@@ -249,6 +232,8 @@ module OData
       other.meta = ServiceMeta.new(other) # hum ... #todo: versions as well ?
       other.relman = @relman
       other.batch_handler = @batch_handler
+      other.complex_types = @complex_types
+      other.function_imports = @function_imports
       other
     end
 
@@ -261,38 +246,43 @@ module OData
     def register_model(modelklass, entity_set_name = nil, is_media = false)
       # check that the provided klass is a Sequel Model
 
-      raise(OData::API::ModelNameError, modelklass) unless modelklass.is_a? Sequel::Model::ClassMethods
+      raise(Safrano::API::ModelNameError, modelklass) unless modelklass.is_a? Sequel::Model::ClassMethods
 
-      if modelklass.ancestors.include? OData::Entity
+      if modelklass.ancestors.include? Safrano::Entity
         # modules were already added previously;
         # cleanup state to avoid having data from previous calls
         # mostly usefull for testing (eg API)
         modelklass.reset
       elsif modelklass.primary_key.is_a?(Array) # first API call... (normal non-testing case)
-        modelklass.extend OData::EntityClassMultiPK
-        modelklass.include OData::EntityMultiPK
+        modelklass.extend Safrano::EntityClassMultiPK
+        modelklass.include Safrano::EntityMultiPK
       else
-        modelklass.extend OData::EntityClassSinglePK
-        modelklass.include OData::EntitySinglePK
+        modelklass.extend Safrano::EntityClassSinglePK
+        modelklass.include Safrano::EntitySinglePK
       end
+
       # Media/Non-media
       if is_media
-        modelklass.extend OData::EntityClassMedia
+        modelklass.extend Safrano::EntityClassMedia
         # set default media handler . Can be overridden later with the
         #  "use HandlerKlass, options" API
 
         modelklass.set_default_media_handler
         modelklass.api_check_media_fields
-        modelklass.include OData::MediaEntity
+        modelklass.include Safrano::MediaEntity
       else
-        modelklass.extend OData::EntityClassNonMedia
-        modelklass.include OData::NonMediaEntity
+        modelklass.extend Safrano::EntityClassNonMedia
+        modelklass.include Safrano::NonMediaEntity
       end
 
       modelklass.prepare_pk
       modelklass.prepare_fields
       esname = (entity_set_name || modelklass).to_s.freeze
-      modelklass.instance_eval { @entity_set_name = esname }
+      serv_namespace = @xnamespace
+      modelklass.instance_eval do
+        @entity_set_name = esname
+        @namespace = serv_namespace
+      end
       @cmap[esname] = modelklass
       set_collections_sorted(@cmap.values)
     end
@@ -313,6 +303,23 @@ module OData
       modelklass.deferred_iblock = block if block_given?
     end
 
+    def publish_complex_type(ctklass)
+      # check that the provided klass is a Safrano ComplexType
+
+      raise(Safrano::API::ComplexTypeNameError, ctklass) unless ctklass.superclass == Safrano::ComplexType
+
+      serv_namespace = @xnamespace
+      ctklass.instance_eval { @namespace = serv_namespace }
+
+      @complex_types.add ctklass
+    end
+
+    def function_import(name)
+      funcimp = Safrano::FunctionImport(name)
+      @function_imports[name] = funcimp
+      funcimp
+    end
+
     def cmap=(imap)
       @cmap = imap
       set_collections_sorted(@cmap.values)
@@ -352,14 +359,10 @@ module OData
       @collections.each(&:finalize_publishing)
 
       # finalize the uri's and include NoMappingBeforeOutput or MappingBeforeOutput as needed
-      @collections.each { |klass|
+      @collections.each do |klass|
         klass.build_uri(@uribase)
-        if klass.time_cols.empty?
-          klass.include OData::NoMappingBeforeOutput
-        else
-          klass.include OData::MappingBeforeOutput
-        end
-      }
+        klass.include(klass.time_cols.empty? ? Safrano::NoMappingBeforeOutput : Safrano::MappingBeforeOutput)
+      end
 
       # build allowed transitions (requires that @collections are filled and sorted for having a
       # correct base_url_regexp)
@@ -368,11 +371,11 @@ module OData
       # mixin adapter specific modules where needed
       case Sequel::Model.db.adapter_scheme
       when :postgres
-        OData::Filter::FuncTree.include OData::Filter::FuncTreePostgres
+        Safrano::Filter::FuncTree.include Safrano::Filter::FuncTreePostgres
       when :sqlite
-        OData::Filter::FuncTree.include OData::Filter::FuncTreeSqlite
+        Safrano::Filter::FuncTree.include Safrano::Filter::FuncTreeSqlite
       else
-        OData::Filter::FuncTree.include OData::Filter::FuncTreeDefault
+        Safrano::Filter::FuncTree.include Safrano::Filter::FuncTreeDefault
       end
     end
 
@@ -389,19 +392,24 @@ module OData
       @collections.map(&:entity_set_name).join('|')
     end
 
+    def base_url_func_regexp
+      @function_imports.keys.join('|')
+    end
+
     def service
       hres = {}
       hres['d'] = { 'EntitySets' => @collections.map(&:type_name) }
       hres
     end
 
-    def service_xml(req)
+    def service_xml(_req)
       doc = REXML::Document.new
       # separator required ? ?
       root = doc.add_element('service', 'xml:base' => @uribase)
 
       root.add_namespace('xmlns:atom', XMLNS::W3_2005_ATOM)
       root.add_namespace('xmlns:app', XMLNS::W3_2007_APP)
+
       # this generates the main xmlns attribute
       root.add_namespace(XMLNS::W3_2007_APP)
       wp = root.add_element 'workspace'
@@ -412,7 +420,7 @@ module OData
       @collections.each do |klass|
         col = wp.add_element('collection', 'href' => klass.entity_set_name)
         ct = col.add_element('atom:title')
-        ct.text = klass.type_name
+        ct.text = klass.entity_set_name
       end
 
       XML_PREAMBLE + doc.to_pretty_xml
@@ -421,10 +429,18 @@ module OData
     def add_metadata_xml_entity_type(schema)
       @collections.each do |klass|
         enty = klass.add_metadata_rexml(schema)
-        klass.add_metadata_navs_rexml(enty, @relman, @xnamespace)
+        klass.add_metadata_navs_rexml(enty, @relman)
       end
     end
 
+    def add_metadata_xml_complex_types(schema)
+      @complex_types.each { |ctklass| ctklass.add_metadata_rexml(schema)   }
+    end
+
+    def add_metadata_xml_function_imports(ec)
+      @function_imports.each_value { |func| func.add_metadata_rexml(ec)    }
+    end
+
     def add_metadata_xml_associations(schema)
       @relman.each_rel do |rel|
         rel.with_metadata_info(@xnamespace) do |name, bdinfo|
@@ -447,7 +463,7 @@ module OData
         # 3.a Entity set's
         ec.add_element('EntitySet',
                        'Name' => klass.entity_set_name,
-                       'EntityType' => "#{@xnamespace}.#{klass.type_name}")
+                       'EntityType' => klass.type_name)
       end
       # 3.b Association set's
       @relman.each_rel do |rel|
@@ -461,6 +477,9 @@ module OData
           assoc.add_element('End', assoend)
         end
       end
+
+      # 4 function imports
+      add_metadata_xml_function_imports(ec)
     end
 
     def metadata_xml(_req)
@@ -494,9 +513,12 @@ module OData
       schema = serv.add_element('Schema',
                                 'Namespace' => @xnamespace,
                                 'xmlns' => XMLNS::MSFT_ADO_2009_EDM)
-      # 1. all EntityType
+      # 1. a. all EntityType
       add_metadata_xml_entity_type(schema)
 
+      # 1. b. all ComplexType
+      add_metadata_xml_complex_types(schema)
+
       # 2. Associations
       add_metadata_xml_associations(schema)
 
@@ -517,18 +539,36 @@ module OData
       ].freeze
 
       def build_allowed_transitions
-        @allowed_transitions = (ALLOWED_TRANSITIONS_FIXED + [
-          Safrano::Transition.new(%r{\A/(#{base_url_regexp})(.*)},
-                                  trans: 'transition_collection')
-        ]).freeze
+        @allowed_transitions = if @function_imports.empty?
+                                 (ALLOWED_TRANSITIONS_FIXED + [
+                                   Safrano::Transition.new(%r{\A/(#{base_url_regexp})(.*)},
+                                                           trans: 'transition_collection')
+                                 ]).freeze
+                               else
+                                 (ALLOWED_TRANSITIONS_FIXED + [
+                                   Safrano::Transition.new(%r{\A/(#{base_url_regexp})(.*)},
+                                                           trans: 'transition_collection'),
+                                   Safrano::Transition.new(%r{\A/(#{base_url_func_regexp})(.*)},
+                                                           trans: 'transition_service_op')
+                                 ]).freeze
+                               end
       end
 
       def allowed_transitions
         @allowed_transitions
       end
 
+      def thread_safe_collection(collklass)
+        Safrano::OData::Collection.new(collklass)
+      end
+
       def transition_collection(match_result)
-        [@cmap[match_result[1]], :run] if match_result[1]
+        [thread_safe_collection(@cmap[match_result[1]]), :run] if match_result[1]
+        #        [@cmap[match_result[1]], :run] if match_result[1]
+      end
+
+      def transition_service_op(match_result)
+        [@function_imports[match_result[1]], :run] if match_result[1]
       end
 
       def transition_batch(_match_result)
@@ -544,7 +584,7 @@ module OData
       end
 
       def transition_end(_match_result)
-        [nil, :end]
+        Safrano::Transition::RESULT_END
       end
     end
 
@@ -552,14 +592,11 @@ module OData
 
     def odata_get(req)
       if req.accept?(APPXML)
-        #  app.headers  'Content-Type' => 'application/xml;charset=utf-8'
-        # Doc: 2.2.3.7.1 Service Document  As per [RFC5023], AtomPub Service
-        # Documents MUST be
-        # identified with the "application/atomsvc+xml" media type (see
-        # [RFC5023] section 8).
-        [200, CT_ATOMXML, [service_xml(req)]]
+        # OData V2 reference service implementations are returning app-xml-u8
+        # so we do
+        [200, CT_APPXML, [service_xml(req)]]
       else
-        # this is returned by http://services.odata.org/V2/OData/OData.svc
+        # this is returned by http://services.odata.org/V2/OData/Safrano.svc
         415
       end
     end
@@ -615,6 +652,7 @@ module OData
   # a virtual entity for the service metadata
   class ServiceMeta
     attr_accessor :service
+
     def initialize(service)
       @service = service
     end
@@ -625,7 +663,7 @@ module OData
     end
 
     def transition_end(_match_result)
-      [nil, :end]
+      Safrano::Transition::RESULT_END
     end
 
     def odata_get(req)