safrano 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56284ecd8544233a820d8163c324a4b86df3f87909e529ac993407dad3358132
-  data.tar.gz: 3097012a5e22ccd3cc2b61e8ecc22427c35e8db12a02dfd3c9a819cfc13abd53
+  metadata.gz: 351f486db0cd9cfa46ac9770e739dce4fcf9b4fe4a564799febc2d23eea2f713
+  data.tar.gz: b214e28350f97dc2a442950803773accb428f8316de8482884c56c81b0aab754
 SHA512:
-  metadata.gz: 23fffb3c40b6264ca8489ded795330c14410419db07fbad0f1fb9781a3ae31668264747df93df8e2d8df45dcdc546d4a6c61cf8d66cee54b7abb7b32e85bef2e
-  data.tar.gz: a4473504fe30c922e3f6803dc608beb5495174ca3f884f4da04de479769a602fdc94df5f45c9a8edad2996146028d1cddacd626d61310b776ced641d32abbbd2
+  metadata.gz: 3e1a12730936b436c30c909970b8d31e90358b87f10242f76c7f8b238def70391fb20bc0568825495045a095db6d799b8da8c07c9f524914eecf0a072d083d40
+  data.tar.gz: 8a1fdd4ca3c8d4512bd6ef6890a653a1ad1e052daad13ee5355d51248c652a938cf75df16d42d97a42ee6149f111e69cce215102b69c414b58920cf4b62180a2

data/lib/core_ext/Date/format.rb

@@ -27,6 +27,7 @@ module Safrano
       end
     end
   end
+
   module CoreIncl
     module Date
       module Format

data/lib/core_ext/DateTime/format.rb

@@ -27,6 +27,7 @@ module Safrano
       end
     end
   end
+
   module CoreIncl
     module DateTime
       module Format

data/lib/core_ext/Hash/transform.rb

@@ -17,10 +17,10 @@ module Safrano
         def symbolize_keys!
           transform_keys! do |key|
             begin
-                                    key.to_sym
+              key.to_sym
             rescue StandardError
               key
-                                  end
+            end
           end
         end
       end

data/lib/core_ext/Time/format.rb

@@ -15,7 +15,7 @@ module Safrano
           return unless (md = instr.match(REGEX))
 
           sec, milli = md[1].to_i.divmod(1000)
-          secm = milli.zero? ? sec : sec + Float(milli) / 1000
+          secm = milli.zero? ? sec : sec + (Float(milli) / 1000)
           if md[3].nil? # no offset
             #            ::Time.at(sec, milli,  :millisecond)  # not supported in ruby 2.4
             ::Time.gm(1970, 1, 1) + secm

data/lib/odata/attribute.rb

@@ -13,6 +13,7 @@ module Safrano
     def initialize(entity, name)
       @entity = entity
       @name = name
+      @allowed_transitions = ALLOWED_TRANSITIONS
     end
 
     def value
@@ -20,11 +21,7 @@ module Safrano
       # currently it is just set to make some minimal testcase work
       # See also model_ext.rb
       case (v = @entity.values[@name.to_sym])
-      when Date
-        v.to_edm_json
-      when Time
-        v.to_edm_json
-      when DateTime
+      when Date, Time, DateTime
         v.to_edm_json
       else
         v
@@ -68,6 +65,8 @@ module Safrano
       def allowed_transitions
         Transitions::ALLOWED_TRANSITIONS
       end
+
+      include Safrano::Transitions::GetNextTrans::BySimpleDetect
     end
     include Transitions
   end

data/lib/odata/batch.rb

@@ -103,7 +103,7 @@ module Safrano
 
     # $batch Handler
     class HandlerBase
-      TREND = Safrano::Transition.new('', trans: 'transition_end')
+      TREND = Safrano::Transition.new('', trans: :transition_end)
       def allowed_transitions
         @allowed_transitions = [TREND]
       end
@@ -111,6 +111,8 @@ module Safrano
       def transition_end(_match_result)
         Safrano::Transition::RESULT_END
       end
+
+      include Safrano::Transitions::GetNextTrans::ForJustTransitionEnd
     end
 
     # $batch disabled Handler

data/lib/odata/collection.rb

@@ -20,6 +20,7 @@ module Safrano
 
       def initialize(modelk)
         @modelk = modelk
+        @allowed_transitions = @modelk.allowed_transitions
       end
 
       def allowed_transitions
@@ -52,6 +53,8 @@ module Safrano
         end
       end
 
+      include Safrano::Transitions::GetNextTrans::ByLongestMatch
+
       # pkid can be a single value for single-pk models,  or an array.
       # type checking/convertion is done in check_odata_key_type
       def find_by_odata_key(pkid)

data/lib/odata/collection_media.rb

@@ -14,6 +14,7 @@ module Safrano
         Contract::OK
       end
     end
+
     # Simple static File/Directory based media store handler
     # similar to Rack::Static
     # with a flat directory structure
@@ -35,11 +36,11 @@ module Safrano
       end
 
       def create_abs_class_dir
-        FileUtils.makedirs @abs_klass_dir unless Dir.exist?(@abs_klass_dir)
+        FileUtils.makedirs @abs_klass_dir
       end
 
       def create_abs_temp_dir
-        FileUtils.makedirs @abs_temp_dir unless Dir.exist?(@abs_temp_dir)
+        FileUtils.makedirs @abs_temp_dir
       end
 
       def finalize
@@ -114,7 +115,7 @@ module Safrano
       # and ensure the directory exists
       def with_media_directory(entity)
         mpi = abs_media_directory(entity)
-        Dir.mkdir mpi unless Dir.exist?(mpi)
+        FileUtils.mkdir_p mpi
         yield Pathname(mpi)
       end
 
@@ -200,7 +201,7 @@ module Safrano
       def with_media_directory(entity)
         mpi = abs_media_directory(entity)
 
-        FileUtils.makedirs mpi unless Dir.exist?(mpi)
+        FileUtils.makedirs mpi
         yield Pathname(mpi)
       end
 

data/lib/odata/complex_type.rb

@@ -21,6 +21,8 @@ module Safrano
         Safrano::Transition::RESULT_END
       end
 
+      include Safrano::Transitions::GetNextTrans::ForJustTransitionEnd
+
       # we will have this on class and instance level for making things simpler first
       class << self
         attr_reader :klassmod
@@ -202,7 +204,7 @@ module Safrano
     end
 
     def metadata_h
-      {   type: type_name }
+      { type: type_name }
     end
 
     def casted_values

data/lib/odata/entity.rb

@@ -19,6 +19,8 @@ module Safrano
         self.class.entity_allowed_transitions
       end
 
+      include Safrano::Transitions::GetNextTrans::ByLongestMatchDyn
+
       def transition_end(_match_result)
         Safrano::Transition::RESULT_END
       end
@@ -184,16 +186,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
+        AlreadyExistsUnprocessableError.odata_get(req)
 
-        [202, EMPTY_HASH, to_odata_post_json(service: req.service)]
       else # TODO: other formats
         415
       end
@@ -361,7 +356,7 @@ module Safrano
     # real implementation for replacing $value for a media entity
     def odata_media_value_put(req)
       model = self.class
-      req.with_media_data do |data, mimetype, filename|
+      req.with_media_data do |data, mimetype, _filename|
         emdata = { content_type: mimetype }
         if req.in_changeset
           set_fields(emdata, model.data_fields, missing: :skip)
@@ -392,6 +387,7 @@ module Safrano
       [pk_uri]
     end
   end
+
   module PKUriWithoutFunc
     def pk_uri
       pk
@@ -405,6 +401,7 @@ module Safrano
       [pk]
     end
   end
+
   # for a single public key
   module EntitySinglePK
     include Entity

data/lib/odata/error.rb

@@ -143,6 +143,10 @@ module Safrano
     end
   end
 
+  class AlreadyExistsUnprocessableError < UnprocessableEntityError
+    @msg = 'The ressource you are trying to create already exists'
+  end
+
   # http Bad Req.
   class BadRequestError
     extend  ErrorClass
@@ -161,6 +165,7 @@ module Safrano
       @msg = "Bad Request: empty media file #{path}"
     end
   end
+
   # Generic failed changeset
   class BadRequestFailedChangeSet < BadRequestError
     @msg = 'Bad Request: Failed changeset '
@@ -170,6 +175,7 @@ module Safrano
   class BadRequestNonMediaValue < BadRequestError
     @msg = 'Bad Request: $value request for a non-media entity'
   end
+
   class BadRequestSequelAdapterError < BadRequestError
     include ErrorInstance
     def initialize(err)
@@ -197,6 +203,7 @@ module Safrano
       @msg = "Bad Request: the $expand path #{path} is invalid for entityset #{model.entity_set_name}"
     end
   end
+
   # for invalid properti(es) in $select param
   class BadRequestSelectInvalidProps < BadRequestError
     include ErrorInstance
@@ -217,7 +224,7 @@ module Safrano
 
   # http not found
   class ErrorNotFound
-    extend  ErrorClass
+    extend ErrorClass
     HTTP_CODE = 404
     @msg = 'The requested ressource was not found'
   end
@@ -238,16 +245,17 @@ module Safrano
 
   # not implemented (Safrano specific)
   class NotImplementedError
-    extend  ErrorClass
+    extend ErrorClass
     HTTP_CODE = 501
   end
 
   # version not implemented (Safrano specific)
   class VersionNotImplementedError
-    extend  ErrorClass
+    extend ErrorClass
     HTTP_CODE = 501
     @msg = 'The requested OData version is not yet supported'
   end
+
   # batch not implemented (Safrano specific)
   class BatchNotImplementedError < RuntimeError
     @msg = 'Not implemented: OData batch'
@@ -266,22 +274,26 @@ module Safrano
       @msg = xmsg
     end
   end
+
   class FilterUnknownFunctionError < BadRequestError
     include ErrorInstance
     def initialize(badfuncname)
       @msg = "Bad request: unknown function #{badfuncname} in $filter"
     end
   end
+
   class FilterParseErrorWrongColumnName < BadRequestError
     extend ErrorClass
     @msg = 'Bad request: invalid property name in $filter'
   end
+
   class FilterParseWrappedError < BadRequestError
     include ErrorInstance
     def initialize(exception)
       @msg = exception.to_s
     end
   end
+
   class ServiceOperationParameterMissing < BadRequestError
     include ErrorInstance
     def initialize(missing:, sopname:)

data/lib/odata/filter/base.rb

@@ -77,6 +77,7 @@ module Safrano
     # DateTime Literals
     class DateTimeLit < Leave
     end
+
     class DateTimeOffsetLit < Leave
     end
 

data/lib/odata/filter/error.rb

@@ -35,6 +35,7 @@ module Safrano
           @cur_typ = cur.class
         end
       end
+
       # Invalid Tokens
       class ErrorInvalidToken < Error
         include ::Safrano::ErrorInstance
@@ -43,6 +44,7 @@ module Safrano
           @msg = "Bad Request: invalid token #{tok} in $filter"
         end
       end
+
       # Unmached closed
       class ErrorUnmatchedClose < Error
         include ::Safrano::ErrorInstance
@@ -73,6 +75,7 @@ module Safrano
           @msg = "Bad Request: wrong number of parameters for function #{cur.parent.value} in $filter"
         end
       end
+
       # Invalid separator in this context (missing parenthesis?)
       class ErrorInvalidSeparator < Error
         include ::Safrano::ErrorInstance

data/lib/odata/filter/sequel.rb

@@ -51,21 +51,17 @@ module Safrano
         when :substringof
 
           # there are multiple possible argument types (but all should return edm.string)
-          if args[0].is_a?(QString)
-            # substringof('Rhum', name)  -->
-            # name contains substr 'Rhum'
-            Contract.collect_result!(args[1].leuqes(jh),
-                                     args[0].leuqes_substringof_sig1(jh)) do |l1, l0|
-              Sequel.like(l1, l0)
-            end
 
-          # special non standard (ui5 client) case ?
-          elsif args[0].is_a?(Literal) && args[1].is_a?(Literal)
+          if args[0].is_a?(QString) ||
+             # substringof('Rhum', name)  -->
+             # name contains substr 'Rhum'
+
+             # special non standard (ui5 client) case ?
+             (args[0].is_a?(Literal) && args[1].is_a?(Literal))
             Contract.collect_result!(args[1].leuqes(jh),
                                      args[0].leuqes_substringof_sig1(jh)) do |l1, l0|
               Sequel.like(l1, l0)
             end
