aspera-cli 4.12.0 → 4.14.0

data/lib/aspera/fasp/uri.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# cspell:words httpport targetrate minrate bwcap createpath lockpolicy lockminrate
+
 require 'aspera/log'
 require 'aspera/command_line_builder'
 
@@ -7,8 +9,8 @@ module Aspera
   module Fasp
     # translates a "faspe:" URI (used in Faspex 4) into transfer spec hash
     class Uri
-      def initialize(fasplink)
-        @fasp_uri = URI.parse(fasplink.gsub(' ', '%20'))
+      def initialize(fasp_link)
+        @fasp_uri = URI.parse(fasp_link.gsub(' ', '%20'))
         # TODO: check scheme is faspe
       end
 
@@ -18,32 +20,32 @@ module Aspera
         result_ts['remote_user'] = @fasp_uri.user
         result_ts['ssh_port'] = @fasp_uri.port
         result_ts['paths'] = [{'source' => URI.decode_www_form_component(@fasp_uri.path)}]
-        # faspex does not encode trailing base64 encoded tags, fix that
+        # faspex does not encode trailing base64 padding, fix that to be able to decode properly
         fixed_query = @fasp_uri.query.gsub(/(=+)$/){|x|'%3D' * x.length}
 
         URI.decode_www_form(fixed_query).each do |i|
           name = i[0]
           value = i[1]
           case name
-          when 'cookie' then result_ts['cookie'] = value
-          when 'token' then result_ts['token'] = value
-          when 'sshfp' then result_ts['sshfp'] = value
-          when 'policy' then result_ts['rate_policy'] = value
-          when 'httpport' then result_ts['http_fallback_port'] = value.to_i
-          when 'targetrate' then result_ts['target_rate_kbps'] = value.to_i
-          when 'minrate' then result_ts['min_rate_kbps'] = value.to_i
-          when 'port' then result_ts['fasp_port'] = value.to_i
-          when 'bwcap' then result_ts['target_rate_cap_kbps'] = value.to_i
-          when 'enc' then result_ts['cipher'] = value.gsub(/^aes/, 'aes-').gsub(/cfb$/, '-cfb').gsub(/gcm$/, '-gcm').gsub(/--/, '-')
-          when 'tags64' then result_ts['tags'] = JSON.parse(Base64.strict_decode64(value))
-          when 'createpath' then result_ts['create_dir'] = CommandLineBuilder.yes_to_true(value)
-          when 'fallback' then result_ts['http_fallback'] = CommandLineBuilder.yes_to_true(value)
-          when 'lockpolicy' then result_ts['lock_rate_policy'] = CommandLineBuilder.yes_to_true(value)
+          when 'cookie'      then result_ts['cookie'] = value
+          when 'token'       then result_ts['token'] = value
+          when 'sshfp'       then result_ts['sshfp'] = value
+          when 'policy'      then result_ts['rate_policy'] = value
+          when 'httpport'    then result_ts['http_fallback_port'] = value.to_i
+          when 'targetrate'  then result_ts['target_rate_kbps'] = value.to_i
+          when 'minrate'     then result_ts['min_rate_kbps'] = value.to_i
+          when 'port'        then result_ts['fasp_port'] = value.to_i
+          when 'bwcap'       then result_ts['target_rate_cap_kbps'] = value.to_i
+          when 'enc'         then result_ts['cipher'] = value.gsub(/^aes/, 'aes-').gsub(/cfb$/, '-cfb').gsub(/gcm$/, '-gcm').gsub(/--/, '-')
+          when 'tags64'      then result_ts['tags'] = JSON.parse(Base64.strict_decode64(value))
+          when 'createpath'  then result_ts['create_dir'] = CommandLineBuilder.yes_to_true(value)
+          when 'fallback'    then result_ts['http_fallback'] = CommandLineBuilder.yes_to_true(value)
+          when 'lockpolicy'  then result_ts['lock_rate_policy'] = CommandLineBuilder.yes_to_true(value)
           when 'lockminrate' then result_ts['lock_min_rate'] = CommandLineBuilder.yes_to_true(value)
