qcloud_cos 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26230f62cf688ff075f6b2a458f6065b5bd70fca
-  data.tar.gz: ca6107d064f556dc927e03d7644e63e091ef6b47
+  metadata.gz: 82a6d54335364ee45eb1d60e4fe33c02181d13f8
+  data.tar.gz: f3ee2074c3a196a7f46ce1ba2077fbb85d16a354
 SHA512:
-  metadata.gz: 520f62c86b0d6f6cbc160f599a00bf8210387f2ff761d693bbcaac16c2421aaecc7b7f8e1ee58003f850f6ebd6bbbbaf3f4ee6c804a0dabfb87ec8259c268e7e
-  data.tar.gz: 8c7e2924e1a6d9dc855f79946feffcf83031f505737f949edd5c031c54baebaa91fec0609a02fe219f56c0b3988a84f2b4fc95025b57b6198640434e23c9c573
+  metadata.gz: b08e8867cd08cd0fba2eefec5754dcacc30633a68d8cbdca71af7b745db0006994e81379bbe25d94680b293cfb45c651d1a7afc0efc1a960d42feb20caa10934
+  data.tar.gz: 76f4f556cf7fe094c5db2d0515be9cc7d463902b115fc439fe8c79905ebe486510f4b306811a5c790da272d43012ae5c587f6d208930d0df8391a713055ad801

data/.rubocop.yml

@@ -35,3 +35,11 @@ Style/AsciiComments:
 
 Metrics/ModuleLength:
   Enabled: false