-
           elsif args[1].is_a?(QString)
             substringof_sig2(jh) # adapter specific
           else

data/lib/odata/filter/sequel_datetime_adapter.rb

@@ -11,6 +11,7 @@ module Safrano
         Sequel.function(:datetime, @value)
       end
     end
+
     # non-sqlite adapter specific DateTime handler
     module DateTimeDefault
       def datetime(_val)

data/lib/odata/filter/sequel_function_adapter.rb

@@ -64,6 +64,7 @@ module Safrano
         Safrano::FilterFunctionNotImplementedError.new("$filter function 'ceiling' is not implemented in sqlite adapter")
       end
     end
+
     # re-useable module with math floor/ceil functions for those adapters having these SQL funcs
     module MathFloorCeilFuncTree
       def floor(lq)

data/lib/odata/filter/tree.rb

@@ -355,14 +355,14 @@ module Safrano
 
     # Numbers (floating point, ints, dec)
     class FPNumber
-      def initialize(val)
-        # 1.53f --> value 1.53
-        # 1.53d --> value 1.53
-        # 1.53 --> value 1.53
-        # Note: the tokenizer has already dropped the not usefull string parts
-        # Note : we dont differentiate between Float and Double here
-        super(val)
-      end
+      # def initialize(val)
+      # 1.53f --> value 1.53
+      # 1.53d --> value 1.53
+      # 1.53 --> value 1.53
+      # 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)
         case typ
@@ -396,14 +396,13 @@ module Safrano
     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)
-      end
+      # 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)
+      # end
 
       def accept?(tok, typ)
         case typ
@@ -418,6 +417,7 @@ module Safrano
         :decimal
       end
     end
+
     # Literals are unquoted words without /
     class Literal
       def accept?(tok, typ)
@@ -465,11 +465,11 @@ module Safrano
 
     # DateTimeLit
     class DateTimeLit
-      def initialize(val)
-        # datetime'2000-12-12T12:00:53' --> value 2000-12-12T12:00:53
-        # Note: the tokenizer has already dropped the not usefull string parts
-        super(val)
-      end
+      # def initialize(val)
+      # datetime'2000-12-12T12:00:53' --> value 2000-12-12T12:00:53
+      # Note: the tokenizer has already dropped the not usefull string parts
+      # super(val)
+      # end
 
       def accept?(tok, typ)
         case typ
@@ -484,13 +484,14 @@ module Safrano
         :datetime
       end
     end
+
     # DateTimeOffsetLit
     class DateTimeOffsetLit
-      def initialize(val)
-        # datetimeoffset'2000-12-12T12:00:53+02:00' --> value 2000-12-12T12:00:53+02:00
-        # Note: the tokenizer has already dropped the not usefull string parts
-        super(val)
-      end
+      # def initialize(val)
+      # datetimeoffset'2000-12-12T12:00:53+02:00' --> value 2000-12-12T12:00:53+02:00
+      # Note: the tokenizer has already dropped the not usefull string parts
+      # super(val)
+      # end
 
       def accept?(tok, typ)
         case typ
@@ -505,6 +506,7 @@ module Safrano
         :datetimeoffset
       end
     end
+
     # Quoted Strings
     class QString
       DBL_QO = "''"

data/lib/odata/function_import.rb

@@ -17,6 +17,7 @@ module Safrano
         super(msg)
       end
     end
+
     class ProcRedefinition < StandardError
       def initialize(fnam)
         msg = "Function import #{fnam}: Block/lambda Redefinition . Provide definition either as a return code block or with .definition(lambda) but not both"
@@ -39,6 +40,12 @@ module Safrano
         [Safrano::TransitionExecuteFunc]
       end
 
+      include Safrano::Transitions::GetNextTrans::ForJustTransitionEnd
+
+      def get_next_transresult(path_remain)
+        Safrano::TransitionExecuteFunc.result(path_remain)
+      end
+
       def input(**parmtypes)
         @input = {}
         parmtypes.each do |k, t|

data/lib/odata/model_ext.rb

@@ -445,17 +445,17 @@ module Safrano
 
       # check if key needs casting. Important for later entity-uri generation !
       return unless primary_key.is_a? Symbol # single key field
-      
-      # guid key as guid'xxx-yyy-zzz'  
+
+      # 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
+        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
@@ -607,12 +607,15 @@ module Safrano
         end
       end
     end
+
     # methods related to transitions to next state (cf. walker)
     module Transitions
       def allowed_transitions
         @allowed_transitions
       end
 
+      include Safrano::Transitions::GetNextTrans::BySimpleDetect
+
       def entity_allowed_transitions
         @entity_allowed_transitions
       end
@@ -621,7 +624,7 @@ module Safrano
         @allowed_transitions = [Safrano::TransitionEnd,
                                 Safrano::TransitionCount,
                                 Safrano::Transition.new(entity_id_url_regexp,
-                                                        trans: 'transition_id')].freeze
+                                                        trans: :transition_id)].freeze
       end
 
       def build_entity_allowed_transitions
@@ -630,17 +633,17 @@ module Safrano
           Safrano::TransitionCount,
           Safrano::TransitionLinks,
           Safrano::TransitionValue,
-          Safrano::Transition.new(transition_attribute_regexp, trans: 'transition_attribute')
+          Safrano::Transition.new(transition_attribute_regexp, trans: :transition_attribute)
         ]
         if (ncurgx = @nav_collection_url_regexp)
           @entity_allowed_transitions <<
