safrano 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda061616194242041f7308c791bc5689fabaf0627f6f5090df3141fe5a34d8e
-  data.tar.gz: bec6791bb225330e1e149bf4166012397f9ffce9df2dbe0be3d7b224c5172212
+  metadata.gz: 3c19f9f9e0a4700de60c1a177c1555663f50ab02e2e5fb0449e21f3c43751dbc
+  data.tar.gz: 0a56ca92c60b1e1a943f7710f7993c325b8e1e9d20b9df745b87dea954170722
 SHA512:
-  metadata.gz: 7aef08bdf67609d7e836b955e478f4b0a8cd67a08fc6caf0c9e9b263bac3d59086a6da59967cdacf5b3bb328060cbb20b9cdbe70e28fcacb5ce464e63eeb7e59
-  data.tar.gz: 2f65e93d591fc18ca7836a17c61250bc181c1d9aff14bd875e2d2f4803406ca76d577c6cd4c0b5f7e468240ac6d63e9389f7367a5b6cba6bfa298c4c5efd5fcd
+  metadata.gz: 9f273cc9008c3bdab427268c5bf139aeb30093c515611714110da1b3f48d90b86ab40c62e6c96aea6dacc8eb7381793d126850fc8bccab991d89fcf010075647
+  data.tar.gz: 3d1e65f46c4e3fe1765288fb1f06e3f488b708216ce708103945fbf2aa12dd088e7fe6da8e06ebc8c6fa18b6bbd65b67506a5c8a8dde2097f405b57ceaa9d2b4

data/lib/odata/entity.rb

@@ -184,16 +184,9 @@ module Safrano
       if req.walker.media_value
         odata_media_value_put(req)
       elsif req.accept?(APPJSON)
-        data.delete('__metadata')
-
-        if req.in_changeset
-          set_fields(data, self.class.data_fields, missing: :skip)
-          save(transaction: false)
-        else
-          update_fields(data, self.class.data_fields, missing: :skip)
-        end
-
-        [202, EMPTY_HASH, to_odata_post_json(service: req.service)]
+      
+        AlreadyExistsUnprocessableError.odata_get(req)
+        
       else # TODO: other formats
         415
       end

data/lib/odata/error.rb

@@ -142,7 +142,11 @@ module Safrano
       @msg = reason
     end
   end
-
+  
+  class AlreadyExistsUnprocessableError < UnprocessableEntityError
+    @msg = 'The ressource you are trying to create already exists'
+  end
+  
   # http Bad Req.
   class BadRequestError
     extend  ErrorClass

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/rack_app.rb

@@ -8,7 +8,7 @@ require_relative 'response'
 module Safrano
   # Note there is a strong 1 to 1 relation between an app instance
   # and a published service. --> actually means also
-  # we only support on service per App-class because publishing is
+  # we only support one service per App-class because publishing is
   # made on app class level
   class ServerApp
     def initialize
@@ -36,7 +36,12 @@ module Safrano
     def self.get_service_base
       @service_base
     end
-
+    
+    # needed for safrano-rack_builder 
+    def get_path_prefix
+      self.class.get_service_base.xpath_prefix
+    end
+    
     def self.set_servicebase(sbase)
       @service_base = sbase
       @service_base.enable_v1_service

data/lib/safrano/rack_builder.rb

@@ -7,12 +7,73 @@ module Rack
   module Safrano
     # just a Wrapper to ensure (force?) that mandatory middlewares are acutally
     # used
+    LOCALHOST_ANY_PORT_RGX = /\A(?:https?:\/\/)?localhost(?::\d+)?\z/ 
     class Builder < ::Rack::Builder
+      
       def initialize(default_app = nil, &block)
         super(default_app) {}
-        use ::Rack::Cors
+        @middlewares = []
+
         instance_eval(&block) if block_given?