-          when 'auth' then Log.log.debug{"ignoring auth #{name}=#{value}"} # TODO: translate into transfer spec ? yes/no
-          when 'v' then Log.log.debug{"ignoring v #{name}=#{value}"} # TODO: translate into transfer spec ? 2
-          when 'protect' then Log.log.debug{"ignoring protect #{name}=#{value}"} # TODO: translate into transfer spec ?
-          else Log.log.warn{"URI parameter ignored: #{name} = #{value}"}
+          when 'auth'        then Log.log.debug{"ignoring #{name}=#{value}"} # Not used (yes/no)
+          when 'v'           then Log.log.debug{"ignoring #{name}=#{value}"} # rubocop:disable Lint/DuplicateBranch Not used (2)
+          when 'protect'     then Log.log.debug{"ignoring #{name}=#{value}"} # rubocop:disable Lint/DuplicateBranch TODO: what is this ?
+          else                    Log.log.warn{"URI parameter ignored: #{name} = #{value}"}
           end
         end
         return result_ts

data/lib/aspera/faspex_gw.rb

@@ -84,6 +84,7 @@ module Aspera
           response['Content-Type'] = 'application/json'
           response.body = {error: e.message}.to_json
           Log.log.error(e.message)
+          Log.log.debug{e.backtrace.join("\n")}
         end
       else
         response.status = 400

data/lib/aspera/faspex_postproc.rb

@@ -13,13 +13,13 @@ module Aspera
     def initialize(server, parameters)
       raise 'parameters must be Hash' unless parameters.is_a?(Hash)
       @parameters = parameters.symbolize_keys
-      Log.dump(:postproc_parameters, @parameters)
+      Log.dump(:post_proc_parameters, @parameters)
       raise "unexpected key in parameters config: only: #{ALLOWED_PARAMETERS.join(', ')}" if @parameters.keys.any?{|k|!ALLOWED_PARAMETERS.include?(k)}
       @parameters[:script_folder] ||= '.'
       @parameters[:fail_on_error] ||= false
       @parameters[:timeout_seconds] ||= 60
       super(server)
-      Log.log.debug{"Faspex4PostProcServlet initialized"}
+      Log.log.debug{'Faspex4PostProcServlet initialized'}
     end
 
     def do_POST(request, response)
@@ -39,7 +39,7 @@ module Aspera
           return
         end
         # build script path by removing domain, and adding script folder
-        script_file = request.path[@parameters[:root].size .. ]
+        script_file = request.path[@parameters[:root].size..]
         Log.log.debug{"script file=#{script_file}"}
         script_path = File.join(@parameters[:script_folder], script_file)
         Log.log.debug{"script=#{script_path}"}

data/lib/aspera/hash_ext.rb

@@ -2,11 +2,21 @@
 
 class ::Hash
   def deep_merge(second)
-    merge(second){|_key, v1, v2|Hash === v1 && Hash === v2 ? v1.deep_merge(v2) : v2}
+    merge(second){|_key, v1, v2|v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.deep_merge(v2) : v2}
   end
 
   def deep_merge!(second)
-    merge!(second){|_key, v1, v2|Hash === v1 && Hash === v2 ? v1.deep_merge!(v2) : v2}
+    merge!(second){|_key, v1, v2|v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.deep_merge!(v2) : v2}
+  end
+
+  def deep_do(memory=nil, &block)
+    each do |key, value|
+      if value.is_a?(Hash)
+        value.deep_do(memory, &block)
+      else
+        yield(self, key, value, memory)
+      end
+    end
   end
 end
 

data/lib/aspera/keychain/macos_security.rb

@@ -3,11 +3,11 @@
 # https://github.com/fastlane-community/security
 require 'aspera/cli/info'
 
-# enhance the gem to support other keychains
+# enhance the gem to support other key chains
 module Aspera
   module Keychain
     module MacosSecurity
-      # keychain based on macOS keychain, using `security` cmmand line
+      # keychain based on macOS keychain, using `security` command line
       class Keychain
         DOMAINS = %i[user system common dynamic].freeze
         LIST_OPTIONS = {
@@ -32,12 +32,12 @@ module Aspera
           getpass:  :g
         }.freeze
         class << self
-          def execute(command, options=nil, supported=nil, lastopt=nil)
+          def execute(command, options=nil, supported=nil, last_opt=nil)
             url = options&.delete(:url)
             if !url.nil?
               uri = URI.parse(url)
               raise 'only https' unless uri.scheme.eql?('https')
-              options[:protocol] = 'htps'
+              options[:protocol] = 'htps' # cspell: disable-line
               raise 'host required in URL' if uri.host.nil?
               options[:server] = uri.host
               options[:path] = uri.path unless ['', '/'].include?(uri.path)
@@ -50,28 +50,28 @@ module Aspera
               cmd.push("-#{supported[k]}")
               cmd.push(v.shellescape) unless v.empty?
             end
-            cmd.push(lastopt) unless lastopt.nil?
+            cmd.push(last_opt) unless last_opt.nil?
             Log.log.debug{"executing>>#{cmd.join(' ')}"}
             result = %x(#{cmd.join(' ')} 2>&1)
             Log.log.debug{"result>>[#{result}]"}
             return result
           end
 
-          def keychains(output)
+          def key_chains(output)
             output.split("\n").collect { |line| new(line.strip.gsub(/^"|"$/, '')) }
           end
 
           def default
-            keychains(execute('default-keychain')).first
+            key_chains(execute('default-keychain')).first
           end
 
           def login
-            keychains(execute('login-keychain')).first
+            key_chains(execute('login-keychain')).first
           end
 
           def list(options={})
             raise ArgumentError, "Invalid domain #{options[:domain]}, expected one of: #{DOMAINS}" unless options[:domain].nil? || DOMAINS.include?(options[:domain])
-            keychains(execute('list-keychains', options, LIST_OPTIONS))
+            key_chains(execute('list-key_chains', options, LIST_OPTIONS))
           end
 
           def by_name(name)
@@ -88,14 +88,14 @@ module Aspera
           [string].pack('H*').force_encoding('UTF-8')
         end
 
-        def password(operation, passtype, options)
+        def password(operation, pass_type, options)
           raise "wrong operation: #{operation}" unless %i[add find delete].include?(operation)
-          raise "wrong passtype: #{passtype}" unless %i[generic internet].include?(passtype)
+          raise "wrong pass_type: #{pass_type}" unless %i[generic internet].include?(pass_type)
           raise 'options shall be Hash' unless options.is_a?(Hash)
           missing = (operation.eql?(:add) ? %i[account service password] : %i[label]) - options.keys
           raise "missing options: #{missing}" unless missing.empty?
           options[:getpass] = '' if operation.eql?(:find)
-          output = self.class.execute("#{operation}-#{passtype}-password", options, ADD_PASS_OPTIONS, @path)
+          output = self.class.execute("#{operation}-#{pass_type}-password", options, ADD_PASS_OPTIONS, @path)
           raise output.gsub(/^.*: /, '') if output.start_with?('security: ')
           return nil unless operation.eql?(:find)
           attributes = {}
@@ -143,7 +143,7 @@ module Aspera
         raise 'not found' if info.nil?
         result = options.clone
         result[:secret] = info['password']
-        result[:description] = info['icmt']
+        result[:description] = info['icmt'] # cspell: disable-line
         return result
       end
 

data/lib/aspera/log.rb

@@ -39,6 +39,7 @@ module Aspera
         end
       end
 
+      # Capture the output of $stderr and log it at debug level
       def capture_stderr
         real_stderr = $stderr
         $stderr = StringIO.new

data/lib/aspera/node.rb

@@ -17,6 +17,7 @@ module Aspera
     MATCH_EXEC_PREFIX = 'exec:'
     HEADER_X_ASPERA_ACCESS_KEY = 'X-Aspera-AccessKey'
     PATH_SEPARATOR = '/'
+    TS_FIELDS_TO_COPY = %w[remote_host remote_user ssh_port fasp_port wss_enabled wss_port].freeze
 
     # register node special token decoder
     Oauth.register_decoder(lambda{|token|JSON.parse(Zlib::Inflate.inflate(Base64.decode64(token)).partition('==SIGNATURE==').first)})
@@ -40,7 +41,9 @@ module Aspera
       end
     end
 
-    REQUIRED_APP_INFO_FIELDS = %i[node_info app api workspace_info].freeze
+    # fields in @app_info
+    REQUIRED_APP_INFO_FIELDS = %i[api app node_info workspace_id workspace_name].freeze
+    # methods of @app_info[:api]
     REQUIRED_APP_API_METHODS = %i[node_api_from add_ts_tags].freeze
     private_constant :REQUIRED_APP_INFO_FIELDS, :REQUIRED_APP_API_METHODS
 
@@ -71,21 +74,27 @@ module Aspera
 
     # @returns [Aspera::Node] a Node or nil
     def node_id_to_node(node_id)
-      return self if !@app_info.nil? && @app_info[:node_info]['id'].eql?(node_id)
-      return @app_info[:api].node_api_from(node_id: node_id, workspace_info: @app_info[workspace_info]) unless @app_info.nil?
+      if !@app_info.nil?
+        return self if node_id.eql?(@app_info[:node_info]['id'])
+        return @app_info[:api].node_api_from(
+          node_id: node_id,
+          workspace_id: @app_info[:workspace_id],
+          workspace_name: @app_info[:workspace_name])
+      end
       Log.log.warn{"cannot resolve link with node id #{node_id}"}
       return nil
     end
 
-    # recursively browse in a folder (with non-recursive method)
+    # Recursively browse in a folder (with non-recursive method)
     # sub folders are processed if the processing method returns true
     # @param state [Object] state object sent to processing method
-    # @param method [Symbol] processing method name
     # @param top_file_id [String] file id to start at (default = access key root file id)
     # @param top_file_path [String] path of top folder (default = /)
-    def process_folder_tree(state:, method:, top_file_id:, top_file_path: '/')
+    # @param block [Proc] processing method, args: entry, path, state
+    def process_folder_tree(state:, top_file_id:, top_file_path: '/', &block)
       raise 'INTERNAL ERROR: top_file_path not set' if top_file_path.nil?
-      raise "INTERNAL ERROR: Missing method #{method}" unless respond_to?(method)
+      raise 'INTERNAL ERROR: Missing block' unless block
+      # start at top folder
       folders_to_explore = [{id: top_file_id, path: top_file_path}]
       Log.dump(:folders_to_explore, folders_to_explore)
       until folders_to_explore.empty?
@@ -102,9 +111,9 @@ module Aspera
         Log.dump(:folder_contents, folder_contents)
         folder_contents.each do |entry|
           relative_path = File.join(current_item[:path], entry['name'])
-          Log.log.debug{"looking #{relative_path}".bg_green}
+          Log.log.debug{"process_folder_tree checking #{relative_path}"}
           # continue only if method returns true
-          next unless send(method, entry, relative_path, state)
+          next unless yield(entry, relative_path, state)
           # entry type is file, folder or link
           case entry['type']
           when 'folder'
@@ -112,85 +121,74 @@ module Aspera
           when 'link'
             node_id_to_node(entry['target_node_id'])&.process_folder_tree(
               state:         state,
-              method:        method,
               top_file_id:   entry['target_id'],
-              top_file_path: relative_path)
+              top_file_path: relative_path,
+              &block)
           end
         end
       end
     end # process_folder_tree
 
-    # processing method to resolve a file path to id
-    # @returns true if processing need to continue
-    def process_resolve_node_path(entry, _path, state)
-      # stop digging here if not in right path
-      return false unless entry['name'].eql?(state[:path].first)
-      # ok it matches, so we remove the match
-      state[:path].shift
-      case entry['type']
-      when 'file'
-        # file must be terminal
-        raise "#{entry['name']} is a file, expecting folder to find: #{state[:path]}" unless state[:path].empty?
-        # it's terminal, we found it
-        state[:result] = {api: self, file_id: entry['id']}
-        return false
-      when 'folder'
-        if state[:path].empty?
-          # we found it
-          state[:result] = {api: self, file_id: entry['id']}
-          return false
-        end
-      when 'link'
-        if state[:path].empty?
-          # we found it
-          other_node = node_id_to_node(entry['target_node_id'])
-          raise 'cannot resolve link' if other_node.nil?
-          state[:result] = {api: other_node, file_id: entry['target_id']}
-          return false
-        end
-      else
-        Log.log.warn{"Unknown element type: #{entry['type']}"}
-      end
-      # continue to dig folder
-      return true
-    end
-
     # Navigate the path from given file id
     # @param top_file_id [String] id initial file id
     # @param path [String]  file path
     # @return [Hash] {.api,.file_id}
     def resolve_api_fid(top_file_id, path)
       raise 'file id shall be String' unless top_file_id.is_a?(String)
