safrano 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda061616194242041f7308c791bc5689fabaf0627f6f5090df3141fe5a34d8e
-  data.tar.gz: bec6791bb225330e1e149bf4166012397f9ffce9df2dbe0be3d7b224c5172212
+  metadata.gz: 56284ecd8544233a820d8163c324a4b86df3f87909e529ac993407dad3358132
+  data.tar.gz: 3097012a5e22ccd3cc2b61e8ecc22427c35e8db12a02dfd3c9a819cfc13abd53
 SHA512:
-  metadata.gz: 7aef08bdf67609d7e836b955e478f4b0a8cd67a08fc6caf0c9e9b263bac3d59086a6da59967cdacf5b3bb328060cbb20b9cdbe70e28fcacb5ce464e63eeb7e59
-  data.tar.gz: 2f65e93d591fc18ca7836a17c61250bc181c1d9aff14bd875e2d2f4803406ca76d577c6cd4c0b5f7e468240ac6d63e9389f7367a5b6cba6bfa298c4c5efd5fcd
+  metadata.gz: 23fffb3c40b6264ca8489ded795330c14410419db07fbad0f1fb9781a3ae31668264747df93df8e2d8df45dcdc546d4a6c61cf8d66cee54b7abb7b32e85bef2e
+  data.tar.gz: a4473504fe30c922e3f6803dc608beb5495174ca3f884f4da04de479769a602fdc94df5f45c9a8edad2996146028d1cddacd626d61310b776ced641d32abbbd2

data/lib/odata/model_ext.rb

@@ -142,40 +142,39 @@ module Safrano
       @attribute_path_list = attribute_path_list
     end
 
-    MAX_DEPTH = 4
-    def attribute_path_list(depth = 0)
+    MAX_DEPTH = 6
+    MAX_TYPE_REPETITION = 2
+    def attribute_path_list(depth_path = [])
       ret = @columns_str.dup
       # break circles
-      return ret if depth >= MAX_DEPTH
-
-      depth += 1
+      return ret if depth_path.size > MAX_DEPTH
+      return ret if depth_path.count(self) > MAX_TYPE_REPETITION
 
       @nav_entity_attribs&.each do |a, k|
-        ret.concat(k.attribute_path_list(depth).map { |kc| "#{a}/#{kc}" })
+        ret.concat(k.attribute_path_list(depth_path + [self]).map { |kc| "#{a}/#{kc}" })
       end
 
       @nav_collection_attribs&.each do |a, k|
-        ret.concat(k.attribute_path_list(depth).map { |kc| "#{a}/#{kc}" })
+        ret.concat(k.attribute_path_list(depth_path + [self]).map { |kc| "#{a}/#{kc}" })
       end
       ret
     end
 
-    def expand_path_list(depth = 0)
+    def expand_path_list(depth_path = [])
       ret = []
       ret.concat(@nav_entity_attribs_keys) if @nav_entity_attribs
       ret.concat(@nav_collection_attribs_keys) if @nav_collection_attribs
 
       # break circles
-      return ret if depth >= MAX_DEPTH
-
-      depth += 1
+      return ret if depth_path.size > MAX_DEPTH
+      return ret if depth_path.count(self) > MAX_TYPE_REPETITION
 
       @nav_entity_attribs&.each do |a, k|
-        ret.concat(k.expand_path_list(depth).map { |kc| "#{a}/#{kc}" })
+        ret.concat(k.expand_path_list(depth_path + [self]).map { |kc| "#{a}/#{kc}" })
       end
 
       @nav_collection_attribs&.each do |a, k|
-        ret.concat(k.expand_path_list(depth).map { |kc| "#{a}/#{kc}" })
+        ret.concat(k.expand_path_list(depth_path + [self]).map { |kc| "#{a}/#{kc}" })
       end
       ret
     end
@@ -446,8 +445,20 @@ module Safrano
 
       # check if key needs casting. Important for later entity-uri generation !
       return unless primary_key.is_a? Symbol # single key field
-
-      @pk_castfunc = @casted_cols[primary_key]
+      
+      # guid key as guid'xxx-yyy-zzz'  
+      metadata = @cols_metadata[primary_key]
+      
+      if metadata[:edm_type] == 'Edm.Guid'
+         props = db_schema[primary_key]
+         @pk_castfunc = if props[:type] == :blob # Edm.Guid but as 16 byte binary Blob on DB level, eg in Sqlite
+            lambda { |x| "guid'#{UUIDTools::UUID.parse_raw(x)}'"  unless x.nil?    } 
+         else
+            lambda { |x|  "guid'#{x}'"  unless x.nil?            } 
+         end
+      else
+        @pk_castfunc = @casted_cols[primary_key]
+      end
     end # build_casted_cols(service)
 
     def finalize_publishing(service)

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-02 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -120,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -231,14 +245,14 @@ files:
 - lib/safrano/type_mapping.rb
 - lib/safrano/version.rb
 - lib/sequel/plugins/join_by_paths.rb
-homepage: https://gitlab.com/dm0da/safrano
+homepage: https://safrano.aithscel.eu
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://gitlab.com/dm0da/safrano/issues
   changelog_uri: https://gitlab.com/dm0da/safrano/blob/master/CHANGELOG
   source_code_uri: https://gitlab.com/dm0da/safrano/tree/master
-  wiki_uri: https://gitlab.com/dm0da/safrano/wikis/home
+  documentation_uri: https://gitlab.com/dm0da/safrano/-/blob/master/README.md
 post_install_message: 
 rdoc_options: []
 require_paths: