ku6vms_sdk 0.1.3 → 0.1.5

data/lib/grand_cloud/object_ext.rb

@@ -0,0 +1,6 @@
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+end

data/lib/grand_cloud/version.rb

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

data/lib/grand_cloud/video.rb

@@ -32,14 +32,24 @@ module GrandCloud
       creation.callback { block.call(JSON.parse(creation.response)) }
 
       creation.errback do 
-        GrandCloud.logger.error('requesting error...')
+        GrandCloud.logger.error("Error is: #{creation.error}, requesting error...")
+        block.call(nil)
       end
     end
 
     # upload is an async method
-    def upload title, file, pass_encoding=nil, &block
+    # you should pass an original_filename on options when you uploading a temp file
+    def upload title, file, options={}, pass_encoding=false, &block
+      return EM.stop if ((file.class == Tempfile) && (!options[:original_filename])) || !block_given?
+
       pn_file = Pathname(file)
-      self.create(title.empty? ? pn_file.basename(pn_file.extname) : title, pass_encoding) do |rep| 
+
+      title = get_video_title(title, options[:original_filename], pn_file)
+      extname = get_video_extname(options[:original_filename], pn_file)
+
+      self.create(title, pass_encoding) do |rep| 
+
+        return block.call(nil) unless rep
 
         GrandCloud.logger.warn(rep)
 
@@ -53,7 +63,7 @@ module GrandCloud
             :sid => rep['sid'],
             :cfrom => 'client',
             :filesize => pn_file.size,
-            :ext => pn_file.extname
+            :ext => extname
           },
           :timeout => {
             :inactivity_timeout => 0
@@ -65,8 +75,12 @@ module GrandCloud
     end
 
     def pull_by_vms title, download_url, &block 
+      return EM.stop unless block_given?
+
       self.create(title) do |rep|
 
+        return block.call(nil) unless rep
+
         GrandCloud.logger.warn(rep)
 
         req = Base.send_request({
@@ -237,6 +251,15 @@ module GrandCloud
       self
     end
 
+    def get_video_title title, original_filename, pn_file
+      return title unless title.blank?
+      original_filename ? File.basename(original_filename, File.extname(original_filename)) : pn_file.basename(pn_file.extname)
+    end
+  
+    def get_video_extname original_filename, pn_file
+      original_filename ? File.extname(original_filename) : pn_file.extname
+    end
+
   end
 
 end

data/lib/grandcloud.rb

@@ -10,6 +10,7 @@ require 'base64'
 require 'openssl'
 require 'multipart_body'
 require 'logger'
+require 'grand_cloud/object_ext'
 require 'grand_cloud/exceptions'
 require 'grand_cloud/authentication'
 require 'grand_cloud/base'

data/spec/grand_cloud/video_spec.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require 'spec_heler'
+require 'tempfile'
 require 'debugger'
 
 module GrandCloud
@@ -39,6 +40,19 @@ module GrandCloud
           end
         end
 
+        it "should upload while mocking a rails controller" do
+          file_path = '/tmp/test.mp4'
+          @video.run do
+            GrandCloud.logger.info('start uploading, please wait...')
+            temp_file = Tempfile.new('/tmp/Rack_tempfiles_0')
+            temp_file.write(File.new(file_path).read)
+            @video.upload('mock_tempfile_as_video', temp_file, {:original_filename => 'woce.mp4'}){ |rep|
+              @@video_id = rep['vid']
+              rep['code'].should == 200
+            }
+          end
+        end
+
         it "should get video detail" do
           @video.get(@@video_id).vid.should_not nil
         end
@@ -82,6 +96,16 @@ module GrandCloud
           @video.update(nil, nil, nil).should == false 
         end
 
+        it "should return nil when uploading video with a temp file without passed an original_filename" do
+          file_path = '/tmp/test.mp4'
+          nil.should == @video.run do
+            GrandCloud.logger.info('start uploading, please wait...')
+            temp_file = Tempfile.new('/tmp/Rack_tempfiles_0')
+            temp_file.write(File.new(file_path).read)
+            @video.upload('mock_tempfile_as_video', temp_file) {}
+          end 
+        end
+
         it "should return false when deleting video raise exception" do
           @video.destory(nil).should == false
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ku6vms_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -59,6 +59,7 @@ files:
 - lib/grand_cloud/authentication.rb
 - lib/grand_cloud/base.rb
 - lib/grand_cloud/exceptions.rb
+- lib/grand_cloud/object_ext.rb
 - lib/grand_cloud/version.rb
 - lib/grand_cloud/video.rb
 - lib/grandcloud.rb