safrano 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb0478a7adf2f62f2530ede1bfe1ebee5b0261379a71d4aec54f3007094429f
-  data.tar.gz: 95a5adbb64d6311d30dad9e4c6c5a2b5a54c4ab0dd788c00743d36a4dbee5cd4
+  metadata.gz: 33ec32a310f05cb4118e15152f2209aec1551d6363af29eddae28b92d4abf79d
+  data.tar.gz: 78d6e4c243fc124280ddfc352f0e9376aae269c016bd57b9d9693caff0c7e5c2
 SHA512:
-  metadata.gz: aa50d7338736540e2ef60a2cded37b2993b8a485d4f760c7f06ddf0ff26ba4cbbf1aaaca6a618f6812c6c85cd8ac05f8d93b514799f311997639e1025e7c4da1
-  data.tar.gz: 967000423228b25f80f070b53ccc2aafdad2e96ab3f6c96bfe17d6845e5d7bfef412dd3c5cd81a7b46c419769a3d0f743e2a74d1e656af983a4ad372e95c05f8
+  metadata.gz: 4344b9959b281e77d830fabf9d812655a50c9560258a5cca3a3364c4569efb10beee34bc7bf0f2fa1b86561fcdff499e40cb3e5a8d819a4b94013870b9a57e91
+  data.tar.gz: e0027ac6315f9b7ee8e1b948de9c5f1236b01f79638ef3ddcc8adad3a1972091ba5ce52f5bea060ad673581b38a7d00cb4a24ed6aa295c92558e228aabde775f

data/lib/core_ext/Date/format.rb

@@ -39,6 +39,10 @@ module Safrano
         def to_edm_json
           # no offset
           # --> %Q milliseconds since epoch
+          # Formatting: look at
+          # https://services.odata.org/V2/Northwind/Northwind.svc/Employees?$format=json
+          # the json raw data is like this :   "HireDate": "\/Date(704678400000)\/"
+          # --> \/\/
           strftime('/Date(%Q)/')
         end
       end

data/lib/core_ext/DateTime/format.rb

@@ -36,6 +36,11 @@ module Safrano
         #                      <ticks> = number of milliseconds since midnight Jan 1, 1970
         #                      <offset> = number of minutes to add or subtract
         # https://stackoverflow.com/questions/10286204/what-is-the-right-json-date-format/10286228#10286228
+
+        # Formatting: look at
+        # https://services.odata.org/V2/Northwind/Northwind.svc/Employees?$format=json
+        # the json raw data is like this :   "HireDate": "\/Date(704678400000)\/"
+        # --> \/\/
         def to_edm_json
           if offset.zero?
             # no offset

data/lib/core_ext/Time/format.rb

@@ -51,6 +51,11 @@ module Safrano
         # https://docs.microsoft.com/de-de/dotnet/standard/datetime/system-text-json-support
         # https://docs.microsoft.com/en-us/dotnet/framework/wcf/feature-details/stand-alone-json-serialization#datestimes-and-json
         # https://blogs.sap.com/2017/01/05/date-and-time-in-sap-gateway-foundation/
+
+        # Formatting: look at
+        # https://services.odata.org/V2/Northwind/Northwind.svc/Employees?$format=json
+        # the json raw data is like this :   "HireDate": "\/Date(704678400000)\/"
+        # --> \/\/
         def to_edm_json
           if utc? || (gmt_offset == 0)
             # no offset

data/lib/odata/edm/primitive_types.rb

@@ -25,6 +25,7 @@ module Safrano
   # 4	55
   # 5	,2
   # 6	2
+  DB_TYPE_GUID_RGX = /\A\s*(uuid)\s*\z/i.freeze
 
   DB_TYPE_FLOATP_RGX = /\A\s*(FLOAT)\s*(\(\s*(\d+)\s*\))?\s*\z/i.freeze
 
@@ -96,6 +97,13 @@ module Safrano
                           end
     return if metadata[:edm_type]
 
