qiniu-rs 3.4.1 → 3.4.2

data/.travis.yml

@@ -10,3 +10,6 @@ rvm:
   - ruby-head
   - jruby-head
   - ree
+before_script:
+  - export QINIU_ACCESS_KEY=iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV
+  - export QINIU_SECRET_KEY=6QTOr2Jg1gcZEWDQXKOGZh5PziC2MCV5KsntT70j

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGE LOG
 
+### v3.4.2
+
+- `Qiniu::RS.generate_upload_token()` 方法新增 `:return_body` 选项。
+
+该选项（`:return_body`）可设置文件上传成功后，执行七牛云存储规定的回调API，并以 JSON 响应格式返回其执行结果。参考 [uploadToken 之 returnBody 说明](http://docs.qiniutek.com/v3/api/io/#uploadToken-returnBody)。
+
 ### v3.4.1
 
 增加为上传文件进行预转的选项，参见 [uploadToken 之 asyncOps 说明](http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.4.1)
+    qiniu-rs (3.4.2)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)
@@ -13,7 +13,7 @@ GEM
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
     json (1.7.6)
-    mime-types (1.19)
+    mime-types (1.20.1)
     rake (10.0.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -24,7 +24,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     ruby-hmac (0.4.0)
 
 PLATFORMS

data/README.md

@@ -32,7 +32,7 @@
 
 ## 许可证
 
-Copyright (c) 2012 qiniutek.com
+Copyright (c) 2012-2013 qiniutek.com
 
 基于 MIT 协议发布:
 

data/docs/README.md

@@ -126,7 +126,8 @@ title: Ruby SDK 使用指南 | 七牛云存储
                                     :callback_body_type => callback_body_type,
                                     :customer           => end_user_id,
                                     :escape             => allow_upload_callback_api,
-                                    :async_options      => async_callback_api_commands
+                                    :async_options      => async_callback_api_commands,
+                                    :return_body        => custom_response_body
 
 **参数**
 
@@ -159,7 +160,11 @@ title: Ruby SDK 使用指南 | 七牛云存储
     `foo=bar&w=$(imageInfo.width)&h=$(imageInfo.height)&exif=$(exif)`
 
 :async_options
-: 可选，字符串类型（String），用于设置文件上传成功后，执行指定的预转指令。参见 [uploadToken 之 asyncOps 说明](http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps)
+: 可选，字符串类型（String），用于设置文件上传成功后，执行指定的预转指令。参考 [uploadToken 之 asyncOps 说明](http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps)
+
+:return_body
+: 可选，字符串类型（String），用于设置文件上传成功后，执行七牛云存储规定的回调API，并以 JSON 响应格式返回其执行结果。参考 [uploadToken 之 returnBody 说明](/v3/api/io/#uploadToken-returnBody)。
+
 
 **返回值**
 
@@ -320,10 +325,10 @@ title: Ruby SDK 使用指南 | 七牛云存储
 **参数**
 
 expires_in
-: 可选，数字类型，用于设置上传 URL 的有效期，单位：秒，缺省为 3600 秒，即 1 小时后该上传链接不再有效。
+: 可选，数字类型，用于设置上传 URL 的有效期，单位：秒，缺省为 3600 秒，即 1 小时后该下载授权凭证（downloadToken）不再有效。
 
 pattern
-: 可选，字符串类型，用于设置可匹配的下载链接。参考：[downloadToken pattern 详解](/v3/api/io/#download-token-pattern)
+: 必须，字符串类型，用于设置可匹配的下载链接。参考：[downloadToken pattern 详解](/v3/api/io/#download-token-pattern)
 
 
 <a name="other-download-features"></a>
@@ -753,11 +758,9 @@ mogrify_options
       thumbnail = Qiniu::RS.get(target_bucket, target_key)
       puts thumbnail["url"]
 
-      # 您可以选择将存放缩略图的 bucket 公开，这样就可以直接以外链的形式访问到缩略图，而不用走API获取下载URL。
-      result = Qiniu::RS.publish("pic.example.com", target_bucket)
+      # 您可以选择将存放缩略图的 bucket 公开，这样就可以直接以外链的形式访问到缩略图，而不用走API获取下载URL，就可以直接以如下方式访问缩略图：
 
-      # 然后将 pic.example.com CNAME 到 iovip.qbox.me ，就可以直接以如下方式访问缩略图
-      # [GET] http://pic.example.com/<target_key>
+      # [GET] http://<bucket>.qiniudn.com/<target_key>
     end
 
 
@@ -765,10 +768,10 @@ mogrify_options
 
 ## 贡献代码
 
-七牛云存储 Ruby SDK 源码地址：[https://github.com/qiniu/ruby-sdk](https://github.com/qiniu/ruby-sdk)
+七牛云存储 Ruby SDK 源码地址：<https://github.com/qiniu/ruby-sdk>
 
-1. 登录 [github.com](https://github.com)
-2. Fork [https://github.com/qiniu/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`)

data/lib/qiniu/rs.rb

@@ -253,6 +253,7 @@ module Qiniu
         #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
 

data/lib/qiniu/rs/version.rb

@@ -5,7 +5,7 @@ module Qiniu
     module Version
       MAJOR = 3
       MINOR = 4
-      PATCH = 1
+      PATCH = 2
       # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
       #
       # Example

data/lib/qiniu/tokens/upload_token.rb

@@ -10,7 +10,7 @@ module Qiniu
 
         include Utils
 
-        attr_accessor :scope, :expires_in, :callback_url, :callback_body_type, :customer, :escape, :async_options
+        attr_accessor :scope, :expires_in, :callback_url, :callback_body_type, :customer, :escape, :async_options, :return_body
 
         def initialize(opts = {})
           @scope = opts[:scope]
@@ -20,6 +20,7 @@ module Qiniu
           @customer = opts[:customer]
           @escape = opts[:escape]
           @async_options = opts[:async_options]
+          @return_body = opts[:return_body]
         end
 
         def generate_signature
@@ -29,6 +30,7 @@ module Qiniu
           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?
           Utils.urlsafe_base64_encode(params.to_json)
         end
 

data/spec/qiniu/rs/image_spec.rb

@@ -24,12 +24,18 @@ module Qiniu
             :scope => @bucket,
             :expires_in => 3600,
             :customer => "why404@gmail.com",
-            :async_options => "imageView/1/w/120/h/120"
+            :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
 
+        data["size"].should_not be_zero
+        data["hash"].should_not be_empty
+        data["width"].should_not be_zero
+        data["height"].should_not be_zero
+
         result = Qiniu::RS.get(@bucket, @key)
         result["url"].should_not be_empty
         puts result.inspect

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiniu-rs
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -607371140838855446
+      hash: -4169114018615426400
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,10 +197,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -607371140838855446
+      hash: -4169114018615426400
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Qiniu Resource (Cloud) Storage SDK for Ruby