safrano 0.6.7 → 0.7.0

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

@@ -372,8 +372,7 @@ module Safrano
 
         end
         model.media_handler.replace_file(data: data,
-                                         entity: self,
-                                         filename: filename)
+                                         entity: self)
 
         ARY_204_EMPTY_HASH_ARY
       end

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

@@ -142,11 +142,11 @@ module Safrano
       @attribute_path_list = attribute_path_list
     end
 
-    MAX_DEPTH = 6
+    MAX_DEPTH = 4
     def attribute_path_list(depth = 0)
       ret = @columns_str.dup
       # break circles
-      return ret if depth > MAX_DEPTH
+      return ret if depth >= MAX_DEPTH
 
       depth += 1
 
@@ -166,7 +166,7 @@ module Safrano
       ret.concat(@nav_collection_attribs_keys) if @nav_collection_attribs
 
       # break circles
-      return ret if depth > MAX_DEPTH
+      return ret if depth >= MAX_DEPTH
 
       depth += 1
 
@@ -387,7 +387,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 +430,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
@@ -445,9 +445,9 @@ module Safrano
       end # db_schema.each do |col, props|
 
       # check if key needs casting. Important for later entity-uri generation !
-      if primary_key.is_a? Symbol # single key field
-        @pk_castfunc = @casted_cols[primary_key]
-      end
+      return unless primary_key.is_a? Symbol # single key field
+
+      @pk_castfunc = @casted_cols[primary_key]
     end # build_casted_cols(service)
 
     def finalize_publishing(service)
@@ -516,14 +516,13 @@ module Safrano
 
         @iuk_rgx_parts.transform_values! { |v| /\A#{v}\z/ }
 
-        @entity_id_url_regexp = KEYPRED_URL_REGEXP
       else
         @pk_names = [primary_key.to_s]
         @pk_cast_from_string = nil
 
         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
@@ -531,9 +530,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
@@ -543,9 +540,9 @@ module Safrano
                         end
                       end
         @iuk_rgx = /\A\s*#{kvpredicate}\s*\z/
-        # @entity_id_url_regexp =   /\A\(\s*#{kvpredicate}\s*\)(.*)/.freeze
-        @entity_id_url_regexp = KEYPRED_URL_REGEXP
       end
+      # @entity_id_url_regexp =   /\A\(\s*#{kvpredicate}\s*\)(.*)/.freeze
+      @entity_id_url_regexp = KEYPRED_URL_REGEXP
     end
 
     def prepare_fields
@@ -673,21 +670,19 @@ module Safrano
 
         mid.split(/\s*,\s*/).each do |midpart|
           mval = nil
-          mpk, mrgx = scan_rgx_parts.find do |_pk, rgx|
+          mpk, _mrgx = scan_rgx_parts.find do |_pk, rgx|
             if (md = rgx.match(midpart))
               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)
@@ -113,8 +113,8 @@ module MIME
       MPS = 'multipart/'
       MP_RGX1 = %r{^(digest|mixed);\s*boundary="(.*)"}.freeze
       MP_RGX2 = %r{^(digest|mixed);\s*boundary=(.*)}.freeze
-      #      APP_HTTP_RGX = %r{^application/http}.freeze
       APP_HTTP = 'application/http'
+
       def new_content
         @target =
           if @target_ct.start_with?(MPS) &&
@@ -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
@@ -319,7 +318,7 @@ module MIME
           def addline(line)
             @body_lines << line
           end
-        end
+        end # Parser
 
         attr_reader :boundary
 
@@ -369,12 +368,12 @@ module MIME
           @hd[CTT_TYPE_LC] = "#{Safrano::MP_MIXED}; boundary=#{@boundary}"
         end
 
-        def get_http_resp(batcha)
-          get_response(batcha)
-          [@response.hd, @response.unparse(true)]
+        def get_mult_resp(full_req)
+          get_response(full_req)
+          [202, @response.hd, @response.unparse_bodyonly]
         end
 
-        def get_response(batcha)
+        def get_response(full_req)
           @response = self.class.new(::SecureRandom.uuid)
           @response.set_multipart_header
           if @level == 1 # changeset need their own global transaction
@@ -382,9 +381,10 @@ module MIME
             # and will be flagged with in_changeset=true
             # and this will finally be used to skip the transaction
             # of the changes
-            batcha.db.transaction do
+
+            full_req.db.transaction do
               begin
-                @response.content = @content.map { |part| part.get_response(batcha) }
+                @response.content = @content.map { |part| part.get_response(full_req) }
               rescue Sequel::Rollback => e
                 # one of the changes of the changeset has failed
                 # --> provide a dummy empty response for the change-parts
@@ -394,7 +394,7 @@ module MIME
               end
             end
           else
-            @response.content = @content.map { |prt| prt.get_response(batcha) }
+            @response.content = @content.map { |part| part.get_response(full_req) }
           end
           @response
         end
@@ -409,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}"
@@ -450,6 +460,7 @@ module MIME
       class HttpResp < Media
         attr_accessor :status
         attr_accessor :content
+        attr_accessor :rack_resp
 
         APPLICATION_HTTP_11 = ['Content-Type: application/http',
                                "Content-Transfer-Encoding: binary#{CRLF}",
@@ -558,9 +569,9 @@ module MIME
           @content = other.content
         end
 
-        def get_response(batchapp)
-          # self.content should be the request
-          rack_resp = batchapp.batch_call(@content)
+        def get_response(full_req)
+          # self.content should be the part-request
+          rack_resp = full_req.batch_call(@content)
           @response = MIME::Content::Application::HttpResp.new
           @response.status = rack_resp[0]
           @response.hd = rack_resp[1]