+    # try Guid with db_type:
+
+    metadata[:edm_type] = if (DB_TYPE_GUID_RGX.match(props[:db_type]))
+                            'Edm.Guid'
+                          end
+    return if metadata[:edm_type]
+
     # try with Sequel(ruby) type
     metadata[:edm_type] = case props[:type]
                           when :integer
@@ -157,6 +165,7 @@ module Safrano
         extend OutputClassMethods
 
         def self.convert_from_urlparam(v)
+          # TODO this should use base64
           Contract.valid(v.dup.force_encoding('BINARY'))
         end
       end
@@ -247,6 +256,18 @@ module Safrano
           Contract::NOK
         end
       end
+
+      class Guid < UUIDTools::UUID
+        extend OutputClassMethods
+
+        def self.convert_from_urlparam(v)
+          Contract::NOK unless m = Filter::Parser::Token::GUIDRGX.match(v)
+
+          Contract.valid(UUIDTools::UUID.parse m[1])
+        rescue StandardError
+          Contract::NOK
+        end
+      end
     end
   end
 end

data/lib/odata/entity.rb

@@ -380,9 +380,20 @@ module Safrano
     end
   end
 
-  # for a single public key
-  module EntitySinglePK
-    include Entity
+  module PKUriWithFunc
+    def pk_uri
+      self.class.pk_castfunc.call(pk)
+    end
+
+    def media_path_id
+      pk_uri.to_s
+    end
+
+    def media_path_ids
+      [pk_uri]
+    end
+  end
+  module PKUriWithoutFunc
     def pk_uri
       pk
     end
@@ -395,6 +406,11 @@ module Safrano
       [pk]
     end
   end
+  # for a single public key
+  module EntitySinglePK
+    include Entity
+    # PKUriWithoutFunc or PKUriWithFunc will be included on startup
+  end
 
   # for multiple key
   module EntityMultiPK
@@ -419,7 +435,6 @@ module Safrano
   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
@@ -428,7 +443,6 @@ module Safrano
   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

data/lib/odata/filter/base.rb

@@ -79,5 +79,9 @@ module Safrano
     end
     class DateTimeOffsetLit < Leave
     end
+
+    # Edm Guid 16 bytes
+    class Guid16 < Leave
+    end
   end
 end

data/lib/odata/filter/parse.rb

@@ -174,6 +174,11 @@ module Safrano
               @cursor.update_state(tok, typ)
               grow_at_cursor(FPNumber.new(tok))
             end
+          when :GuidLit
+            with_accepted(tok, typ) do
+              @cursor.update_state(tok, typ)
+              grow_at_cursor(Guid16.new(tok))
+            end
           when :DecimalLit
             with_accepted(tok, typ) do
               @cursor.update_state(tok, typ)

data/lib/odata/filter/token.rb

@@ -15,65 +15,65 @@ module Safrano
         BINOBOOL = '[eE][qQ]|[LlgGNn][eETt]|[aA][nN][dD]|[oO][rR]'
         BINOARITHM = '[aA][dD][dD]|[sS][uU][bB]|[mM][uU][lL]|[dD][iI][vV]|[mM][oO][dD]'
         NOTRGX = 'not|NOT|Not'
-        FPRGX = '\d+(?:\.\d+)?(?:e[+-]?\d+)?[df]?'
-        DECIMALRGX = '\d+(?:\.\d+)[mM]'
+        FPRGX = '(\d+(?:\.\d+)?(?:e[+-]?\d+)?)[df]?'
+        DECIMALRGX = '(\d+(?:\.\d+))[mM]'
         QUALITRGX = '\w+(?:\/\w+)+'
         # datetime'yyyy-mm-ddThh:mm[:ss[.fffffff]]' NOTE: Spaces are not allowed between datetime and quoted portion.
         # datetime is case-insensitive
         DATIRGX = '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?:\:\d{2})?(?:\.\d{1,7})?'
