safrano 0.4.5 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2ebcbe8cf374526aa263f93515e2424753898ad878904d6d5d087bc6317c4e
-  data.tar.gz: 48190a71451991630bd48347c3cf2acb701423bb58266fa736b0cf7a5b6f3bdf
+  metadata.gz: 64699787371f5e9f696461faac80382cf2d53fe78d387742d8650e5a4b2c54df
+  data.tar.gz: 530e7619b4b27a1a50a63f832d4f3a8894850c6cea36e638769cdffbc6b7d942
 SHA512:
-  metadata.gz: 70ef7d275b566269879e4cd37f019958cd354504d1dede907adcf4d078e47361412997c69eec2c403317013ef5ac8019315aeb8cc89715906f2f12bd59e885dc
-  data.tar.gz: 1ff899294284a5e9531187533938e14ae304c1344131177dff1612037ca32e6a27dfcd72b367dd705afbb5cd5b9d38e9c11dc7b8f7766d470c2ac4c45686372b
+  metadata.gz: e5d118f15a3a3ba78f5385867c82370e36612585b7f83329343babb2e3a8a7220d1059ad766fbe7c9e1f7f74a57945c086e60624d0301259c1427f0053b59052
+  data.tar.gz: 52b283be3e8902226f14864a74eae30bc62c65908be748ea37c5a150f574f3130c8957f26251e1958e298eba221eeada9f0155fcc73ed2591034e97466f1e629

data/lib/odata/collection.rb

@@ -60,10 +60,13 @@ module Safrano
       end
 
       def initialize_dataset(dtset = nil)
-        @cx = dtset || @modelk
+        @cx = @cx ||  dtset || @modelk
+      end
+      
+      def initialize_uparms
         @uparms = UrlParameters4Coll.new(@cx, @params)
       end
-
+      
       def odata_get_apply_params
         @uparms.apply_to_dataset(@cx).map_result! do |dataset|
           @cx = dataset
@@ -131,9 +134,9 @@ module Safrano
 
       # on model class level we return the collection
       def odata_get(req)