-            Safrano::Transition.new(%r{\A/(#{ncurgx})(.*)\z}, trans: 'transition_nav_collection')
+            Safrano::Transition.new(%r{\A/(#{ncurgx})(.*)\z}, trans: :transition_nav_collection)
         end
         if (neurgx = @nav_entity_url_regexp)
           @entity_allowed_transitions <<
-            Safrano::Transition.new(%r{\A/(#{neurgx})(.*)\z}, trans: 'transition_nav_entity')
+            Safrano::Transition.new(%r{\A/(#{neurgx})(.*)\z}, trans: :transition_nav_entity)
         end
-        @entity_allowed_transitions << Safrano::Transition.new(%r{\A/(\w+)(.*)\z}, trans: 'transition_invalid_attribute')
+        @entity_allowed_transitions << Safrano::Transition.new(%r{\A/(\w+)(.*)\z}, trans: :transition_invalid_attribute)
         @entity_allowed_transitions.freeze
         @entity_allowed_transitions
       end

data/lib/odata/navigation_attribute.rb

@@ -78,6 +78,10 @@ module Safrano
   # Represents a named but nil-valued navigation-attribute of an Entity
   # (usually resulting from a NULL FK db value)
   class NilNavigationAttribute
+    def initialize
+      @allowed_transitions = ALLOWED_TRANSITIONS
+    end
+
     include Safrano::NavigationInfo
     def odata_get(req)
       if req.walker.media_value
@@ -131,6 +135,8 @@ module Safrano
       def allowed_transitions
         ALLOWED_TRANSITIONS
       end
+
+      include Safrano::Transitions::GetNextTrans::BySimpleDetect
     end
     include Transitions
   end

data/lib/odata/request/json.rb

@@ -35,6 +35,7 @@ module Safrano
       end
     end
   end
+
   # This is used from the Test-suite code !
   # it does recursive / deep symbolize additionally to inbound casting
   module XJSON

data/lib/odata/transition.rb

@@ -4,16 +4,78 @@ require_relative 'error'
 
 # our main namespace
 module Safrano
+  module Transitions
+    module GetNextTrans
+      module BySimpleDetect
+        def get_next_transresult(path_remain)
+          # current url-parsing context
+          # has no ambiguous next match and we dont need to find longest match
+          # but it's sufficient to find the one matching (or nil)
+          tres_next = nil
+          @allowed_transitions.detect { |t| tres_next = t.result(path_remain) }
+          tres_next
+        end
+      end
+
+      module ForJustTransitionEnd
+        def get_next_transresult(path_remain)
+          Safrano::TransitionEnd.result(path_remain)
+        end
+      end
+
+      # Transitions::GetNextTrans::ByLongestMatch
+      module ByLongestMatch
+        def get_next_transresult(path_remain)
+          # current url-parsing context
+          # has  ambiguous next match and we need to find longest match
+          # example: current context is "the top level service" and we have
+          # entity types Race and RaceType
+
+          match_len = -1
+          tres_next = nil
+
+          @allowed_transitions.each { |t|
+            if (res = t.longer_match(path_remain, match_len))
+              tres_next = res
+              match_len = tres_next.match_length
+            end
+          }
+          tres_next
+        end
+      end
+
+      # same as ByLongestMatch but use the getter method allowed_transitions instead of
+      # directly @allowed_transitions
+      module ByLongestMatchDyn
+        def get_next_transresult(path_remain)
+          # current url-parsing context
+          # has  ambiguous next match and we need to find longest match
+          # example: current context is "the top level service" and we have
+          # entity types Race and RaceType
+
+          match_len = -1
+          tres_next = nil
+
+          allowed_transitions.each { |t|
+            if (res = t.longer_match(path_remain, match_len))
+              tres_next = res
+              match_len = tres_next.match_length
+            end
+          }
+          tres_next
+        end
+      end
+    end
+  end
+
   # represents a state transition when navigating/parsing the url path
   # from left to right
   class Transition
-    attr_accessor :trans
-    attr_accessor :match_result
-    attr_accessor :rgx
-    attr_reader :remain_idx
-
-    EMPTYSTR = ''
-    SLASH = '/'
+    # attr_accessor :trans
+    # attr_accessor :match_result
+    # attr_accessor :trans_result
+    # attr_accessor :rgx
+    # attr_reader   :remain_idx
 
     RESULT_BAD_REQ_ERR = [nil, :error, ::Safrano::BadRequestError].freeze
     RESULT_NOT_FOUND_ERR = [nil, :error, ::Safrano::ErrorNotFound].freeze
@@ -25,31 +87,58 @@ module Safrano
                Regexp.new(arg)
              else
                arg
-             end
+             end.freeze
+      @trans = trans.freeze
+      @remain_idx = remain_idx.freeze
+    end
+
+    def result(str)
+      return unless (mres = @rgx.match(str))
+
+      TransitionResult.new(trans: @trans, match_result: mres, remain_idx: @remain_idx)
+    end
+
+    # return  match-result for str, if longer  as   min_match_length
+    def longer_match(str, min_match_length)
+      return unless (mres = @rgx.match(str))
+      return unless (mres.match_length(1) > min_match_length)
+
+      TransitionResult.new(trans: @trans, match_result: mres, remain_idx: @remain_idx)
+    end
+  end
+
+  class TransitionResult
+    attr_reader :match
+
+    EMPTYSTR = ''
+    SLASH = '/'
+
+    def initialize(trans:, match_result:, remain_idx:)
       @trans = trans
+      @match = match_result
       @remain_idx = remain_idx
     end
 
-    def do_match(str)
-      @match_result = @rgx.match(str)
+    def match_length
+      @match.match_length(1)
     end
 
     # remain_idx is the index of the last match-data. ususally its 2
     # but can be overidden
     def path_remain
-      @match_result[@remain_idx] if @match_result && @match_result[@remain_idx]
+      @match[@remain_idx] if @match && @match[@remain_idx]
     end
 
     def path_done
-      if @match_result
-        @match_result[1] || EMPTYSTR
+      if @match
+        @match[1] || EMPTYSTR
       else
         EMPTYSTR
       end
     end
 
     def do_transition(ctx)
-      ctx.method(@trans).call(@match_result)
+      ctx.__send__(@trans, @match)
     end
   end
 
@@ -59,8 +148,30 @@ module Safrano
       @trans = trans
     end
 
-    def do_match(str)
+    def result(str)
+      @str = str
+      InplaceTransitionResult.new(trans: @trans, match_result: @str)
+    end
+
+    # return  match-result for str, if longer  as   min_match_length
+    def longer_match(str, min_match_length)
       @str = str
+      return unless (@str.size > min_match_length)
+
+      InplaceTransitionResult.new(trans: @trans, match_result: @str)
+    end
+  end
+
+  # Transition that does not move/change the input
+  class InplaceTransitionResult < TransitionResult
+    def initialize(trans:, match_result:)
+      @trans = trans
+      @match = match_result
+      @str = match_result
+    end
+
+    def match_length
+      @str.size
     end
 
     def path_remain
@@ -70,26 +181,22 @@ module Safrano
     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')
+  TransitionEnd = Transition.new('\A(\/?)\z', trans: :transition_end)
+  TransitionExecuteFunc = InplaceTransition.new(trans: :transition_execute_func)
   TransitionMetadata = Transition.new('\A(\/\$metadata)(.*)',
-                                      trans: 'transition_metadata')
+                                      trans: :transition_metadata)
   TransitionBatch = Transition.new('\A(\/\$batch)(.*)',
-                                   trans: 'transition_batch')
+                                   trans: :transition_batch)
   TransitionContentId = Transition.new('\A(\/\$(\d+))(.*)',
-                                       trans: 'transition_content_id',
+                                       trans: :transition_content_id,
                                        remain_idx: 3)
   TransitionCount = Transition.new('(\A\/\$count)(.*)\z',
-                                   trans: 'transition_count')
+                                   trans: :transition_count)
   TransitionValue = Transition.new('(\A\/\$value)(.*)\z',
-                                   trans: 'transition_value')
+                                   trans: :transition_value)
   TransitionLinks = Transition.new('(\A\/\$links)(.*)\z',
-                                   trans: 'transition_links')
+                                   trans: :transition_links)
   attr_accessor :allowed_transitions
 end

data/lib/odata/walker.rb

@@ -65,30 +65,10 @@ module Safrano
       if (prefix == EMPTYSTR) || (prefix == SLASH)
         path
       else
-        #        path.sub!(/\A#{prefix}/, '')
-        # TODO: check
         path.sub(/\A#{prefix}/, EMPTYSTR)
       end
     end
 
-    def get_next_transition
-      # handle  multiple valid transitions
-      # like when we have attributes that are substring of each other
-      # --> instead of using detect (ie take first transition)
-      # we need to use select and then find the longest match
-
-      valid_tr = @context.allowed_transitions.map(&:dup).select do |t|
-        t.do_match(@path_remain)
-      end
-
-      # HACK: (wanted: a better one) to make attributes that are substrings of each other
-      # work well
-      return unless valid_tr
-      return (@tr_next = nil) if valid_tr.empty?
-
-      @tr_next = valid_tr.size == 1 ? valid_tr.first : valid_tr.max_by { |t| t.match_result[1].size }
-    end
-
     # perform a content-id ($batch changeset ref) transition
     def do_run_with_content_id
       if @content_id_refs.is_a? Hash
@@ -137,7 +117,7 @@ module Safrano
     end
 
     def do_next_transition
-      @context, @status, @error = @tr_next.do_transition(@context)
+      @context, @status, @error = @tres_next.do_transition(@context)
       # little hack's
       case @status
         # we dont have the content-id references data on service level
@@ -151,8 +131,8 @@ module Safrano
       end
 
       @contexts << @context
-      @path_remain = @tr_next.path_remain
-      @path_done << @tr_next.path_done
+      @path_remain = @tres_next.path_remain
+      @path_done << @tres_next.path_done
 
       # little hack's
       state_mappings
@@ -160,8 +140,8 @@ module Safrano
 
     def eo
       while @context
-        get_next_transition
-        if @tr_next
+        @tres_next = @context.get_next_transresult(@path_remain)
+        if @tres_next
           do_next_transition
         else
           @context = nil

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
@@ -37,6 +37,11 @@ module Safrano
       @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/.freeze
+    CORS_RO_METHODS = %i[get head options].freeze
+    CORS_BATCH_METHODS = %i[post head options].freeze
+    CORS_RW_METHODS = %i[get post put patch delete head options].freeze
     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: CORS_BATCH_METHODS
+            resource '*', headers: :any, methods: CORS_RW_METHODS
+          end
+          allow do
+            origins '*'
+            resource '*', headers: :any, methods: CORS_RO_METHODS
+          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
@@ -97,6 +99,7 @@ module Safrano
         @type
       end
     end
+
     ## original coding:
     #    # The set of media-types. Requests that do not indicate
     #    # one of the media types presents in this list will not be eligible

data/lib/safrano/service.rb

@@ -107,7 +107,10 @@ 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
+  GENERIC_415_RESP = [415, {}, ['']].freeze
   # Base class for service. Subclass will be for V1, V2 etc...
   class ServiceBase
     include Safrano
@@ -166,7 +169,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 +202,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
@@ -618,6 +621,8 @@ module Safrano
         Safrano::TransitionContentId
       ].freeze
 
+      include Safrano::Transitions::GetNextTrans::ByLongestMatch
+
       def build_allowed_transitions
         @allowed_transitions = if @function_imports.empty?
                                  (ALLOWED_TRANSITIONS_FIXED + [
@@ -677,7 +682,7 @@ module Safrano
         [200, CT_APPXML, [service_xml(req)]]
       else
         # this is returned by http://services.odata.org/V2/OData/Safrano.svc
-        415
+        GENERIC_415_RESP
       end
     end
   end
@@ -746,11 +751,13 @@ module Safrano
       Safrano::Transition::RESULT_END
     end
 
+    include Safrano::Transitions::GetNextTrans::ForJustTransitionEnd
+
     def odata_get(req)
       if req.accept?(APPXML)
         [200, CT_APPXML, [@service.metadata_xml(req)]]
       else
-        415
+        GENERIC_415_RESP
       end
     end
   end

data/lib/safrano/type_mapping.rb

@@ -12,6 +12,7 @@ module Safrano
     attr_reader :castfunc
     attr_reader :edm_type
   end
+
   # Model attribute (column) specific mapping
   class AttributeTypeMapping < TypeMapping
     attr_reader :attr_name
@@ -20,6 +21,7 @@ module Safrano
       @edm_type = builder.xedm_type
       @castfunc = builder.castfunc
     end
+
     # wrapper to handle API
     class Builder
       attr_reader :xedm_type
@@ -82,9 +84,8 @@ module Safrano
       end
 
       def match(curtyp)
-        if @bui2 && (m = @bui2.match(curtyp))
-          m
-        elsif @bui1 && (m = @bui1.match(curtyp))
+        if (@bui2 && (m = @bui2.match(curtyp))) ||
+           (@bui1 && (m = @bui1.match(curtyp)))
           m
         elsif @rgx.match(curtyp)
           type_mapping
@@ -134,6 +135,7 @@ module Safrano
         RgxTypeMapping1Par.new(self)
       end
     end
+
     class Builder2Par < Builder
       def initialize(db_ty_rgx, proc)
         @db_types_rgx = db_ty_rgx
@@ -177,6 +179,7 @@ module Safrano
       @castfunc = builder.castfunc
     end
   end
+
   class RgxTypeMapping2Par < RgxTypeMapping
     def initialize(builder)
       @edm_type = builder.xedm_type

data/lib/safrano/version.rb

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

data/lib/sequel/plugins/join_by_paths.rb

@@ -130,7 +130,7 @@ class JoinByPathsHelper < Set
           #                  associated model's primary key.  Each current model object can be
           #                  associated with many associated model objects, and each associated
           #                  model object can be associated with many current model objects.
-          # TODO: testcase for  :one_through_one 
+          # TODO: testcase for  :one_through_one
           # when    # :one_through_one :: Similar to many_to_many in terms of foreign keys, but only one object
           #                     is associated to the current object through the association.
           #                     Provides only getter methods, no setter or modification methods.
@@ -173,7 +173,6 @@ class JoinByPathsHelper < Set
 
           next result_
 
-
         end
 
         lks.map! { |k| Sequel[seg.first.alias_sym][k] } unless seg.first.empty?
@@ -229,6 +228,7 @@ module Sequel
           @alias_cnt = 0
         end
       end
+
       module ClassMethods
         attr_reader :aliases_sym
         attr_reader :alias_cnt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - oz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -253,7 +253,7 @@ metadata:
   changelog_uri: https://gitlab.com/dm0da/safrano/blob/master/CHANGELOG
   source_code_uri: https://gitlab.com/dm0da/safrano/tree/master
   documentation_uri: https://gitlab.com/dm0da/safrano/-/blob/master/README.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -268,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: []