-        DATETIMERGX = /datetime'#{DATIRGX}[zZ]?'/i.freeze
-        DATIOFFRGX = /datetimeoffset'#{DATIRGX}(?:[zZ]|[+-]\d{2}:\d{2})'/.freeze
-
-        RGX = /(#{FUNCRGX})|(#{NULLRGX})|([(),])|(#{BINOBOOL})\s+|(#{BINOARITHM})|(#{NOTRGX})|#{QSTRINGRGX}|(#{DECIMALRGX})|(#{FPRGX})|(#{QUALITRGX})|(#{DATETIMERGX})|(#{DATIOFFRGX})|(\w+)|(')/.freeze
+        DATETIMERGX = /datetime'(#{DATIRGX}[zZ]?)'/i.freeze
+        DATIOFFRGX = /datetimeoffset'(#{DATIRGX}(?:[zZ]|[+-]\d{2}:\d{2}))'/i.freeze
+        GUIDRGX = /guid'([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})'/i.freeze
+        RGX = /(#{FUNCRGX})|(#{NULLRGX})|([(),])|(#{BINOBOOL})\s+|(#{BINOARITHM})|(#{NOTRGX})|#{QSTRINGRGX}|#{DECIMALRGX}|#{FPRGX}|(#{QUALITRGX})|#{DATETIMERGX}|#{DATIOFFRGX}|#{GUIDRGX}|(\w+)|(')/.freeze
 
         def each_typed_token(inp)
           typ = nil
 
           inp.scan(RGX) do |groups|
-            idx = nil
-            found = nil
             groups.each_with_index do |tok, i|
-              if (found = tok)
-                idx = i
+              if tok
+
+                typ = case i
+                      when 0
+                        :FuncTree
+                      when 1
+                        :NullLiteral
+                      when 2
+                        case tok
+                        when '(', ')'
+                          :Delimiter
+                        when ','
+                          :Separator
+                        end
+                      when 3
+                        :BinopBool
+                      when 4
+                        :BinopArithm
+                      when 5
+                        :UnopTree
+                      when 6
+                        :QString
+                      when 7
+                        :DecimalLit
+                      when 8
+                        :FPNumber
+                      when 9
+                        :Qualit
+                      when 10
+                        :DateTimeLit
+                      when 11
+                        :DateTimeOffsetLit
+                      when 12
+                        :GuidLit
+                      when 13
+                        :Literal
+                      when 14
+                        :unmatchedQuote
+                end
+                yield tok, typ
                 break
               end
             end
-            typ = case idx
-                  when 0
-                    :FuncTree
-                  when 1
-                    :NullLiteral
-                  when 2
-                    case found
-                    when '(', ')'
-                      :Delimiter
-                    when ','
-                      :Separator
-                    end
-                  when 3
-                    :BinopBool
-                  when 4
-                    :BinopArithm
-                  when 5
-                    :UnopTree
-                  when 6
-                    :QString
-                  when 7
-                    :DecimalLit
-                  when 8
-                    :FPNumber
-                  when 9
-                    :Qualit
-                  when 10
-                    :DateTimeLit
-                  when 11
-                    :DateTimeOffsetLit
-                  when 12
-                    :Literal
-                  when 13
-                    :unmatchedQuote
-                  end
-            yield found, typ
           end
         end
       end

data/lib/odata/filter/tree.rb

@@ -71,7 +71,7 @@ module Safrano
       def accept?(tok, typ)
         case typ
         when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :ArgTree,
-             :UnopTree, :FPNumber, :DecimalLit, :DateTimeLit, :DateTimeOffsetLit
+             :UnopTree, :FPNumber, :DecimalLit, :DateTimeLit, :DateTimeOffsetLit, :GuidLit
           nil
         when :Delimiter
           if tok == '('
@@ -238,7 +238,7 @@ module Safrano
       def update_state(_tok, typ)
         case typ
         when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :BinopBool, :BinopArithm,
-            :UnopTree, :FPNumber, :DecimalLit, :DateTimeLit, :DateTimeOffsetLit
+            :UnopTree, :FPNumber, :DecimalLit, :DateTimeLit, :DateTimeOffsetLit, :GuidLit
           @state = :closed
         end
       end
@@ -304,7 +304,7 @@ module Safrano
         when :Separator
           @state =  :sep
         when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber, :DecimalLit,
-             :DateTimeLit, :DateTimeOffsetLit
+             :DateTimeLit, :DateTimeOffsetLit, :GuidLit
           @state =  :val
         end
       end
@@ -335,7 +335,7 @@ module Safrano
             Parser::ErrorInvalidToken.new(tok, typ, self)
           end
         when :Literal, :NullLiteral, :Qualit, :QString, :FuncTree, :FPNumber, :DecimalLit,
-             :DateTimeLit, :DateTimeOffsetLit
+             :DateTimeLit, :DateTimeOffsetLit, :GuidLit
           if (@state == :open) || (@state == :sep)
             Parser::ErrorInvalidArity.new(tok, typ, self) if @parent.arity_full?(@children.size)
           else
@@ -359,7 +359,9 @@ module Safrano
         # 1.53f --> value 1.53
         # 1.53d --> value 1.53
         # 1.53 --> value 1.53
-        val[-1] =~ /[fd]/i ? super(val[0..-2]) : super(val)
+        # Note: the tokenizer has already dropped the not usefull string parts
+        # Note : we dont differentiate between Float and Double here
+        super(val)
       end
 
       def accept?(tok, typ)
@@ -376,13 +378,31 @@ module Safrano
         :number
       end
     end
+
+    # Edm guid
+    class Guid16
+      def accept?(tok, typ)
+        case typ
+        when :Delimiter, :Separator, :BinopBool, :BinopArithm
+          nil
+        else
+          Parser::ErrorInvalidToken.new(tok, typ, self)
+        end
+      end
+
+      def edm_type
+        :guid
+      end
+    end
+
     class DecimalLit
       def initialize(val)
         # 1.53m --> value 1.53
         # Warning, this assumes that the m|M part in the input is really not optional
+        # Note: the tokenizer has already dropped the not usefull string parts
         # cf. DECIMALRGX in token.rb
 
-        super(val[0..-2])
+        super(val)
       end
 
       def accept?(tok, typ)
@@ -447,7 +467,8 @@ module Safrano
     class DateTimeLit
       def initialize(val)
         # datetime'2000-12-12T12:00:53' --> value 2000-12-12T12:00:53
-        super(val[9..-2])
+        # Note: the tokenizer has already dropped the not usefull string parts
+        super(val)
       end
 
       def accept?(tok, typ)
@@ -467,7 +488,8 @@ module Safrano
     class DateTimeOffsetLit
       def initialize(val)
         # datetimeoffset'2000-12-12T12:00:53+02:00' --> value 2000-12-12T12:00:53+02:00
-        super(val[15..-2])
+        # Note: the tokenizer has already dropped the not usefull string parts
+        super(val)
       end
 
       def accept?(tok, typ)

data/lib/odata/function_import.rb

@@ -36,6 +36,9 @@ module Safrano
                         Safrano::Edm::Edm::Double
                       when 'DateTime'
                         Safrano::Edm::Edm::DateTime
+                      # UUID with uuidtools
+                      when 'UUIDTools::UUID'
+                        Safrano::Edm::Edm::Guid
                       else
                         t
                       end

data/lib/odata/model_ext.rb

@@ -48,6 +48,11 @@ module Safrano
     # typically the block should contain the publication of the associations
     attr_accessor :deferred_iblock
 
+    # allows to override standard types
+    attr_accessor :type_mappings
+
+    attr_accessor :pk_castfunc
+
     # convention: entityType is the namepsaced Ruby Model class --> name is just to_s
     # Warning: for handling Navigation relations, we use anonymous collection classes
     # dynamically subtyped from a Model class, and in such an anonymous class
@@ -73,7 +78,6 @@ module Safrano
     end
 
     def reset
-      # TODO: automatically reset all attributes?
       @deferred_iblock = nil
       @entity_set_name = nil
       @uri = nil
@@ -82,6 +86,8 @@ module Safrano
       @params = nil
       @cx = nil
       @cols_metadata = {}
+      @type_mappings = {}
+      @pk_castfunc = nil
     end
 
     def build_uri(uribase)
@@ -192,6 +198,7 @@ module Safrano
                   #                  'Type' => Safrano.get_edm_type(db_type: prop[:db_type]) }
                   'Type' => metadata[:edm_type] }
         attrs['Nullable'] = 'false' if prop[:allow_null] == false
+        attrs['Precision'] = '0' if metadata[:edm_type] == 'Edm.DateTime'
         enty.add_element('Property', attrs)
       end
       enty
@@ -348,6 +355,13 @@ module Safrano
       @nav_entity_url_regexp = @nav_entity_attribs_keys.join('|')
     end
 
+    # allow to override default type settings on attribute level
+    # for example use Edm.Guid instead of Binary(Blob) or Edm.DateTimeOffset instead of Edm.DateTime
+    def with_attribute(asymb, &proc)
+      am = AttributeTypeMapping.builder(asymb, &proc).type_mapping
+      @type_mappings[asymb] = am
+    end
+
     EMPTYH = {}.freeze
 
     def build_default_template
@@ -359,16 +373,26 @@ module Safrano
       # cols needed catsting before final json output
       @casted_cols = {}
       db_schema.each do |col, props|
-        # first check if we have user-defined type mapping
+        # first check if we have user-defined regexp based global type mapping
         usermap = nil
         dbtyp = props[:db_type]
         metadata = @cols_metadata[col]
         if service.type_mappings.values.find { |map| usermap = map.match(dbtyp) }
 
           metadata[:edm_type] = usermap.edm_type
+          if usermap.castfunc
+            @casted_cols[col] = usermap.castfunc
+            next # this will override our rules below !
+          end
+        end
 
-          @casted_cols[col] = usermap.castfunc
-          next # this will override our rules below !
+        # attribute specific type mapping
+        if colmap = @type_mappings[col]
+          metadata[:edm_type] = colmap.edm_type
+          if colmap.castfunc
+            @casted_cols[col] = colmap.castfunc
+            next # this will override our rules below !
+          end
         end
 
         if metadata[:edm_precision] && (metadata[:edm_type] =~ /\AEdm.Decimal\(/i)
@@ -401,14 +425,30 @@ module Safrano
           @casted_cols[col] = ->(x) { Base64.encode64(x) unless x.nil? } # Base64
           next
         end
+        # Odata V2 Spec:
+        # 	Literal form of Edm.Guid as used in URIs formatted as a JSON string
+        if metadata[:edm_type] == 'Edm.Guid'
+
+          if props[:type] == :blob # Edm.Guid but as 16 byte binary Blob on DB level, eg in Sqlite
+            @casted_cols[col] = ->(x) {
+              UUIDTools::UUID.parse_raw(x).to_s unless x.nil?
+            } # Base64
+            next
+          end
+        end
         # TODO: check this more in details
         # NOTE: here we use :type which is the sequel defined ruby-type
         if props[:type] == :datetime || props[:type] == :date
           #          @casted_cols[col] = ->(x) { x&.iso8601 }
           @casted_cols[col] = ->(x) { x&.to_edm_json }
         end
+      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
-    end
+    end # build_casted_cols(service)
 
     def finalize_publishing(service)
       build_type_name
@@ -417,17 +457,17 @@ module Safrano
       build_default_template
 
       # add edm_types into metadata store
-      @cols_metadata = {}
+
       db_schema.each do |col, props|
         metadata = @cols_metadata.key?(col) ? @cols_metadata[col] : (@cols_metadata[col] = {})
         Safrano.add_edm_types(metadata, props)
       end
 
       build_casted_cols(service)
-      # unless @casted_cols.empty?
-      # require 'pry'
-      # binding.pry
-      # end
+
+      # build pk regexps
+      prepare_pk
+
       # and finally build the path lists and allowed tr's
       build_attribute_path_list
       build_expand_path_list
@@ -440,7 +480,8 @@ module Safrano
       finalize_media if respond_to? :finalize_media
     end
 
-    KEYPRED_URL_REGEXP = /\A\(\s*'?([\w=,'\s]+)'?\s*\)(.*)/.freeze
+    KEYPRED_URL_REGEXP = /\A\(\s*((?:guid)?'?[\w=,\-'\s]+'?)\s*\)(.*)/.freeze
+    GUIDRGX = /guid'([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})'/i.freeze
     def prepare_pk
       if primary_key.is_a? Array
         @pk_names = []
@@ -479,14 +520,30 @@ module Safrano
       else
         @pk_names = [primary_key.to_s]
         @pk_cast_from_string = nil
+
         kvpredicate = case db_schema[primary_key][:type]
                       when :integer
+                        # TODO harmonize this with primitive_types.rb  convert_from_url
                         @pk_cast_from_string = ->(str) { Integer(str) }
-                        '(\\d+)'
+                        /(\d+)/.freeze
                       else
-                        "'(\\w+)'"
+                        metadata = @cols_metadata[primary_key]
+                        case metadata[:edm_type]
+                        when 'Edm.Guid'
+                          if db_schema[primary_key][:type] == :blob # Edm.Guid but as 16byte binary Blob on DB
+                            @pk_cast_from_string = ->(str) {
+                              # TODO harmonize this with primitive_types.rb  convert_from_url
+                              #  Sequel::SQL::Blob.new([ str.gsub('-', '') ].pack('H*')) }
+                              Sequel::SQL::Blob.new(UUIDTools::UUID.parse(str).raw)
+                            }
+                          end
+                          GUIDRGX
+                        else
+                          /'(\w+)'/.freeze
+                        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
     end
@@ -663,7 +720,7 @@ module Safrano
     end
 
     def pk_lookup_expr(id)
-      id
+      { primary_key => id }
     end
   end
 

data/lib/safrano/service.rb

@@ -262,19 +262,19 @@ module Safrano
 
       raise(Safrano::API::ModelNameError, modelklass) unless modelklass.is_a? Sequel::Model::ClassMethods
 
-      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)
+      if modelklass.primary_key.is_a?(Array) # first API call... (normal non-testing case)
         modelklass.extend Safrano::EntityClassMultiPK
         modelklass.include Safrano::EntityMultiPK
       else
+
         modelklass.extend Safrano::EntityClassSinglePK
         modelklass.include Safrano::EntitySinglePK
+
       end
 
+      # initialize state
+      modelklass.reset
+
       # Media/Non-media
       if is_media
         modelklass.extend Safrano::EntityClassMedia
@@ -289,8 +289,12 @@ module Safrano
         modelklass.include Safrano::NonMediaEntity
       end
 
-      modelklass.prepare_pk
+      #      this needs to be done later as it can depend on overrided attribute specific Edm type
+      #      eg. Edm-Guid. --> moved to finalize_publishing
+      #      modelklass.prepare_pk
+
       modelklass.prepare_fields
+
       esname = (entity_set_name || modelklass).to_s.freeze
       serv_namespace = @xnamespace
       modelklass.instance_eval do
@@ -317,13 +321,17 @@ module Safrano
       modelklass.deferred_iblock = block if block_given?
     end
 
+    def copy_namespace_to(klass)
+      serv_namespace = @xnamespace
+      klass.instance_eval { @namespace = serv_namespace }
+    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 }
+      copy_namespace_to(ctklass)
 
       @complex_types.add ctklass
     end