-        @params = req.params
-        initialize_dataset
-
+        @params = @params || req.params
+        initialize_dataset 
+        initialize_uparms
         @uparms.check_all.if_valid { |_ret|
           odata_get_apply_params.if_valid { |_ret|
             odata_get_output(req)
@@ -170,8 +173,7 @@ module Safrano
       end
 
       def initialize_dataset(dtset = nil)
-        @cx = dtset || navigated_dataset
-        @uparms = UrlParameters4Coll.new(@cx, @params)
+        @cx = @cx || dtset || navigated_dataset
       end
       # redefinitions of the main methods for a navigated collection
       # (eg. all Books of Author[2]  is Author[2].Books.all )

data/lib/odata/collection_filter.rb

@@ -45,12 +45,12 @@ module Safrano
     # the join-helper is shared by the order-by object and was potentially already
     # partly built on order-by object creation.
     def finalize(jh)
-      @filtexpr = @ast.if_valid { |ast| ast.sequel_expr(jh) }  
+      @filtexpr = @ast.if_valid { |ast| ast.sequel_expr(jh) }
     end
 
     def apply_to_dataset(dtcx)
       #     normally finalize is called before, and thus @filtexpr is set
-      @filtexpr.map_result! { |f| dtcx.where(f) } 
+      @filtexpr.map_result! { |f| dtcx.where(f) }
     end
 
     # Note: this is really only *parse* error, ie the error encounterd while

data/lib/odata/collection_media.rb

@@ -8,6 +8,11 @@ module Safrano
   module Media
     # base class for Media Handler
     class Handler
+      def check_before_create(data:,
+                              entity:,
+                              filename:)
+        Contract::OK
+      end
     end
 
     # Simple static File/Directory based media store handler
@@ -54,13 +59,13 @@ module Safrano
       end
 
       # relative to @root
-      # eg Photo/1/pommes-topaz.jpg
+      # 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('*').min)
+          File.join(media_path(entity), Dir.glob('*').max)
         end
       end
 
@@ -147,15 +152,14 @@ module Safrano
 
       # this is relative to abs_klass_dir(entity) eg to /@root/Photo
       # tree-structure
-      #  media_path_ids = 1  -->  1
-      #  media_path_ids = 15  -->  1/5
-      #  media_path_ids = 555  -->  5/5/5
-      #  media_path_ids = 5,5,5  -->  5/00/5/00/5
-      #  media_path_ids = 5,00,5  -->  5/00/0/0/00/5
-      #  media_path_ids = 5,xyz,5  -->  5/00/x/y/z/00/5
+      #  media_path_ids = 1  -->  1/v
+      #  media_path_ids = 15  -->  1/5/v
+      #  media_path_ids = 555  -->  5/5/5/v
+      #  media_path_ids = 5,5,5  -->  5/00/5/00/5/v
+      #  media_path_ids = 5,00,5  -->  5/00/0/0/00/5/v
+      #  media_path_ids = 5,xyz,5  -->  5/00/x/y/z/00/5/v
       def media_directory(entity)
         StaticTree.path_builder(entity.media_path_ids)
-        #        entity.media_path_ids.map{|id| id.to_s.chars.join('/')}.join(@sep)
       end
 
       def in_media_directory(entity)
@@ -267,29 +271,39 @@ module Safrano
                                   missing: :skip)
           end
 
-          # to_one rels are create with FK data set on the parent entity
-          if parent
-            odata_create_save_entity_and_rel(req, new_entity, assoc, parent)
-          else
-            # in-changeset requests get their own transaction
-            new_entity.save(transaction: !req.in_changeset)
-          end
+          # call before_create_entity media hook
+          new_entity.before_create_media_entity(data: data, mimetype: mimetype) if new_entity.respond_to? :before_create_media_entity
+
+          media_handler.check_before_create(data: data,
+                                            entity: new_entity,
+                                            filename: filename).if_valid { |_ret|
+            # to_one rels are create with FK data set on the parent entity
+            if parent
+              odata_create_save_entity_and_rel(req, new_entity, assoc, parent)
+            else
+              # in-changeset requests get their own transaction
+              new_entity.save(transaction: !req.in_changeset)
+            end
+
+            req.register_content_id_ref(new_entity)
+            new_entity.copy_request_infos(req)
 
-          req.register_content_id_ref(new_entity)
-          new_entity.copy_request_infos(req)
+            # call before_create_media hook
+            new_entity.before_create_media if new_entity.respond_to? :before_create_media
 
-          # call before_create_media hook
-          new_entity.before_create_media if new_entity.respond_to? :before_create_media
+            media_handler.save_file(data: data,
+                                    entity: new_entity,
+                                    filename: filename)
 
-          media_handler.save_file(data: data,
-                                  entity: new_entity,
-                                  filename: filename)
+            # call after_create_media hook
+            new_entity.after_create_media if new_entity.respond_to? :after_create_media
 
-          # call after_create_media hook
-          new_entity.after_create_media if new_entity.respond_to? :after_create_media
+            # json is default content type so we dont need to specify it here again
+            #           Contract.valid([201, EMPTY_HASH, new_entity.to_odata_post_json(service: req.service)])
+            # TODO quirks array mode !
+            Contract.valid([201, EMPTY_HASH, new_entity.to_odata_create_json(request: req)])
+          }.tap_error { |e| return e.odata_get(req) }.result
 
-          # json is default content type so we dont need to specify it here again
-          [201, EMPTY_HASH, new_entity.to_odata_post_json(service: req.service)]
         else # TODO: other formats
           415
         end

data/lib/odata/complex_type.rb

@@ -2,6 +2,7 @@
 
 module Safrano
   module FunctionImport
+    EMPTY_HASH = {}.freeze
     class ResultDefinition
       D = 'd'
       DJ_OPEN = '{"d":'
@@ -11,67 +12,174 @@ module Safrano
       VALUEK = 'value'
       RESULTSK = 'results'
       COLLECTION = 'Collection'
-
-      def initialize(klassmod)
-        @klassmod = klassmod
+      
+      def allowed_transitions
+        [Safrano::TransitionEnd]
       end
-
-      def to_odata_json(result, _req)
-        "#{DJ_OPEN}#{result.odata_h.to_json}#{DJ_CLOSE}"
+      
+      def transition_end(_match_result)
+        Safrano::Transition::RESULT_END
       end
-
-      def type_metadata
+           
+      # we will have this on class and instance level for making things simpler first
+      def self.klassmod
+        @klassmod
+      end
+      
+      # return a subclass of ResultAsComplexType
+      def self.asComplexType(klassmod)
+        Class.new(ResultAsComplexType) do
+          @klassmod = klassmod
+        end
+      end
+      
+      # return a subclass of ResultAsComplexType
+      def self.asComplexTypeColl(klassmod)
+        Class.new(ResultAsComplexTypeColl) do
+          @klassmod = klassmod
+        end
+      end
+      
+      def self.asPrimitiveType(klassmod)
+        Class.new(ResultAsPrimitiveType) do
+          @klassmod = klassmod
+        end
+      end
+      
+      def self.asPrimitiveTypeColl(klassmod)
+        Class.new(ResultAsPrimitiveTypeColl) do
+          @klassmod = klassmod
+        end
+      end      
+      
+      def self.asEntity(klassmod)
+        Class.new(ResultAsEntity) do
+          @klassmod = klassmod
+        end
+      end
+      
+      def self.asEntityColl(klassmod)
+        Class.new(ResultAsEntityColl) do
+          @klassmod = klassmod
+        end
+      end
+      
+      def initialize(value)
+        @value = value
+      end
+      
+      def odata_get(req)
+        [200, EMPTY_HASH, [to_odata_json(req)]]
+      end
+      def self.type_metadata
         @klassmod.type_name
       end
+      def type_metadata
+        self.class.type_metadata
+      end
+      
+      # needed for ComplexType result
+      def to_odata_json(_req)
+        "#{DJ_OPEN}#{@value.odata_h.to_json}#{DJ_CLOSE}"
+      end      
+      
+      # wrapper 
+      # for OData Entity and Collections, return them directly
+      # for others, ie ComplexType, Prims etc, return the ResultDefinition-subclass wrapped result
+      def self.do_execute_func_result(result, _req, apply_query_params=false)
+        self.new(result)
+      end
+      
     end
+    
     class ResultAsComplexType < ResultDefinition
+      def self.type_metadata
+        @klassmod.type_name
+      end
     end
+    
     class ResultAsComplexTypeColl < ResultDefinition
-      def type_metadata
+      def self.type_metadata
         "Collection(#{@klassmod.type_name})"
       end
 
-      def to_odata_json(coll, _req)
-        "#{DJ_OPEN}#{{ RESULTSK => coll.map { |c| c.odata_h } }.to_json}#{DJ_CLOSE}"
+      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
+
+        innerh = req.service.get_coll_odata_h(array: @value,
+                                              template: template)
+                                              
+        innerj = innerh.to_json
+
+        "#{DJ_OPEN}#{innerj}#{DJ_CLOSE}"
       end
     end
+    
     class ResultAsEntity < ResultDefinition
-      def to_odata_json(result_entity, req)
-        result_entity.instance_exec do
-          copy_request_infos(req)
-          to_odata_json(request: req)
-        end
+    
+      def self.type_metadata
+        @klassmod.type_name
       end
+
+      
+      # wrapper 
+      # for OData Entity  return them directly
+      def self.do_execute_func_result(result, _req, apply_query_params=false)
+        # note: Sequel entities instances seem to be thread safe, so we can 
+        # safely add request-dependant data (eg. req.params) there
+        apply_query_params ? result : result.inactive_query_params
+      end
+      
     end
+    
     class ResultAsEntityColl < ResultDefinition
-      def type_metadata
+    
+      def self.type_metadata
         "Collection(#{@klassmod.type_name})"
       end
-
-      def to_odata_json(result_dataset, req)
+      
+      # wrapper 
+      # for OData Entity Collection return them directly
+      def self.do_execute_func_result(result, req, apply_query_params=false)
         coll = Safrano::OData::Collection.new(@klassmod)
+        # instance_exec has other instance variables; @values would be nil in the block below
+        # need to pass a local copy
+        dtset = result
         coll.instance_exec do
-          @params = req.params
-          initialize_dataset(result_dataset)
+
+          @params =  apply_query_params ?  req.params : EMPTY_HASH
+          initialize_dataset(dtset)
+          initialize_uparms
         end
-        coll.to_odata_json(request: req)
+        coll
       end
+
     end
+    
     class ResultAsPrimitiveType < ResultDefinition
-      def to_odata_json(result, _req)
+      def self.type_metadata
+        @klassmod.type_name
+      end
+
+      def to_odata_json(_req)
         { D => { METAK => { TYPEK => type_metadata },
-                 VALUEK => @klassmod.odata_value(result) } }.to_json
+                 VALUEK => self.class.klassmod.odata_value(@value) } }.to_json
       end
     end
