upyun 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a66fd1986e039bfa120d3ce923ab1809edd6c5a
-  data.tar.gz: cec146d124a0257d94540c4b23001d56b9589402
+  metadata.gz: 7ede2802f726646a9e884163947fd0deb0bda7bb
+  data.tar.gz: ffd7837ffa0dd88cf1f204fe10a95eb91a9c3ad3
 SHA512:
-  metadata.gz: d8397e0d383e03a1574f47ed5ef1b18ce92ccc5b4ff3da243791b5dad47491c38136bbee8bf2adfcbb454ab6d743befb84c90b1535a19ce37db747e13aeb4f8e
-  data.tar.gz: 2760c52be9fb2be54d320c9b7064febc600163c98e888b6e47803b015670d4ad6d263a5c13838b520106a3a1e07ad5af526c629fcfd9227aa3d2a271aa48dedc
+  metadata.gz: 722d70c68fbd1e73efd3cf4b7361e4290715902fc28a4d949bd5f2e39eb4d0de3d58e016c7c954fcee3daef1eee4af9d760efbaafc983752aa8481ec66aaa637
+  data.tar.gz: 895bccf056eac1f6e35314dca90c297e4cfbdb1561c274300d35e2d7aaa296bb0de4541e5c37f6bccd8350c1563e470d06b27737991fb79eafdde87a21818f11

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## CHANGE LOG
 
+### v1.0.7
+- 表单上传返回的信息不论是否设置了 `return-url`, 返回信息一致
+
 ### v1.0.5
 - GET 请求支持自定义 Headers
 - 修正 Readme 说明

data/README.md

@@ -104,7 +104,7 @@ upyun.put('/save/to/path', 'file or binary', headers)
 
 失败返回一个 `Hash` 结构: `{request_id: request_id, error: {code: code, message: message}}`, 其中：
 
-* `request_id` 为本次请求的请求码，由 UPYUN 本台返回，可用该值查询 UPYUN 日志;
+* `request_id` 为本次请求的请求码，由 UPYUN 后台返回，可用该值查询 UPYUN 日志;
 * `code` 为又拍云返回的错误码；
 * `message` 为错误信息；
 
@@ -307,7 +307,7 @@ opts = {
 }
 upyun.upload('file', opts)
 ```
-特别地，如果指定了 `return-url`, 那么返回的是需要跳转的地址，
+特别地，如果指定了 `return-url`, 那么返回的需要跳转的地址等信息也在这个 `Hash` 结构中，
 详情查阅 [通知规则](http://docs.upyun.com/api/form_api/#notify_return)
 
 

data/lib/upyun/form.rb

@@ -58,13 +58,24 @@ module Upyun
       rest_client.post(payload, {'User-Agent' => "Upyun-Ruby-SDK-#{VERSION}"}) do |res|
         case res.code
         when 302
-          res
+
+          # return 302 when set 'return-url' in opts
+          hds = res.headers
+          body = CGI::parse(URI.parse(hds[:location]).query).reduce({}) do |memo, (k, v)|
+            memo.merge!({k.to_sym => v.first})
+          end
+
+          body[:code] = body[:code].to_i
+          body[:time] = body[:time].to_i
+          body[:request_id] = hds[:x_request_id]
+          body
         else
           body = JSON.parse(res.body, symbolize_names: true)
 
           # TODO Upyun have a small bug for the `code`,
           # we have to adjust it to integer
           body[:code] = body[:code].to_i
+          body[:request_id] = res.headers[:x_request_id]
           body
         end
       end

data/lib/upyun/version.rb

@@ -1,3 +1,3 @@
 module Upyun
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/upyun_spec.rb

@@ -100,6 +100,7 @@ describe "Upyun Restful API Basic testing" do
     it "GET a not-exist file" do
       res = @upyun.get("/ruby-sdk/foo/#{String.random}/test-not-exist.jpg")
       expect(res.is_a?(Hash) && res[:error][:code] == 404)
+      expect(res[:request_id]).to be_instance_of(String)
     end
 
     after(:all) { @upyun.delete(@path) }
@@ -222,20 +223,24 @@ describe "Form Upload", current: true do
       expect(res[:message]).to match(/Authorize has expired/)
     end
 
-    it "set 'return-url' should return 302 with 'location' header" do
+    it "set 'return-url' should a hash" do
       res = @form.upload(@file, {'return-url' => 'http://www.example.com'})
-      expect(res.code).to eq(302)
-      expect(res.headers.key?(:location)).to be true
+      expect(res).to be_instance_of(Hash)
+      expect(res[:code]).to eq(200)
+      expect(res[:time]).to be_instance_of(Fixnum)
+      expect(res[:request_id]).to be_instance_of(String)
     end
 
-    it "set 'return-url' and handle failed, should also return 302 with 'location' header" do
+    it "set 'return-url' and handle failed, should also return a hash" do
       opts = {
         'image-width-range' => '0,10',
         'return-url' => 'http://www.example.com'
       }
       res = @form.upload(@file, opts)
-      expect(res.code).to eq(302)
-      expect(res.headers.key?(:location)).to be true
+      expect(res).to be_instance_of(Hash)
+      expect(res[:code]).to eq(403)
+      expect(res[:time]).to be_instance_of(Fixnum)
+      expect(res[:request_id]).to be_instance_of(String)
     end
 
     it "set 'notify-url' should return 200 success" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upyun
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - jsvisa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client