safrano 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c19f9f9e0a4700de60c1a177c1555663f50ab02e2e5fb0449e21f3c43751dbc
-  data.tar.gz: 0a56ca92c60b1e1a943f7710f7993c325b8e1e9d20b9df745b87dea954170722
+  metadata.gz: 5e43512da576932288321a8e821e26fa9c70d578f52562f6a343bfe3c3711bae
+  data.tar.gz: e2c00621b792634355f99d2025fada0d05cd44666516d916aa2546fb72f5157f
 SHA512:
-  metadata.gz: 9f273cc9008c3bdab427268c5bf139aeb30093c515611714110da1b3f48d90b86ab40c62e6c96aea6dacc8eb7381793d126850fc8bccab991d89fcf010075647
-  data.tar.gz: 3d1e65f46c4e3fe1765288fb1f06e3f488b708216ce708103945fbf2aa12dd088e7fe6da8e06ebc8c6fa18b6bbd65b67506a5c8a8dde2097f405b57ceaa9d2b4
+  metadata.gz: 8ff433c52ec4406198b0988e122213f0af36a8f1a06b2eb1d2ebfc2c3736db5f8c575fa86e04b8ac9801d4d4fb363edc468c3078b3f93c66313497739ffc3c2e
+  data.tar.gz: 59ebba62c9a7e81496a651473fa9469d843409dab4c1703221f897425136fe02439ea400e17124a910de599378056b7b21758815d734c9807778193c791e3286

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/MatchData/matchlen.rb

@@ -0,0 +1,14 @@
+# mach_length for ruby < 3.0
+module Safrano
+  module CoreIncl
+    module MatchData
+      module MatchLen
+        unless method_defined? :match_length
+          def  match_length(i)
+            self[i].length
+          end
+        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/core_ext/matchdata.rb

@@ -0,0 +1,3 @@
+require_relative 'MatchData/matchlen'
+
+MatchData.include Safrano::CoreIncl::MatchData::MatchLen

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
@@ -213,10 +215,9 @@ module Safrano
     # needed for nested json output
     # this is a simpler version of model_ext#output_template
     def self.default_template
-      template = {}
+      template = { meta: EMPTYH, all_values: EMPTYH }
       expand_e = {}
 
-      template[:all_values] = EMPTYH
       @props.each do |prop, kl|
         expand_e[prop] = kl.default_template if kl.respond_to? :default_template
       end

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,9 +186,9 @@ module Safrano
       if req.walker.media_value
         odata_media_value_put(req)
       elsif req.accept?(APPJSON)
-      
+
         AlreadyExistsUnprocessableError.odata_get(req)
-        
+
       else # TODO: other formats
         415
       end
@@ -215,7 +217,6 @@ module Safrano
     def odata_patch(req)
       req.with_parsed_data(self.class) do |data|
         data.delete('__metadata')
-
         # validate payload column names
         if (invalid = self.class.invalid_hash_data?(data))
           ::Safrano::Request::ON_CGST_ERROR.call(req)
@@ -354,7 +355,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)
@@ -385,6 +386,7 @@ module Safrano
       [pk_uri]
     end
   end
+
   module PKUriWithoutFunc
     def pk_uri
       pk
@@ -398,6 +400,7 @@ module Safrano
       [pk]
     end
   end
+
   # for a single public key
   module EntitySinglePK
     include Entity

data/lib/odata/error.rb

@@ -46,6 +46,14 @@ module Safrano
         super(msg, symbname)
       end
     end
+
+    # invalid response format option
+    class InvalidRespFormatOption < NameError
+      def initialize(opt)
+        msg = "Invalid response format option: #{opt}"
+        super(msg, opt.to_s)
+      end
+    end
   end
 
   # used in function import error handling. cf. func import / do_execute_func
@@ -142,11 +150,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
@@ -165,6 +173,7 @@ module Safrano
       @msg = "Bad Request: empty media file #{path}"
     end
   end
+
   # Generic failed changeset
   class BadRequestFailedChangeSet < BadRequestError
     @msg = 'Bad Request: Failed changeset '
@@ -174,6 +183,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)
@@ -201,6 +211,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
@@ -221,7 +232,7 @@ module Safrano
 
   # http not found
   class ErrorNotFound
-    extend  ErrorClass
+    extend ErrorClass
     HTTP_CODE = 404
     @msg = 'The requested ressource was not found'
   end
@@ -242,16 +253,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'
@@ -270,22 +282,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

@@ -236,9 +236,9 @@ module Safrano
     def output_template(expand_list:,
                         select: Safrano::SelectBase::ALL)
 
-      return @default_template if expand_list.empty? && select.all_props?
+      return @default_template.dup if expand_list.empty? && select.all_props?
 
-      template = {}
+      template = { meta: EMPTYH }
       expand_e = {}
       expand_c = {}
       deferr = []
@@ -364,7 +364,7 @@ module Safrano
     EMPTYH = {}.freeze
 
     def build_default_template
-      @default_template = { all_values: EMPTYH }
+      @default_template = { meta:  EMPTYH, all_values: EMPTYH }
       @default_template[:deferr] = (@nav_entity_attribs&.keys || []) + (@nav_collection_attribs&.keys || EMPTY_ARRAY) if @nav_entity_attribs || @nav_collection_attribs
     end
 
@@ -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