+    
     class ResultAsPrimitiveTypeColl < ResultDefinition
-      def type_metadata
+      def self.type_metadata
         "Collection(#{@klassmod.type_name})"
       end
 
-      def to_odata_json(result, _req)
-        { D => { METAK => { TYPEK => type_metadata },
-                 RESULTSK => @klassmod.odata_collection(result) } }.to_json
+      def to_odata_json(_req)
+        { D => { METAK => { TYPEK => self.class.type_metadata },
+                 RESULTSK => self.class.klassmod.odata_collection(@value) } }.to_json
       end
+    
     end
   end
 
@@ -80,7 +188,8 @@ module Safrano
   # with added OData functionality
   class ComplexType
     attr_reader :values
-
+    EMPTYH = {}.freeze
+    
     @namespace = nil
     def self.namespace
       @namespace
@@ -89,9 +198,41 @@ module Safrano
     def self.props
       @props
     end
-
+    
+    def type_name
+      self.class.type_name
+    end
+    
+    def metadata_h
+      {   type: type_name }
+    end
+    
+    def casted_values
+      # MVP... TODO: handle time mappings like in Entity models
+      values
+    end
+    
+    # needed for nested json output
+    # this is a simpler version of model_ext#output_template
+    def self.default_template
+      template = {}
+      expand_e = {}
+      
+      template[:all_values] = EMPTYH
+      @props.each { |prop, kl| 
+        if kl.respond_to? :default_template
+          expand_e[prop] = kl.default_template
+        end
+      }
+      template[:expand_e] = expand_e
+      template
+    end
+    
+    def self.output_template
+      default_template
+    end
     def self.type_name
