update version for refresh gems

去掉publish/unpublish接口的封装函数。

.gitignore

@@ -5,7 +5,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

.travis.yml

@@ -3,10 +3,11 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - ruby-head
   - jruby-head
   - ree
+before_script:
+  - export QINIU_ACCESS_KEY=LGRqJsjX7LAvtdtX6hhyxs861lS57HwnOQmJsOuX
+  - export QINIU_SECRET_KEY=g_OxhuN5iJ1O7BoA6YdXyF6zSszk34UZFKDfdIIW

CHANGELOG.md

@@ -0,0 +1,91 @@
+## CHANGE LOG
+
+### v3.4.9
+
+- 去掉publish和unpublish接口的封装函数。 [https://github.com/qiniu/ruby-sdk/pull/89](https://github.com/qiniu/ruby-sdk/pull/89) (#8143)
+
+### v3.4.8
+
+- 修复断点续上传功能中一直重试上传出错片的Bug。[https://github.com/qiniu/ruby-sdk/pull/87](https://github.com/qiniu/ruby-sdk/pull/87) (#7205)
+
+### v3.4.7
+
+- 停止追加新功能，仅进行Bug修正维护。  
+
+### v3.4.6
+
+- `Qiniu::RS.generate_download_token()` 方法的 `:pattern` 调整为必选项。
+
+### v3.4.5
+
+- `Qiniu::RS.generate_upload_token()` 方法新增 `:callback_body` 和 `return_url` 选项。
+- 选项含义参考: <http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-callback-body>
+
+### v3.4.2
+
+- `Qiniu::RS.generate_upload_token()` 方法新增 `:return_body` 选项。
+
+该选项（`:return_body`）可设置文件上传成功后，执行七牛云存储规定的回调API，并以 JSON 响应格式返回其执行结果。参考 [uploadToken 之 returnBody 说明](http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-return-body)。
+
+### v3.4.1
+
+增加为上传文件进行预转的选项，参见 [uploadToken 之 asyncOps 说明](http://docs.qiniu.com/api/v6/put.html#uploadToken-asyncOps)
+
+- `Qiniu::RS.generate_upload_token()` 方法新增 `:async_options` 选项用于进行预转操作。
+
+### v3.4.0
+
+增加文件复制/移动方法，包括批量复制/移动文件
+
+- `Qiniu::RS.copy(source_bucket, source_key, target_bucket, target_key)`
+- `Qiniu::RS.move(source_bucket, source_key, target_bucket, target_key)`
+- `Qiniu::RS.batch_copy [source_bucket, source_key, target_bucket, target_key], ...`
+- `Qiniu::RS.batch_move [source_bucket, source_key, target_bucket, target_key], ...`
+
+### v3.3.1
+
+确保单元测试里边用到的测试 Bucket 全局唯一
+
+使得10多种不通的 Ruby 宿主环境能隔离互不影响地执行单元/集成测试
+
+Ruby 宿主环境如下
+
+1.8.7, 1.9.2, 1.9.3, jruby-18mode, jruby-19mode, rbx-18mode, rbx-19mode, ruby-head, jruby-head, ree
+
+详见 <https://travis-ci.org/qiniu/ruby-sdk>
+
+### v3.3.0
+
+私有资源下载新版实现，添加 Qiniu::RS.generate_download_token() 方法。参考 [downloadToken](http://developer.qiniu.com/docs/v6/api/reference/security/download-token.html)
+
+详见 [Ruby SDK 使用文档之私有资源下载](http://developer.qiniu.com/docs/v6/api/overview/dn/security.html)
+
+### v3.2.2
+
+fixed E701 error
+
+断点续上传根据 mkblk 返回的 host 字段进行 bput 和 mkfile ，规避由于DNS智能解析造成的分布式并行块上传会出现上下文不连贯导致的 E701 问题。
+
+### v3.2.1
+
+allow images uploaded auto-orient.
+
+允许图片上传成功后自动旋转。
+
+参考：
+
+1. [[API] multipart/form-data 上传文件之 action 字段详解](http://docs.qiniutek.com/v3/api/io/#upload-action)
+2. [[SDK] Qiniu::RS.upload_file() 方法中的参数增加了 :rotate 选项](http://docs.qiniutek.com/v3/sdk/ruby/#upload-server-side)
+
+### v3.2.0
+
+2012-11-06
+
+allow files uploaded auto callback some APIs (like imageInfo, exif, etc…), and add those APIs callback results as part of the custom data for POST biz-server.
+
+允许上传文件(图片)成功后执行回调指定的 API (比如 imageInfo, exif 接口等)，并将指定API的回调结果一并 POST 发送给客户方的业务服务器。
+
+参考：
+
+1. [[API] 生成上传授权凭证 uploadToken 之 escape 参数详解](http://docs.qiniutek.com/v3/api/io/#escape-expression)
+2. [[SDK] Qiniu::RS.generate_upload_token() 方法中的参数增加了 :escape 选项](http://docs.qiniutek.com/v3/sdk/ruby/#generate-upload-token)

Gemfile.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    qiniu-rs (3.4.9)
+      json (~> 1.7)
+      mime-types (~> 1.19)
+      rest-client (~> 1.6)
+      ruby-hmac (~> 0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    json (1.8.1)
+    mime-types (1.23)
+    rake (10.0.3)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    ruby-hmac (0.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeweb (~> 1.3)
+  qiniu-rs!
+  rake (>= 0.9)
+  rspec (>= 2.11)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 why404
+Copyright (c) 2012-2013 qiniutek.com
 
 MIT License
 

README.md

@@ -1,8 +1,13 @@
-# Qiniu Resource (Cloud) Storage SDK for Ruby - [![Build Status](https://secure.travis-ci.org/why404/qiniu-rs.png?branch=master)](http://travis-ci.org/why404/qiniu-rs) [![Dependency Status](https://gemnasium.com/why404/qiniu-rs.png)](https://gemnasium.com/why404/qiniu-rs)
+# Qiniu Resource (Cloud) Storage SDK for Ruby
+
+# 版本说明
+
+此版本不再进行技术升级，仅做Bug修正维护。  
+请移步 [https://github.com/qiniu/ruby-sdk](https://github.com/qiniu/ruby-sdk) 查看最新版本。  
 
 # 关于
 
-此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x 版本，基于 [七牛云存储官方API](http://docs.qiniutek.com/v1/api/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
+此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://developer.qiniu.com/docs/v6/index.html) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
 
 ## 安装
 
@@ -20,7 +25,7 @@
 
 ## 使用
 
-参考文档：[七牛云存储 Ruby SDK 使用指南](http://docs.qiniutek.com/v1/sdk/ruby/)
+参考文档：[七牛云存储 Ruby SDK 使用指南](http://developer.qiniu.com/docs/v6/sdk/ruby-sdk.html)
 
 ## 贡献代码
 
@@ -32,7 +37,7 @@
 
 ## 许可证
 
-Copyright (c) 2012 why404
+Copyright (c) 2012-2013 qiniutek.com
 
 基于 MIT 协议发布:
 

docs/README.md

@@ -0,0 +1,790 @@
+---
+title: Ruby SDK
+---
+
+此 Ruby SDK 适用于 Ruby 1.8.x, 1.9.x, jruby, rbx, ree 版本，基于 [七牛云存储官方API](http://docs.qiniu.com/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
+
+七牛云存储 Ruby SDK 源码地址：<https://github.com/qiniu/ruby-sdk>
+
+**目录**
+
+- [安装](#Installation)
+- [接入](#turn-on)
+    - [配置密钥（AccessKey / SecretKey）](#establish_connection!)
+    - [针对 Ruby On Rails 网站应用初始化设置](#ror-init)
+- [使用](#Usage)
+    - [文件上传](#upload)
+        - [生成上传授权凭证（uploadToken）](#generate-upload-token)
+        - [Ruby 服务端上传文件](#upload-server-side)
+            - [开启断点续上传](#resumable-upload)
+        - [iOS / Android / Web 端直传文件说明](#upload-client-side)
+    - [文件下载](#download)
+        - [公有资源下载](#download-public-files)
+        - [私有资源下载](#download-private-files)
+            - [生成下载授权凭证（downloadToken）](#download-token)
+        - [高级特性](#other-download-features)
+            - [断点续下载](#resumable-download)
+            - [自定义 404 NotFound](#upload-file-for-not-found)
+    - [文件管理](#file-management)
+        - [查看单个文件属性信息](#stat)
+        - [复制单个文件](#copy)
+        - [移动单个文件](#move)
+        - [删除单个文件](#delete)
+        - [批量操作](#batch)
+            - [批量获取文件属性信息](#batch-get)
+            - [批量复制文件](#batch-copy)
+            - [批量移动文件](#batch-move)
+            - [批量删除文件](#batch-delete)
+    - [云处理](#cloud-processing)
+        - [图像](#image-processing)
+            - [查看图片属性信息](#image-info)
+            - [查看图片EXIF信息](#image-exif)
+            - [图像在线处理（缩略、裁剪、旋转、转化）](#image-mogrify-for-preview)
+            - [图像在线处理（缩略、裁剪、旋转、转化）后并持久化存储](#image-mogrify-for-save-as)
+        - 音频(TODO)
+        - 视频(TODO)
+- [贡献代码](#Contributing)
+- [许可证](#License)
+
+
+<a name="Installation"></a>
+
+## 安装
+
+在您 Ruby 应用程序的 `Gemfile` 文件中，添加如下一行代码：
+
+    gem 'qiniu-rs'
+
+然后，在应用程序所在的目录下，可以运行 `bundle` 安装依赖包：
+
+    $ bundle
+
+或者，可以使用 Ruby 的包管理器 `gem` 进行安装：
+
+    $ gem install qiniu-rs
+
+
+<a name="turn-on"></a>
+
+## 接入
+
+<a name="establish_connection!"></a>
+
+### 配置密钥（AccessKey / SecretKey）
+
+要接入七牛云存储，您需要拥有一对有效的 Access Key 和 Secret Key 用来进行签名认证。可以通过如下步骤获得：
+
+1. [开通七牛开发者帐号](https://portal.qiniu.com/signup)
+2. [登录七牛开发者自助平台，查看 Access Key 和 Secret Key](https://portal.qiniu.com/setting/key)
+
+在获取到 Access Key 和 Secret Key 之后，您可以在您的程序中调用如下两行代码进行初始化对接：
+
+    Qiniu::RS.establish_connection! :access_key => YOUR_APP_ACCESS_KEY,
+                                    :secret_key => YOUR_APP_SECRET_KEY
+
+<a name="ror-init"></a>
+
+### 针对 Ruby On Rails 网站应用初始化设置
+
+如果您使用的是 [Ruby on Rails](http://rubyonrails.org/) 框架，我们建议您在应用初始化启动的过程中，依次调用上述两个函数即可，操作如下：
+
+首先，在应用初始化脚本加载的目录中新建一个文件：`YOUR_RAILS_APP/config/initializers/qiniu-rs.rb`
+
+然后，编辑 `YOUR_RAILS_APP/config/initializers/qiniu-rs.rb` 文件内容如下：
+
+    Qiniu::RS.establish_connection! :access_key => YOUR_APP_ACCESS_KEY,
+                                    :secret_key => YOUR_APP_SECRET_KEY
+
+这样，您就可以在您的 `RAILS_APP` 中使用七牛云存储 Ruby SDK 提供的其他任意方法了。
+
+接下来，我们会逐一介绍此 SDK 提供的其他方法。
+
+
+<a name="Usage"></a>
+
+## 使用
+
+<a name="upload"></a>
+
+### 文件上传
+
+**注意**：如果您只是想要上传已存在您电脑本地或者是服务器上的文件到七牛云存储，可以直接使用七牛提供的 [qrsync](http://docs.qiniu.com/tools/qrsync.html) 上传工具。如果是需要通过您的网站或是移动应用(App)上传文件，则可以接入使用此 SDK，详情参考如下文档说明。
+
+<a name="generate-upload-token"></a>
+
+#### 生成上传授权凭证（uploadToken）
+
+要上传一个文件，首先需要调用 SDK 提供的 `Qiniu::RS.generate_upload_token` 函数来获取一个经过授权用于临时匿名上传的 `upload_token`——经过数字签名的一组数据信息，该 `upload_token` 作为文件上传流中 `multipart/form-data` 的一部分进行传输。
+
+`Qiniu::RS.generate_upload_token` 函数原型如下：
+
+    Qiniu::RS.generate_upload_token :scope              => target_bucket,
+                                    :expires_in         => expires_in_seconds,
+                                    :callback_url       => callback_url,
+                                    :callback_body      => callback_body,
+                                    :callback_body_type => callback_body_type,
+                                    :customer           => end_user_id,
+                                    :escape             => allow_upload_callback_api,
+                                    :async_options      => async_callback_api_commands,
+                                    :return_body        => custom_response_body
+
+**参数**
+
+:scope
+: 必须，字符串类型（String），设定文件要上传到的目标 `bucket`
+
+:expires_in
+: 可选，数字类型，用于设置上传 URL 的有效期，单位：秒，缺省为 3600 秒，即 1 小时后该上传链接不再有效（但该上传URL在其生成之后的59分59秒都是可用的）。
+
+:callback_url
+: 可选，字符串类型（String），用于设置文件上传成功后，七牛云存储服务端要回调客户方的业务服务器地址。
+
+:callback_body
+: 可选，字符串类型（String），用于设置文件上传成功后，七牛云存储服务端向客户方的业务服务器发送回调请求的值。
+
+:callback_body_type
+: 可选，字符串类型（String），用于设置文件上传成功后，七牛云存储服务端向客户方的业务服务器发送回调请求的 `Content-Type`。
+
+:customer
+: 可选，字符串类型（String），客户方终端用户（End User）的ID，该字段可以用来标示一个文件的属主，这在一些特殊场景下（比如给终端用户上传的图片打上名字水印）非常有用。
+
+:escape
+: 可选，数字类型，可选值 0 或者 1，缺省为 0 。值为 1 表示 callback 传递的自定义数据中允许存在转义符号 `$(VarExpression)`，参考 [VarExpression](http://docs.qiniutek.com/v3/api/words/#VarExpression)。
+
+当 `escape` 的值为 `1` 时，常见的转义语法如下：
+
+- 若 `callbackBodyType` 为 `application/json` 时，一个典型的自定义回调数据（[CallbackParams](http://docs.qiniutek.com/v3/api/io/#CallbackParams)）为：
+
+    `{foo: "bar", w: $(imageInfo.width), h: $(imageInfo.height), exif: $(exif)}`
+
+- 若 `callbackBodyType` 为 `application/x-www-form-urlencoded` 时，一个典型的自定义回调数据（[CallbackParams](http://docs.qiniutek.com/v3/api/io/#CallbackParams)）为：
+
+    `foo=bar&w=$(imageInfo.width)&h=$(imageInfo.height)&exif=$(exif)`
+
+:async_options
+: 可选，字符串类型（String），用于设置文件上传成功后，执行指定的预转指令。参考 [uploadToken 之 asyncOps 说明](http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps)
+
+:return_body
+: 可选，字符串类型（String），用于设置文件上传成功后，执行七牛云存储规定的回调API，并以 JSON 响应格式返回其执行结果。参考 [uploadToken 之 returnBody 说明](http://docs.qiniutek.com/v3/api/io/#uploadToken-returnBody)。
+
+
+**返回值**
+
+返回一个字符串类型（String）的用于上传文件用的临时授权 `upload_token`。
+
+<a name="upload-server-side"></a>
+
+#### Ruby 服务端上传文件
+
+通过 `Qiniu::RS.upload_file()` 方法可在客户方的业务服务器上直接往七牛云存储上传文件。该函数规格如下：
+
+    Qiniu::RS.upload_file :uptoken            => upload_token,
+                          :file               => file_path,
+                          :bucket             => bucket_name,
+                          :key                => record_id,
+                          :mime_type          => file_mime_type,
+                          :note               => some_notes,
+                          :callback_params    => callback_params,
+                          :enable_crc32_check => false,
+                          :rotate             => auto_rotate
+
+**参数**
+
+:uptoken
+: 必须，字符串类型（String），调用 `Qiniu::RS.generate_upload_token` 生成的 [用于上传文件的临时授权凭证](#generate-upload-token)
+
+:file
+: 必须，字符串类型（String），本地文件可被读取的有效路径
+
+:bucket
+: 必须，字符串类型（String），空间名称。
+
+:key
+: 必须，字符串类型（String），若把 Bucket 理解为关系性数据库的某个表，那么 key 类似数据库里边某个表的主键ID，需给每一个文件一个UUID用于进行标示。
+
+:mime_type
+: 可选，字符串类型（String），文件的 mime-type 值。如若不传入，SDK 会自行计算得出，若计算失败缺省使用 application/octet-stream 代替之。
+
+:note
+: 可选，字符串类型（String），为文件添加备注信息。
+
+:callback_params
+: 可选，String 或者 Hash 类型，文件上传成功后，七牛云存储向客户方业务服务器发送的回调参数。
+
+:enable_crc32_check
+: 可选，Boolean 类型，是否启用文件上传 crc32 校验，缺省为 false 。
+
+:rotate
+: 可选，数字类型，上传图片时专用，可针对图片上传后进行旋转。该参数值为 0 ：表示根据图像EXIF信息自动旋转；值为 1 : 右转90度；值为 2 :右转180度；值为 3 : 右转270度。
+
+**返回值**
+
+上传成功，返回如下一个 Hash：
+
+    {"hash"=>"FgHk-_iqpnZji6PsNr4ghsK5qEwR"}
+
+上传失败，会抛出 `UploadFailedError` 异常。
+
+<a name="resumable-upload"></a>
+
+##### 开启断点续上传
+
+无需任何额外改动，SDK 提供的 `Qiniu::RS.upload_file()` 方法缺省支持断点续上传。默认情况下，SDK 会自动启用断点续上传的方式来上传超过 4MB 大小的文件。您也可以在 [应用接入](http://docs.qiniutek.com/v3/sdk/ruby/#establish_connection!) 时通过修改缺省配置来设置该阀值：
+
+    Qiniu::RS.establish_connection! :access_key      => YOUR_APP_ACCESS_KEY,
+                                    :secret_key      => YOUR_APP_SECRET_KEY,
+                                    :block_size      => 1024*1024*4,
+                                    :chunk_size      => 1024*256,
+                                    :tmpdir          => Dir.tmpdir + File::SEPARATOR + 'Qiniu-RS-Ruby-SDK',
+                                    :enable_debug    => true,
+                                    :auto_reconnect  => true,
+                                    :max_retry_times => 3
+
+**参数详解**
+
+应用接入初始化时，以下配置参数均为可选：
+
+:block_size
+: 整型，指定断点续上传针对大文件所使用的分块大小，缺省为 4MB ，小于该阀值的文件不启用断点续上传。
+
+:chunk_size
+: 整型，指定断点续上传每次http请求上传的数据块大小，缺省为 256KB。该设置尽量不要超过实际使用的上行带宽，且不能超过 `:block_size` 定义的值。
+
+:tmpdir
+: 字符串类型，指定持久化保存断点续上传进度状态临时文件的目录，缺省放置于操作系统的临时目录中。
+
+:enable_debug
+: 布尔值，是否启用调试模式，缺省启用（true），启用后会打印相关日志。该参数 SDK 全局有效。
+
+:auto_reconnect
+: 布尔值，指定每次 http 若请求失败是否启用重试，缺省启用（true）。该参数 SDK 全局有效。
+
+:max_retry_times
+: 整型，指定每次 http 若请求失败最多可以重试的次数，缺省为3次。该参数 SDK 全局有效。
+
+
+<a name="upload-client-side"></a>
+
+#### iOS / Android / Web 端直传文件说明
+
+客户端 iOS / Android / Web 上传流程和服务端上传类似，差别在于：客户端直传文件所需的 `uploadToken` 选择在客户方的业务服务器端生成，然后将其生成的 `uploadToken` 颁发给客户端。
+
+简单来讲，客户端上传流程分为两步：
+
+1. [服务端生成上传授权凭证（uploadToken）](#generate-upload-token)
+2. 客户端程序调用 [iOS](http://docs.qiniu.com/ios-sdk/index.html) / [Android](http://docs.qiniu.com/android-sdk/index.html) SDK 的文件上传方法进行上传
+
+如果是网页直传文件到七牛云存储，网页可以使用 JavaScript 动态实现 [七牛云存储上传API](http://docs.qiniutek.com/v3/api/io/#upload-file-by-html-form)。
+
+通过客户端直传文件，您的终端用户即可把数据（比如图片或视频）直接上传到七牛云存储服务器上，而无须经由您的服务端中转，终端用户上传数据始终是离他物理距离最近的七牛存储节点。当终端用户上传成功后，七牛云存储服务端会向您指定的 `callback_url` （一般在 [uploadToken](#generate-upload-token) 里边指定）发送回调数据（回调数据在客户端程序里边指定）。如果 `callback_url` 所指向的服务端处理完毕后输出 `JSON` 格式的数据，七牛云存储服务端会将该回调请求所得的 JSON 响应信息原封不动地返回给客户端应用程序。
+
+
+<a name="download"></a>
+
+### 文件下载
+
+七牛云存储上的资源下载分为 [公有资源下载](#download-public-files) 和 [私有资源下载](#download-private-files) 。
+
+私有（private）是 Bucket（空间）的一个属性，一个私有 Bucket 中的资源为私有资源，私有资源不可匿名下载。
+
+新创建的空间（Bucket）缺省为私有，也可以将某个 Bucket 设为公有，公有 Bucket 中的资源为公有资源，公有资源可以匿名下载。
+
+<a name="download-public-files"></a>
+
+#### 公有资源下载
+
+    [GET] http://<bucket>.qiniudn.com/<key>
+
+或者，
+
+    [GET] http://<绑定域名>/<key>
+
+绑定域名可以是自定义域名，可以在 [七牛云存储开发者自助网站](https://portal.qiniu.com/) 进行域名绑定操作。
+
+**注意**，尖括号不是必需，代表替换项。
+
+<a name="download-private-files"></a>
+
+#### 私有资源下载
+
+私有资源只能通过临时下载授权凭证(downloadToken)下载，下载链接格式如下：
+
+    [GET] http://<bucket>.qiniudn.com/<key>?token=<downloadToken>
+
+或者，
+
+    [GET] http://<绑定域名>/<key>?token=<downloadToken>
+
+<a name="download-token"></a>
+
+##### 生成下载授权凭证（downloadToken）
+
+`<downloadToken>` 可以使用 SDK 提供的如下方法生成：
+
+    Qiniu::RS.generate_download_token :expires_in => expires_in_seconds,
+                                      :pattern    => download_url_patterns
+
+**参数**
+
+expires_in
+: 可选，数字类型，用于设置上传 URL 的有效期，单位：秒，缺省为 3600 秒，即 1 小时后该下载授权凭证（downloadToken）不再有效。
+
+pattern
+: 必选，字符串类型，用于设置可匹配的下载链接。参考：[downloadToken pattern 详解](http://docs.qiniutek.com/v3/api/io/#download-token-pattern)
+
+
+<a name="other-download-features"></a>
+
+#### 高级特性
+
+<a name="resumable-download"></a>
+
+##### 断点续下载
+
+七牛云存储支持标准的断点续下载，参考：[云存储API之断点续下载](http://docs.qiniu.com/api/get.html#download-by-range-bytes)
+
+<a name="upload-file-for-not-found"></a>
+
+##### 自定义 404 NotFound
+
+您可以上传一个应对 HTTP 404 出错处理的文件，当用户访问一个不存在的文件时，即可使用您上传的“自定义404文件”代替之。要这么做，您只须使用 `Qiniu::RS.upload_file` 函数上传一个 `key` 为固定字符串类型的值 `errno-404` 即可。
+
+除了使用 SDK 提供的方法，同样也可以借助七牛云存储提供的命令行辅助工具 [qboxrsctl](http://docs.qiniu.com/tools/qboxrsctl.html) 达到同样的目的：
+
+    qboxrsctl put <Bucket> <Key> <LocalFile>
+
+将其中的 `<Key>` 换作  `errno-404` 即可。
+
+注意，每个 `<Bucket>` 里边有且只有一个 `errno-404` 文件，上传多个，最后的那一个会覆盖前面所有的。
+
+
+<a name="file-management"></a>
+
+### 文件管理
+
+文件管理包括对存储在七牛云存储上的文件进行查看、复制、移动和删除处理。
+
+<a name="stat"></a>
+
+#### 查看单个文件属性信息
+
+    Qiniu::RS.stat(bucket, key)
+
+可以通过 SDK 提供的 `Qiniu::RS.stat` 函数，来查看某个已上传文件的属性信息。
+
+**参数**
+
+bucket
+: 必须，字符串类型（String），空间名称。
+
+key
+: 必须，字符串类型（String），若把 Bucket 理解为关系性数据库的某个表，那么 key 类似数据库里边某个表的主键ID，需给每一个文件一个UUID用于进行标示。
+
+**返回值**
+
+如果请求失败，返回 `false`；否则返回如下一个 `Hash` 类型的结构：
+
+    {
+        "fsize"    => 3053,
+        "hash"     => "Fu9lBSwQKbWNlBLActdx8-toAajv",
+        "mimeType" => "application/x-ruby",
+        "putTime"  => 13372775859344500
+    }
+
+fsize
+: 表示文件总大小，单位是 Byte
+
+hash
+: 文件的特征值，可以看做是基版本号
+
+mimeType
+: 文件的 mime-type
+
+putTime
+: 上传时间，单位是 百纳秒
+
+
+<a name="copy"></a>
+
+#### 复制单个文件
+
+    Qiniu::RS.copy(source_bucket, source_key, target_bucket, target_key)
+
+可以通过 SDK 提供的 `Qiniu::RS.copy` 函数进行文件复制操作。
+
+**参数**
+
+source_bucket
+: 必须，字符串类型（String），指定源空间。
+
+source_key
+: 必须，字符串类型（String），指定源文件。
+
+target_bucket
+: 必须，字符串类型（String），指定要复制到的目标空间。
+
+target_key
+: 必须，字符串类型（String），指定要复制到目标空间的目标文件名。
+
+**返回值**
+
+如果请求失败，返回 `false`；否则返回 `true` 。
+
+
+<a name="move"></a>
+
+#### 移动单个文件
+
+    Qiniu::RS.move(source_bucket, source_key, target_bucket, target_key)
+
+可以通过 SDK 提供的 `Qiniu::RS.move` 函数进行文件移动操作。
+
+**参数**
+
+source_bucket
+: 必须，字符串类型（String），指定源空间。
+
+source_key
+: 必须，字符串类型（String），指定源文件。
+
+target_bucket
+: 必须，字符串类型（String），指定要移动到的目标空间。
+
+target_key
+: 必须，字符串类型（String），指定要移动到目标空间的目标文件名。
+
+**返回值**
+
+如果请求失败，返回 `false`；否则返回 `true` 。
+
+
+<a name="delete"></a>
+
+### 删除单个文件
+
+    Qiniu::RS.delete(bucket, key)
+
+`Qiniu::RS.delete` 函数提供了从指定的 `bucket` 中删除指定的 `key`，即删除 `key` 索引关联的具体文件。
+
+**参数**
+
+bucket
+: 必须，字符串类型（String），空间名称。
+
+key
+: 必须，字符串类型（String），若把 Bucket 理解为关系性数据库的某个表，那么 key 类似数据库里边某个表的主键ID，需给每一个文件一个UUID用于进行标示。
+
+**返回值**
+
+如果删除成功，返回 `true`，否则返回 `false` 。
+
+
+<a name="batch"></a>
+
+### 批量操作
+
+    Qiniu::RS.batch(command, bucket, keys)
+
+SDK 还提供了 `Qiniu::RS.batch` 函数来提供批量处理 `Qiniu::RS.stat` 或是 `Qiniu::RS.get` 或 `Qiniu::RS.delete` 的相应功能。
+
+**参数**
+
+command
+: 必须，字符串类型（String），其值可以是 `stat`, `get`, `delete` 中的一种
+
+bucket
+: 必须，字符串类型（String），空间名称。
+
+keys
+: 必须，数组类型（Array），所要操作 `key` 的集合。
+
+**返回值**
+
+如果请求失败，返回 `false`，否则返回一个 `Array` 类型的结构，其中每个元素是一个 `Hash` 类型的结构。例如批量`get`：
+
+    [
+        {
+            "code" => 200,
+            "data" => {
+                "expires"  => 3600,
+                "fsize"    => 3053,
+                "hash"     => "Fu9lBSwQKbWNlBLActdx8-toAajv",
+                "mimeType" => "application/x-ruby",
+                "url"      => "http://iovip.qbox.me/file/<an-authorized-token>"
+            }
+        },
+        ...
+    ]
+
+<a name="batch-get"></a>
+
+#### 批量获取文件属性信息
+
+    Qiniu::RS.batch_get(bucket, keys)
+
+`Qiniu::RS.batch_get` 函数是在 `Qiniu::RS.batch` 之上的封装，提供批量获取文件属性信息（含下载链接）的功能。
+
+**参数**
+
+bucket
+: 必须，字符串类型（String），空间名称。
+
+keys
+: 必须，数组类型（Array），所要操作 `key` 的集合。
+
+**返回值**
+
+如果请求失败，返回 `false`，否则返回一个 `Array` 类型的结构，其中每个元素是一个 `Hash` 类型的结构。`Hash` 类型的值同 `Qiniu::RS.get` 函数的返回值类似，只多出一个 `code` 字段，`code` 为 200 表示所有 keys 全部获取成功，`code` 若为 298 表示部分获取成功。
+
+    [
+        {
+            "code" => 200,
+            "data" => {
+                "expires"  => 3600,
+                "fsize"    => 3053,
+                "hash"     => "Fu9lBSwQKbWNlBLActdx8-toAajv",
+                "mimeType" => "application/x-ruby",
+                "url"      => "http://iovip.qbox.me/file/<an-authorized-token>"
+            }
+        },
+        ...
+    ]
+
+
+<a name="batch-copy"></a>
+
+#### 批量复制文件
+
+    Qiniu::RS.batch_copy(*args)
+
+等价于，
+
+    Qiniu::RS.batch_copy [source_bucket, source_key, target_bucket, target_key], ...
+
+`Qiniu::RS.batch_copy()` 的参数是一个可变长数组，其中每个数组其元素含义同 `Qiniu::RS.copy` 的参数一样。
+
+**返回值**
+
+如果批量删除成功，返回 `true` ，否则为 `false` 。
+
+
+<a name="batch-move"></a>
+
+#### 批量移动文件
+
+    Qiniu::RS.batch_move(*args)
+
+等价于，
+
+    Qiniu::RS.batch_move [source_bucket, source_key, target_bucket, target_key], ...
+
+`Qiniu::RS.batch_move()` 的参数是一个可变长数组，其中每个数组其元素含义同 `Qiniu::RS.move` 的参数一样。
+
+**返回值**
+
+如果批量删除成功，返回 `true` ，否则为 `false` 。
+
+
+<a name="batch-delete"></a>
+
+#### 批量删除文件
+
+    Qiniu::RS.batch_delete(bucket, keys)
+
+`Qiniu::RS.batch_download` 函数也是在 `Qiniu::RS.batch` 之上的封装，提供批量删除文件的功能。
+
+参数同 `Qiniu::RS.batch_get` 的参数一样。
+
+**返回值**
+
+如果批量删除成功，返回 `true` ，否则为 `false` 。
+
+
+<a name="cloud-processing"></a>
+
+### 云处理
+
+<a name="image-processing"></a>
+
+#### 图像
+
+<a name="image-info"></a>
+
+##### 查看图片属性信息
+
+    Qiniu::RS.image_info(url)
+
+使用 SDK 提供的 `Qiniu::RS.image_info` 方法，可以基于一张存储于七牛云存储服务器上的图片，针对其下载链接来获取该张图片的属性信息。
+
+**参数**
+
+url
+: 必须，字符串类型（String），图片的下载链接，需是 `Qiniu::RS.get`（或`Qiniu::RS.batch_get`）函数返回值中 `url` 字段的值，或者是 `Qiniu::RS.download`（或`Qiniu::RS.batch_download`）函数返回的下载链接。且文件本身必须是图片。
+
+**返回值**
+
+如果请求失败，返回 `false`；否则，返回如下一个 `Hash` 类型的结构：
+
+    {
+        "format"     => "jpeg",
+        "width"      => 640,
+        "height"     => 425,
+        "colorModel" => "ycbcr"
+    }
+
+format
+: 原始图片类型
+
+width
+: 原始图片宽度，单位像素
+
+height
+: 原始图片高度，单位像素
+
+colorModel
+: 原始图片着色模式
+
+<a name="image-exif"></a>
+
+##### 查看图片EXIF信息
+
+    Qiniu::RS.image_exif(url)
+
+使用 SDK 提供的 `Qiniu::RS.image_exif` 方法，可以基于一张存储于七牛云存储服务器上的原始图片图片，取到该图片的  EXIF 信息。
+
+**参数**
+
+url
+: 必须，字符串类型（String），原图的下载链接，需是 `Qiniu::RS.get`（或`Qiniu::RS.batch_get`）函数返回值中 `url` 字段的值，或者是 `Qiniu::RS.download`（或`Qiniu::RS.batch_download`）函数返回的下载链接。且文件本身必须是图片。
+
+**返回值**
+
+如果参数 `url` 所代表的图片没有 EXIF 信息，返回 `false`。否则，返回一个包含 EXIF 信息的 Hash 结构。
+
+<a name="image-mogrify-for-preview"></a>
+
+##### 图像在线处理（缩略、裁剪、旋转、转化）
+
+`Qiniu::RS.image_mogrify_preview_url()` 方法支持将一个存储在七牛云存储的图片进行缩略、裁剪、旋转和格式转化处理，该方法返回一个可以直接预览缩略图的URL。
+
+    image_mogrify_preview_url = Qiniu::RS.image_mogrify_preview_url(source_image_url, mogrify_options)
+
+**参数**
+
+source_image_url
+: 必须，字符串类型（string），指定原始图片的下载链接，可以根据 rs.get() 获取到。
+
+mogrify_options
+: 必须，Hash Map 格式的图像处理参数。
+
+`mogrify_options` 对象具体的规格如下：
+
+    mogrify_options = {
+        :thumbnail => <ImageSizeGeometry>,
+        :gravity => <GravityType>, =NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast
+        :crop => <ImageSizeAndOffsetGeometry>,
+        :quality => <ImageQuality>,
+        :rotate => <RotateDegree>,
+        :format => <DestinationImageFormat>, =jpg, gif, png, tif, etc.
+        :auto_orient => <TrueOrFalse>
+    }
+
+`Qiniu::RS.image_mogrify_preview_url()` 方法是对七牛云存储图像处理高级接口的完整包装，关于 `mogrify_options` 参数里边的具体含义和使用方式，可以参考文档：[图像处理高级接口](http://docs.qiniu.com/api/image-process.html#imageMogr)。
+
+**返回值**
+
+返回一个可以预览最终缩略图的URL，String 类型。
+
+<a name="image-mogrify-for-save-as"></a>
+
+#### 图像在线处理（缩略、裁剪、旋转、转化）后并持久化存储
+
+`Qiniu::RS.image_mogrify_save_as()` 方法支持将一个存储在七牛云存储的图片进行缩略、裁剪、旋转和格式转化处理，并且将处理后的缩略图作为一个新文件持久化存储到七牛云存储服务器上，这样就可以供后续直接使用而不用每次都传入参数进行图像处理。
+
+    result = Qiniu::RS.image_mogrify_save_as(target_bucket, target_key, src_img_url, mogrify_options)
+
+**参数**
+
+target_bucket
+: 必须，字符串类型（string），指定最终缩略图要存放的 bucket 。
+
+target_key
+: 必须，字符串类型（string），指定最终缩略图存放在云存储服务端的唯一文件ID。
+
+src_img_url
+: 必须，字符串类型（string），指定原始图片的下载链接，可以根据 rs.get() 获取到。
+
+mogrify_options
+: 必须，Hash Map 格式的图像处理参数。
+
+`mogrify_options` 对象具体的规格如下：
+
+    mogrify_options = {
+        :thumbnail => <ImageSizeGeometry>,
+        :gravity => <GravityType>, =NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast
+        :crop => <ImageSizeAndOffsetGeometry>,
+        :quality => <ImageQuality>,
+        :rotate => <RotateDegree>,
+        :format => <DestinationImageFormat>, =jpg, gif, png, tif, etc.
+        :auto_orient => <TrueOrFalse>
+    }
+
+`Qiniu::RS::Image.mogrify_preview_url()` 方法是对七牛云存储图像处理高级接口的完整包装，关于 `mogrify_options` 参数里边的具体含义和使用方式，可以参考文档：[图像处理高级接口](http://docs.qiniu.com/api/image-process.html#imageMogr)
+
+**返回值**
+
+如果请求失败，返回 `false`；否则，返回如下一个 `Hash` 类型的结构：
+
+    {"hash" => "FrOXNat8VhBVmcMF3uGrILpTu8Cs"}
+
+示例代码：
+
+    data = Qiniu::RS.get("<test_image_bucket>", "<test_image_key>")
+    src_img_url = data["url"]
+
+    target_bucket = "test_thumbnails_bucket"
+    target_key = "cropped-" + @test_image_key
+
+    mogrify_options = {
+      :thumbnail => "!120x120r",
+      :gravity => "center",
+      :crop => "!120x120a0a0",
+      :quality => 85,
+      :rotate => 45,
+      :format => "jpg",
+      :auto_orient => true
+    }
+
+    result = Qiniu::RS.image_mogrify_save_as(target_bucket, target_key, src_img_url, mogrify_options)
+    if result
+      thumbnail = Qiniu::RS.get(target_bucket, target_key)
+      puts thumbnail["url"]
+
+      # 您可以选择将存放缩略图的 bucket 公开，这样就可以直接以外链的形式访问到缩略图，而不用走API获取下载URL，就可以直接以如下方式访问缩略图：
+
+      # [GET] http://<bucket>.qiniudn.com/<target_key>
+    end
+
+
+<a name="Contributing"></a>
+
+## 贡献代码
+
+七牛云存储 Ruby SDK 源码地址：<https://github.com/qiniu/ruby-sdk>
+
+1. 登录 <https://github.com>
+2. Fork <https://github.com/qiniu/ruby-sdk>
+3. 创建您的特性分支 (`git checkout -b my-new-feature`)
+4. 提交您的改动 (`git commit -am 'Added some feature'`)
+5. 将您的改动记录提交到远程 `git` 仓库 (`git push origin my-new-feature`)
+6. 然后到 github 网站的该 `git` 远程仓库的 `my-new-feature` 分支下发起 Pull Request
+
+<a name="License"></a>
+
+## 许可证
+
+Copyright (c) 2012 qiniutek.com
+
+基于 MIT 协议发布:
+
+* [www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)

lib/qiniu/rs.rb

@@ -1,17 +1,24 @@
 # -*- encoding: utf-8 -*-
 
-require 'qiniu/rs/version'
-
 module Qiniu
   module RS
+    autoload :Version, 'qiniu/rs/version'
     autoload :Config, 'qiniu/rs/config'
     autoload :Log, 'qiniu/rs/log'
     autoload :Exception, 'qiniu/rs/exceptions'
     autoload :Utils, 'qiniu/rs/utils'
     autoload :Auth, 'qiniu/rs/auth'
     autoload :IO, 'qiniu/rs/io'
+    autoload :UP, 'qiniu/rs/up'
     autoload :RS, 'qiniu/rs/rs'
+    autoload :EU, 'qiniu/rs/eu'
+    autoload :Pub, 'qiniu/rs/pub'
     autoload :Image, 'qiniu/rs/image'
+    autoload :AccessToken, 'qiniu/tokens/access_token'
+    autoload :QboxToken, 'qiniu/tokens/qbox_token'
+    autoload :UploadToken, 'qiniu/tokens/upload_token'
+    autoload :DownloadToken, 'qiniu/tokens/download_token'
+    autoload :Abstract, 'qiniu/rs/abstract'
 
     class << self
 
@@ -26,16 +33,109 @@ module Qiniu
         code == StatusOK
       end
 
+      def mkbucket(bucket_name)
+        code, data = RS.mkbucket(bucket_name)
+        code == StatusOK
+      end
+
+      def buckets
+        code, data = RS.buckets
+        code == StatusOK ? data : false
+      end
+
+      def set_protected(bucket, protected_mode)
+        code, data = Pub.set_protected(bucket, protected_mode)
+        code == StatusOK
+      end
+
+      def set_separator(bucket, separator)
+        code, data = Pub.set_separator(bucket, separator)
+        code == StatusOK
+      end
+
+      def set_style(bucket, name, style)
+        code, data = Pub.set_style(bucket, name, style)
+        code == StatusOK
+      end
+
+      def unset_style(bucket, name)
+        code, data = Pub.unset_style(bucket, name)
+        code == StatusOK
+      end
+
+=begin
+      def set_watermark(customer_id, options = {})
+        code, data = EU.set_watermark(customer_id, options)
+        code == StatusOK
+      end
+
+      def get_watermark(customer_id = nil)
+        code, data = EU.get_watermark(customer_id)
+        code == StatusOK ? data : false
+      end
+=end
+
       def put_auth(expires_in = nil, callback_url = nil)
         code, data = IO.put_auth(expires_in, callback_url)
         code == StatusOK ? data["url"] : false
       end
 
-      def upload(url, local_file, bucket = '', key = '', mime_type = '', custom_meta = '', callback_params = {})
-        code, data = IO.put_file(url, local_file, bucket, key, mime_type, custom_meta, callback_params)
+      def upload opts = {}
+        code, data = IO.upload_file(opts[:url],
+                                    opts[:file],
+                                    opts[:bucket],
+                                    opts[:key],
+                                    opts[:mime_type],
+                                    opts[:note],
+                                    opts[:callback_params],
+                                    opts[:enable_crc32_check])
         code == StatusOK
       end
 
+      def put_file opts = {}
+        code, data = IO.put_file(opts[:file],
+                                 opts[:bucket],
+                                 opts[:key],
+                                 opts[:mime_type],
+                                 opts[:note],
+                                 opts[:enable_crc32_check])
+        code == StatusOK
+      end
+
+      def upload_file opts = {}
+        uncontained_opts = [:uptoken, :file, :bucket, :key] - opts.keys
+        raise MissingArgsError, uncontained_opts unless uncontained_opts.empty?
+
+        source_file = opts[:file]
+        raise NoSuchFileError, source_file unless File.exist?(source_file)
+
+        opts[:enable_resumable_upload] = true unless opts.has_key?(:enable_resumable_upload)
+
+        if opts[:enable_resumable_upload] && File::size(source_file) > Config.settings[:block_size]
+          code, data = UP.upload_with_token(opts[:uptoken],
+                                            opts[:file],
+                                            opts[:bucket],
+                                            opts[:key],
+                                            opts[:mime_type],
+                                            opts[:note],
+                                            opts[:customer],
+                                            opts[:callback_params],
+                                            opts[:rotate])
+        else
+          code, data = IO.upload_with_token(opts[:uptoken],
+                                            opts[:file],
+                                            opts[:bucket],
+                                            opts[:key],
+                                            opts[:mime_type],
+                                            opts[:note],
+                                            opts[:callback_params],
+                                            opts[:enable_crc32_check],
+                                            opts[:rotate])
+        end
+        raise UploadFailedError.new(code, data) if code != StatusOK
+        return data
+      end
+
       def stat(bucket, key)
         code, data = RS.stat(bucket, key)
         code == StatusOK ? data : false
@@ -51,6 +151,16 @@ module Qiniu
         code == StatusOK ? data["url"] : false
       end
 
+      def copy(source_bucket, source_key, target_bucket, target_key)
+        code, data = RS.copy(source_bucket, source_key, target_bucket, target_key)
+        code == StatusOK
+      end
+
+      def move(source_bucket, source_key, target_bucket, target_key)
+        code, data = RS.move(source_bucket, source_key, target_bucket, target_key)
+        code == StatusOK
+      end
+
       def delete(bucket, key)
         code, data = RS.delete(bucket, key)
         code == StatusOK
@@ -71,6 +181,16 @@ module Qiniu
         code == StatusOK ? data : false
       end
 
+      def batch_copy(*args)
+        code, data = RS.batch_copy(*args)
+        code == StatusOK
+      end
+
+      def batch_move(*args)
+        code, data = RS.batch_move(*args)
+        code == StatusOK
+      end
+
       def batch_download(bucket, keys)
         code, data = RS.batch_get(bucket, keys)
         return false unless code == StatusOK
@@ -84,16 +204,6 @@ module Qiniu
         code == StatusOK ? data : false
       end
 
-      def publish(domain, bucket)
-        code, data = RS.publish(domain, bucket)
-        code == StatusOK
-      end
-
-      def unpublish(domain)
-        code, data = RS.unpublish(domain)
-        code == StatusOK
-      end
-
       def drop(bucket)
         code, data = RS.drop(bucket)
         code == StatusOK
@@ -104,10 +214,48 @@ module Qiniu
         code == StatusOK ? data : false
       end
 
+      def image_exif(url)
+        code, data = Image.exif(url)
+        code == StatusOK ? data : false
+      end
+
       def image_preview_url(url, spec)
         Image.preivew_url(url, spec)
       end
 
+      def image_mogrify_preview_url(source_image_url, options)
+        Image.mogrify_preview_url(source_image_url, options)
+      end
+
+      def image_mogrify_save_as(bucket, key, source_image_url, options)
+        code, data = RS.image_mogrify_save_as(bucket, key, source_image_url, options)
+        code == StatusOK ? data : false
+      end
+
+      def generate_upload_token(opts = {})
+        token_obj = UploadToken.new(opts)
+        token_obj.access_key = Config.settings[:access_key]
+        token_obj.secret_key = Config.settings[:secret_key]
+        #token_obj.scope = opts[:scope]
+        #token_obj.expires_in = opts[:expires_in]
+        #token_obj.callback_url = opts[:callback_url]
+        #token_obj.callback_body_type = opts[:callback_body_type]
+        #token_obj.customer = opts[:customer]
+        #token_obj.escape = opts[:escape]
+        #token_obj.async_options = opts[:async_options]
+        #token_obj.return_body = opts[:return_body]
+        token_obj.generate_token
+      end
+
+      def generate_download_token(opts = {})
+        token_obj = DownloadToken.new(opts)
+        token_obj.access_key = Config.settings[:access_key]
+        token_obj.secret_key = Config.settings[:secret_key]
+        #token_obj.expires_in = opts[:expires_in]
+        #token_obj.pattern = opts[:pattern]
+        token_obj.generate_token
+      end
+
     end
 
   end

lib/qiniu/rs/abstract.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+module Qiniu
+  module RS
+    module Abstract
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def abstract_methods(*args)
+          args.each do |name|
+            class_eval <<-END
+              def #{name}(*args)
+                errmsg = %Q(class \#{self.class.name} must implement abstract method #{self.name}##{name}().)
+                raise NotImplementedError.new(errmsg)
+              end
+            END
+          end
+        end
+      end
+    end
+  end
+end

lib/qiniu/rs/auth.rb

@@ -8,63 +8,13 @@ module Qiniu
       class << self
         include Utils
 
-        def exchange_by_password!(username, password)
-          @username = username
-          @password = password
-          post_data = {
-            :client_id  => Config.settings[:client_id],
-            :grant_type => "password",
-            :username   => username,
-            :password   => password
-          }
-          code, data = http_request Config.settings[:auth_url], post_data
-          reset_token(data["access_token"], data["refresh_token"]) if code == 200
+        def call_with_signature(url, data, retry_times = 0, options = {})
+          code, data = http_request url, data, options.merge({:qbox_signature_token => generate_qbox_signature(url, data, options[:mime])})
           [code, data]
         end
 
-        def exchange_by_refresh_token!(refresh_token)
-          post_data = {
-            :client_id     => Config.settings[:client_id],
-            :grant_type    => "refresh_token",
-            :refresh_token => refresh_token
-          }
-          code, data = http_request Config.settings[:auth_url], post_data
-          reset_token(data["access_token"], data["refresh_token"]) if code == 200
-          [code, data]
-        end
-
-        def reset_token(access_token, refresh_token)
-          @access_token  = access_token
-          @refresh_token = refresh_token
-        end
-
-        def call(url, data, retry_times = 0)
-          raise MissingAccessToken if @access_token.nil?
-          code, data = http_request url, data, {:access_token => @access_token}
-          if code == 401
-            raise MissingRefreshToken if @refresh_token.nil?
-            code, data = exchange_by_refresh_token!(@refresh_token)
-            if code == 401
-              raise MissingUsernameOrPassword if (@username.nil? || @password.nil?)
-              code, data = exchange_by_password!(@username, @password)
-            end
-            if code == 200
-              retry_times += 1
-              if Config.settings[:auto_reconnect] && retry_times < Config.settings[:max_retry_times]
-                return call(url, data, retry_times)
-              end
-            end
-          end
-          [code, data]
-        end
-
-        def request(url, data = nil)
-          begin
-            code, data = Auth.call(url, data)
-          rescue [MissingAccessToken, MissingRefreshToken, MissingUsernameOrPassword] => e
-            Log.logger.error e
-            code, data = 401, {}
-          end
+        def request(url, data = nil, options = {})
+              code, data = Auth.call_with_signature(url, data, 0, options)
           [code, data]
         end
 

lib/qiniu/rs/config.rb

@@ -8,7 +8,7 @@
 # Qbox::Config.load "path/to/your_project/config/qiniu.yml"
 #
 
-require "qiniu/rs/version"
+require 'tmpdir'
 
 module Qiniu
   module RS
@@ -16,19 +16,28 @@ module Qiniu
       class << self
 
         DEFAULT_OPTIONS = {
-          :user_agent      => 'Qiniu-RS-Ruby-SDK-' + VERSION + '()',
+          :user_agent      => 'Qiniu-RS-Ruby-SDK-' + Version.to_s + '()',
           :method          => :post,
           :content_type    => 'application/x-www-form-urlencoded',
           :auth_url        => "https://acc.qbox.me/oauth2/token",
-          :rs_host         => "http://rs.qbox.me:10100",
-          :io_host         => "http://io.qbox.me",
-          :client_id       => "<YOUR_APP_CLIENT_ID>",
-          :client_secret   => "<YOUR_APP_CLIENT_SECRET>",
+          :rs_host         => "http://rs.qiniu.com",
+          :io_host         => "http://iovip.qbox.me",
+          :up_host         => "http://up.qiniu.com",
+          :pub_host        => "http://pu.qbox.me:10200",
+          :eu_host         => "http://eu.qbox.me",
+          :client_id       => "a75604760c4da4caaa456c0c5895c061c3065c5a",
+          :client_secret   => "75df554a39f58accb7eb293b550fa59618674b7d",
+          :access_key      => "",
+          :secret_key      => "",
           :auto_reconnect  => true,
-          :max_retry_times => 5
+          :max_retry_times => 3,
+          :block_size      => 1024*1024*4,
+          :chunk_size      => 1024*256,
+          :enable_debug    => true,
+          :tmpdir          => Dir.tmpdir + File::SEPARATOR + 'Qiniu-RS-Ruby-SDK'
         }
 
-        REQUIRED_OPTION_KEYS = [:client_id, :client_secret, :auth_url, :rs_host, :io_host]
+        REQUIRED_OPTION_KEYS = [:access_key, :secret_key]
 
         attr_reader :settings, :default_params
 

lib/qiniu/rs/eu.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+module Qiniu
+  module RS
+    module EU
+      class << self
+        include Utils
+
+        def set_watermark(customer_id, options = {})
+          Auth.request Config.settings[:eu_host] + '/wmset', options.merge({:customer => customer_id})
+        end
+
+        def get_watermark(customer_id = nil)
+          post_data = customer_id.nil? ? nil : {:customer => customer_id}
+          Auth.request Config.settings[:eu_host] + '/wmget', post_data
+        end
+
+      end
+    end
+  end
+end
+

lib/qiniu/rs/exceptions.rb

@@ -4,9 +4,6 @@ module Qiniu
   module RS
 
     class Exception < RuntimeError
-      def to_s
-        inspect
-      end
     end
 
     class ResponseError < Exception
@@ -32,7 +29,7 @@ module Qiniu
 
     class RequestFailed < ResponseError
       def message
-        "HTTP status code #{http_code}"
+        "HTTP status code: #{http_code}. Response body: #{http_body}"
       end
 
       def to_s
@@ -40,6 +37,43 @@ module Qiniu
       end
     end
 
+    class UploadFailedError < Exception
+      def initialize(status_code, response_data)
+        data_string = response_data.map { |key, value| %Q(:#{key.to_s} => #{value.to_s}) }
+        msg = %Q(Uploading Failed. HTTP Status Code: #{status_code}. HTTP response body: #{data_string.join(', ')}.)
+        super(msg)
+      end
+    end
+
+    class FileSeekReadError < Exception
+      def initialize(fpath, block_index, seek_pos, read_length, result_length)
+        msg =  "Reading file: #{fpath}, "
+        msg += "at block index: #{block_index}. "
+        msg += "Expected seek_pos:#{seek_pos} and read_length:#{read_length}, "
+        msg += "but got result_length: #{result_length}."
+        super(msg)
+      end
+    end
+
+    class BlockSizeNotMathchError < Exception
+      def initialize(fpath, block_index, offset, restsize, block_size)
+        msg  = "Reading file: #{fpath}, "
+        msg += "at block index: #{block_index}. "
+        msg += "Expected offset: #{offset}, restsize: #{restsize} and block_size: #{block_size}, "
+        msg += "but got offset+restsize=#{offset+restsize}."
+        super(msg)
+      end
+    end
+
+    class BlockCountNotMathchError < Exception
+      def initialize(fpath, block_count, checksum_count, progress_count)
+        msg  = "Reading file: #{fpath}, "
+        msg += "Expected block_count, checksum_count, progress_count is: #{block_count}, "
+        msg += "but got checksum_count: #{checksum_count}, progress_count: #{progress_count}."
+        super(msg)
+      end
+    end
+
     class MissingArgsError < Exception
       def initialize(missing_keys)
         key_list = missing_keys.map {|key| key.to_s}.join(' and the ')

lib/qiniu/rs/image.rb

@@ -10,10 +10,32 @@ module Qiniu
           Utils.http_request url + '/imageInfo', nil, {:method => :get}
         end
 
+        def exif(url)
+          Utils.http_request url + '?exif', nil, {:method => :get}
+        end
+
         def preivew_url(url, spec)
           url + '/imagePreview/' + spec.to_s
         end
 
+        def mogrify_preview_url(source_image_url, options)
+          source_image_url + '?' + generate_mogrify_params_string(options)
+        end
+
+        def generate_mogrify_params_string(options = {})
+          opts = {}
+          options.each do |k, v|
+            opts[k.to_s] = v
+          end
+          params_string = ""
+          keys = ["thumbnail", "gravity", "crop", "quality", "rotate", "format"]
+          keys.each do |key|
+            params_string += %Q(/#{key}/#{opts[key]}) unless opts[key].nil?
+          end
+          params_string += '/auto-orient' unless opts["auto_orient"].nil?
+          'imageMogr' + URI.escape(params_string)
+        end
+
       end
     end
   end

lib/qiniu/rs/io.rb

@@ -20,19 +20,42 @@ module Qiniu
           Auth.request(url)
         end
 
-        def put_file(url, local_file, bucket = '', key = '', mime_type = '', custom_meta = '', callback_params = '')
-          raise NoSuchFileError unless File.exist?(local_file)
-          key = Digest::SHA1.hexdigest(local_file + Time.now.to_s) if key.empty?
+        def upload_file(url, local_file, bucket, key = nil, mime_type = nil, custom_meta = nil, callback_params = nil, enable_crc32_check = false)
+          action_params = _generate_action_params(local_file, bucket, key, mime_type, custom_meta, enable_crc32_check)
+          callback_params = {:bucket => bucket, :key => key, :mime_type => mime_type} if callback_params.nil?
+          callback_query_string = Utils.generate_query_string(callback_params)
+          Utils.upload_multipart_data(url, local_file, action_params, callback_query_string)
+        end
+
+        def put_file(local_file, bucket, key = nil, mime_type = nil, custom_meta = nil, enable_crc32_check = false)
+          action_params = _generate_action_params(local_file, bucket, key, mime_type, custom_meta, enable_crc32_check)
+          url = Config.settings[:io_host] + action_params
+          options = {:content_type => 'application/octet-stream'}
+          Auth.request url, ::IO.read(local_file), options
+        end
+
+        def upload_with_token(uptoken, local_file, bucket, key = nil, mime_type = nil, custom_meta = nil, callback_params = nil, enable_crc32_check = false, rotate = nil)
+          action_params = _generate_action_params(local_file, bucket, key, mime_type, custom_meta, enable_crc32_check, rotate)
+          callback_params = {:bucket => bucket, :key => key, :mime_type => mime_type} if callback_params.nil?
+          callback_query_string = Utils.generate_query_string(callback_params)
+          url = Config.settings[:up_host] + '/upload'
+          Utils.upload_multipart_data(url, local_file, action_params, callback_query_string, uptoken)
+        end
+
+        private
+        def _generate_action_params(local_file, bucket, key = nil, mime_type = nil, custom_meta = nil, enable_crc32_check = false, rotate = nil)
+          raise NoSuchFileError, local_file unless File.exist?(local_file)
+          key = Digest::SHA1.hexdigest(local_file + Time.now.to_s) if key.nil?
           entry_uri = bucket + ':' + key
-          if mime_type.empty?
+          if mime_type.nil? || mime_type.empty?
             mime = MIME::Types.type_for local_file
             mime_type = mime.empty? ? 'application/octet-stream' : mime[0].content_type
           end
           action_params = '/rs-put/' + Utils.urlsafe_base64_encode(entry_uri) + '/mimeType/' + Utils.urlsafe_base64_encode(mime_type)
-          action_params += '/meta/' + Utils.urlsafe_base64_encode(custom_meta) unless custom_meta.empty?
-          callback_params = {:bucket => bucket, :key => key, :mime_type => mime_type} if callback_params.empty?
-          callback_query_string = Utils.generate_query_string(callback_params)
-          Utils.upload_multipart_data(url, local_file, action_params, callback_query_string)
+          action_params += '/meta/' + Utils.urlsafe_base64_encode(custom_meta) unless custom_meta.nil?
+          action_params += '/crc32/' + Utils.crc32checksum(local_file).to_s if enable_crc32_check
+          action_params += '/rotate/' + rotate if !rotate.nil? && rotate.to_i >= 0
+          action_params
         end
 
       end

lib/qiniu/rs/pub.rb

@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+
+module Qiniu
+  module RS
+    module Pub
+      class << self
+        include Utils
+
+        def set_protected(bucket, protected_mode)
+          host = Config.settings[:pub_host]
+          Auth.request %Q(#{host}/accessMode/#{bucket}/mode/#{protected_mode})
+        end
+
+        def set_separator(bucket, separator)
+          host = Config.settings[:pub_host]
+          encoded_separator = Utils.urlsafe_base64_encode(separator)
+          Auth.request %Q(#{host}/separator/#{bucket}/sep/#{encoded_separator})
+        end
+
+        def set_style(bucket, name, style)
+          host = Config.settings[:pub_host]
+          encoded_name = Utils.urlsafe_base64_encode(name)
+          encoded_style = Utils.urlsafe_base64_encode(style)
+          Auth.request %Q(#{host}/style/#{bucket}/name/#{encoded_name}/style/#{encoded_style})
+        end
+
+        def unset_style(bucket, name)
+          host = Config.settings[:pub_host]
+          encoded_name = Utils.urlsafe_base64_encode(name)
+          Auth.request %Q(#{host}/unstyle/#{bucket}/name/#{encoded_name})
+        end
+
+      end
+    end
+  end
+end
+

lib/qiniu/rs/rs.rb

@@ -6,6 +6,14 @@ module Qiniu
       class << self
         include Utils
 
+        def buckets
+          Auth.request Config.settings[:rs_host] + '/buckets'
+        end
+
+        def mkbucket(bucket_name)
+          Auth.request Config.settings[:rs_host] + '/mkbucket/' + bucket_name
+        end
+
         def stat(bucket, key)
           Auth.request Config.settings[:rs_host] + '/stat/' + encode_entry_uri(bucket, key)
         end
@@ -18,20 +26,20 @@ module Qiniu
           Auth.request url
         end
 
+        def copy(source_bucket, source_key, target_bucket, target_key)
+          uri = _generate_cp_or_mv_opstr('copy', source_bucket, source_key, target_bucket, target_key)
+          Auth.request Config.settings[:rs_host] + uri
+        end
+
+        def move(source_bucket, source_key, target_bucket, target_key)
+          uri = _generate_cp_or_mv_opstr('move', source_bucket, source_key, target_bucket, target_key)
+          Auth.request Config.settings[:rs_host] + uri
+        end
+
         def delete(bucket, key)
           Auth.request Config.settings[:rs_host] + '/delete/' + encode_entry_uri(bucket, key)
         end
 
-        def publish(domain, bucket)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/publish/#{encoded_domain}/from/#{bucket}"
-        end
-
-        def unpublish(domain)
-          encoded_domain = Utils.urlsafe_base64_encode(domain)
-          Auth.request Config.settings[:rs_host] + "/unpublish/#{encoded_domain}"
-        end
-
         def drop(bucket)
           Auth.request Config.settings[:rs_host] + "/drop/#{bucket}"
         end
@@ -42,7 +50,7 @@ module Qiniu
             encoded_uri = encode_entry_uri(bucket, key)
             execs << "op=/#{command}/#{encoded_uri}"
           end
-          Auth.request Config.settings[:rs_host] + "/batch?" + execs.join("&")
+          Auth.request Config.settings[:rs_host] + "/batch", execs.join("&"), {:mime => "application/x-www-form-urlencoded" }
         end
 
         def batch_get(bucket, keys)
@@ -53,10 +61,46 @@ module Qiniu
           batch("stat", bucket, keys)
         end
 
+        def batch_copy(*args)
+          _batch_cp_or_mv('copy', args)
+        end
+
+        def batch_move(*args)
+          _batch_cp_or_mv('move', args)
+        end
+
         def batch_delete(bucket, keys)
           batch("delete", bucket, keys)
         end
 
+        def save_as(bucket, key, source_url, op_params_string)
+          encoded_uri = encode_entry_uri(bucket, key)
+          save_as_string = '/save-as/' + encoded_uri
+          new_url = source_url + '?' + op_params_string + save_as_string
+          Auth.request new_url
+        end
+
+        def image_mogrify_save_as(bucket, key, source_image_url, options)
+          mogrify_params_string = Image.generate_mogrify_params_string(options)
+          save_as(bucket, key, source_image_url, mogrify_params_string)
+        end
+
+        private
+
+        def _generate_cp_or_mv_opstr(command, source_bucket, source_key, target_bucket, target_key)
+          source_encoded_entry_uri = encode_entry_uri(source_bucket, source_key)
+          target_encoded_entry_uri = encode_entry_uri(target_bucket, target_key)
+          %Q(/#{command}/#{source_encoded_entry_uri}/#{target_encoded_entry_uri})
+        end
+
+        def _batch_cp_or_mv(command, *op_args)
+          execs = []
+          op_args.each do |e|
+            execs << 'op=' + _generate_cp_or_mv_opstr(command, e[0], e[1], e[2], e[3]) if e.size == 4
+          end
+          Auth.request Config.settings[:rs_host] + "/batch", execs.join("&"), {:mime => "application/x-www-form-urlencoded" }
+        end
+
       end
     end
   end

lib/qiniu/rs/up.rb

@@ -0,0 +1,328 @@
+# -*- encoding: utf-8 -*-
+
+require 'zlib'
+require 'yaml'
+require 'tmpdir'
+require 'fileutils'
+require 'mime/types'
+require 'digest/sha1'
+require 'qiniu/rs/abstract'
+require 'qiniu/rs/exceptions'
+require 'qiniu/rs/io'
+
+module Qiniu
+  module RS
+    module UP
+
+      PROGRESS_TMP_FILE = 'progresses'
+      CHECKSUM_TMP_FILE = 'ctxes'
+
+      module AbstractClass
+        class ChunkProgressNotifier
+          include Qiniu::RS::Abstract
+          abstract_methods :notify
+          # def notify(block_index, block_put_progress); end
+        end
+
+        class BlockProgressNotifier
+          include Qiniu::RS::Abstract
+          abstract_methods :notify
+          # def notify(block_index, checksum); end
+        end
+      end
+
+      class ChunkProgressNotifier < AbstractClass::ChunkProgressNotifier
+          attr_reader :tmpdata
+          def initialize(id)
+              @tmpdata = UP::TmpData.new(id, PROGRESS_TMP_FILE)
+          end
+          def notify(index, progress)
+              @tmpdata.set(index, progress)
+              logmsg = "chunk #{progress[:offset]/Config.settings[:chunk_size]} in block #{index} successfully uploaded.\n" + progress.to_s
+              Utils.debug(logmsg)
+          end
+      end
+
+      class BlockProgressNotifier < AbstractClass::BlockProgressNotifier
+          attr_reader :tmpdata
+          def initialize(id)
+              @tmpdata = UP::TmpData.new(id, CHECKSUM_TMP_FILE)
+          end
+          def notify(index, checksum)
+              @tmpdata.set(index, checksum)
+              Utils.debug "block #{index}: {ctx: #{checksum}} successfully uploaded."
+              Utils.debug "block #{index}: {checksum: #{checksum}} successfully uploaded."
+          end
+      end
+
+      class TmpData
+          def initialize(dir, filename)
+              @tmpdir = Config.settings[:tmpdir] + File::SEPARATOR + dir
+              FileUtils.mkdir_p(@tmpdir) unless File.directory?(@tmpdir)
+              @tmpfile = @tmpdir + File::SEPARATOR + filename
+          end
+
+          def init(values)
+              File.open(@tmpfile, "w") do |f|
+                  YAML::dump(values, f)
+                  Utils.debug %Q(Initializing tmpfile: #{@tmpfile})
+              end
+          end
+
+          def all
+              File.exist?(@tmpfile) ? YAML.load_file(@tmpfile) : []
+          end
+
+          def set(index, value)
+              values = all
+              values[index] = value
+              File.open(@tmpfile, "w") do |f|
+                  YAML::dump(values, f)
+                  Utils.debug %Q(Updating tmpfile: #{@tmpfile})
+              end
+          end
+
+          def sweep!
+              FileUtils.rm_r(@tmpdir) if File.directory?(@tmpdir)
+          end
+      end
+
+
+      class << self
+        include Utils
+
+        def upload_with_token(uptoken,
+                              local_file,
+                              bucket,
+                              key = nil,
+                              mime_type = nil,
+                              custom_meta = nil,
+                              customer = nil,
+                              callback_params = nil,
+                              rotate = nil)
+          begin
+            ifile = File.open(local_file, 'rb')
+            fh = FileData.new(ifile)
+            fsize = fh.data_size
+            key = Digest::SHA1.hexdigest(local_file + fh.mtime.to_s) if key.nil?
+            if mime_type.nil? || mime_type.empty?
+              mime = MIME::Types.type_for local_file
+              mime_type = mime.empty? ? 'application/octet-stream' : mime[0].content_type
+            end
+            code, data = _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type, custom_meta, customer, callback_params, rotate)
+            [code, data]
+          ensure
+            ifile.close unless ifile.nil?
+          end
+        end
+
+        private
+
+        class FileData
+            attr_accessor :fh
+            def initialize(fh)
+                @fh = fh
+            end
+            def data_size
+                @fh.stat.size
+            end
+            def get_data(offset, length)
+                @fh.seek(offset)
+                @fh.read(length)
+            end
+            def path
+                @fh.path
+            end
+            def mtime
+                @fh.mtime
+            end
+            #delegate :path, :mtime, :to => :fh
+        end
+
+        def _new_block_put_progress_data
+          {:ctx => nil, :offset => 0, :restsize => nil, :status_code => nil, :host => nil}
+        end
+
+        def _call_binary_with_token(uptoken, url, data, content_type = nil, retry_times = 0)
+          options = {
+              :method => :post,
+              :content_type => 'application/octet-stream',
+              :upload_signature_token => uptoken
+          }
+          options[:content_type] = content_type if !content_type.nil? && !content_type.empty?
+          code, data = http_request url, data, options
+          unless Utils.is_response_ok?(code)
+              retry_times += 1
+              if Config.settings[:auto_reconnect] && retry_times < Config.settings[:max_retry_times]
+                  return _call_binary_with_token(uptoken, url, data, options[:content_type], retry_times)
+              end
+          end
+          [code, data]
+        end
+
+        def _mkblock(uptoken, block_size, body)
+            url = Config.settings[:up_host] + "/mkblk/#{block_size}"
+            _call_binary_with_token(uptoken, url, body)
+        end
+
+        def _putblock(uphost, uptoken, ctx, offset, body)
+            url = uphost + "/bput/#{ctx}/#{offset}"
+            _call_binary_with_token(uptoken, url, body)
+        end
+
+        def _resumable_put_block(uptoken, fh, block_index, block_size, chunk_size, progress, retry_times, notifier)
+            code, data = 0, {}
+            fpath = fh.path
+            # this block has never been uploaded.
+            if progress[:ctx] == nil || progress[:ctx].empty?
+                progress[:offset] = 0
+                progress[:restsize] = block_size
+                # choose the smaller one
+                body_length = [block_size, chunk_size].min
+                for i in 1..retry_times
+                    seek_pos = block_index*Config.settings[:block_size]
+                    body = fh.get_data(seek_pos, body_length)
+                    result_length = body.length
+                    if result_length != body_length
+                        raise FileSeekReadError.new(fpath, block_index, seek_pos, body_length, result_length)
+                    end
+                    code, data = _mkblock(uptoken, block_size, body)
+                    body_crc32 = Zlib.crc32(body)
+                    if Utils.is_response_ok?(code) && data["crc32"] == body_crc32
+                        progress[:ctx] = data["ctx"]
+                        progress[:offset] = body_length
+                        progress[:restsize] = block_size - body_length
+                        progress[:status_code] = code
+                        progress[:host] = data["host"]
+                        if !notifier.nil? && notifier.respond_to?("notify")
+                            notifier.notify(block_index, progress)
+                        end
+                        break
+                    elsif i == retry_times && data["crc32"] != body_crc32
+                        Log.logger.error %Q(Uploading block error. Expected crc32: #{body_crc32}, but got: #{data["crc32"]})
+                        # 上传重试达到上限，直接返回错误
+                        return [code, data]
+                    end
+                end
+            elsif progress[:offset] + progress[:restsize] != block_size
+                raise BlockSizeNotMathchError.new(fpath, block_index, progress[:offset], progress[:restsize], block_size)
+            end
+            # loop uploading other chunks except the first one
+            while progress[:restsize].to_i > 0 && progress[:restsize] < block_size
+                # choose the smaller one
+                body_length = [progress[:restsize], chunk_size].min
+                for i in 1..retry_times
+                    seek_pos = block_index*Config.settings[:block_size] + progress[:offset]
+                    body = fh.get_data(seek_pos, body_length)
+                    result_length = body.length
+                    if result_length != body_length
+                        raise FileSeekReadError.new(fpath, block_index, seek_pos, body_length, result_length)
+                    end
+                    code, data = _putblock(progress[:host], uptoken, progress[:ctx], progress[:offset], body)
+                    body_crc32 = Zlib.crc32(body)
+                    if Utils.is_response_ok?(code) && data["crc32"] == body_crc32
+                        progress[:ctx] = data["ctx"]
+                        progress[:offset] += body_length
+                        progress[:restsize] -= body_length
+                        progress[:status_code] = code
+                        progress[:host] = data["host"]
+                        if !notifier.nil? && notifier.respond_to?("notify")
+                            notifier.notify(block_index, progress)
+                        end
+                        break
+                    elsif i == retry_times && data["crc32"] != body_crc32
+                        Log.logger.error %Q(Uploading block error. Expected crc32: #{body_crc32}, but got: #{data["crc32"]})
+                        # 上传重试达到上限，直接返回错误
+                        return [code, data]
+                    end
+                end
+            end
+            # return
+            return [code, data]
+        end
+
+        def _block_count(fsize)
+            ((fsize + Config.settings[:block_size] - 1) / Config.settings[:block_size]).to_i
+        end
+
+        def _resumable_put(uptoken, fh, checksums, progresses, block_notifier = nil, chunk_notifier = nil)
+            code, data = 0, {}
+            fsize = fh.data_size
+            block_count = _block_count(fsize)
+            checksum_count = checksums.length
+            progress_count = progresses.length
+            if checksum_count != block_count || progress_count != block_count
+                raise BlockCountNotMathchError.new(fh.path, block_count, checksum_count, progress_count)
+            end
+            0.upto(block_count-1).each do |block_index|
+                if checksums[block_index].nil? || checksums[block_index].empty?
+                    block_size = Config.settings[:block_size]
+                    if block_index == block_count - 1
+                        block_size = fsize - block_index*Config.settings[:block_size]
+                    end
+                    if progresses[block_index].nil?
+                        progresses[block_index] = _new_block_put_progress_data
+                    end
+                    code, data = _resumable_put_block(uptoken, fh, block_index, block_size, Config.settings[:chunk_size], progresses[block_index], Config.settings[:max_retry_times], chunk_notifier)
+                    if Utils.is_response_ok?(code)
+                        #checksums[block_index] = data["checksum"]
+                        checksums[block_index] = data["ctx"]
+                        if !block_notifier.nil? && block_notifier.respond_to?("notify")
+                            block_notifier.notify(block_index, checksums[block_index])
+                        end
+                    end
+                end
+            end
+            return [code, data]
+        end
+
+        def _mkfile(uphost, uptoken, entry_uri, fsize, checksums, mime_type = nil, custom_meta = nil, customer = nil, callback_params = nil, rotate = nil)
+          path = '/rs-mkfile/' + Utils.urlsafe_base64_encode(entry_uri) + "/fsize/#{fsize}"
+          path += '/mimeType/' + Utils.urlsafe_base64_encode(mime_type) if !mime_type.nil? && !mime_type.empty?
+          path += '/meta/' + Utils.urlsafe_base64_encode(custom_meta) if !custom_meta.nil? && !custom_meta.empty?
+          path += '/customer/' + customer if !customer.nil? && !customer.empty?
+          callback_query_string = Utils.generate_query_string(callback_params) if !callback_params.nil? && !callback_params.empty?
+          path += '/params/' + Utils.urlsafe_base64_encode(callback_query_string) if !callback_query_string.nil? && !callback_query_string.empty?
+          path += '/rotate/' + rotate if !rotate.nil? && rotate.to_i >= 0
+          url = uphost + path
+          #body = ''
+          #checksums.each do |checksum|
+          #    body += Utils.urlsafe_base64_decode(checksum)
+          #end
+          body = checksums.join(',')
+          _call_binary_with_token(uptoken, url, body, 'text/plain')
+        end
+
+        def _resumable_upload(uptoken, fh, fsize, bucket, key, mime_type = nil, custom_meta = nil, customer = nil, callback_params = nil, rotate = nil)
+          block_count = _block_count(fsize)
+          chunk_notifier = ChunkProgressNotifier.new(key)
+          block_notifier = BlockProgressNotifier.new(key)
+          progresses = chunk_notifier.tmpdata.all
+          if progresses.empty?
+              block_count.times{progresses << _new_block_put_progress_data}
+              chunk_notifier.tmpdata.init(progresses)
+          end
+          checksums = block_notifier.tmpdata.all
+          if checksums.empty?
+              block_count.times{checksums << ''}
+              block_notifier.tmpdata.init(checksums)
+          end
+          code, data = _resumable_put(uptoken, fh, checksums, progresses, block_notifier, chunk_notifier)
+          if Utils.is_response_ok?(code)
+            uphost = data["host"]
+            entry_uri = bucket + ':' + key
+            code, data = _mkfile(uphost, uptoken, entry_uri, fsize, checksums, mime_type, custom_meta, customer, callback_params, rotate)
+          end
+          if Utils.is_response_ok?(code)
+            Utils.debug "File #{fh.path} {size: #{fsize}} successfully uploaded."
+            chunk_notifier.tmpdata.sweep!
+            block_notifier.tmpdata.sweep!
+          end
+          [code, data]
+        end
+
+      end
+
+    end
+  end
+end

lib/qiniu/rs/utils.rb

@@ -1,9 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 require 'uri'
+require 'cgi'
 require 'json'
+require 'zlib'
 require 'base64'
 require 'rest_client'
+require 'hmac-sha1'
 require 'qiniu/rs/exceptions'
 
 module Qiniu
@@ -29,6 +32,20 @@ module Qiniu
         {}
       end
 
+      def is_response_ok?(status_code)
+          status_code/100 == 2
+      end
+
+      def response_error(status_code, errmsg)
+          [status_code, {"error" => errmsg}]
+      end
+
+      def debug(msg)
+          if Config.settings[:enable_debug]
+              Log.logger.debug(msg)
+          end
+      end
+
       def send_request_with url, data = nil, options = {}
         options[:method] = Config.settings[:method] unless options[:method]
         options[:content_type] = Config.settings[:content_type] unless options[:content_type]
@@ -36,17 +53,25 @@ module Qiniu
           :accept => :json,
           :user_agent => Config.settings[:user_agent]
         }
-        header_options.merge!('Authorization' => "Bearer #{options[:access_token]}") if options[:access_token]
+        auth_token = nil
+        if !options[:qbox_signature_token].nil? && !options[:qbox_signature_token].empty?
+          auth_token = 'QBox ' + options[:qbox_signature_token]
+        elsif !options[:upload_signature_token].nil? && !options[:upload_signature_token].empty?
+          auth_token = 'UpToken ' + options[:upload_signature_token]
+        elsif options[:access_token]
+          auth_token = 'Bearer ' + options[:access_token]
+        end
+        header_options.merge!('Authorization' => auth_token) unless auth_token.nil?
         case options[:method]
         when :get
-          response = RestClient.get url, header_options
+          response = RestClient.get(url, header_options)
         when :post
           header_options.merge!(:content_type => options[:content_type])
-          response = RestClient.post url, data, header_options
+          response = RestClient.post(url, data, header_options)
         end
         code = response.respond_to?(:code) ? response.code.to_i : 0
-        if code != 200
-          raise RequestFailed.new(response)
+        unless is_response_ok?(code)
+          raise RequestFailed.new("Request Failed", response)
         else
           data = {}
           body = response.respond_to?(:body) ? response.body : {}
@@ -81,42 +106,46 @@ module Qiniu
         end
       end
 
-      def upload_multipart_data(url, filepath, action_string, callback_query_string = '')
-        code, data = 0, {}
-        begin
-          header_options = {
-            :accept => :json,
-            :user_agent => Config.settings[:user_agent]
-          }
+      def upload_multipart_data(url, filepath, action_string, callback_query_string = '', uptoken = nil)
           post_data = {
-            :file => File.new(filepath, 'rb'),
             :params => callback_query_string,
             :action => action_string,
+            :file => File.new(filepath, 'rb'),
             :multipart => true
           }
-          response = RestClient.post url, post_data, header_options
-          body = response.respond_to?(:body) ? response.body : ""
-          data = safe_json_parse(body) unless body.empty?
-          code = response.code.to_i if response.respond_to?(:code)
-        rescue Errno::ECONNRESET => err
-          Log.logger.error err
-        rescue => e
-          Log.logger.warn "#{e.message} => Utils.http_request('#{url}')"
-          res = e.response
-          if e.respond_to? :response
-            res = e.response
-            code = res.code.to_i if res.respond_to? :code
-            body = res.respond_to?(:body) ? res.body : ""
-            data = safe_json_parse(body) unless body.empty?
-          end
-        end
-        [code, data]
+          post_data[:auth] = uptoken unless uptoken.nil?
+          http_request url, post_data
       end
 
       def generate_query_string(params)
         return params if params.is_a?(String)
-        total_param = params.map { |key, value| key.to_s+"="+value.to_s }
-        URI.escape(total_param.join("&"))
+        total_param = params.map { |key, value| %Q(#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s).gsub('+', '%20')}) }
+        total_param.join("&")
+      end
+
+      def crc32checksum(filepath)
+        File.open(filepath, "rb") { |f| Zlib.crc32 f.read }
+      end
+
+      def generate_qbox_signature(url, params, mime = nil)
+        access_key = Config.settings[:access_key]
+        secret_key = Config.settings[:secret_key]
+        uri = URI.parse(url)
+        signature = uri.path
+        query_string = uri.query
+        signature += '?' + query_string if !query_string.nil? && !query_string.empty?
+        signature += "\n"
+        if params.is_a?(Hash)
+            params_string = generate_query_string(params)
+            signature += params_string
+        end
+        if mime.is_a?(String) && mime == "application/x-www-form-urlencoded" && params.is_a?(String)
+            signature += params
+        end
+        hmac = HMAC::SHA1.new(secret_key)
+        hmac.update(signature)
+        encoded_digest = urlsafe_base64_encode(hmac.digest)
+        %Q(#{access_key}:#{encoded_digest})
       end
 
     end

lib/qiniu/rs/version.rb

@@ -2,6 +2,18 @@
 
 module Qiniu
   module RS
-    VERSION = "1.0.4"
+    module Version
+      MAJOR = 3
+      MINOR = 4
+      PATCH = 10
+      # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
+      #
+      # Example
+      #
+      #   Version.to_s # '1.0.2'
+      def self.to_s
+        [MAJOR, MINOR, PATCH].join('.')
+      end
+    end
   end
 end

lib/qiniu/tokens/access_token.rb

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+
+require 'hmac-sha1'
+require 'qiniu/rs/config'
+require 'qiniu/rs/utils'
+
+module Qiniu
+  module RS
+      class AccessToken
+
+        include Utils
+
+        attr_accessor :access_key, :secret_key
+
+        def generate_encoded_digest(signature)
+          hmac = HMAC::SHA1.new(@secret_key)
+          hmac.update(signature)
+          urlsafe_base64_encode(hmac.digest)
+        end
+
+      end
+  end
+end

lib/qiniu/tokens/download_token.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+require 'json'
+require 'qiniu/tokens/access_token'
+require 'qiniu/rs/utils'
+
+module Qiniu
+  module RS
+      class DownloadToken < AccessToken
+
+        include Utils
+
+        attr_accessor :pattern, :expires_in
+
+        def initialize(opts = {})
+          @pattern = opts[:pattern]
+          @expires_in = opts[:expires_in] || 3600
+        end
+
+        def generate_signature
+          params = {"S" => @pattern, "E" => Time.now.to_i + @expires_in}
+          Utils.urlsafe_base64_encode(params.to_json)
+        end
+
+        def generate_token
+          signature = generate_signature
+          encoded_digest = generate_encoded_digest(signature)
+          %Q(#{@access_key}:#{encoded_digest}:#{signature})
+        end
+
+      end
+  end
+end

lib/qiniu/tokens/qbox_token.rb

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+
+require 'cgi'
+require 'json'
+require 'qiniu/tokens/access_token'
+
+module Qiniu
+  module RS
+      class QboxToken < AccessToken
+
+        include Utils
+
+        attr_accessor :url, :params
+
+        def initialize(opts = {})
+          @url = opts[:url]
+          @params = opts[:params]
+        end
+
+        def generate_signature
+          uri = URI.parse(@url)
+          signature = uri.path
+          query_string = uri.query
+          signature += '?' + query_string if !query_string.nil? && !query_string.empty?
+          signature += "\n"
+          if @params.is_a?(Hash)
+              params_string = Utils.generate_query_string(@params)
+              signature += params_string
+          end
+          signature
+        end
+
+        def generate_token
+          encoded_digest = generate_encoded_digest(generate_signature)
+          %Q(#{@access_key}:#{encoded_digest})
+        end
+
+      end
+  end
+end

lib/qiniu/tokens/upload_token.rb

@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+
+require 'json'
+require 'qiniu/tokens/access_token'
+require 'qiniu/rs/utils'
+
+module Qiniu
+  module RS
+      class UploadToken < AccessToken
+
+        include Utils
+
+        attr_accessor :scope, :expires_in, :callback_url, :callback_body, :callback_body_type, :customer, :escape, :async_options, :return_body, :return_url
+
+        def initialize(opts = {})
+          @scope = opts[:scope]
+          @expires_in = opts[:expires_in] || 3600
+          @callback_url = opts[:callback_url]
+          @callback_body = opts[:callback_body]
+          @callback_body_type = opts[:callback_body_type]
+          @customer = opts[:customer]
+          @escape = opts[:escape]
+          @async_options = opts[:async_options]
+          @return_body = opts[:return_body]
+          @return_url = opts[:return_url]
+        end
+
+        def generate_signature
+          params = {:scope => @scope, :deadline => Time.now.to_i + @expires_in}
+          params[:callbackUrl] = @callback_url if !@callback_url.nil? && !@callback_url.empty?
+          params[:callbackBody] = @callback_body if !@callback_body.nil? && !@callback_body.empty?
+          params[:callbackBodyType] = @callback_body_type if !@callback_body_type.nil? && !@callback_body_type.empty?
+          params[:customer] = @customer if !@customer.nil? && !@customer.empty?
+          params[:escape] = 1 if @escape == 1 || @escape == true
+          params[:asyncOps] = @async_options if !@async_options.nil? && !@async_options.empty?
+          params[:returnBody] = @return_body if !@return_body.nil? && !@return_body.empty?
+          params[:returnUrl] = @return_url if !@return_url.nil? && !@return_url.empty?
+          Utils.urlsafe_base64_encode(params.to_json)
+        end
+
+        def generate_token
+          signature = generate_signature
+          encoded_digest = generate_encoded_digest(signature)
+          %Q(#{@access_key}:#{encoded_digest}:#{signature})
+        end
+
+      end
+  end
+end

qiniu-rs.gemspec

@@ -4,24 +4,25 @@ require File.expand_path('../lib/qiniu/rs/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["why404"]
-  gem.email         = ["why404@gmail.com"]
-  gem.description   = %q{Qiniu Cloud Storage SDK for Ruby. See: http://docs.qiniutek.com/v1/sdk/ruby/}
-  gem.summary       = %q{Qiniu Cloud Storage SDK for Ruby}
-  gem.homepage      = "https://github.com/why404/qiniu-rs"
+  gem.email         = ["sdk@qiniu.com"]
+  gem.description   = %q{Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby. Please use new SDK https://rubygems.org/gems/qiniu}
+  gem.summary       = %q{Deprecated Qiniu Resource (Cloud) Storage SDK for Ruby}
+  gem.homepage      = "https://github.com/qiniu/ruby-sdk/tree/qiniu-rs"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "qiniu-rs"
   gem.require_paths = ["lib"]
-  gem.version       = Qiniu::RS::VERSION
+  gem.version       = Qiniu::RS::Version.to_s
 
   # specify any dependencies here; for example:
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "fakeweb"
-  gem.add_runtime_dependency "json"
-  gem.add_runtime_dependency "rest-client"
-  gem.add_runtime_dependency "mime-types"
-  gem.add_runtime_dependency "jruby-openssl" if RUBY_PLATFORM == "java"
+  gem.add_development_dependency "rake", ">= 0.9"
+  gem.add_development_dependency "rspec", ">= 2.11"
+  gem.add_development_dependency "fakeweb", "~> 1.3"
+  gem.add_runtime_dependency "json", "~> 1.7"
+  gem.add_runtime_dependency "rest-client", "~> 1.6"
+  gem.add_runtime_dependency "mime-types", "~> 1.19"
+  gem.add_runtime_dependency "ruby-hmac", "~> 0.4"
+  gem.add_runtime_dependency "jruby-openssl", "~> 0.7" if RUBY_PLATFORM == "java"
 end

spec/qiniu/rs/abstract_spec.rb

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+require 'qiniu/rs/abstract'
+
+describe Qiniu::RS::Abstract do
+  before(:each) do
+    @klass = Class.new do
+      include Qiniu::RS::Abstract
+
+      abstract_methods :foo, :bar
+    end
+  end
+
+  it "raises NotImplementedError" do
+    proc {
+      @klass.new.foo
+    }.should raise_error(NotImplementedError)
+  end
+
+  it "can be overridden" do
+    subclass = Class.new(@klass) do
+      def foo
+        :overridden
+      end
+    end
+
+    subclass.new.foo.should == :overridden
+  end
+end

spec/qiniu/rs/auth_spec.rb

@@ -1,58 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-require 'spec_helper'
-require 'qiniu/rs/auth'
-
-module Qiniu
-  module RS
-    describe Auth do
-
-      before :all do
-        @username = "test@qbox.net"
-        @password = "test"
-
-        code, data = Qiniu::RS::Auth.exchange_by_password!(@username, @password)
-        code.should == 200
-        data.should be_an_instance_of(Hash)
-        data["access_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-
-        @access_token = data["access_token"]
-        @refresh_token = data["refresh_token"]
-        puts data.inspect
-      end
-
-      context ".exchange_by_password" do
-        it "should sign in failed when pass a non-existent username" do
-          code, data = Qiniu::RS::Auth.exchange_by_password!("a_non_existent_user@example.com", "password")
-          code.should == 401
-          data["error_code"].should == 11
-          data["error"].should == "failed_authentication"
-          puts data.inspect
-        end
-
-        it "should sign in failed when pass a wrong password" do
-          code, data = Qiniu::RS::Auth.exchange_by_password!(@username, "a-wrong-password")
-          code.should == 401
-          data["error_code"].should == 11
-          data["error"].should == "failed_authentication"
-          puts data.inspect
-        end
-      end
-
-      context ".exchange_by_refresh_token" do
-        it "should works" do
-          @refresh_token.should_not be_empty
-          code, data = Qiniu::RS::Auth.exchange_by_refresh_token!(@refresh_token)
-          code.should == 200
-          data["access_token"].should_not be_empty
-          data["refresh_token"].should_not be_empty
-          data["expires_in"].should_not be_zero
-          puts data.inspect
-        end
-      end
-
-    end
-  end
-end

spec/qiniu/rs/eu_spec.rb

@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+require 'qiniu/rs'
+require 'qiniu/rs/pub'
+require 'qiniu/rs/eu'
+
+module Qiniu
+  module RS
+    describe EU do
+
+      before :all do
+        @customer_id = "why404@gmail.com"
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @key = "image_logo_for_test.png"
+
+        result = Qiniu::RS.mkbucket(@bucket)
+        puts result.inspect
+        result.should be_true
+
+        local_file = File.expand_path('../' + @key, __FILE__)
+        upopts = {:scope => @bucket, :expires_in => 3600, :customer => @customer_id}
+        uptoken = Qiniu::RS.generate_upload_token(upopts)
+
+        data = Qiniu::RS.upload_file :uptoken => uptoken, :file => local_file, :bucket => @bucket, :key => @key
+        puts data.inspect
+
+        code2, data2 = Qiniu::RS::Pub.set_separator(@bucket, "-")
+        code2.should == 200
+        puts data2.inspect
+
+        code3, data3 = Qiniu::RS::Pub.set_style(@bucket, "small.jpg", "imageView/1/w/120/h/120/q/85/format/jpg/watermark/1")
+        code3.should == 200
+        puts data3.inspect
+      end
+
+      after :all do
+        result = Qiniu::RS.drop(@bucket)
+        puts result.inspect
+        result.should_not be_false
+      end
+
+=begin
+      context ".set_watermark" do
+        it "should works" do
+          options = {
+            :text => "Powered by QiniuRS"
+          }
+          code, data = Qiniu::RS::EU.set_watermark(@customer_id, options)
+          code.should == 200
+          puts data.inspect
+        end
+      end
+
+      context ".get_watermark" do
+        it "should works" do
+          code, data = Qiniu::RS::EU.get_watermark(@customer_id)
+          code.should == 200
+          puts data.inspect
+        end
+      end
+=end
+
+    end
+  end
+end

spec/qiniu/rs/image_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 require 'qiniu/rs/auth'
-require 'qiniu/rs/rs'
+require 'qiniu/rs'
 require 'qiniu/rs/image'
 
 module Qiniu
@@ -10,32 +10,76 @@ module Qiniu
     describe Image do
 
       before :all do
-        code, data = Qiniu::RS::Auth.exchange_by_password!("test@qbox.net", "test")
-        code.should == 200
-        data.should be_an_instance_of(Hash)
-        data["access_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
+
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @key = "image_logo_for_test.png"
+
+        result = Qiniu::RS.mkbucket(@bucket)
+        puts result.inspect
+        result.should be_true
+
+        local_file = File.expand_path('../' + @key, __FILE__)
+
+        upopts = {
+            :scope => @bucket,
+            :expires_in => 3600,
+            :customer => "why404@gmail.com",
+            :async_options => "imageView/1/w/120/h/120",
+            :return_body => '{"size":$(fsize), "hash":$(etag), "width":$(imageInfo.width), "height":$(imageInfo.height)}'
+        }
+        uptoken = Qiniu::RS.generate_upload_token(upopts)
+        data = Qiniu::RS.upload_file :uptoken => uptoken, :file => local_file, :bucket => @bucket, :key => @key
         puts data.inspect
 
-        @bucket = "test_images"
-        @key = "test_image.jpg"
-        code2, data2 = Qiniu::RS::RS.get(@bucket, @key)
-        code2.should == 200
-        data2["url"].should_not be_empty
-        puts data2.inspect
+        data["size"].should_not be_zero
+        data["hash"].should_not be_empty
+        data["width"].should_not be_zero
+        data["height"].should_not be_zero
 
-        @download_url = data2["url"]
+        result = Qiniu::RS.get(@bucket, @key)
+        result["url"].should_not be_empty
+        puts result.inspect
+        @source_image_url = result["url"]
+
+        @mogrify_options = {
+            :thumbnail => "!120x120>",
+            :gravity => "center",
+            :crop => "!120x120a0a0",
+            :quality => 85,
+            :rotate => 45,
+            :format => "jpg",
+            :auto_orient => true
+        }
+      end
+
+      after :all do
+        result = Qiniu::RS.drop(@bucket)
+        puts result.inspect
+        result.should_not be_false
       end
 
       context ".info" do
         it "should works" do
-          code, data = Qiniu::RS::Image.info(@download_url)
+          code, data = Qiniu::RS::Image.info(@source_image_url)
           code.should == 200
           puts data.inspect
         end
       end
 
+      context ".exif" do
+        it "should works" do
+          code, data = Qiniu::RS::Image.exif(@source_image_url)
+          puts data.inspect
+        end
+      end
+
+      context ".mogrify_preview_url" do
+        it "should works" do
+          mogrify_preview_url = Qiniu::RS::Image.mogrify_preview_url(@source_image_url, @mogrify_options)
+          puts mogrify_preview_url.inspect
+        end
+      end
+
     end
   end
 end

spec/qiniu/rs/io_spec.rb

@@ -10,28 +10,46 @@ module Qiniu
     describe IO do
 
       before :all do
-        code, data = Qiniu::RS::Auth.exchange_by_password!("test@qbox.net", "test")
-        code.should == 200
-        data.should be_an_instance_of(Hash)
-        data["access_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        puts data.inspect
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
 
-        code2, data2 = Qiniu::RS::IO.put_auth()
-        code2.should == 200
-        data2["url"].should_not be_empty
-        data2["expiresIn"].should_not be_zero
-        puts data2.inspect
+        result = Qiniu::RS.mkbucket(@bucket)
+        puts result.inspect
+        result.should be_true
+      end
 
-        @put_url = data2["url"]
-        @bucket = "test"
-        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
+      after :all do
+        result = Qiniu::RS.drop(@bucket)
+        puts result.inspect
+        result.should_not be_false
+      end
+
+      context ".upload_file" do
+        it "should works" do
+          code, data = Qiniu::RS::IO.put_auth()
+          code.should == 200
+          data["url"].should_not be_empty
+          data["expiresIn"].should_not be_zero
+          puts data.inspect
+          code2, data2 = Qiniu::RS::IO.upload_file(data["url"], __FILE__, @bucket, @key)
+          code2.should == 200
+          puts data2.inspect
+        end
       end
 
       context ".put_file" do
         it "should works" do
-          code, data = Qiniu::RS::IO.put_file(@put_url, __FILE__, @bucket, @key)
+          code, data = Qiniu::RS::IO.put_file(__FILE__, @bucket, @key, 'application/x-ruby', 'customMeta', true)
+          code.should == 200
+          puts data.inspect
+        end
+      end
+
+      context ".upload_with_token" do
+        it "should works" do
+          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
+          uptoken = Qiniu::RS.generate_upload_token(upopts)
+          code, data = Qiniu::RS::IO.upload_with_token(uptoken, __FILE__, @bucket, @key, nil, nil, nil, true)
           code.should == 200
           puts data.inspect
         end

spec/qiniu/rs/pub_spec.rb

@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+require 'qiniu/rs/auth'
+require 'qiniu/rs/rs'
+require 'qiniu/rs/pub'
+
+module Qiniu
+  module RS
+    describe Pub do
+
+      before :all do
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        result = Qiniu::RS.mkbucket(@bucket)
+        puts result.inspect
+        result.should_not be_false
+      end
+
+      after :all do
+        result = Qiniu::RS.drop(@bucket)
+        puts result.inspect
+        result.should_not be_false
+      end
+
+      context ".set_protected" do
+        it "should works" do
+          code, data = Qiniu::RS::Pub.set_protected(@bucket, 1)
+          code.should == 200
+          puts data.inspect
+        end
+      end
+
+      context ".set_separator" do
+        it "should works" do
+          code, data = Qiniu::RS::Pub.set_separator(@bucket, "-")
+          code.should == 200
+          puts data.inspect
+        end
+      end
+
+      context ".set_style" do
+        it "should works" do
+          code, data = Qiniu::RS::Pub.set_style(@bucket, "small.jpg", "imageMogr/auto-orient/thumbnail/!120x120r/gravity/center/crop/!120x120/quality/80")
+          code.should == 200
+          puts data.inspect
+        end
+      end
+
+      context ".unset_style" do
+        it "should works" do
+          code, data = Qiniu::RS::Pub.unset_style(@bucket, "small.jpg")
+          code.should == 200
+          puts data.inspect
+        end
+      end
+
+    end
+  end
+end

spec/qiniu/rs/rs_spec.rb

@@ -11,29 +11,40 @@ module Qiniu
     describe RS do
 
       before :all do
-        code, data = Qiniu::RS::Auth.exchange_by_password!("test@qbox.net", "test")
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @key = Digest::SHA1.hexdigest((Time.now.to_i+rand(100)).to_s)
+        @key2 = @key + rand(100).to_s
+        #@domain = @bucket + '.dn.qbox.me'
+
+        code, data = Qiniu::RS::RS.mkbucket(@bucket)
+        puts [code, data].inspect
         code.should == 200
-        data.should be_an_instance_of(Hash)
-        data["access_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        data["refresh_token"].should_not be_empty
-        puts data.inspect
-
-        code2, data2 = Qiniu::RS::IO.put_auth()
-        code2.should == 200
-        data2["url"].should_not be_empty
-        data2["expiresIn"].should_not be_zero
-        puts data2.inspect
-
-        @put_url = data2["url"]
-        @bucket = "test"
-        @key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
-        @domain = 'cdn.example.com'
       end
 
-      context "IO.put_file" do
+      after :all do
+        code, data = Qiniu::RS::RS.drop(@bucket)
+        puts [code, data].inspect
+        code.should == 200
+      end
+
+      context "IO.upload_file" do
         it "should works" do
-          code, data = Qiniu::RS::IO.put_file(@put_url, __FILE__, @bucket, @key)
+          code, data = Qiniu::RS::IO.put_auth()
+          puts data.inspect
+          code.should == 200
+          data["url"].should_not be_empty
+          data["expiresIn"].should_not be_zero
+          @put_url = data["url"]
+
+          code2, data2 = Qiniu::RS::IO.upload_file(@put_url, __FILE__, @bucket, @key)
+          puts data2.inspect
+          code2.should == 200
+        end
+      end
+
+      context ".buckets" do
+        it "should works" do
+          code, data = Qiniu::RS::RS.buckets
           code.should == 200
           puts data.inspect
         end
@@ -79,19 +90,64 @@ module Qiniu
         end
       end
 
-      context ".publish" do
+      context ".batch_copy" do
         it "should works" do
-          code, data = Qiniu::RS::RS.publish(@domain, @bucket)
+          code, data = Qiniu::RS::RS.batch_copy @bucket, @key, @bucket, @key2
           code.should == 200
           puts data.inspect
+
+          #code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          #code2.should == 200
+          #puts data2.inspect
+          #
+          code, data = Qiniu::RS::RS.delete(@bucket, @key2)
+          code.should == 200
+          puts data.inspect
+
         end
       end
 
-      context ".unpublish" do
+      context ".batch_move" do
         it "should works" do
-          code, data = Qiniu::RS::RS.unpublish(@domain)
+          code, data = Qiniu::RS::RS.batch_move @bucket, @key, @bucket, @key2
           code.should == 200
           puts data.inspect
+
+          #code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          #code2.should == 200
+          #puts data2.inspect
+
+          code3, data3 = Qiniu::RS::RS.batch_move @bucket, @key2, @bucket, @key
+          code3.should == 200
+          puts data3.inspect
+        end
+      end
+
+      context ".move" do
+        it "should works" do
+          code, data = Qiniu::RS::RS.move(@bucket, @key, @bucket, @key2)
+          code.should == 200
+          puts data.inspect
+
+          code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          code2.should == 200
+          puts data2.inspect
+
+          code3, data3 = Qiniu::RS::RS.move(@bucket, @key2, @bucket, @key)
+          code3.should == 200
+          puts data3.inspect
+        end
+      end
+
+      context ".copy" do
+        it "should works" do
+          code, data = Qiniu::RS::RS.copy(@bucket, @key, @bucket, @key2)
+          code.should == 200
+          puts data.inspect
+
+          #code2, data2 = Qiniu::RS::RS.stat(@bucket, @key2)
+          #code2.should == 200
+          #puts data2.inspect
         end
       end
 

spec/qiniu/rs/up_spec.rb

@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+
+require 'digest/sha1'
+require 'spec_helper'
+require 'qiniu/rs/rs'
+require 'qiniu/rs/up'
+
+module Qiniu
+  module RS
+    describe UP do
+
+      before :all do
+        @localfile = "bigfile.txt"
+        File.open(@localfile, "w"){|f| 5242888.times{f.write(rand(9).to_s)}}
+        @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+        @key = Digest::SHA1.hexdigest(@localfile+Time.now.to_s)
+
+        code, data = Qiniu::RS::RS.mkbucket(@bucket)
+        puts [code, data].inspect
+        code.should == 200
+      end
+
+      after :all do
+        File.unlink(@localfile) if File.exists?(@localfile)
+
+        code, data = Qiniu::RS::RS.drop(@bucket)
+        puts [code, data].inspect
+        code.should == 200
+      end
+
+      context ".upload_with_token" do
+        it "should works" do
+          upopts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
+          uptoken = Qiniu::RS.generate_upload_token(upopts)
+          code, data = Qiniu::RS::UP.upload_with_token(uptoken, @localfile, @bucket, @key)
+          puts data.inspect
+          (code/100).should == 2
+        end
+      end
+
+      context ".stat" do
+        it "should exists" do
+          code, data = Qiniu::RS::RS.stat(@bucket, @key)
+          puts data.inspect
+          code.should == 200
+        end
+      end
+
+      context ".delete" do
+        it "should works" do
+          code, data = Qiniu::RS::RS.delete(@bucket, @key)
+          puts data.inspect
+          code.should == 200
+        end
+      end
+
+    end
+  end
+end

spec/qiniu/rs/version_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 require 'qiniu/rs/version'
 
-describe Qiniu::RS do
+describe Qiniu::RS::Version do
   it "should has a VERSION" do
-    Qiniu::RS::VERSION.should =~ /^\d+\.\d+\.\d+?$/
+    Qiniu::RS::Version.to_s.should =~ /^\d+\.\d+\.\d+?$/
   end
 end

spec/qiniu/rs_spec.rb

@@ -1,24 +1,107 @@
 # -*- encoding: utf-8 -*-
 
+require 'digest/sha1'
 require 'spec_helper'
 require 'qiniu/rs'
+require 'qiniu/rs/exceptions'
 
 module Qiniu
   describe RS do
 
     before :all do
-      @bucket = 'qiniu_rs_test'
+      @bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
       @key = Digest::SHA1.hexdigest Time.now.to_s
-      @domain = 'cdn.example.com'
+      @key2 = @key + rand(100).to_s
+      #@domain = @bucket + '.dn.qbox.me'
+
+      result = Qiniu::RS.mkbucket(@bucket)
+      result.should_not be_false
+
+      @test_image_bucket = 'RubySdkTest' + (Time.now.to_i+rand(1000)).to_s
+      result2 = Qiniu::RS.mkbucket(@test_image_bucket)
+      puts result2.inspect
+      result2.should be_true
+
+      @test_image_key = 'image_logo_for_test.png'
+      local_file = File.expand_path('./rs/' + @test_image_key, File.dirname(__FILE__))
+      puts local_file.inspect
+      upopts = {:scope => @test_image_bucket, :expires_in => 3600, :customer => "why404@gmail.com"}
+      uptoken = Qiniu::RS.generate_upload_token(upopts)
+      data = Qiniu::RS.upload_file :uptoken => uptoken, :file => local_file, :bucket => @test_image_bucket, :key => @test_image_key
+      puts data.inspect
     end
 
-    context ".login!" do
+    after :all do
+      result1 = Qiniu::RS.drop(@bucket)
+      puts result1.inspect
+      result1.should_not be_false
+
+      result2 = Qiniu::RS.drop(@test_image_bucket)
+      puts result2.inspect
+      result2.should_not be_false
+    end
+
+    context ".buckets" do
       it "should works" do
-        result = Qiniu::RS.login!("test@qbox.net", "test")
-        result.should be_true
+        result = Qiniu::RS.buckets
+        result.should_not be_false
+        puts result.inspect
       end
     end
 
+    context ".set_protected" do
+      it "should works" do
+        result = Qiniu::RS.set_protected(@bucket, 1)
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".set_separator" do
+      it "should works" do
+        result = Qiniu::RS.set_separator(@bucket, "-")
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".set_style" do
+      it "should works" do
+        result = Qiniu::RS.set_style(@bucket, "small.jpg", "imageMogr/auto-orient/thumbnail/!120x120r/gravity/center/crop/!120x120/quality/80")
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".unset_style" do
+      it "should works" do
+        result = Qiniu::RS.unset_style(@bucket, "small.jpg")
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+=begin
+    context ".set_watermark" do
+      it "should works" do
+        options = {
+          :text => "Powered by QiniuRS"
+        }
+        result = Qiniu::RS.set_watermark(1, options)
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+
+    context ".get_watermark" do
+      it "should works" do
+        result = Qiniu::RS.get_watermark(1)
+        result.should_not be_false
+        puts result.inspect
+      end
+    end
+=end
+
     context ".put_auth" do
       it "should works" do
         result = Qiniu::RS.put_auth(10)
@@ -34,11 +117,101 @@ module Qiniu
         put_url.should_not be_false
         put_url.should_not be_empty
         puts put_url.inspect
-        result = Qiniu::RS.upload(put_url, __FILE__, @bucket, @key)
+        result = Qiniu::RS.upload :url => put_url,
+                                  :file =>  __FILE__,
+                                  :bucket => @bucket,
+                                  :key => @key,
+                                  :mime_type => 'application/x-ruby',
+                                  :enable_crc32_check => true
         result.should be_true
       end
     end
 
+    context ".put_file" do
+      it "should works" do
+        result = Qiniu::RS.put_file :file =>  __FILE__,
+                                    :bucket => @bucket,
+                                    :key => @key,
+                                    :mime_type => 'application/x-ruby',
+                                    :enable_crc32_check => true
+        result.should be_true
+      end
+    end
+
+    context ".upload_file" do
+      it "should works" do
+        uptoken_opts = {:scope => @bucket, :escape => 0}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => __FILE__,
+          :bucket => @bucket,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        result = Qiniu::RS.upload_file(upload_opts)
+        result.should_not be_false
+        puts result.inspect
+      end
+
+      it "should raise MissingArgsError" do
+        uptoken_opts = {:scope => @bucket, :escape => 0}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => __FILE__,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        lambda { Qiniu::RS.upload_file(upload_opts) }.should raise_error(RS::MissingArgsError)
+      end
+
+      it "should raise NoSuchFileError" do
+        uptoken_opts = {:scope => @bucket, :escape => 0}
+        upload_opts = {
+          :uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
+          :file => 'no_this_file',
+          :bucket => @bucket,
+          :key => @key,
+          :enable_crc32_check => true
+        }
+        lambda { Qiniu::RS.upload_file(upload_opts) }.should raise_error(RS::NoSuchFileError)
+      end
+    end
+
+    context ".resumable_upload_file" do
+      it "should works" do
+        # generate bigfile for testing
+        localfile = "test_bigfile"
+        File.open(localfile, "w"){|f| 5242888.times{f.write(rand(9).to_s)}}
+        key = Digest::SHA1.hexdigest(localfile+Time.now.to_s)
+        # generate the upload token
+        uptoken_opts = {:scope => @bucket, :expires_in => 3600, :customer => "why404@gmail.com", :escape => 0}
+        uptoken = Qiniu::RS.generate_upload_token(uptoken_opts)
+        # uploading
+        upload_opts = {
+            :uptoken => uptoken,
+            :file => localfile,
+            :bucket => @bucket,
+            :key => key
+        }
+        #uploading
+        result1 = Qiniu::RS.upload_file(upload_opts)
+        #drop the bigfile
+        File.unlink(localfile) if File.exists?(localfile)
+        #expect
+        puts result1.inspect
+        result1.should_not be_false
+        result1.should_not be_empty
+        #stat
+        result2 = Qiniu::RS.stat(@bucket, key)
+        puts result2.inspect
+        result2.should_not be_false
+        #delete
+        result3 = Qiniu::RS.delete(@bucket, key)
+        puts result3.inspect
+        result3.should_not be_false
+      end
+    end
+
     context ".stat" do
       it "should works" do
         result = Qiniu::RS.stat(@bucket, @key)
@@ -102,17 +275,52 @@ module Qiniu
       end
     end
 
-    context ".publish" do
+    context ".batch_copy" do
       it "should works" do
-        result = Qiniu::RS.publish(@domain, @bucket)
+        result = Qiniu::RS.batch_copy @bucket, @key, @bucket, @key2
+        result.should_not be_false
+
+        #result2 = Qiniu::RS.stat(@bucket, @key2)
+        #result2.should_not be_false
+
+        result = Qiniu::RS.delete @bucket, @key2
         result.should_not be_false
       end
     end
 
-    context ".unpublish" do
+    context ".batch_move" do
       it "should works" do
-        result = Qiniu::RS.unpublish(@domain)
+        result = Qiniu::RS.batch_move @bucket, @key, @bucket, @key2
         result.should_not be_false
+
+        #result2 = Qiniu::RS.stat(@bucket, @key2)
+        #result2.should_not be_false
+
+        result3 = Qiniu::RS.batch_move @bucket, @key2, @bucket, @key
+        result3.should_not be_false
+      end
+    end
+
+    context ".move" do
+      it "should works" do
+        result = Qiniu::RS.move(@bucket, @key, @bucket, @key2)
+        result.should_not be_false
+
+        result2 = Qiniu::RS.stat(@bucket, @key2)
+        result2.should_not be_false
+
+        result3 = Qiniu::RS.move(@bucket, @key2, @bucket, @key)
+        result3.should_not be_false
+      end
+    end
+
+    context ".copy" do
+      it "should works" do
+        result = Qiniu::RS.copy(@bucket, @key, @bucket, @key2)
+        result.should_not be_false
+
+        #result2 = Qiniu::RS.stat(@bucket, @key2)
+        #result2.should_not be_false
       end
     end
 
@@ -132,7 +340,7 @@ module Qiniu
 
     context ".image_info" do
       it "should works" do
-        data = Qiniu::RS.get("test_images", "test_image.jpg")
+        data = Qiniu::RS.get(@test_image_bucket, @test_image_key)
         data.should_not be_false
         data.should_not be_empty
         puts data.inspect
@@ -143,5 +351,59 @@ module Qiniu
       end
     end
 
+    context ".image_exif" do
+      it "should works" do
+        data = Qiniu::RS.get(@test_image_bucket, @test_image_key)
+        data.should_not be_false
+        data.should_not be_empty
+        puts data.inspect
+        result = Qiniu::RS.image_exif(data["url"])
+        puts result.inspect
+      end
+    end
+
+    context ".image_mogrify_save_as" do
+      it "should works" do
+        data = Qiniu::RS.get(@test_image_bucket, @test_image_key)
+        data.should_not be_false
+        data.should_not be_empty
+        puts data.inspect
+
+        dest_key = "cropped-" + @test_image_key
+        src_img_url = data["url"]
+        mogrify_options = {
+          :thumbnail => "!120x120>",
+          :gravity => "center",
+          :crop => "!120x120a0a0",
+          :quality => 85,
+          :rotate => 45,
+          :format => "jpg",
+          :auto_orient => true
+        }
+        result2 = Qiniu::RS.image_mogrify_save_as(@test_image_bucket, dest_key, src_img_url, mogrify_options)
+        result2.should_not be_false
+        result2.should_not be_empty
+        puts result2.inspect
+      end
+    end
+
+    context ".generate_upload_token" do
+      it "should works" do
+        data = Qiniu::RS.generate_upload_token({:scope => @bucket, :expires_in => 3600, :escape => 0})
+        data.should_not be_empty
+        puts data.inspect
+        data.split(":").length.should == 3
+      end
+    end
+
+    context ".generate_download_token" do
+      it "should works" do
+        data = Qiniu::RS.generate_download_token({:expires_in => 1, :pattern => 'http://*.dn.qbox.me/*'})
+        data.should_not be_empty
+        puts data.inspect
+        data.split(":").length.should == 3
+      end
+    end
+
   end
 end

spec/qiniu/tokens/qbox_token_spec.rb

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+require 'qiniu/tokens/qbox_token'
+
+module Qiniu
+  module RS
+    describe QboxToken do
+      before :all do
+        @qbox_token = QboxToken.new(:url => 'www.qiniutek.com?key1=value1',
+                                    :params => { :key2 => 'value2' })
+        @qbox_token.access_key = 'access_key'
+        @qbox_token.secret_key = 'secret_key'
+      end
+
+      context "#generate_token" do
+        it "should generate token" do
+          @qbox_token.generate_token.should_not be_empty
+        end
+      end
+
+      context "#generate_signature" do
+        it "should generate signature" do
+          @qbox_token.generate_signature.should == "www.qiniutek.com?key1=value1\nkey2=value2"
+        end
+      end
+    end
+  end
+end

spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'rspec'
 
 RSpec.configure do |config|
   config.before :all do
-    Qiniu::RS.establish_connection! :client_id     => "abcd0c7edcdf914228ed8aa7c6cee2f2bc6155e2",
-                                    :client_secret => "fc9ef8b171a74e197b17f85ba23799860ddf3b9c"
+    Qiniu::RS.establish_connection! :access_key => ENV["QINIU_ACCESS_KEY"], :secret_key => ENV["QINIU_SECRET_KEY"]
   end
 end