+
+Style/FileName:
+  Exclude:
+    - 'bin/*'
+
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/qcloud_cos/model/*'

data/README.md

@@ -54,7 +54,7 @@ Here is original Restful API, It has the most detailed and authoritative explana
 
 Here is our RDoc Document, It's well format to help you find more detail about methods.
 
-+ [RDoc Document](http://www.rubydoc.info/gems/qcloud_cos/0.3.0)
++ [RDoc Document](http://www.rubydoc.info/gems/qcloud_cos/0.4.1)
 
 
 Here are some more guides for help you. Welcome to advice.
@@ -76,4 +76,4 @@ We use minitest for test and rubocop for Syntax checker, If you want to make con
 
 ## License
 
-licensed under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html)
+licensed under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html)

data/bin/qcloud-cos

@@ -10,10 +10,12 @@ program :description, 'command-line tool for Qcloud COS'
 program :help, 'Author', 'Newell Zhu<zlx.star@gmail.com>'
 default_command :help
 
+global_option '-b', '--bucket Bucket Name', 'specify bucket name, it will override default bucket'
+
 command :config do |c|
   c.syntax = 'qcloud-cos config'
   c.description = 'Init config, eg: qcloud-cos config'
-  c.action do |args, options|
+  c.action do |_args, _options|
     QcloudCos::Cli.config
   end
 end
@@ -25,7 +27,6 @@ command :info do |c|
   c.example 'Obtain information for /test/', '$ qcloud-cos info /test/'
   c.example 'Obtain information for /production.log', '$ qcloud-cos info /production.log'
   c.example 'Obtain information for /production.log from bucket2', '$ qcloud-cos info --bucket bucket2 /production.log'
-  c.option '--bucket Bucket Name', String, 'specify bucket name, it will override default bucket'
   c.action do |args, options|
     abort unless QcloudCos::Cli.environment_configed?
     begin
@@ -44,13 +45,13 @@ command :list do |c|
   c.example 'List all objects under /test/', '$ qcloud-cos list /test/'
   c.example 'List first 10 objects under /test/', '$ qcloud-cos list --num 10 /test/'
   c.example 'List all objects under / for bucket: bucket2', '$ qcloud-cos list --num 10 --bucket bucket2 /test/'
-  c.option '--bucket Bucket Name', String, 'specify bucket name, it will override default bucket'
   c.option '--num Num', Integer, 'specify max objects, default is 100'
   c.action do |args, options|
     abort unless QcloudCos::Cli.environment_configed?
+    options.default num: 100
     begin
       cli = QcloudCos::Cli.init
-      cli.list(args, options).map{|path| puts path }
+      cli.list(args, options).map { |path| puts path }
     rescue => e
       say_error e.message
     end
@@ -65,11 +66,11 @@ command :upload do |c|
   c.example 'Upload all files under ./test/ to /data/', '$ qcloud-cos upload test/ /data/'
   c.example 'Upload all files under ./test/ to /data/ with other bucket: bucket2', '$ qcloud-cos upload --bucket bucket2 test/ /data/'
   c.example 'Upload production.log to /data/ with slice_size and min', '$ qcloud-cos upload --size 10 --min 100 production.log /data/'
-  c.option '--bucket Bucket Name', String, 'specify bucket name, it will override default bucket'
-  c.option '--size Slice Size', Integer, "specify slice size for slice upload in Bytes, default: #{QcloudCos::DEFAULT_SLICE_SIZE}(#{QcloudCos::DEFAULT_SLICE_SIZE/1024/1024}M)"
+  c.option '--size Slice Size', Integer, "specify slice size for slice upload in Bytes, default: #{QcloudCos::DEFAULT_SLICE_SIZE}(#{QcloudCos::DEFAULT_SLICE_SIZE / 1024 / 1024}M)"
   c.option '--min Min Slice File Size', Integer, "specify min slice file size in Bytes, default: default: #{QcloudCos::MIN_SLICE_FILE_SIZE * 1024 * 1024}(#{QcloudCos::MIN_SLICE_FILE_SIZE}M)"
   c.action do |args, options|
     abort unless QcloudCos::Cli.environment_configed?
+    options.default size: QcloudCos::DEFAULT_SLICE_SIZE, min: QcloudCos::MIN_SLICE_FILE_SIZE * 1024 * 1024
     begin
       cli = QcloudCos::Cli.init
       cli.upload(args, options)
@@ -86,7 +87,6 @@ command :download do |c|
   c.example 'Download file from /data/production.log and save under ./data/', '$ qcloud-cos download /data/production.log ./data'
   c.example 'Download whole folder /data/test/ and save under ./data/', '$ qcloud-cos download /data/test/ ./data'
   c.example 'Download whole folder /data/test/ from bucket2 and save under ./data/', '$ qcloud-cos download --bucket bucket2 /data/test/ ./data'
-  c.option '--bucket Bucket Name', String, 'specify bucket name, it will override default bucket'
   c.action do |args, options|
     abort unless QcloudCos::Cli.environment_configed?
     begin
@@ -105,7 +105,6 @@ command :remove do |c|
   c.example 'Remove folder /data/test/', '$ qcloud-cos remove /data/test/'
   c.example 'Remove folder /data/test/ in recursive', '$ qcloud-cos remove --recursive /data/test/'
   c.example 'Remove folder /data/test/ from bucket2', '$ qcloud-cos download --bucket bucket2 /data/test/'
-  c.option '--bucket Bucket Name', String, 'specify bucket name, it will override default bucket'
   c.option '--[no-]recursive', 'specify recursive or not when remove folder'
   c.action do |args, options|
     abort unless QcloudCos::Cli.environment_configed?

data/lib/qcloud_cos.rb

@@ -64,7 +64,7 @@ module QcloudCos
     end
 
     def num_validates(number)
-      fail InvalidNumError if (number > 199 || number < 1)
+      fail InvalidNumError unless number.between?(1, 199)
     end
 
     def bucket_validates(bucket_name)

data/lib/qcloud_cos/api.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
 require 'qcloud_cos/utils'
+require 'qcloud_cos/multipart'
 require 'qcloud_cos/model/list'
 
 module QcloudCos
   module Api
-    # 列出所有文件或者目录
+    # 列出文件或者目录
     #
     # @param path [String] 指定目标路径, 以 / 结尾, 则列出该目录下文件或者文件夹，不以 / 结尾，就搜索该前缀的文件或者文件夹
     # @param options [Hash] 额外参数
@@ -135,42 +136,13 @@ module QcloudCos
       fail FileNotExistError unless File.exist?(src_path)
       bucket = validates(dst_path, options)
 
-      filesize = File.size(src_path)
-      sha = Utils.generate_file_sha(src_path)
-      sign = authorization.sign(bucket)
-
-      resp = init_slice_upload(dst_path, filesize, sha, options.merge('sign' => sign))
-
-      data = resp['data']
-      return data if data.key?('url') # 妙传命中
-
-      slice_size = data['slice_size'] || DEFAULT_SLICE_SIZE
-      session = data['session'] || options['session']
-      offset = data['offset'] || 0
-
-      fail MissingSessionIdError unless session
-
-      while offset < filesize
-        filecontent = IO.read(src_path, slice_size, offset)
-
-        retry_times = 0
-        begin
-          result = upload_part(dst_path, session, offset, filecontent, options)
-          progress = [offset + slice_size, filesize].min
-          yield((progress.to_f/filesize).round(2)) if block_given?
-
-          if result.key?('data') && result['data'].key?('session')
-            session = result['data']['session']
-          elsif result.key?('data') && result['data'].key?('url')
-            return result['data']
-          end
-        rescue => e
-          retry_times += 1
-          retry if retry_times <= config.max_retry_times
-          raise e
-        end
-        offset += slice_size
-      end
+      multipart = QcloudCos::Multipart.new(
+        dst_path,
+        src_path,
+        options.merge(bucket: bucket, authorization: authorization)
+      )
+      multipart.upload(&block)
+      multipart.result
     end
 
     # 初始化分片上传
@@ -279,17 +251,12 @@ module QcloudCos
 
       return delete(path, options) if options['recursive'] != true
 
-      loop do
-        objects = list(path, options)
-        objects.each do |object|
-          if object.is_a?(QcloudCos::FolderObject)
-            delete_folder("#{path}#{object.name}/", options)
-          elsif object.is_a?(QcloudCos::FileObject)
-            delete_file("#{path}#{object.name}", options)
-          end
+      all(path, options).each do |object|
+        if object.is_a?(QcloudCos::FolderObject)
+          delete_folder("#{path}#{object.name}/", options)
+        elsif object.is_a?(QcloudCos::FileObject)
+          delete_file("#{path}#{object.name}", options)
         end
-        break unless objects.has_more
-        options['context'] = objects.context
       end
       delete(path)
     end

data/lib/qcloud_cos/cli.rb

@@ -21,30 +21,23 @@ module QcloudCos
     # 交互模式配置环境
     # 命令: $ qcloud-cos config
     def self.config(config_path = nil)
-      config_path = config_path || QcloudCos::QCLOUD_COS_CONFIG
+      config_path ||= QcloudCos::QCLOUD_COS_CONFIG
       return Commander::UI.say_error("#{config_path} already exist, remove it first or direct edit it!") if File.exist?(config_path)
 
       app_id = Commander::UI.ask 'Qcloud COS APP ID: '
-      return Commander::UI.say_error("Missing Qcloud COS APP ID") if app_id.empty?
+      return Commander::UI.say_error('Missing Qcloud COS APP ID') if app_id.empty?
 
       secret_id = Commander::UI.ask 'Qcloud COS Secret ID: '
-      return Commander::UI.say_error("Missing Qcloud COS Secret ID") if secret_id.empty?
+      return Commander::UI.say_error('Missing Qcloud COS Secret ID') if secret_id.empty?
 
       secret_key = Commander::UI.ask 'Qcloud COS Secret Key: '
-      return Commander::UI.say_error("Missing Qcloud COS Secret Key") if secret_key.empty?
+      return Commander::UI.say_error('Missing Qcloud COS Secret Key') if secret_key.empty?
 
       endpoint = Commander::UI.ask "Default Qcloud COS Endpoint [#{QcloudCos::DEFAULT_ENDPOINT}]: "
       endpoint = QcloudCos::DEFAULT_ENDPOINT if endpoint.empty?
       bucket = Commander::UI.ask 'Default Qcloud COS Bucket: '
 
-      write_config(
-        config_path,
-        app_id: app_id,
-        secret_id: secret_id,
-        secret_key: secret_key,
-        endpoint: endpoint,
-        bucket: bucket
-      )
+      write_config(config_path, app_id: app_id, secret_id: secret_id, secret_key: secret_key, endpoint: endpoint, bucket: bucket)
     end
 
     # 检查环境是否配置
@@ -52,7 +45,7 @@ module QcloudCos
     # @return [Boolean]
     def self.environment_configed?
       configed = File.exist?(QcloudCos::QCLOUD_COS_CONFIG) || !ENV['QCLOUD_COS_APP_ID'].to_s.empty?
-      Commander::UI.say_error("Use `qcloud-cos config` first or export your environments") unless configed
+      Commander::UI.say_error('Use `qcloud-cos config` first or export your environments') unless configed
       configed
     end
 
@@ -62,7 +55,7 @@ module QcloudCos
         load_config.each { |k, v| config.send("#{k}=", v) }
       end
 
-      self.new
+      new
     end
 
     # 查看信息
@@ -82,7 +75,7 @@ module QcloudCos
     #   qcloud-cos info --bucket bucket2 /production.log
     def info(args, options)
       path = args.shift || '/'
-      opts = parse(options)
+      opts = parse_options(options)
 
       QcloudCos.stat(path, opts)['data']
     end
@@ -106,8 +99,7 @@ module QcloudCos
     #
     def list(args, options)
       path = args.shift || '/'
-      opts = parse(options)
-      opts[:num] = options.num || 100
+      opts = parse_options(options)
 
       objects = QcloudCos.list(path, opts)
       objects.map do |object|
@@ -133,20 +125,16 @@ module QcloudCos
     #   qcloud-cos upload --bucket bucket2 test/ /data/
     def upload(args, options)
       path = args.shift
-      return Commander::UI.say_error("file missing, see example: $ qcloud-cos upload -h") unless path
+      return Commander::UI.say_error('file missing, see example: $ qcloud-cos upload -h') unless path
       return Commander::UI.say_error("file #{path} not exist") unless File.exist?(path)
 
       dest_path = args.shift || '/'
-      return Commander::UI.say_error("dest_path must end with /, see example: $ qcloud-cos upload -h") unless dest_path.end_with?('/')
-
-      opts = parse(options)
-      opts[:slice_size] = options.size || QcloudCos::DEFAULT_SLICE_SIZE
-      opts[:min] = options.min || QcloudCos::MIN_SLICE_FILE_SIZE * 1024 * 1024
+      return Commander::UI.say_error('dest_path must end with /, see example: $ qcloud-cos upload -h') unless dest_path.end_with?('/')
 
       if path.end_with?('/')
-        upload_folder(path, dest_path, opts)
+        upload_folder(path, dest_path, parse_options(options))
       else
-        upload_file(path, dest_path, opts)
+        upload_file(path, dest_path, parse_options(options))
       end
     end
 
@@ -169,14 +157,14 @@ module QcloudCos
     #
     def download(args, options)
       path = args.shift
-      return Commander::UI.say_error("missing path, see example: $ qcloud-cos download -h") unless path
-      opts = parse(options)
-      opts[:save_path] = args.shift || '.'
+      return Commander::UI.say_error('missing path, see example: $ qcloud-cos download -h') unless path
+      opts = parse_options(options)
+      save_path = args.shift || '.'
 
       if path.end_with?('/')
-        download_folder(path, opts)
+        download_folder(path, save_path, opts)
       else
-        download_file(path, opts)
+        download_file(path, save_path, opts)
       end
     end
 
@@ -195,12 +183,11 @@ module QcloudCos
     #   qcloud-cos remove --recursive /data/test/
     #
     #   # 删除 bucket2 下面的目录 /data/test/
-    #   qcloud-cos download --bucket bucket2 /data/test/
+    #   qcloud-cos remove --bucket bucket2 /data/test/
     def remove(args, options)
       path = args.shift
-      return Commander::UI.say_error("missing dest_path, see example: $ qcloud-cos remove -h") unless path
-
-      opts = parse(options)
+      return Commander::UI.say_error('missing dest_path, see example: $ qcloud-cos remove -h') unless path
+      opts = parse_options(options)
 
       if path.end_with?('/')
         QcloudCos.delete_folder(path, opts.merge(recursive: !!options.recursive))
@@ -213,47 +200,61 @@ module QcloudCos
 
     def upload_file(path, dest_path, opts)
       dest_path = File.join(dest_path, path.split('/').last)
-      file = File.new(path)
-      if file.size > opts[:min]
-        QcloudCos.upload_slice(dest_path, path, Utils.hash_slice(opts, :bucket).merge(slice_size: opts[:slice_size]))
-      else
-        QcloudCos.upload(dest_path, file, Utils.hash_slice(opts, :bucket))
+
+      create_file_with_lint(path, dest_path) do
+        if File.size(path) > opts[:min]
+          QcloudCos.upload_slice(dest_path, path, Utils.hash_slice(opts, :bucket).merge(slice_size: opts[:size]))
+        else
+          QcloudCos.upload(dest_path, File.new(path), Utils.hash_slice(opts, :bucket))
+        end
       end
+    end
+
+    def create_file_with_lint(path, dest_path, &block)
+      yield if block_given?
       Commander::UI.say_ok "#{path} uploaded to #{dest_path}..."
     rescue => e
       Commander::UI.say_error "Failed when uploaded #{path} ===> #{e.message}"
-    ensure
-      file && file.close
     end
 
     def upload_folder(path, dest_path, opts)
-      file_path_map = {}
-      Dir.glob("#{path}**/*") do |file_path|
-        split_path = file_path.sub(path, '').split('/')
-        new_path =
-          if File.file?(file_path)
-            split_path.size > 1 ? File.join(dest_path, *split_path[0..-2]) : dest_path
-          else
-            file_path = File.join(file_path, '')
-            File.join(dest_path, *split_path, '')
-          end
-
-        file_path_map[file_path] = new_path
-      end
-      remove_subdirectories(file_path_map)
+      path_map = find_upload_path_map(path, dest_path)
 
-      file_path_map.each do |file_path, dest_path|
+      path_map.each do |file_path, dest|
         if file_path.end_with?('/')
-          QcloudCos.create_folder(dest_path, opts)
-          Commander::UI.say_ok "Create folder #{dest_path}"
+          create_folder_with_lint(dest, opts)
         else
-          upload_file(file_path, dest_path, opts)
+          upload_file(file_path, dest, opts)
         end
       end
     end
 
-    def download_file(path, opts)
-      save_path = opts.delete(:save_path)
+    def create_folder_with_lint(dest, opts)
+      QcloudCos.create_folder(dest, opts)
+      Commander::UI.say_ok "Create folder #{dest}"
+    rescue => e
+      Commander::UI.say_ok "Failed when create folder #{dest} ====> #{e.message}"
+    end
+
+    def find_upload_path_map(path, dest_path)
+      path_map = Hash[Dir.glob("#{path}**/*").map do |file_path|
+        file_path = File.join(file_path, '') unless File.file?(file_path)
+        [file_path, find_upload_dest_path(file_path, path, dest_path)]
+      end]
+      remove_subdirectories!(path_map)
+      path_map
+    end
+
+    def find_upload_dest_path(file_path, parent_path, dest_path)
+      split_path = file_path.sub(parent_path, '').split('/')
+      if File.file?(file_path)
+        split_path.size > 1 ? File.join(dest_path, *split_path[0..-2]) : dest_path
+      else
+        File.join(dest_path, *split_path, '')
+      end
+    end
+
+    def download_file(path, save_path, opts)
       FileUtils.mkdir_p(save_path) unless File.exist?(save_path)
 
       file_path = File.join(save_path, path.split('/').last)
@@ -264,31 +265,26 @@ module QcloudCos
       Commander::UI.say_error("Failed when Download #{path}  ===> #{e.message}")
     end
 
-    def download_folder(path, opts)
-      save_path = opts.delete(:save_path)
-      loop do
-        objects = QcloudCos.list(path, opts)
-        objects.each do |object|
-          if object.is_a?(QcloudCos::FolderObject)
-            new_path = File.join(save_path, object.name)
-            unless File.exist?(new_path)
-              FileUtils.mkdir_p(new_path) unless File.exist?(new_path)
-              Commander::UI.say_ok "Save #{path}#{object.name}/ to #{new_path}/"
-            end
-            download_folder("#{path}#{object.name}/", opts.merge(save_path: new_path))
-          elsif object.is_a?(QcloudCos::FileObject)
-            if object.access_url
-              download_file("#{path}#{object.name}", opts.merge(save_path: save_path, access_url: object.access_url))
-            else
-              download_file("#{path}#{object.name}", opts.merge(save_path: save_path))
-            end
-          end
+    def download_folder(path, save_path, opts)
+      mkdir_with_lint(path, save_path)
+
+      QcloudCos.all(path, opts).each do |object|
+        new_path = "#{path}#{object.name}"
+
+        if object.is_a?(QcloudCos::FolderObject)
+          download_folder(File.join(new_path, ''), File.join(save_path, object.name), opts)
+        elsif object.is_a?(QcloudCos::FileObject)
+          download_file(new_path, save_path, opts.merge(access_url: object.access_url))
         end
-        break unless objects.has_more
-        opts['context'] = objects.context
       end
     end
 
+    def mkdir_with_lint(path, save_path)
+      return if File.exist?(save_path)
+      FileUtils.mkdir_p(save_path)
+      Commander::UI.say_ok "Save #{path} to #{save_path}/"
+    end
+
     def self.load_config
       file_config = load_file_config
 
@@ -308,13 +304,16 @@ module QcloudCos
       end.compact]
     end
 
-    def parse(options)
+    def parse_options(options)
       opts = {}
       opts[:bucket] = options.bucket if options.bucket
+      opts[:min] = options.min if options.min
+      opts[:size] = options.size if options.size
+      opts[:num] = options.num if options.num
       opts
     end
 
-    def remove_subdirectories(path_map)
+    def remove_subdirectories!(path_map)
       new_map = path_map.dup
       new_map.each do |_, dest_path|
         path_map.reject! do |file_path, dest|
@@ -324,22 +323,21 @@ module QcloudCos
     end
 
     def save_to_file(access_url, file_path)
-      File.open(file_path, "wb") do |f|
+      File.open(file_path, 'wb') do |f|
         f.write HTTParty.get(access_url)
       end
     end
 
     def self.write_config(config_path, options)
-      File.open(config_path, "w") do |file|
+      File.open(config_path, 'w') do |file|
         file.puts "app_id=#{options[:app_id]}"
         file.puts "secret_id=#{options[:secret_id]}"
         file.puts "secret_key=#{options[:secret_key]}"
         file.puts "endpoint=#{options[:endpoint]}"
         file.puts "bucket=#{options[:bucket]}"
-        file.puts "ssl_ca_file="
-        file.puts "max_retry_times="
+        file.puts 'ssl_ca_file='
+        file.puts 'max_retry_times='
       end
     end
-
   end
 end

data/lib/qcloud_cos/convenient_api.rb

@@ -1,13 +1,12 @@
 module QcloudCos
   module ConvenientApi
-
     # 获取 Bucket 信息
     #
     # @param bucket_name [String] :bucket (config.bucket) 指定当前 bucket, 默认是配置里面的 bucket
     #
     # @return [Hash] 返回 Bucket 信息
     def bucket_info(bucket_name = nil)
-      bucket_name = bucket_name || config.bucket
+      bucket_name ||= config.bucket
       stat('/', bucket: bucket_name)['data']
     rescue
       {}
@@ -104,5 +103,25 @@ module QcloudCos
         fail FileNotExistError
       end
     end
+
+    # 列出所有文件或者目录
+    #
+    # @param path [String] 指定目标路径, 以 / 结尾, 则列出该目录下文件或者文件夹，不以 / 结尾，就搜索该前缀的文件或者文件夹
+    # @param options [Hash] 额外参数
+    # @option options [String] :bucket (config.bucket_name) 指定当前 bucket, 默认是配置里面的 bucket
+    # @option options [String] :pattern (eListBoth) 指定拉取的内容，可选值: eListBoth, eListDirOnly, eListFileOnly
+    # @option options [Integer] :order (0) 指定拉取文件的顺序, 默认为正序(=0), 可选值: 0, 1
+    #
+    # @return [Hash]
+    def all(path, options = {})
+      results = []
+      loop do
+        objects = QcloudCos.list(path, options)
+        results += objects.to_a
+        break unless objects.has_more
+        options['context'] = objects.context
+      end
+      results
+    end
   end
 end

data/lib/qcloud_cos/model/folder_object.rb

@@ -22,13 +22,18 @@ module QcloudCos
       if !path.end_with?('/')
         fail InvalidFolderPathError, '文件夹路径必须以 / 结尾'
       elsif !(names = path.split('/')).empty?
-        if names.detect { |name| RETAINED_FIELDS.include?(name.downcase) }
-          fail InvalidFolderPathError, %(文件夹名字不能是保留字段: '#{RETAINED_FIELDS.join("', '")}')
-        elsif names.detect { |name| name.match(/[\/?*:|\\<>"]/) }
-          fail InvalidFolderPathError, %(文件夹名字不能包含保留字符: '#{RETAINED_SYMBOLS.join("', '")}')
-        elsif names.detect { |name| name.length > MAXLENGTH }
-          fail InvalidFolderPathError, %(文件夹名字不能超过#{MAXLENGTH}个字符)
-        end
+        validate_name(names)
+      end
+    end
+
+    # 校验文件夹名字
+    def self.validate_name(names)
+      if names.detect { |name| RETAINED_FIELDS.include?(name.downcase) }
+        fail InvalidFolderPathError, %(文件夹名字不能是保留字段: '#{RETAINED_FIELDS.join("', '")}')
+      elsif names.detect { |name| name.match(/[\/?*:|\\<>"]/) }
+        fail InvalidFolderPathError, %(文件夹名字不能包含保留字符: '#{RETAINED_SYMBOLS.join("', '")}')
+      elsif names.detect { |name| name.length > MAXLENGTH }
+        fail InvalidFolderPathError, %(文件夹名字不能超过#{MAXLENGTH}个字符)
       end
     end
   end

data/lib/qcloud_cos/multipart.rb

@@ -0,0 +1,82 @@
+module QcloudCos
+  class Multipart
+    attr_reader :dst_path, :src_path, :bucket, :authorization, :result, :options
+
+    def initialize(dst_path, src_path, options = {})
+      @dst_path = dst_path
+      @src_path = src_path
+      @options = options
+      @bucket = options.delete(:bucket)
+      @authorization = options.delete(:authorization)
+    end
+
+    def upload(&block)
+      init_multipart
+      return if complete?
+      fail QcloudCos::MissingSessionIdError unless session
+
+      offset = @result['offset'] || 0
+
+      while offset < filesize
+        filecontent = IO.read(src_path, slice_size, offset)
+        break if upload_part(offset, filecontent, &block)
+        offset += slice_size
+      end
+    end
+
+    private
+
+    def init_multipart
+      @result ||= QcloudCos.init_slice_upload(dst_path, filesize, sha, options.merge('sign' => sign))['data']
+    end
+
+    def upload_part(offset, content, &block)
+      retry_for(QcloudCos.config.max_retry_times) do
+        @result = QcloudCos.upload_part(dst_path, session, offset, content, options)['data']
+        notify_progress(offset + slice_size, &block)
+
+        return true if complete?
+      end
+    end
+
+    def complete?
+      @result.key?('url')
+    end
+
+    def notify_progress(progress, &block)
+      progress = [progress, filesize].min
+      yield((progress.to_f / filesize).round(2)) if block_given?
+    end
+
+    def filesize
+      @filesize ||= File.size(src_path)
+    end
+
+    def sha
+      @sha ||= Utils.generate_file_sha(src_path)
+    end
+
+    def sign
+      @sign ||= authorization.sign(bucket)
+    end
+
+    def slice_size
+      @slice_size ||= @result['slice_size'] || QcloudCos::DEFAULT_SLICE_SIZE
+    end
+
+    def session
+      @session ||= @result['session'] || options['session']
+    end
+
+    def retry_for(max_times, &block)
+      retry_times = 0
+      begin
+        yield if block_given?
+      rescue => e
+        retry_times += 1
+        retry if retry_times <= max_times
+        raise e
+      end
+    end
+  end
+end

data/lib/qcloud_cos/version.rb

@@ -1,3 +1,3 @@
 module QcloudCos
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/wiki/get_started.md

@@ -1082,5 +1082,5 @@ $ qcloud-cos download --bucket bucket2 /data/test/
 
 ## 其它资源
 
-+ [RDoc 文档](http://www.rubydoc.info/gems/qcloud_cos/0.3.0)
++ [RDoc 文档](http://www.rubydoc.info/gems/qcloud_cos/0.4.1)
 + [腾讯 COS 详细文档](http://www.qcloud.com/doc/product/227/%E4%BA%A7%E5%93%81%E4%BB%8B%E7%BB%8D)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qcloud_cos
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Newell Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -208,6 +208,7 @@ files:
 - lib/qcloud_cos/model/folder_object.rb
 - lib/qcloud_cos/model/list.rb
 - lib/qcloud_cos/model/objectable.rb
+- lib/qcloud_cos/multipart.rb
 - lib/qcloud_cos/utils.rb
 - lib/qcloud_cos/version.rb
 - qcloud_cos.gemspec