-      "#{@namespace}.#{self.to_s}"
+      @namespace ? "#{@namespace}.#{self.to_s}" : self.to_s
     end
 
     def initialize
@@ -102,6 +243,7 @@ module Safrano
 
     def odata_h
       ret = { METAK => { TYPEK => self.class.type_name } }
+
       @values.each { |k, v|
         ret[k] = if v.respond_to? :odata_h
                    v.odata_h
@@ -113,11 +255,11 @@ module Safrano
     end
 
     def self.return_as_collection_descriptor
-      FunctionImport::ResultAsComplexTypeColl.new(self)
+      FunctionImport::ResultDefinition.asComplexTypeColl(self)
     end
 
     def self.return_as_instance_descriptor
-      FunctionImport::ResultAsComplexType.new(self)
+      FunctionImport::ResultDefinition.asComplexType(self)
     end
 
     # add metadata xml to the passed REXML schema object

data/lib/odata/edm/primitive_types.rb

@@ -20,13 +20,15 @@ module Safrano
   # cf. Sequel Database column_schema_default_to_ruby_value
   #                     schema_column_type
   # https://www.odata.org/documentation/odata-version-2-0/overview/
-  def self.default_edm_type(ruby_type:)
+  def self.default_edm_type(ruby_type:, db_type: )
     case ruby_type
     when :integer
       'Edm.Int32'
     when :string
       'Edm.String'
-    when :date, :datetime,
+    when :date
+      'Edm.DateTime'
+    when :datetime
       'Edm.DateTime'
     when :time
       'Edm.Time'
@@ -38,6 +40,10 @@ module Safrano
       'Edm.Decimal'
     when :blob
       'Edm.Binary'
+    else  # try with db_type:
+      if ( db_type =~ /\ANUMERIC/ )
+        'Edm.Decimal'
+      end
     end
   end
 

data/lib/odata/entity.rb

@@ -112,10 +112,11 @@ module Safrano
       selvals
     end
 
-    # post paylod expects the new entity in an array
-    def to_odata_post_json(service:)
-      innerj = service.get_coll_odata_h(array: [self],
-                                        template: self.class.default_template).to_json
+    # some clients wrongly expect post payload with the new entity in an array
+    # TODO quirks array mode !
+    def to_odata_array_json(request:)
+      innerj = request.service.get_coll_odata_h(array: [self],
+                                                template: self.class.default_template).to_json
       "#{DJ_OPEN}#{innerj}#{DJ_CLOSE}"
     end
 
@@ -124,7 +125,7 @@ module Safrano
     end
 
     def copy_request_infos(req)
-      @params = req.params
+      @params = @inactive_query_params ? EMPTY_HASH : req.params
       @do_links = req.walker.do_links
       @uparms = UrlParameters4Single.new(self, @params)
     end
@@ -150,7 +151,11 @@ module Safrano
       @uparms.check_all.tap_valid { return odata_get_output(req) }
              .tap_error { |e| return e.odata_get(req) }
     end
-
+    def inactive_query_params
+      @inactive_query_params = true
+      self # chaining
+    end
+    
     DELETE_REL_AND_ENTY = lambda do |entity, assoc, parent|
       Safrano.remove_nav_relation(assoc, parent)
       entity.destroy(transaction: false)
@@ -263,6 +268,7 @@ module Safrano
       ret
     end
   end
+
   # end of module SafranoEntity
   module Entity
     include EntityBase
@@ -305,7 +311,7 @@ module Safrano
   end
 
   module MappingBeforeOutput
-    # needed for proper datetime output
+    # needed for proper datetime or Decimal output
     def casted_values(cols = nil)
       vals = case cols
              when nil
@@ -316,6 +322,10 @@ module Safrano
              else
                selected_values_for_odata(cols)
              end
+      # TODO better design (perf/ do more during startup and less during request runtime )    
+      # TODO replace the quick and dirty BigDecimal hack with something better      
+      self.class.decimal_cols.each { |dc| vals[dc] = BigDecimal(vals[dc].to_s).to_s('F') if vals.key?(dc) }
+             
       self.class.time_cols.each { |tc| vals[tc] = vals[tc]&.iso8601 if vals.key?(tc) }
       vals
     end
@@ -438,5 +448,22 @@ module Safrano
       pk_hash.values
     end
   end
-end
-# end of Module OData
+
+  module EntityCreateStandardOutput
+    # Json formatter for a create  entity POST call / Standard version; return as json object
+    def to_odata_create_json(request:)
+      # TODO Perf: reduce method call overhead
+      # we added this redirection for readability and flexibility
+      to_odata_json(request: request)
+    end
+  end
+
+  module EntityCreateArrayOutput
+    # Json formatter for a create  entity POST call Array version
+    def to_odata_create_json(request:)
+      # TODO Perf: reduce method call overhead
+      # we added this redirection for readability and flexibility
+      to_odata_array_json(request: request)
+    end
+  end
+end # end of Module OData

data/lib/odata/error.rb

@@ -114,6 +114,18 @@ module Safrano
     end
   end
 
+  # http Unprocessable Entity for example when trying to
+  # upload duplicated media ressource
+  class UnprocessableEntityError
+    extend  ErrorClass
+    include ErrorInstance
+    HTTP_CODE = 422
+    @msg = 'Unprocessable Entity'
+    def initialize(reason)
+      @msg = reason
+    end
+  end
+
   # http Bad Req.
   class BadRequestError
     extend  ErrorClass
@@ -125,6 +137,13 @@ module Safrano
     end
   end
 
+  # for upload empty media
+  class BadRequestEmptyMediaUpload < BadRequestError
+    include ErrorInstance
+    def initialize(path)
+      @msg = "Bad Request: empty media file #{path}"
+    end
+  end
   # Generic failed changeset
   class BadRequestFailedChangeSet < BadRequestError
     @msg = 'Bad Request: Failed changeset '

data/lib/odata/function_import.rb

@@ -21,7 +21,7 @@ module Safrano
       end
 
       def allowed_transitions
-        [Safrano::TransitionEnd]
+        [Safrano::TransitionExecuteFunc]
       end
 
       def input(**parmtypes)
@@ -42,7 +42,13 @@ module Safrano
         end
         self
       end
-
+      
+      def auto_query_parameters
+        @auto_query_params = true
+        self   # chaining
+      end
+      alias auto_query_params auto_query_parameters 
+      
       def return(klassmod, &proc)
         raise('Please provide a code block') unless block_given?
 
@@ -51,7 +57,7 @@ module Safrano
                      else
                        # if it's neither a ComplexType nor a Model-Entity
                        # --> assume it is a Primitive
-                       ResultAsPrimitiveType.new(klassmod)
+                       ResultDefinition.asPrimitiveType(klassmod)
                      end
         @proc = proc
         self
@@ -65,7 +71,8 @@ module Safrano
                      else
                        # if it's neither a ComplexType nor a Modle-Entity
                        # --> assume it is a Primitive
-                       ResultAsPrimitiveTypeColl.new(klassmod)
+#                       ResultAsPrimitiveTypeColl.new(klassmod)
+                       ResultDefinition.asPrimitiveTypeColl(klassmod)
                      end
         @proc = proc
         self
@@ -135,33 +142,25 @@ module Safrano
         end if @input
         funky
       end
-
-      def with_validated_get(req)
+      
+      def with_transition_validated(req)
         #        initialize_params
+        @params = req.params
         return yield unless (@error = check_url_func_params)
 
-        @error.odata_get(req) if @error
-      end
-
-      def to_odata_json(req)
-        result = @proc.call(**@funcparams)
-        @returning.to_odata_json(result, req)
+        [nil, :error, @error] if @error
       end
-
-      def odata_get_output(req)
-        [200, EMPTY_HASH, [to_odata_json(req)]]
-      end
-
-      def odata_get(req)
-        @params = req.params
-
-        with_validated_get(req) do
-          odata_get_output(req)
+      
+     
+      def do_execute_func(req)
+        with_transition_validated(req) do
+          result = @proc.call(**@funcparams)
+          [@returning.do_execute_func_result(result, req, @auto_query_params), :run]
         end
       end
-
-      def transition_end(_match_result)
-        Transition::RESULT_END
+    
+      def transition_execute_func(_match_result)
+        [self, :run_with_execute_func]
       end
     end
   end

data/lib/odata/model_ext.rb

@@ -6,6 +6,7 @@
 
 require 'json'
 require 'rexml/document'
+require 'bigdecimal'
 require_relative '../safrano/core'
 require_relative 'error'
 require_relative 'collection_filter'
@@ -32,6 +33,7 @@ module Safrano
     attr_reader :uri
     attr_reader :odata_upk_parts
     attr_reader :time_cols
+    attr_reader :decimal_cols
     attr_reader :namespace
 
     # initialising block of code to be executed at end of
@@ -73,7 +75,7 @@ module Safrano
       @uparms = nil
       @params = nil
       @cx = nil
-      @@time_cols = nil
+#      @@time_cols = nil
     end
 
     def build_uri(uribase)
@@ -81,11 +83,11 @@ module Safrano
     end
 
     def return_as_collection_descriptor
-      Safrano::FunctionImport::ResultAsEntityColl.new(self)
+      Safrano::FunctionImport::ResultDefinition.asEntityColl(self)
     end
 
     def return_as_instance_descriptor
-      Safrano::FunctionImport::ResultAsEntity.new(self)
+      Safrano::FunctionImport::ResultDefinition.asEntity(self)
     end
 
     def execute_deferred_iblock
@@ -94,8 +96,10 @@ module Safrano
 
     # Factory json-> Model Object instance
     def new_from_hson_h(hash)
-      enty = new
-      enty.set_fields(hash, data_fields, missing: :skip)
+      #enty = new
+      #enty.set_fields(hash, data_fields, missing: :skip)
+      enty = create(hash)
+      #enty.set(hash)
       enty
     end
 
@@ -356,11 +360,16 @@ module Safrano
       # Time columns
       @time_cols = db_schema.select { |_c, v| v[:type] == :datetime }.map { |c, _v| c }
 
+      
+
       # add edm_types into schema
       db_schema.each do |_col, props|
-        props[:odata_edm_type] = Safrano.default_edm_type(ruby_type: props[:type])
+        props[:odata_edm_type] = Safrano.default_edm_type(ruby_type: props[:type],
+                                                          db_type: props[:db_type])
       end
-
+      # Edm.Decimal cols
+      @decimal_cols = db_schema.select { |_c, v| v[:odata_edm_type] == 'Edm.Decimal' }.map { |c, _v| c }
+      
       # and finally build the path lists and allowed tr's
       build_attribute_path_list
       build_expand_path_list
@@ -627,7 +636,9 @@ module Safrano
           req.register_content_id_ref(new_entity)
           new_entity.copy_request_infos(req)
           # json is default content type so we dont need to specify it here again
-          [201, EMPTY_HASH, new_entity.to_odata_post_json(service: req.service)]
+          # TODO quirks array mode !
+          # [201, EMPTY_HASH, new_entity.to_odata_post_json(service: req.service)]
+          [201, EMPTY_HASH, new_entity.to_odata_create_json(request: req)]
         else # TODO: other formats
           415
         end

data/lib/odata/transition.rb

@@ -6,7 +6,7 @@ require_relative 'error'
 module Safrano
   # represents a state transition when navigating/parsing the url path
   # from left to right
-  class Transition < Regexp
+  class Transition 
     attr_accessor :trans
     attr_accessor :match_result
     attr_accessor :rgx
@@ -52,8 +52,28 @@ module Safrano
       ctx.method(@trans).call(@match_result)
     end
   end
-
+    
+  #Transition that does not move/change the input 
+  class InplaceTransition < Transition 
+    def initialize(trans: )
+      @trans = trans
+    end
+    def do_match(str)
+      @str = str
+    end
+    def path_remain
+      @str 
+    end
+    def path_done
+      EMPTYSTR
+    end
+    def do_transition(ctx)
+      ctx.method(@trans).call(@str)
+    end
+  end
+     
   TransitionEnd = Transition.new('\A(\/?)\z', trans: 'transition_end')
+  TransitionExecuteFunc = InplaceTransition.new(trans: 'transition_execute_func')
   TransitionMetadata = Transition.new('\A(\/\$metadata)(.*)',
                                       trans: 'transition_metadata')
   TransitionBatch = Transition.new('\A(\/\$batch)(.*)',

data/lib/odata/walker.rb

@@ -29,18 +29,24 @@ module Safrano
 
     # are $links requested ?
     attr_reader :do_links
+    
+    attr_reader :request 
 
     NIL_SERVICE_FATAL = 'Walker is called with a nil service'
     EMPTYSTR = ''
     SLASH = '/'
 
-    def initialize(service, path, content_id_refs = nil)
+    def initialize(service, path, request, content_id_refs = nil )
       raise NIL_SERVICE_FATAL unless service
 
       path = URI.decode_www_form_component(path)
       @context = service
       @content_id_refs = content_id_refs
-
+      
+      # needed because for function import we need access to the url parameters (req.params)
+      # who contains the functions params
+      @request = request
+      
       @contexts = [@context]
 
       @path_start = @path_remain = if service
@@ -109,6 +115,16 @@ module Safrano
       end
     end
 
+    # execute function import with request parameters 
+    # input: @context containt the function to exectute,
+    #        @request.params should normally contain the params
+    # result: validate the params for the given function, execute the function and 
+    #          return it's result back into @context,
+    #          and finaly set status :end   (or error if anyting went wrong )
+    def do_run_with_execute_func
+      @context, @status, @error = @context.do_execute_func(@request)
+    end
+   
     # little hacks... depending on returned state, set some attributes
     def state_mappings
       case @status
@@ -137,6 +153,8 @@ module Safrano
         # entity reference here and place it in @context
       when :run_with_content_id
         do_run_with_content_id
+      when :run_with_execute_func
+        do_run_with_execute_func
       end
 
       @contexts << @context

data/lib/safrano/contract.rb

@@ -62,6 +62,8 @@ module Safrano
     # All tap_valid* handlers are executed
     #     tap_error* handlers are not executed
     class Valid
+      attr_reader :result
+
       def initialize(result)
         @result = result
       end
@@ -100,10 +102,6 @@ module Safrano
       def error
         nil
       end
-
-      def result
-        @result
-      end
     end # class Valid
 
     def self.valid(result)

data/lib/safrano/multipart.rb

@@ -4,7 +4,7 @@ CRLF = "\r\n"
 LF = "\n"
 
 require 'securerandom'
-require 'webrick/httpstatus'
+require 'rack/utils'
 
 # Simple multipart support for OData $batch purpose
 module MIME
@@ -457,7 +457,7 @@ module MIME
                                "Content-Transfer-Encoding: binary#{CRLF}",
                                'HTTP/1.1 '].join(CRLF).freeze
 
-        StatusMessage = ::WEBrick::HTTPStatus::StatusMessage.freeze
+        StatusMessage = ::Rack::Utils::HTTP_STATUS_CODES.freeze
 
         def initialize
           @hd = {}

data/lib/safrano/request.rb

@@ -99,6 +99,7 @@ module Safrano
     def create_odata_walker
       @env['safrano.walker'] = @walker = Walker.new(@service,
                                                     path_info,
+                                                    self,
                                                     @content_id_references)
     end
 

data/lib/safrano/service.rb

@@ -112,7 +112,7 @@ module Safrano
     include Safrano
     include ExpandHandler
 
-    XML_PREAMBLE = %Q(<?xml version="1.0" encoding="utf-8" standalone="yes"?>\r\n)
+    XML_PREAMBLE = %(<?xml version="1.0" encoding="utf-8" standalone="yes"?>\r\n)
 
     # This is just a hash of entity Set Names to the corresponding Class
     # Example
@@ -137,6 +137,7 @@ module Safrano
     attr_accessor :relman
     attr_accessor :complex_types
     attr_accessor :function_imports
+    attr_accessor :function_import_keys
 
     # Instance attributes for specialized Version specific Instances
     attr_accessor :v1
@@ -155,6 +156,7 @@ module Safrano
       @relman = Safrano::RelationManager.new
       @complex_types = Set.new
       @function_imports = {}
+      @function_import_keys = []
       @cmap = {}
       instance_eval(&block) if block_given?
     end
@@ -204,6 +206,12 @@ module Safrano
       (@v2.xserver_url = @xserver_url) if @v2
     end
 
+    # keep the bug active for now, but allow to activate the fix,
+    # later we will change the default to be fixed
+    def bugfix_create_response(bool = false)
+      @bugfix_create_response = bool
+    end
+
     # end public API
 
     def set_uribase
@@ -233,6 +241,7 @@ module Safrano
       other.batch_handler = @batch_handler
       other.complex_types = @complex_types
       other.function_imports = @function_imports
+      other.function_import_keys = @function_import_keys
       other
     end
 
@@ -316,6 +325,8 @@ module Safrano
     def function_import(name)
       funcimp = Safrano::FunctionImport(name)
       @function_imports[name] = funcimp
+      @function_import_keys << name
+      set_funcimports_sorted
       funcimp
     end
 
@@ -332,7 +343,11 @@ module Safrano
       @collections.sort_by! { |klass| klass.entity_set_name.size }.reverse! if @collections
       @collections
     end
-
+    
+    # need to be sorted by size too
+    def set_funcimports_sorted
+      @function_import_keys.sort_by!{|k| k.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
     # for validation of $orderby or $filter params
@@ -360,7 +375,11 @@ module Safrano
       # finalize the uri's and include NoMappingBeforeOutput or MappingBeforeOutput as needed
       @collections.each do |klass|
         klass.build_uri(@uribase)
-        klass.include(klass.time_cols.empty? ? Safrano::NoMappingBeforeOutput : Safrano::MappingBeforeOutput)
+        # TODO perf 
+        klass.include( (klass.time_cols.empty? && klass.decimal_cols.empty?) ? Safrano::NoMappingBeforeOutput : Safrano::MappingBeforeOutput)
+
+        # Output create (POST) as single entity (Standard) or as array (non-standard buggy)
+        klass.include ( @bugfix_create_response ? Safrano::EntityCreateStandardOutput : Safrano::EntityCreateArrayOutput)
       end
 
       # build allowed transitions (requires that @collections are filled and sorted for having a
@@ -392,7 +411,7 @@ module Safrano
     end
 
     def base_url_func_regexp
-      @function_imports.keys.join('|')
+      @function_import_keys.join('|')
     end
 
     def service
@@ -486,7 +505,9 @@ module Safrano
       doc.add_element('edmx:Edmx', 'Version' => '1.0')
       doc.root.add_namespace('xmlns:edmx', XMLNS::MSFT_ADO_2007_EDMX)
       serv = doc.root.add_element('edmx:DataServices',
-                                  'm:DataServiceVersion' => '1.0')
+      # TODO: export the real version (result from version negotions)
+      # but currently we support only v1 and v2, and most users will use v2
+                                  'm:DataServiceVersion' => '2.0')
       # 'm:DataServiceVersion' => "#{self.dataServiceVersion}" )
       # DataServiceVersion: This attribute MUST be in the data service
       # metadata namespace

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.3
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.51'
-description: Safrano is an OData server library based on Ruby, Rack and Sequel.
+description: Safrano is an OData server library based on Ruby Sequel and Rack.
 email: dev@aithscel.eu
 executables: []
 extensions: []
@@ -189,8 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
-summary: Safrano is a Ruby OData server library based on Sequel and Rack
+summary: Safrano is an OData server library based on Ruby Sequel and Rack
 test_files: []