+      process_last_link = path.end_with?(PATH_SEPARATOR)
       path_elements = path.split(PATH_SEPARATOR).reject(&:empty?)
       return {api: self, file_id: top_file_id} if path_elements.empty?
       resolve_state = {path: path_elements, result: nil}
-      process_folder_tree(state: resolve_state, method: :process_resolve_node_path, top_file_id: top_file_id)
-      raise "entry not found: #{resolve_state[:path]}" if resolve_state[:result].nil?
-      return resolve_state[:result]
-    end
-
-    # add entry to list if test block is success
-    # @return [TrueClass,FalseClass]
-    def process_find_files(entry, path, state)
-      begin
-        # add to result if match filter
-        state[:found].push(entry.merge({'path' => path})) if state[:test_block].call(entry)
-        # process link
-        if entry[:type].eql?('link')
-          other_node = node_id_to_node(entry['target_node_id'])
-          other_node.process_folder_tree(state: state, method: process_find_files, top_file_id: entry['target_id'], top_file_path: path)
+      process_folder_tree(state: resolve_state, top_file_id: top_file_id) do |entry, _path, state|
+        # this block is called recursively for each entry in folder
+        # stop digging here if not in right path
+        next false unless entry['name'].eql?(state[:path].first)
+        # ok it matches, so we remove the match
+        state[:path].shift
+        case entry['type']
+        when 'file'
+          # file must be terminal
+          raise "#{entry['name']} is a file, expecting folder to find: #{state[:path]}" unless state[:path].empty?
+          # it's terminal, we found it
+          state[:result] = {api: self, file_id: entry['id']}
+          next false
+        when 'folder'
+          if state[:path].empty?
+            # we found it
+            state[:result] = {api: self, file_id: entry['id']}
+            next false
+          end
+        when 'link'
+          if state[:path].empty?
+            if process_last_link
+              # we found it
+              other_node = node_id_to_node(entry['target_node_id'])
+              raise 'cannot resolve link' if other_node.nil?
+              state[:result] = {api: other_node, file_id: entry['target_id']}
+            else
+              # we found it but we do not process the link
+              state[:result] = {api: self, file_id: entry['id']}
+            end
+            next false
+          end
+        else
+          Log.log.warn{"Unknown element type: #{entry['type']}"}
         end
-      rescue StandardError => e
-        Log.log.error{"#{path}: #{e.message}"}
+        # continue to dig folder
+        next true
       end
-      # process all folders
-      return true
+      raise "entry not found: #{resolve_state[:path]}" if resolve_state[:result].nil?
+      return resolve_state[:result]
     end
 
     def find_files(top_file_id, test_block)
       Log.log.debug{"find_files: file id=#{top_file_id}"}
       find_state = {found: [], test_block: test_block}
-      process_folder_tree(state: find_state, method: :process_find_files, top_file_id: top_file_id)
+      process_folder_tree(state: find_state, top_file_id: top_file_id) do |entry, path, state|
+        state[:found].push(entry.merge({'path' => path})) if state[:test_block].call(entry)
+        # test all files deeply
+        true
+      end
       return find_state[:found]
     end
 
@@ -205,6 +203,8 @@ module Aspera
       case params[:auth][:type]
       when :basic
         ak_name = params[:auth][:username]