-        use ::Rack::ContentLength
+        prepend_rackcors_ifneeded
+      end
+      
+      def use(middleware, *args, &block)
+        @middlewares << middleware
+        super(middleware, *args, &block)
+      end
+      
+      def prepend_rackcors_ifneeded
+        return if stack_has_rackcors
+        
+        # get the safrano app path prefix
+        # normally @run is a Safrano Server app
+        return unless @run.is_a? ::Safrano::ServerApp
+        
+        
+        service_path_prefix = @run.get_path_prefix.dup
+        
+        # due to a bug in rack-cors 
+        # we cant use the batch ressource path as
+        # a string but need to pass it as a regexp
+        # ( bug fixed in rack-cors git / new release? but still need to workaround it for 
+        # current/old releases ), 
+        batch_path_regexp = if service_path_prefix.empty?   
+          # Ressource /$batch
+          /\A\/\$batch\z/ 
+        else      
+          # Ressource  like  /foo/bar/baz/$batch 
+          service_path_prefix.sub!(::Safrano::TRAILING_SLASH_RGX, '')
+          service_path_prefix.sub!(::Safrano::LEADING_SLASH_RGX, '')
+          # now is  foo/bar/baz 
+          path_prefix_rgx = Regexp.escape("/#{service_path_prefix}/$batch")
+          # now  escaped path regexp /foo/bar/baz/$batch
+          # finaly just add start / end anchors
+          /\A#{path_prefix_rgx}\z/
+        end
+        # this will append rack-cors mw
+        # per default allow GET * from everywhere 
+        #             allow POST $batch from localhost only  
+        use ::Rack::Cors do
+          allow do
+            origins LOCALHOST_ANY_PORT_RGX
+            resource (batch_path_regexp), headers: :any, methods: [:post, :head, :options]
+            resource '*', headers: :any, methods: [:get,  :post, :put, :patch, :head, :options]
+          end     
+          allow do
+            origins '*'
+            resource '*', headers: :any, methods: [:get,  :head, :options]
+          end         
+       
+        end
+        
+        # we need it in first place... move last element to beginin of mw stack
+        rackcors = @use.delete_at(-1)    
+        @use.insert(0, rackcors) 
+      end
+      
+      def stack_has_rackcors
+        @middlewares.find{|mw| mw == Rack::Cors }
       end
     end
   end

data/lib/safrano/request.rb

@@ -7,14 +7,16 @@ module Safrano
   # handle GET PUT etc
   module MethodHandlers
     def odata_options
-      @walker.finalize.tap_error { |err| return err.odata_get(self) }
-             .if_valid do |_context|
-        # cf. stackoverflow.com/questions/22924678/sinatra-delete-response-headers
-        headers.delete('Content-Type')
-        @response.headers.delete('Content-Type')
-        @response.headers['Content-Type'] = ''
-        [200, EMPTY_HASH, '']
-      end
+      # cf. stackoverflow.com/questions/22924678/sinatra-delete-response-headers
+      headers.delete('Content-Type')
+      @response.headers.delete('Content-Type')
+      @response.headers['Content-Type'] = ''
+      
+      # we only let rack-cors handle Cors OPTIONS .
+      # otherwise dont do it...
+      # see https://www.mnot.net/blog/2012/10/29/NO_OPTIONS 
+      # 501 not implemented
+      [501, EMPTY_HASH, '']  
     end
 
     def odata_delete
@@ -39,7 +41,7 @@ module Safrano
 
     def odata_post
       @walker.finalize.tap_error { |err| return err.odata_get(self) }
-             .if_valid { |context| context.odata_post(self) }
+                      .if_valid { |context| context.odata_post(self) }
     end
 
     def odata_head

data/lib/safrano/service.rb

@@ -107,6 +107,8 @@ module Safrano
   MIN_DATASERVICE_VERSION = '1'
   CV_MAX_DATASERVICE_VERSION = Contract.valid(MAX_DATASERVICE_VERSION).freeze
   CV_MIN_DATASERVICE_VERSION = Contract.valid(MIN_DATASERVICE_VERSION).freeze
+  TRAILING_SLASH_RGX = %r{/\z}.freeze
+  LEADING_SLASH_RGX = %r{\A/}.freeze
   include XMLNS
   # Base class for service. Subclass will be for V1, V2 etc...
   class ServiceBase
@@ -166,7 +168,6 @@ module Safrano
       instance_eval(&block) if block_given?
     end
 
-    TRAILING_SLASH = %r{/\z}.freeze
     DEFAULT_PATH_PREFIX = '/'
     DEFAULT_SERVER_URL = 'http://localhost:9494'
 
@@ -200,13 +201,14 @@ module Safrano
     end
 
     def path_prefix(path_pr)
-      @xpath_prefix = path_pr.sub(TRAILING_SLASH, '')
+      @xpath_prefix = path_pr.sub(TRAILING_SLASH_RGX, '')
+      @xpath_prefix.freeze
       (@v1.xpath_prefix = @xpath_prefix) if @v1
       (@v2.xpath_prefix = @xpath_prefix) if @v2
     end
 
     def server_url(surl)
-      @xserver_url = surl.sub(TRAILING_SLASH, '')
+      @xserver_url = surl.sub(TRAILING_SLASH_RGX, '')
       (@v1.xserver_url = @xserver_url) if @v1
       (@v2.xserver_url = @xserver_url) if @v2
     end

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - oz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-02 00:00:00.000000000 Z
+date: 2023-10-30 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,15 +245,15 @@ 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
-post_install_message: 
+  documentation_uri: https://gitlab.com/dm0da/safrano/-/blob/master/README.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -254,8 +268,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Safrano is an OData server library
 test_files: []