ku6vms_sdk 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/grand_cloud/base.rb +3 -2
- data/lib/grand_cloud/version.rb +1 -1
- data/lib/grand_cloud/video.rb +8 -9
- data/lib/grandcloud.rb +1 -0
- data/spec/grand_cloud/video_spec.rb +2 -2
- metadata +2 -2
data/lib/grand_cloud/base.rb
CHANGED
@@ -29,6 +29,7 @@ module GrandCloud
|
|
29
29
|
end
|
30
30
|
|
31
31
|
def file_upload options
|
32
|
+
pn_file = options[:pn_file]
|
32
33
|
auth = GrandCloud::Authentication.new(@secret_access_key, @snda_access_key_id)
|
33
34
|
|
34
35
|
protocal_params = auth.generate_upload_params options[:request_params]
|
@@ -44,8 +45,8 @@ module GrandCloud
|
|
44
45
|
#multipart patch
|
45
46
|
partfile = Part.new(
|
46
47
|
:name => 'file',
|
47
|
-
:filename =>
|
48
|
-
:body =>
|
48
|
+
:filename => pn_file.basename(pn_file.extname),
|
49
|
+
:body => pn_file.read
|
49
50
|
)
|
50
51
|
parts = [partfile]
|
51
52
|
body = MultipartBody.new(parts)
|
data/lib/grand_cloud/version.rb
CHANGED
data/lib/grand_cloud/video.rb
CHANGED
@@ -37,10 +37,9 @@ module GrandCloud
|
|
37
37
|
end
|
38
38
|
|
39
39
|
# upload is an async method
|
40
|
-
def upload title,
|
41
|
-
|
42
|
-
|
43
|
-
self.create(title, pass_encoding) do |rep|
|
40
|
+
def upload title, file, pass_encoding=nil, &block
|
41
|
+
pn_file = Pathname(file)
|
42
|
+
self.create(title.empty? ? pn_file.basename(pn_file.extname) : title, pass_encoding) do |rep|
|
44
43
|
|
45
44
|
GrandCloud.logger.warn(rep)
|
46
45
|
|
@@ -48,20 +47,20 @@ module GrandCloud
|
|
48
47
|
:method => 'post',
|
49
48
|
:uri => '/vmsUpload.htm',
|
50
49
|
:url => rep['uploadUrl'],
|
51
|
-
:
|
50
|
+
:pn_file => pn_file,
|
52
51
|
:host => rep['uploadUrl'].gsub(/^http:\/\/(.+)\/.+/, '\1'),
|
53
52
|
:request_params => {
|
54
53
|
:sid => rep['sid'],
|
55
54
|
:cfrom => 'client',
|
56
|
-
:filesize =>
|
57
|
-
:ext =>
|
55
|
+
:filesize => pn_file.size,
|
56
|
+
:ext => pn_file.extname
|
58
57
|
},
|
59
58
|
:timeout => {
|
60
59
|
:inactivity_timeout => 0
|
61
60
|
}
|
62
61
|
|
63
62
|
})
|
64
|
-
callback(req, block.to_proc, rep.select{|k, v|
|
63
|
+
callback(req, block.to_proc, rep.select{|k, v| %W{sid vid}.include?(k)})
|
65
64
|
end
|
66
65
|
end
|
67
66
|
|
@@ -85,7 +84,7 @@ module GrandCloud
|
|
85
84
|
}
|
86
85
|
|
87
86
|
})
|
88
|
-
callback(req, block.to_proc, rep.select{|k, v|
|
87
|
+
callback(req, block.to_proc, rep.select{|k, v| %W{sid vid}.include?(k)})
|
89
88
|
end
|
90
89
|
end
|
91
90
|
|
data/lib/grandcloud.rb
CHANGED
@@ -23,7 +23,7 @@ module GrandCloud
|
|
23
23
|
|
24
24
|
it "should pulled by ku6vms" do
|
25
25
|
@video.run do
|
26
|
-
@video.pull_by_vms('spec_pull_video', 'http://storage-huadong-1.sdcloud.cn/images.jiaoxuebang.com/
|
26
|
+
@video.pull_by_vms('spec_pull_video', 'http://storage-huadong-1.sdcloud.cn/images.jiaoxuebang.com/MOV_0399.mp4?SNDAAccessKeyId=BH297OBMKFV0T2LO9MC189P2J&Expires=1377147099&Signature=JpbNOKlBc7SD4%2FYKIiPz8HJDHf4%3D'){ |rep|
|
27
27
|
rep['code'].should == 200
|
28
28
|
}
|
29
29
|
end
|
@@ -32,7 +32,7 @@ module GrandCloud
|
|
32
32
|
it 'should upload video' do
|
33
33
|
@video.run do
|
34
34
|
GrandCloud.logger.info('start uploading, please wait...')
|
35
|
-
@video.upload('spec_video', '/tmp/test.mp4'){ |rep|
|
35
|
+
@video.upload('spec_video', File.new('/tmp/test.mp4')){ |rep|
|
36
36
|
@@video_id = rep['vid']
|
37
37
|
rep['code'].should == 200
|
38
38
|
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ku6vms_sdk
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-08-
|
12
|
+
date: 2013-08-26 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: em-http-request
|