ku6vms_sdk 0.1.1 → 0.1.2

data/lib/grand_cloud/base.rb

@@ -20,9 +20,12 @@ module GrandCloud
 
         url = URI.escape((options[:url] || ("http://#{(options[:host] || DEFAULT_HOST_URL)+options[:uri]}")) + "?" + protocal_params)+'&Signature='+CGI::escape(signature)
 
+        request_params = {}
+        request_params.merge!(options[:timeout]) if options[:timeout]
+
         params = {:head => {:Accept => options[:header_accept] || 'application/json'}}
         params.merge!(options[:request_params]) if options[:request_params]
-        EM::HttpRequest.new(url).send((options[:method] && options[:method].downcase) || "get", params)
+        EM::HttpRequest.new(url, request_params).send((options[:method] && options[:method].downcase) || "get", params)
       end
 
       def file_upload options

data/lib/grand_cloud/version.rb

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

data/lib/grand_cloud/video.rb

@@ -20,12 +20,13 @@ module GrandCloud
       EM.run { yield }
     end
 
-    def create title, &block
+    def create title, pass_encoding=false, &block
       creation = Base.send_request({
         :method => 'post',
         :uri => '/video',
         :additional_params => {
-          :Title => title
+          :Title => title,
+          :BypassEncoding => pass_encoding
         }
       })
       creation.callback { block.call(JSON.parse(creation.response)) }
@@ -36,10 +37,10 @@ module GrandCloud
     end
 
     # upload is an async method
-    def upload title, file_path, &block
+    def upload title, file_path, pass_encoding=nil, &block
       file = File.new(file_path)
 
-      self.create(title) do |rep| 
+      self.create(title, pass_encoding) do |rep| 
 
         GrandCloud.logger.warn(rep)
 
@@ -54,7 +55,11 @@ module GrandCloud
             :cfrom => 'client',
             :filesize => file.size,
             :ext => File.extname(file)
+          },
+          :timeout => {
+            :inactivity_timeout => 0
           }
+
         })
         callback(req, block.to_proc, rep.select{|k, v| k =='sid' || k =='vid'})
       end
@@ -74,6 +79,9 @@ module GrandCloud
             :uploadUrl => rep['uploadUrl'],
             :accessKey => Base.snda_access_key_id,
             :secretKey => Base.secret_access_key
+          },
+          :timeout => {
+            :inactivity_timeout => 0
           }
 
         })
@@ -201,7 +209,7 @@ module GrandCloud
       end
       req.errback do
         response.fail(nil)
-        raise Error::ResponseError.new("Maybe the network doesn't working")
+        raise Error::ResponseError.new("Error is #{req.error}, Maybe the network doesn't working")
         EM.stop
       end
       response

metadata

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