+        raise 'ERROR: no secret in node object' unless params[:auth][:password]
+        ak_token = Rest.basic_creds(params[:auth][:username], params[:auth][:password])
       when :oauth2
         ak_name = params[:headers][HEADER_X_ASPERA_ACCESS_KEY]
         # TODO: token_generation_lambda = lambda{|do_refresh|oauth_token(force_refresh: do_refresh)}
@@ -216,7 +216,7 @@ module Aspera
         'direction' => direction,
         'token'     => ak_token,
         'tags'      => {
-          'aspera' => {
+          Fasp::TransferSpec::TAG_RESERVED => {
             'node' => {
               'access_key' => ak_name,
               'file_id'    => file_id
@@ -228,12 +228,7 @@ module Aspera
       add_tspec_info(transfer_spec)
       transfer_spec.deep_merge!(ts_merge) unless ts_merge.nil?
       # add application specific tags (AoC)
-      the_app = app_info
-      the_app[:api].add_ts_tags(transfer_spec: transfer_spec, app_info: the_app) unless the_app.nil?
-      # add basic token
-      if transfer_spec['token'].nil?
-        ts_basic_token(transfer_spec)
-      end
+      app_info[:api].add_ts_tags(transfer_spec: transfer_spec, app_info: app_info) unless app_info.nil?
       # add remote host info
       if self.class.use_standard_ports
         # get default TCP/UDP ports and transfer user
@@ -244,23 +239,17 @@ module Aspera
           transfer_spec['remote_host'] = @app_info[:node_info]['transfer_url']
         end
       else
-        # retrieve values from API
-        std_t_spec = create(
+        # retrieve values from API (and keep a copy/cache)
+        @std_t_spec_cache ||= create(
           'files/download_setup',
           {transfer_requests: [{ transfer_request: {paths: [{'source' => '/'}] } }] }
         )[:data]['transfer_specs'].first['transfer_spec']
         # copy some parts
-        %w[remote_host remote_user ssh_port fasp_port wss_enabled wss_port].each {|i| transfer_spec[i] = std_t_spec[i] if std_t_spec.key?(i)}
+        TS_FIELDS_TO_COPY.each {|i| transfer_spec[i] = @std_t_spec_cache[i] if @std_t_spec_cache.key?(i)}
       end
+      Log.log.warn{"Expected transfer user: #{Fasp::TransferSpec::ACCESS_KEY_TRANSFER_USER}, but have #{transfer_spec['remote_user']}"} \
+        unless transfer_spec['remote_user'].eql?(Fasp::TransferSpec::ACCESS_KEY_TRANSFER_USER)
       return transfer_spec
     end
-
-    # set basic token in transfer spec
-    def ts_basic_token(ts)
-      Log.log.warn{"Expected transfer user: #{Fasp::TransferSpec::ACCESS_KEY_TRANSFER_USER}, but have #{ts['remote_user']}"} \
-        unless ts['remote_user'].eql?(Fasp::TransferSpec::ACCESS_KEY_TRANSFER_USER)
-      raise 'ERROR: no secret in node object' unless params[:auth][:password]
-      ts['token'] = Rest.basic_creds(params[:auth][:username], params[:auth][:password])
-    end
   end
 end

data/lib/aspera/oauth.rb

@@ -87,6 +87,7 @@ module Aspera
       # @param lambda_create called to create token
       # @param id_create called to generate unique id for token, for cache
       def register_token_creator(id, lambda_create, id_create)
+        Log.log.debug{"registering token creator #{id}"}
         raise 'ERROR: requites Symbol and 2 lambdas' unless id.is_a?(Symbol) && lambda_create.is_a?(Proc) && id_create.is_a?(Proc)
         @create_handlers[id] = lambda_create
         @id_handlers[id] = id_create
@@ -94,7 +95,7 @@ module Aspera
 
       # @return one of the registered creators for the given create type
       def token_creator(id)
-        raise "token grant method unknown: #{id}/#{id.class}" unless @create_handlers.key?(id)
+        raise "token grant method unknown: '#{id}' (#{id.class})" unless @create_handlers.key?(id)
         @create_handlers[id]
       end
 
@@ -191,7 +192,7 @@ module Aspera
       # replace default values
       @generic_parameters = DEFAULT_CREATE_PARAMS.deep_merge(a_params)
       # legacy
-      @generic_parameters[:grant_method] ||= @generic_parameters.delete(:crtype) if @generic_parameters.key?(:crtype)
+      @generic_parameters[:grant_method] ||= @generic_parameters.delete(:crtype) if @generic_parameters.key?(:crtype) # cspell: disable-line
       # check that type is known
       self.class.token_creator(@generic_parameters[:grant_method])
       # specific parameters for the creation type
@@ -272,7 +273,7 @@ module Aspera
 
       # an API was already called, but failed, we need to regenerate or refresh
       if use_refresh_token
-        if token_data.is_a?(Hash) && token_data.key?('refresh_token')
+        if token_data.is_a?(Hash) && token_data.key?('refresh_token') && !token_data['refresh_token'].eql?('not_supported')
           # save possible refresh token, before deleting the cache
           refresh_token = token_data['refresh_token']
         end

data/lib/aspera/persistency_action_once.rb

@@ -8,7 +8,7 @@ module Aspera
   class PersistencyActionOnce
     # @param :manager  Mandatory Database
     # @param :data     Mandatory object to persist, must be same object from begin to end (assume array by default)
-    # @param :id      Mandatory identifiers
+    # @param :id       Mandatory identifiers
     # @param :delete   Optional  delete persistency condition
     # @param :parse    Optional  parse method (default to JSON)
     # @param :format   Optional  dump method (default to JSON)

data/lib/aspera/preview/file_types.rb

@@ -12,6 +12,7 @@ module Aspera
       CONVERSION_TYPES = %i[image office pdf plaintext video].freeze
 
       # define how files are processed based on mime type
+      # spellchecker:disable
       SUPPORTED_MIME_TYPES = {
         'application/json'                                                          => :plaintext,
         'application/mac-binhex40'                                                  => :office,
@@ -267,6 +268,7 @@ module Aspera
         'ycbcra'       => :image,
         'yuv'          => :image,
         'zabw'         => :office}.freeze
+      # spellchecker:enable
 
       private_constant :SUPPORTED_MIME_TYPES, :SUPPORTED_EXTENSIONS
 
@@ -301,12 +303,12 @@ module Aspera
       def conversion_type(filepath, mimetype)
         Log.log.debug{"conversion_type(#{filepath},m=#{mimetype},t=#{@use_mimemagic})"}
         # 1- get type from provided mime type, using local mapping
-        conv_type = SUPPORTED_MIME_TYPES[mimetype] if !mimetype.nil?
+        conversion_type = SUPPORTED_MIME_TYPES[mimetype] if !mimetype.nil?
         # 2- else, from computed mime type (if available)
-        if conv_type.nil? && @use_mimemagic
+        if conversion_type.nil? && @use_mimemagic
           detected_mime = mime_from_file(filepath)
           if !detected_mime.nil?
-            conv_type = SUPPORTED_MIME_TYPES[detected_mime]
+            conversion_type = SUPPORTED_MIME_TYPES[detected_mime]
             if !mimetype.nil?
               if mimetype.eql?(detected_mime)
                 Log.log.debug('matching mime type per magic number')
@@ -319,9 +321,9 @@ module Aspera
         end
         # 3- else, from extensions, using local mapping
         extension = File.extname(filepath.downcase)[1..-1]
-        conv_type = SUPPORTED_EXTENSIONS[extension] if conv_type.nil?
-        Log.log.debug{"conversion_type(#{extension}): #{conv_type.class.name} [#{conv_type}]"}
-        return conv_type
+        conversion_type = SUPPORTED_EXTENSIONS[extension] if conversion_type.nil?
+        Log.log.debug{"conversion_type(#{extension}): #{conversion_type.class.name} [#{conversion_type}]"}
+        return conversion_type
       end
     end
   end