ku6vms_sdk 0.1.2 → 0.1.3

data/lib/grand_cloud/base.rb

@@ -29,6 +29,7 @@ module GrandCloud
       end
 
       def file_upload options
+        pn_file = options[:pn_file]
         auth = GrandCloud::Authentication.new(@secret_access_key, @snda_access_key_id)
 
         protocal_params = auth.generate_upload_params options[:request_params]
@@ -44,8 +45,8 @@ module GrandCloud
         #multipart patch
         partfile = Part.new(
           :name => 'file',
-          :filename => File.basename(options[:file_path]),
-          :body => File.new(options[:file_path]).read
+          :filename => pn_file.basename(pn_file.extname),
+          :body => pn_file.read
         )
         parts = [partfile]
         body = MultipartBody.new(parts)

data/lib/grand_cloud/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module GrandCloud
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/grand_cloud/video.rb

@@ -37,10 +37,9 @@ module GrandCloud
     end
 
     # upload is an async method
-    def upload title, file_path, pass_encoding=nil, &block
-      file = File.new(file_path)
-
-      self.create(title, pass_encoding) do |rep| 
+    def upload title, file, pass_encoding=nil, &block
+      pn_file = Pathname(file)
+      self.create(title.empty? ? pn_file.basename(pn_file.extname) : title, pass_encoding) do |rep| 
 
         GrandCloud.logger.warn(rep)
 
@@ -48,20 +47,20 @@ module GrandCloud
           :method => 'post',
           :uri => '/vmsUpload.htm',
           :url => rep['uploadUrl'],
-          :file_path => file_path,
+          :pn_file => pn_file,
           :host => rep['uploadUrl'].gsub(/^http:\/\/(.+)\/.+/, '\1'),
           :request_params => {
             :sid => rep['sid'],
             :cfrom => 'client',
-            :filesize => file.size,
-            :ext => File.extname(file)
+            :filesize => pn_file.size,
+            :ext => pn_file.extname
           },
           :timeout => {
             :inactivity_timeout => 0
           }
 
         })
-        callback(req, block.to_proc, rep.select{|k, v| k =='sid' || k =='vid'})
+        callback(req, block.to_proc, rep.select{|k, v| %W{sid vid}.include?(k)})
       end
     end
 
@@ -85,7 +84,7 @@ module GrandCloud
           }
 
         })
-        callback(req, block.to_proc, rep.select{|k, v| k =='sid' || k == 'vid'})
+        callback(req, block.to_proc, rep.select{|k, v| %W{sid vid}.include?(k)})
       end
     end
 

data/lib/grandcloud.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+require 'pathname'
 require 'date'
 require 'net/http'
 require 'cgi'

data/spec/grand_cloud/video_spec.rb

@@ -23,7 +23,7 @@ module GrandCloud
 
         it "should pulled by ku6vms" do
           @video.run do
-            @video.pull_by_vms('spec_pull_video', 'http://storage-huadong-1.sdcloud.cn/images.jiaoxuebang.com/nec_ppt.mp4?SNDAAccessKeyId=BH297OBMKFV0T2LO9MC189P2J&Expires=1376880551&Signature=MxRKaSen2q65pd8jjUK9Tt8Ffz8%3D'){ |rep|
+            @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|
               rep['code'].should == 200
             }
           end
@@ -32,7 +32,7 @@ module GrandCloud
         it 'should upload video' do
           @video.run do
             GrandCloud.logger.info('start uploading, please wait...')
-            @video.upload('spec_video', '/tmp/test.mp4'){ |rep|
+            @video.upload('spec_video', File.new('/tmp/test.mp4')){ |rep|
               @@video_id = rep['vid']
               rep['code'].should == 200
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ku6vms_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request