home/ruby-sdk
2
0
Fork 0
mirror of https://github.com/wahyd4/ruby-sdk.git synced 2026-08-26 13:18:23 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/allow_upload_callback_api' into develop

Browse Source
This commit is contained in:
404
2012-11-06 23:17:16 +08:00
parent 38a0877b66 000eef8870
commit 611837b137
13 changed files with 113 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+1 -1
View File
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
qiniu-rs (3.1.0)
qiniu-rs (3.1.1)
json (~> 1.7)
mime-types (~> 1.19)
rest-client (~> 1.6)
docs/README.md
+15 -1
View File
@@ -120,7 +120,8 @@ title: Ruby SDK 使用指南 | 七牛云存储
:expires_in => expires_in_seconds,
:callback_url => callback_url,
:callback_body_type => callback_body_type,
:customer => end_user_id
:customer => end_user_id,
:escape => allow_upload_callback_api
**参数**
@@ -139,6 +140,19 @@ title: Ruby SDK 使用指南 | 七牛云存储
:customer
: 可选，字符串类型（String），客户方终端用户（End User）的ID，该字段可以用来标示一个文件的属主，这在一些特殊场景下（比如给终端用户上传的图片打上名字水印）非常有用。
:escape
: 可选，数字类型，可选值 0 或者 1，缺省为 0 。值为 1 表示 callback 传递的自定义数据中允许存在转义符号 `$(VarExpression)`，参考 [VarExpression](/v3/api/words/#VarExpression)。
当 `escape` 的值为 `1` 时，常见的转义语法如下：
- 若 `callbackBodyType` 为 `application/json` 时，一个典型的自定义回调数据（[CallbackParams](/v3/api/io/#CallbackParams)）为：
`{foo: "bar", w: $(imageInfo.width), h: $(imageInfo.height), exif: $(exif)}`
- 若 `callbackBodyType` 为 `application/x-www-form-urlencoded` 时，一个典型的自定义回调数据（[CallbackParams](/v3/api/io/#CallbackParams)）为：
`foo=bar&w=$(imageInfo.width)&h=$(imageInfo.height)&exif=$(exif)`
**返回值**
返回一个字符串类型（String）的用于上传文件用的临时授权 `upload_token`。
lib/qiniu/rs.rb
+1
View File
@@ -224,6 +224,7 @@ module Qiniu
#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.generate_token
end
lib/qiniu/rs/version.rb
+1 -1
View File
@@ -5,7 +5,7 @@ module Qiniu
module Version
MAJOR = 3
MINOR = 1
PATCH = 0
PATCH = 1
# Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
#
# Example
lib/qiniu/tokens/upload_token.rb
+3 -1
View File
@@ -10,7 +10,7 @@ module Qiniu
include Utils
attr_accessor :scope, :expires_in, :callback_url, :callback_body_type, :customer
attr_accessor :scope, :expires_in, :callback_url, :callback_body_type, :customer, :escape
def initialize(opts = {})
@scope = opts[:scope]
@@ -18,6 +18,7 @@ module Qiniu
@callback_url = opts[:callback_url]
@callback_body_type = opts[:callback_body_type]
@customer = opts[:customer]
@escape = opts[:escape]
end
def generate_signature
@@ -25,6 +26,7 @@ module Qiniu
params[:callbackUrl] = @callback_url if !@callback_url.nil? && !@callback_url.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
urlsafe_base64_encode(params.to_json)
end
spec/qiniu/rs/eu_spec.rb
+12 -7
View File
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
require 'spec_helper'
require 'qiniu/rs/io'
require 'qiniu/rs'
require 'qiniu/rs/pub'
require 'qiniu/rs/eu'
@@ -14,12 +14,15 @@ module Qiniu
@bucket = "wm_test_bucket"
@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)
code, data = Qiniu::RS::IO.upload_with_token(uptoken, local_file, @bucket, @key, nil, nil, nil, true)
code.should == 200
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, "-")
@@ -31,10 +34,12 @@ module Qiniu
puts data3.inspect
end
#after :all do
# result = Qiniu::RS.drop(@bucket)
# result.should_not be_false
#end
after :all do
@bucket = "wm_test_bucket"
result = Qiniu::RS.drop(@bucket)
puts result.inspect
result.should_not be_false
end
context ".set_watermark" do
it "should works" do
spec/qiniu/rs/image_spec.rb
+14 -22
View File
@@ -10,35 +10,20 @@ module Qiniu
describe Image do
before :all do
=begin
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
=end
@bucket = "test_images_12345"
@key = "image_logo_for_test.png"
local_file = File.expand_path('../' + @key, __FILE__)
result = Qiniu::RS.drop(@bucket)
result.should_not be_false
result = Qiniu::RS.mkbucket(@bucket)
puts result.inspect
put_url = Qiniu::RS.put_auth(10)
put_url.should_not be_false
put_url.should_not be_empty
result = Qiniu::RS.upload :url => put_url,
:file => local_file,
:bucket => @bucket,
:key => @key,
:enable_crc32_check => true
result.should be_true
local_file = File.expand_path('../' + @key, __FILE__)
upopts = {:scope => @bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com"}
uptoken = Qiniu::RS.generate_upload_token(upopts)
data = Qiniu::RS.upload_file :uptoken => uptoken, :file => local_file, :bucket => @bucket, :key => @key
puts data.inspect
result = Qiniu::RS.get(@bucket, @key)
result["url"].should_not be_empty
@@ -56,6 +41,13 @@ module Qiniu
}
end
after :all do
@bucket = "test_images_12345"
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(@source_image_url)
spec/qiniu/rs/io_spec.rb
+12 -10
View File
@@ -10,17 +10,19 @@ module Qiniu
describe IO do
before :all do
=begin
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
=end
@bucket = "test"
@bucket = "io_test_bucket"
@key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
result = Qiniu::RS.mkbucket(@bucket)
puts result.inspect
result.should be_true
end
after :all do
@bucket = "io_test_bucket"
result = Qiniu::RS.drop(@bucket)
puts result.inspect
result.should_not be_false
end
context ".upload_file" do
spec/qiniu/rs/pub_spec.rb
+6 -14
View File
@@ -10,24 +10,16 @@ module Qiniu
describe Pub do
before :all do
@bucket = "test123"
code, data = Qiniu::RS::RS.mkbucket(@bucket)
code.should == 200
puts data.inspect
@bucket = "pub_test_bucket"
result = Qiniu::RS.mkbucket(@bucket)
puts result.inspect
result.should_not be_false
end
=begin
context ".mkbucket" do
it "should works" do
code, data = Qiniu::RS::RS.mkbucket(@bucket)
code.should == 200
puts data.inspect
end
end
=end
after :all do
@bucket = "pub_test_bucket"
result = Qiniu::RS.drop(@bucket)
puts result.inspect
result.should_not be_false
end
spec/qiniu/rs/rs_spec.rb
+10 -4
View File
@@ -11,13 +11,19 @@ module Qiniu
describe RS do
before :all do
@bucket = "test_bucket_1234"
@bucket = "rs_test_bucket"
@key = Digest::SHA1.hexdigest (Time.now.to_i+rand(100)).to_s
@domain = 'iovip.qbox.me/test'
@domain = 'rs-test-bucket.dn.qbox.me'
code, data = Qiniu::RS::RS.mkbucket(@bucket)
puts data.inspect
puts [code, data].inspect
code.should == 200
end
after :all do
@bucket = "rs_test_bucket"
code, data = Qiniu::RS::RS.drop(@bucket)
puts [code, data].inspect
code.should == 200
end
spec/qiniu/rs/up_spec.rb
+11 -1
View File
@@ -12,12 +12,22 @@ module Qiniu
before :all do
@localfile = "bigfile.txt"
File.open(@localfile, "w"){|f| 9437184.times{f.write(Random.rand(9).to_s)}}
@bucket = "test"
@bucket = "up_test_bucket"
@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
@localfile = "bigfile.txt"
File.unlink(@localfile) if File.exists?(@localfile)
@bucket = "up_test_bucket"
code, data = Qiniu::RS::RS.drop(@bucket)
puts [code, data].inspect
code.should == 200
end
context ".upload_with_token" do
spec/qiniu/rs_spec.rb
+27 -7
View File
@@ -10,13 +10,33 @@ module Qiniu
before :all do
@bucket = 'qiniu_rs_test'
@key = Digest::SHA1.hexdigest Time.now.to_s
@domain = 'cdn.example.com'
@test_image_bucket = 'test_images_12345'
@test_image_key = 'image_logo_for_test.png'
@domain = 'qiniu-rs-test.dn.qbox.me'
result = Qiniu::RS.mkbucket(@bucket)
result.should_not be_false
@test_image_bucket = 'test_images_12345'
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 => "awhy.xu@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
after :all do
result = Qiniu::RS.drop(@bucket)
puts result.inspect
result.should_not be_false
result2 = Qiniu::RS.drop(@test_image_bucket)
puts result2.inspect
result2.should_not be_false
end
context ".buckets" do
@@ -116,7 +136,7 @@ module Qiniu
context ".upload_file" do
it "should works" do
uptoken_opts = {:scope => @bucket}
uptoken_opts = {:scope => @bucket, :escape => 0}
upload_opts = {
:uptoken => Qiniu::RS.generate_upload_token(uptoken_opts),
:file => __FILE__,
@@ -137,7 +157,7 @@ module Qiniu
File.open(localfile, "w"){|f| 5242888.times{f.write(Random.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 => "awhy.xu@gmail.com"}
uptoken_opts = {:scope => @bucket, :expires_in => 3600, :customer => "awhy.xu@gmail.com", :escape => 0}
uptoken = Qiniu::RS.generate_upload_token(uptoken_opts)
# uploading
upload_opts = {
@@ -311,7 +331,7 @@ module Qiniu
context ".generate_upload_token" do
it "should works" do
data = Qiniu::RS.generate_upload_token({:scope => 'test_bucket', :expires_in => 3600})
data = Qiniu::RS.generate_upload_token({:scope => 'test_bucket', :expires_in => 3600, :escape => 0})
data.should_not be_empty
puts data.inspect
end
spec/spec_helper.rb
-5
View File
@@ -14,10 +14,5 @@ RSpec.configure do |config|
:up_host => "http://m1.qbox.me:13019",
:pub_host => "http://m1.qbox.me:13012",
:eu_host => "http://m1.qbox.me:13050"
=begin
Qiniu::RS.establish_connection! :access_key => "aPoWOtE9EFca1fLxFCtlkeZAOV7aADVMTLdSydmr",
:secret_key => "L3ShtjCQTCagVCDPfHJoOix7JO_o3qHz3ScyflUG"
=end
end
end