@@ -337,7 +345,7 @@ module Safrano
     end
 
     def with_db_type(*dbtypnams, &proc)
-      m = TypeMapping.builder(*dbtypnams, &proc)
+      m = RgxTypeMapping.builder(*dbtypnams, &proc)
       @type_mappings[m.db_types_rgx] = m
     end
 
@@ -368,6 +376,8 @@ module Safrano
       @cmap = {}
       @collections.each do |klass|
         @cmap[klass.entity_set_name] = klass
+        # set namespace needed to have qualified type name
+        copy_namespace_to(klass)
       end
 
       # now that we know all model klasses we can handle relationships
@@ -405,6 +415,17 @@ module Safrano
             vals
           end
         end
+        # needed for example if the pk is a guid, saved as binary on DB and the DB
+        # does not have a real uuid type but just return binary data...
+        # --> we need to convert the pk similarly as for json output
+        unless klass.primary_key.is_a?(Array) # we do this only for single PK
+          # guid in multi-PK not yet supported
+          if klass.pk_castfunc
+            klass.include Safrano::PKUriWithFunc
+          else
+            klass.include Safrano::PKUriWithoutFunc
+          end
+        end
       end
 
       # build allowed transitions (requires that @collections are filled and sorted for having a

data/lib/safrano/type_mapping.rb

@@ -10,8 +10,45 @@ module Safrano
   # Base class
   class TypeMapping
     attr_reader :castfunc
-    attr_reader :db_types_rgx
     attr_reader :edm_type
+  end
+  # Model attribute (column) specific mapping
+  class AttributeTypeMapping < TypeMapping
+    attr_reader :attr_name
+
+    def initialize(builder)
+      @edm_type = builder.xedm_type
+      @castfunc = builder.castfunc
+    end
+    # wrapper to handle API
+    class Builder
+      attr_reader :xedm_type
+      attr_reader :castfunc
+      attr_reader :attr_name
+
+      def initialize(atnam)
+        @attr_name = atnam
+      end
+
+      def edm_type(input)
+        @xedm_type = input
+      end
+
+      def type_mapping
+        AttributeTypeMapping.new(self)
+      end
+    end
+
+    def self.builder(atnam, &proc)
+      builder = Builder.new(atnam)
+      builder.instance_eval(&proc)
+      builder
+    end
+  end
+
+  # Regexp based Global mapping
+  class RgxTypeMapping < TypeMapping
+    attr_reader :db_types_rgx
 
     # wrapper to handle API
     class Builder
@@ -56,7 +93,7 @@ module Safrano
 
       def type_mapping
         # TODO: perf; return always same object when called multiple times
-        FixedTypeMapping.new(self)
+        RgxFixedTypeMapping.new(self)
       end
     end # Builder
 
@@ -94,7 +131,7 @@ module Safrano
         p1val = @md[1]
         instance_exec p1val, &@proc
 
-        TypeMapping1Par.new(self)
+        RgxTypeMapping1Par.new(self)
       end
     end
     class Builder2Par < Builder
@@ -121,26 +158,26 @@ module Safrano
         p1val = @md[1]
         p2val = @md[2]
         instance_exec p1val, p2val, &@proc
-        TypeMapping2Par.new(self)
+        RgxTypeMapping2Par.new(self)
       end
     end
   end
 
   # Fixed type (ie. without variable parts)
-  class FixedTypeMapping < TypeMapping
+  class RgxFixedTypeMapping < RgxTypeMapping
     def initialize(builder)
       @edm_type = builder.xedm_type
       @castfunc = builder.castfunc
     end
   end
 
-  class TypeMapping1Par < TypeMapping
+  class RgxTypeMapping1Par < RgxTypeMapping
     def initialize(builder)
       @edm_type = builder.xedm_type
       @castfunc = builder.castfunc
     end
   end
-  class TypeMapping2Par < TypeMapping
+  class RgxTypeMapping2Par < RgxTypeMapping
     def initialize(builder)
       @edm_type = builder.xedm_type
       @castfunc = builder.castfunc

data/lib/safrano/version.rb

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

data/lib/safrano.rb

@@ -2,6 +2,7 @@
 
 require 'json'
 require 'rexml/document'
+require 'uuidtools'
 require_relative 'safrano/version'
 require_relative 'safrano/deprecation'
 require_relative 'safrano/core_ext'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,20 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement