safrano 0.6.8 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1ee63cc31ce50cff784481ce75f5f5581c2b9ff406a18efb516908bbf7c65d
-  data.tar.gz: 5770021472ccce8efb445114d4b4834b4fb0ff31b58f6444654cfb16b5aeb860
+  metadata.gz: 56284ecd8544233a820d8163c324a4b86df3f87909e529ac993407dad3358132
+  data.tar.gz: 3097012a5e22ccd3cc2b61e8ecc22427c35e8db12a02dfd3c9a819cfc13abd53
 SHA512:
-  metadata.gz: b1be48927ce7f3b5350ea903fa6ebb514cd6c09a1eafb064b7760c56bb396f02e59cab6e2a2e091ab8c526c77d45e9ff18838728d34d7500b29f611ba98e858b
-  data.tar.gz: 5877c1e41a0bbbcb76d948914a703a24ea8cdf52215815b7c4051c3cfb3807463adfa0144ccce4861dfd988abf8776a002de6353d6343205f3767af02b9ca090
+  metadata.gz: 23fffb3c40b6264ca8489ded795330c14410419db07fbad0f1fb9781a3ae31668264747df93df8e2d8df45dcdc546d4a6c61cf8d66cee54b7abb7b32e85bef2e
+  data.tar.gz: a4473504fe30c922e3f6803dc608beb5495174ca3f884f4da04de479769a602fdc94df5f45c9a8edad2996146028d1cddacd626d61310b776ced641d32abbbd2

data/lib/core_ext/DateTime/format.rb

@@ -49,7 +49,7 @@ module Safrano
           else
             # same as above with GMT offset in minutes
             # DateTime offset is Rational ; fraction of hours per Day --> *24*60
-            min_off_s = (min_off = (offset * 60 * 24).to_i) > 0 ? "+#{min_off}" : min_off.to_s
+            min_off_s = (min_off = (offset * 60 * 24).to_i).positive? ? "+#{min_off}" : min_off.to_s
             "/Date(#{strftime('%Q')}#{min_off_s})/"
           end
         end

data/lib/core_ext/Time/format.rb

@@ -57,7 +57,7 @@ module Safrano
         # the json raw data is like this :   "HireDate": "\/Date(704678400000)\/"
         # --> \/\/
         def to_edm_json
-          if utc? || (gmt_offset == 0)
+          if utc? || gmt_offset.zero?
             # no offset
             # %s : seconds since unix epoch
             # %L : milliseconds 000-999
@@ -66,7 +66,7 @@ module Safrano
           else
             # same as above with GMT offset in minutes
 
-            min_off_s = (min_off = gmt_offset / 60) > 0 ? "+#{min_off}" : min_off.to_s
+            min_off_s = (min_off = gmt_offset / 60).positive? ? "+#{min_off}" : min_off.to_s
             "/Date(#{strftime('%s%L')}#{min_off_s})/"
           end
         end

data/lib/odata/collection.rb

@@ -194,9 +194,8 @@ module Safrano
         @child_dataset_method.call
       end
 
-      def each
-        y = @child_method.call
-        y.each { |enty| yield enty }
+      def each(&block)
+        @child_method.call.each(&block)
       end
 
       def to_a

data/lib/odata/collection_media.rb

@@ -10,9 +10,7 @@ module Safrano
   module Media
     # base class for Media Handler
     class Handler
-      def check_before_create(data:,
-                              entity:,
-                              filename:)
+      def check_before_create(data:, entity:, filename:)
         Contract::OK
       end
     end
@@ -21,8 +19,9 @@ module Safrano
     # with a flat directory structure
     class Static < Handler
       def initialize(root: nil, mediaklass:)
+        super()
         @root = Pathname(File.absolute_path(root || Dir.pwd))
-        @files_class = (::Rack.release[0..2] == '2.0') ? ::Rack::File : ::Rack::Files
+        @files_class = ::Rack.release[0..2] == '2.0' ? ::Rack::File : ::Rack::Files
         @media_class = mediaklass
         @media_dir_name = Pathname(mediaklass.to_s)
         @semaphore = Thread::Mutex.new
@@ -32,7 +31,7 @@ module Safrano
 
       def register
         @abs_klass_dir = @root + @media_dir_name
-        @abs_temp_dir = @abs_klass_dir + 'tmp'
+        @abs_temp_dir = @abs_klass_dir.join('tmp')
       end
 
       def create_abs_class_dir
@@ -129,7 +128,7 @@ module Safrano
       # Here as well, MVP implementation
       def save_file(data:, filename:, entity:)
         with_media_directory(entity) do |d|
-          filename = d + '1'
+          filename = d.join('1')
           atomic_write(filename) { |f| IO.copy_stream(data, f) }
         end
       end
@@ -138,7 +137,7 @@ module Safrano
       # after each upload, so that clients get informed about new versions
       # of the same media ressource
       def ressource_version(entity)
-        abs_media_directory(entity).children(with_directory = false).max.to_s
+        abs_media_directory(entity).children(false).max.to_s
       end
 
       # Note:  add a new Version and remove the previous one

data/lib/odata/common_logger.rb

@@ -13,11 +13,28 @@ module Rack
     MSG_FUNC = case FORMAT.count('%')
                when 10
                  lambda { |env, length, status, began_at|
-                   format(FORMAT, env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR'] || '-', env['REMOTE_USER'] || '-', Time.now.strftime('%d/%b/%Y:%H:%M:%S %z'), env[REQUEST_METHOD], env[SCRIPT_NAME] + env[PATH_INFO], env[QUERY_STRING].empty? ? '' : "?#{env[QUERY_STRING]}", env[SERVER_PROTOCOL], status.to_s[0..3], length, Utils.clock_time - began_at)
+                   format(FORMAT,
+                          env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR'] || '-',
+                          env['REMOTE_USER'] || '-',
+                          Time.now.strftime('%d/%b/%Y:%H:%M:%S %z'),
+                          env[REQUEST_METHOD],
+                          env[SCRIPT_NAME] + env[PATH_INFO],
+                          env[QUERY_STRING].empty? ? '' : "?#{env[QUERY_STRING]}",
+                          env[SERVER_PROTOCOL],
+                          status.to_s[0..3], length, Utils.clock_time - began_at)
                  }
                when 11
                  lambda { |env, length, status, began_at|
-                   format(FORMAT, env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR'] || '-', env['REMOTE_USER'] || '-', Time.now.strftime('%d/%b/%Y:%H:%M:%S %z'), env[REQUEST_METHOD], env[SCRIPT_NAME], env[PATH_INFO], env[QUERY_STRING].empty? ? '' : "?#{env[QUERY_STRING]}", env[SERVER_PROTOCOL], status.to_s[0..3], length, Utils.clock_time - began_at)
+                   format(FORMAT,
+                          env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR'] || '-',
+                          env['REMOTE_USER'] || '-',
+                          Time.now.strftime('%d/%b/%Y:%H:%M:%S %z'),
+                          env[REQUEST_METHOD],
+                          env[SCRIPT_NAME],
+                          env[PATH_INFO],
+                          env[QUERY_STRING].empty? ? '' : "?#{env[QUERY_STRING]}",
+                          env[SERVER_PROTOCOL],
+                          status.to_s[0..3], length, Utils.clock_time - began_at)
                  }
                end
 

data/lib/odata/complex_type.rb

@@ -92,7 +92,7 @@ module Safrano
       # wrapper
       # for OData Entity and Collections, return them directly
       # for others, ie ComplexType, Prims etc, return the ResultDefinition-subclass wrapped result
-      def self.do_execute_func_result(result, _req, _apply_query_params = false)
+      def self.do_execute_func_result(result, _req, apply_query_params: false)
         new(result)
       end
     end
@@ -129,7 +129,7 @@ module Safrano
 
       # wrapper
       # for OData Entity  return them directly
-      def self.do_execute_func_result(result, _req, apply_query_params = false)
+      def self.do_execute_func_result(result, _req, apply_query_params: false)
         # note: Sequel entities instances seem to be thread safe, so we can
         # safely add request-dependant data (eg. req.params) there
         apply_query_params ? result : result.inactive_query_params
@@ -143,7 +143,7 @@ module Safrano
 
       # wrapper
       # for OData Entity Collection return them directly
-      def self.do_execute_func_result(result, req, apply_query_params = false)
+      def self.do_execute_func_result(result, req, apply_query_params: false)
         coll = Safrano::OData::Collection.new(@klassmod)
         # instance_exec has other instance variables; @values would be nil in the block below
         # need to pass a local copy
@@ -241,12 +241,8 @@ module Safrano
     def odata_h
       ret = { METAK => { TYPEK => self.class.type_name } }
 
-      @values.each do |k, v|
-        ret[k] = if v.respond_to? :odata_h
-                   v.odata_h
-                 else
-                   v
-                 end
+      @values.each do |key, val|
+        ret[key] = val.respond_to?(:odata_h) ? val.odata_h : val
       end
       ret
     end

data/lib/odata/edm/primitive_types.rb

@@ -38,6 +38,28 @@ module Safrano
 
   # type mappings are hard, especially between "Standards" like SQL and OData V2 (might be a bit better in V4 ?)
   # this is all best effort/try to make it work  logic
+
+  RUBY_TY_EDM_TY_MAP = { integer: 'Edm.Int32',
+                         string: 'Edm.String',
+                         date: 'Edm.DateTime',
+                         datetime: 'Edm.DateTime',
+                         time: 'Edm.Time',
+                         boolean: 'Edm.Boolean',
+                         float: 'Edm.Double',
+                         decimal: 'Edm.Decimal',
+                         blob: 'Edm.Binary' }.freeze
+  DB_TY_EDM_TY_MAP = { 'smallint' => 'Edm.Int16',
+                       'int2' => 'Edm.Int16',
+                       'smallserial' => 'Edm.Int16',
+                       'int' => 'Edm.Int32',
+                       'integer' => 'Edm.Int32',
+                       'serial' => 'Edm.Int32',
+                       'mediumint' => 'Edm.Int32',
+                       'int4' => 'Edm.Int32',
+                       'bigint' => 'Edm.Int64',
+                       'bigserial' => 'Edm.Int64',
+                       'int8' => 'Edm.Int64',
+                       'tinyint' => 'Edm.Byte' }.freeze
   def self.add_edm_types(metadata, props)
     # try num/dec with db_type:
     metadata[:edm_type] = if (md = DB_TYPE_NUMDEC_RGX.match(props[:db_type]))
@@ -80,51 +102,24 @@ module Safrano
 
     # try int-like with db_type:
     # smallint|int|integer|bigint|serial|bigserial
-    metadata[:edm_type] = if (md = DB_TYPE_INTLIKE_RGX.match(props[:db_type]))
 
+    metadata[:edm_type] = if (md = DB_TYPE_INTLIKE_RGX.match(props[:db_type]))
                             if (itype = md[1])
-                              case itype.downcase
-                              when 'smallint', 'int2', 'smallserial'
-                                'Edm.Int16'
-                              when 'int', 'integer', 'serial', 'mediumint', 'int4'
-                                'Edm.Int32'
-                              when 'bigint', 'bigserial', 'int8'
-                                'Edm.Int64'
-                              when 'tinyint'
-                                'Edm.Byte'
-                              end
+                              DB_TY_EDM_TY_MAP[itype.downcase]
                             end
                           end
     return if metadata[:edm_type]
 
     # try Guid with db_type:
 
-    metadata[:edm_type] = if (DB_TYPE_GUID_RGX.match(props[: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
-                            'Edm.Int32'
-                          when :string
-                            'Edm.String'
-                          when :date
-                            'Edm.DateTime'
-                          when :datetime
-                            'Edm.DateTime'
-                          when :time
-                            'Edm.Time'
-                          when :boolean
-                            'Edm.Boolean'
-                          when :float
-                            'Edm.Double'
-                          when :decimal
-                            'Edm.Decimal'
-                          when :blob
-                            'Edm.Binary'
-                          end
+    metadata[:edm_type] = RUBY_TY_EDM_TY_MAP[props[:type]]
   end
 
   # use Edm twice so that we can do include Safrano::Edm and then
@@ -153,8 +148,8 @@ module Safrano
           nil
         end
 
-        def self.convert_from_urlparam(v)
-          return Contract::NOK unless v == 'null'
+        def self.convert_from_urlparam(val)
+          return Contract::NOK unless val == 'null'
 
           Contract.valid(nil)
         end
@@ -164,9 +159,9 @@ module Safrano
       class Binary < String
         extend OutputClassMethods
 
-        def self.convert_from_urlparam(v)
-          # TODO this should use base64
-          Contract.valid(v.dup.force_encoding('BINARY'))
+        def self.convert_from_urlparam(val)
+          # TODO: this should use base64
+          Contract.valid(val.dup.force_encoding('BINARY'))
         end
       end
 
@@ -180,13 +175,13 @@ module Safrano
         end
 
         def self.odata_collection(array)
-          array.map { |v| odata_value(v) }
+          array.map { |val| odata_value(val) }
         end
 
-        def self.convert_from_urlparam(v)
-          return Contract::NOK unless %w[true false].include?(v)
+        def self.convert_from_urlparam(val)
+          return Contract::NOK unless %w[true false].include?(val)
 
-          Contract.valid(v == 'true')
+          Contract.valid(val == 'true')
         end
       end
 
@@ -195,8 +190,8 @@ module Safrano
       class Byte < Integer
         extend OutputClassMethods
 
-        def self.convert_from_urlparam(v)
-          return Contract::NOK unless (bytev = v.to_i) < 256
+        def self.convert_from_urlparam(val)
+          return Contract::NOK unless (bytev = val.to_i) < 256
 
           Contract.valid(bytev)
         end
@@ -209,29 +204,29 @@ module Safrano
         end
 
         def self.odata_collection(array)
-          array.map { |v| odata_value(v) }
+          array.map { |val| odata_value(val) }
         end
 
-        def self.convert_from_urlparam(v)
-          Contract.valid(DateTime.parse(v))
+        def self.convert_from_urlparam(val)
+          Contract.valid(DateTime.parse(val))
         rescue StandardError
-          convertion_error(v)
+          convertion_error(val)
         end
       end
 
       class String < ::String
         extend OutputClassMethods
 
-        def self.convert_from_urlparam(v)
-          Contract.valid(v)
+        def self.convert_from_urlparam(val)
+          Contract.valid(val)
         end
       end
 
       class Int32 < Integer
         extend OutputClassMethods
 
-        def self.convert_from_urlparam(v)
-          return Contract::NOK unless (ret = number_or_nil(v))
+        def self.convert_from_urlparam(val)
+          return Contract::NOK unless (ret = number_or_nil(val))
 
           Contract.valid(ret)
         end
@@ -240,8 +235,8 @@ module Safrano
       class Int64 < Integer
         extend OutputClassMethods
 
-        def self.convert_from_urlparam(v)
-          return Contract::NOK unless (ret = number_or_nil(v))
+        def self.convert_from_urlparam(val)
+          return Contract::NOK unless (ret = number_or_nil(val))
 
           Contract.valid(ret)
         end
@@ -250,8 +245,8 @@ module Safrano
       class Double < Float
         extend OutputClassMethods
 
-        def self.convert_from_urlparam(v)
-          Contract.valid(v.to_f)
+        def self.convert_from_urlparam(val)
+          Contract.valid(val.to_f)
         rescue StandardError
           Contract::NOK
         end
@@ -260,10 +255,10 @@ module Safrano
       class Guid < UUIDTools::UUID
         extend OutputClassMethods
 
-        def self.convert_from_urlparam(v)
-          Contract::NOK unless m = Filter::Parser::Token::GUIDRGX.match(v)
+        def self.convert_from_urlparam(val)
+          Contract::NOK unless (m = Filter::Parser::Token::GUIDRGX.match(val))
 
-          Contract.valid(UUIDTools::UUID.parse m[1])
+          Contract.valid(UUIDTools::UUID.parse(m[1]))
         rescue StandardError
           Contract::NOK
         end
@@ -271,9 +266,3 @@ module Safrano
     end
   end
 end
-
-# include Safrano
-
-# x = Edm::String.new('xxx')
-
-# pp x

data/lib/odata/error.rb

@@ -50,9 +50,9 @@ module Safrano
 
   # used in function import error handling. cf. func import / do_execute_func
   def self.with_error(result)
-    if result.respond_to?(:error) && (err = result.error)
-      yield err
-    end
+    return unless result.respond_to?(:error) && (err = result.error)
+
+    yield err
   end
 
   # base module for HTTP errors, when used as a Error Class

data/lib/odata/expand.rb

@@ -14,9 +14,6 @@ module Safrano
       expandstr.nil? ? EmptyExpand : MultiExpand.new(expandstr, model)
     end
 
-    # output template
-    attr_reader :template
-
     def apply_to_dataset(dtcx)
       Contract.valid(dtcx)
     end

data/lib/odata/function_import.rb

@@ -196,7 +196,7 @@ module Safrano
         unless (@error = check_url_func_params)
           begin
             return yield
-          rescue LocalJumpError => e
+          rescue LocalJumpError
             @error = Safrano::ServiceOperationReturnError.new
           end
         end
@@ -212,13 +212,15 @@ module Safrano
 
           # Note: Sequel::Error exceptions are already
           # handled on rack app level (cf. the call methode )
-          Safrano::with_error(result) do |error|
+          Safrano.with_error(result) do |error|
             @error = error
             return [nil, :error, @error] # this is return from do_execute_func !
           end
 
           # non error case
-          [@returning.do_execute_func_result(result, req, @auto_query_params), :run]
+          [@returning.do_execute_func_result(result, req,
+                                             apply_query_params: @auto_query_params),
+           :run]
         end
       end
 

data/lib/odata/model_ext.rb

@@ -143,39 +143,38 @@ module Safrano
     end
 
     MAX_DEPTH = 6
-    def attribute_path_list(depth = 0)
+    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
@@ -387,7 +386,7 @@ module Safrano
         end
 
         # attribute specific type mapping
-        if colmap = @type_mappings[col]
+        if (colmap = @type_mappings[col])
           metadata[:edm_type] = colmap.edm_type
           if colmap.castfunc
             @casted_cols[col] = colmap.castfunc
@@ -430,7 +429,7 @@ module Safrano
         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) {
+            @casted_cols[col] = lambda { |x|
               UUIDTools::UUID.parse_raw(x).to_s unless x.nil?
             } # Base64
             next
@@ -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)
@@ -522,7 +533,7 @@ module Safrano
 
         kvpredicate = case db_schema[primary_key][:type]
                       when :integer
-                        # TODO harmonize this with primitive_types.rb  convert_from_url
+                        # TODO: Harmonize this with primitive_types.rb  convert_from_url
                         @pk_cast_from_string = ->(str) { Integer(str) }
                         /(\d+)/.freeze
                       else
@@ -530,9 +541,7 @@ module Safrano
                         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*')) }
+                            @pk_cast_from_string = lambda { |str|
                               Sequel::SQL::Blob.new(UUIDTools::UUID.parse(str).raw)
                             }
                           end
@@ -544,7 +553,7 @@ module Safrano
         @iuk_rgx = /\A\s*#{kvpredicate}\s*\z/
       end
       # @entity_id_url_regexp =   /\A\(\s*#{kvpredicate}\s*\)(.*)/.freeze
-      @entity_id_url_regexp = KEYPRED_URL_REGEXP      
+      @entity_id_url_regexp = KEYPRED_URL_REGEXP
     end
 
     def prepare_fields
@@ -677,16 +686,14 @@ module Safrano
               mval = md[1]
             end
           end
-          if mpk && mval
-            mdch[mpk] = if (pk_cast = @pk_cast_from_string[mpk])
-                          pk_cast.call(mval)
-                        else
-                          mval # no cast needed, eg for string
-                        end
-            scan_rgx_parts.delete(mpk)
-          else
-            return Contract::NOK
-          end
+          return Contract::NOK unless mpk && mval
+
+          mdch[mpk] = if (pk_cast = @pk_cast_from_string[mpk])
+                        pk_cast.call(mval)
+                      else
+                        mval # no cast needed, eg for string
+                      end
+          scan_rgx_parts.delete(mpk)
         end
         # normally arriving here we have mdch filled with key values pairs,
         # but not in the model key ordering. lets just re-order the values

data/lib/odata/walker.rb

@@ -66,34 +66,27 @@ module Safrano
         path
       else
         #        path.sub!(/\A#{prefix}/, '')
-        # TODO check
+        # TODO: check
         path.sub(/\A#{prefix}/, EMPTYSTR)
       end
     end
 
     def get_next_transition
-      # this does not work if there are multiple valid transitions
+      # 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
-      #        tr_next = @context.allowed_transitions.detect do |t|
-      #          t.do_match(@path_remain)
-      #        end
 
-      valid_tr = @context.allowed_transitions.select do |t|
+      valid_tr = @context.allowed_transitions.map(&:dup).select do |t|
         t.do_match(@path_remain)
       end
 
-      # this is a very fragile and obscure but required hack (wanted: a
-      # better one) to make attributes that are substrings of each other
+      # HACK: (wanted: a better one) to make attributes that are substrings of each other
       # work well
-      @tr_next = if valid_tr
-                   if valid_tr.size == 1
-                     valid_tr.first
-                   elsif valid_tr.size > 1
-                     valid_tr.max_by { |t| t.match_result[1].size }
-                   end
-                 end
+      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

data/lib/safrano/multipart.rb

@@ -45,9 +45,9 @@ module MIME
       end
 
       def parse_next_part(line)
-        if @target.parser.next_part(line)
+        return if @target.parser.next_part(line)
 
-        elsif @target.parser.last_part(line)
+        if @target.parser.last_part(line)
           @state = :end
         else
           @target.parser.addline(line)
@@ -138,18 +138,17 @@ module MIME
 
       def parse_str(inpstr, level: 0)
         # we need to keep the line separators --> use io.readlines
-        if inpstr.respond_to?(:readlines)
-          @lines = inpstr.readlines(@sep)
-        else
-          # rack input wrapper only has gets but not readlines
-          # BUT the rack SPEC says it only supports gets without argument!
-          # --> finally we end up using read and split into lines...
-          # normally should be ok for $batch POST payloads
-
-          # inpstr.read should be a String
-          @lines = inpstr.read.lines(@sep)
-
-        end
+        @lines = if inpstr.respond_to?(:readlines)
+                   inpstr.readlines(@sep)
+                 else
+                   # rack input wrapper only has gets but not readlines
+                   # BUT the rack SPEC says it only supports gets without argument!
+                   # --> finally we end up using read and split into lines...
+                   # normally should be ok for $batch POST payloads
+
+                   # inpstr.read should be a String
+                   inpstr.read.lines(@sep)
+                 end
         # tmp hack for test-tools that convert CRLF in payload to LF :-(
         if @lines.size == 1
           @sep = LF
@@ -371,7 +370,7 @@ module MIME
 
         def get_mult_resp(full_req)
           get_response(full_req)
-          [202, @response.hd, @response.unparse(true)]
+          [202, @response.hd, @response.unparse_bodyonly]
         end
 
         def get_response(full_req)
@@ -410,10 +409,20 @@ module MIME
           @response
         end
 
-        def unparse(bodyonly = false)
+        def unparse
           b = +String.new
-          b << "#{Safrano::CONTENT_TYPE}: #{@hd[CTT_TYPE_LC]}#{CRLF}" unless bodyonly
+          b << "#{Safrano::CONTENT_TYPE}: #{@hd[CTT_TYPE_LC]}#{CRLF}"
 
+          # warning: duplicated code with below
+          b << crbdcr = "#{CRLF}--#{@boundary}#{CRLF}"
+          b << @content.map(&:unparse).join(crbdcr)
+          b << "#{CRLF}--#{@boundary}--#{CRLF}"
+          b
+        end
+
+        def unparse_bodyonly
+          b = +String.new
+          # warning: duplicated code with above
           b << crbdcr = "#{CRLF}--#{@boundary}#{CRLF}"
           b << @content.map(&:unparse).join(crbdcr)
           b << "#{CRLF}--#{@boundary}--#{CRLF}"

data/lib/safrano/request.rb

@@ -61,6 +61,7 @@ module Safrano
                      'Expires' => '-1',
                      'Pragma' => 'no-cache' }.freeze
     DATASERVICEVERSION = 'DataServiceVersion'
+
     # borowed from Sinatra
     class AcceptEntry
       attr_accessor :params
@@ -79,10 +80,6 @@ module Safrano
         @q = @params.delete('q') { 1.0 }.to_f
       end
 
-      def method_missing(*args, &block)
-        to_str.send(*args, &block)
-      end
-
       def <=>(other)
         other.priority <=> priority
       end
@@ -96,10 +93,6 @@ module Safrano
         super || to_str.respond_to?(*args)
       end
 
-      def to_s(full = false)
-        full ? entry : to_str
-      end
-
       def to_str
         @type
       end

data/lib/safrano/service.rb

@@ -257,7 +257,7 @@ module Safrano
     #  * Single/Multi PK
     #  * Media/Non-Media entity
     # Putting this logic here in modules loaded once on start shall result in less runtime overhead
-    def register_model(modelklass, entity_set_name = nil, is_media = false)
+    def register_model(modelklass, entity_set_name = nil, is_media: false)
       # check that the provided klass is a Sequel Model
 
       raise(Safrano::API::ModelNameError, modelklass) unless modelklass.is_a? Sequel::Model::ClassMethods
@@ -314,7 +314,7 @@ module Safrano
     end
 
     def publish_media_model(modelklass, entity_set_name = nil, &block)
-      register_model(modelklass, entity_set_name, true)
+      register_model(modelklass, entity_set_name, is_media: true)
       # we need to execute the passed block in a deferred step
       # after all models have been registered (due to rel. dependancies)
       #      modelklass.instance_eval(&block) if block_given?
@@ -450,7 +450,7 @@ module Safrano
       end
 
       # check function import definition
-      function_imports.each_value { |func| func.check_definition }
+      function_imports.each_value(&:check_definition)
     end
 
     def execute_deferred_iblocks

data/lib/safrano/version.rb

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

data/lib/sequel/plugins/join_by_paths.rb

@@ -99,6 +99,8 @@ class JoinByPathsHelper < Set
       @result << iset
     end
 
+    many_to_many_count = 0 # counter for differing multiple
+    # many_to_many through alias
     @result.map! do |jseg|
       jseg.map  do |seg|
         leftm = seg.first.model_class
@@ -122,29 +124,65 @@ class JoinByPathsHelper < Set
           lks = [leftm.primary_key].flatten
           rks = [assoc[:key]].flatten
 
-          # TODO
-          # when         # :many_to_many :: A join table is used that has a foreign key that points
+        when :many_to_many, :one_through_one
+          #  :many_to_many :: A join table is used that has a foreign key that points
           #                  to this model's primary key and a foreign key that points to the
           #                  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 
           # 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.
 
+          result_ = []
+
+          # in case of multiple many_to_many rels, we need differing through aliases
+          many_to_many_count = many_to_many_count + 1
+          through_alias = "t#{many_to_many_count}".to_sym
+
+          # For many_to_many first we add the join with assigment table
+          lks_ = [assoc[:left_primary_key]].flatten
+          rks_ = [assoc[:left_key]].flatten
+
+          lks_.map! { |k| Sequel[seg.first.alias_sym][k] } unless seg.first.empty?
+          rks_.map! { |k| Sequel[through_alias][k] }
+
+          result_ << {
+            type: assoc[:type],
+            left: leftm.table_name,
+            right: assoc[:join_table],
+            alias: through_alias,
+            cond: rks_.zip(lks_).to_h
+          }
+
+          # then we add the join with with target table (right)
+          lks = [assoc[:right_key]].flatten
+          rks = [assoc.right_primary_key].flatten
+
+          lks.map! { |k| Sequel[through_alias][k] }
+          rks.map! { |k| Sequel[seg.last.alias_sym][k] }
+
+          result_ << {
+            type: assoc[:type],
+            left: assoc[:join_table],
+            right: rightm.table_name,
+            alias: seg.last.alias_sym,
+            cond: rks.zip(lks).to_h
+          }
+
+          next result_
+
+
         end
 
         lks.map! { |k| Sequel[seg.first.alias_sym][k] } unless seg.first.empty?
-
         rks.map! { |k| Sequel[seg.last.alias_sym][k] }
 
         { type: assoc[:type],
-          segment: seg,
           left: leftm.table_name,
           right: rightm.table_name,
           alias: seg.last.alias_sym,
-          left_keys: lks,
-          right_keys: rks,
           cond: rks.zip(lks).to_h }
       end
     end
@@ -159,11 +197,14 @@ class JoinByPathsHelper < Set
     return start_dataset if empty?
 
     build_unique_join_segments
-    @result.flatten.inject(start_dataset) do |dt, jo|
+    need_distinct = false
+    ret = @result.flatten.inject(start_dataset) do |dt, jo|
+      need_distinct = true if jo[:type] == :many_to_many
       dt.left_join(Sequel[jo[:right]].as(jo[:alias]),
                    jo[:cond],
                    implicit_qualifier: jo[:left])
     end
+    need_distinct ? ret.distinct : ret
   end
 
   def join_by_paths_helper(*pathlist)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.1
 platform: ruby
 authors:
 - oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-13 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: