msp-youtube-g 0.4.8.3 → 0.4.8.4

data/lib/youtube_g.rb

@@ -26,5 +26,5 @@ require File.dirname(__FILE__) + '/youtube_g/request/video_search'
 require File.dirname(__FILE__) + '/youtube_g/response/video_search'
 
 class YouTubeG #:nodoc:
-  VERSION = '0.4.8.3'
+  VERSION = '0.4.8.4'
 end

data/lib/youtube_g/request/video_upload.rb

@@ -1,6 +1,10 @@
 class YouTubeG
 
   module Upload
+    
+    CLIENT_LOGIN_HEADER = "GoogleLogin auth="
+    AUTH_SUB_HEADER = "AuthSub token=" 
+    
     class UploadError < Exception; end
     class AuthenticationError < Exception; end
 
@@ -16,8 +20,9 @@ class YouTubeG
       
       attr_accessor :auth_token
 
-      def initialize user, pass, dev_key, client_id = 'youtube_g', auth_token = nil
-        @user, @pass, @dev_key, @client_id, @auth_token = user, pass, dev_key, client_id, auth_token
+      def initialize user, pass, dev_key, client_id = 'youtube_g', auth_sub_token = nil
+        @user, @pass, @dev_key, @client_id, @auth_sub_token = user, pass, dev_key, client_id, auth_sub_token
+        @auth_token = @auth_sub_token != nil ? @auth_sub_token : nil
       end         
         
       # TODO merge this in with logger.rb or replace logger.rb
@@ -63,7 +68,7 @@ class YouTubeG
         upload_body = generate_upload_body(boundary, video_xml, data)
 
         upload_header = {
-        "Authorization"  => "GoogleLogin auth=#{derive_auth_token}",
+        "Authorization"  => get_auth_header,
         "X-GData-Client" => "#{@client_id}",
         "X-GData-Key"    => "key=#{@dev_key}",
         "Slug"           => "#{@opts[:filename]}",
@@ -74,6 +79,7 @@ class YouTubeG
 
         direct_upload_url = "/feeds/api/users/#{@user}/uploads"
         logger.debug("direct_upload_url [#{direct_upload_url}]")
+        logger.debug("upload_header [#{upload_header}]")
 
         Net::HTTP.start(base_url) do |upload|
           response = upload.post(direct_upload_url, upload_body, upload_header)
@@ -92,7 +98,15 @@ class YouTubeG
         end
 
       end   
-      
+       
+      def get_auth_header 
+        logger.debug("@auth_sub_token [#{@auth_sub_token}]") 
+        if @auth_sub_token
+          return YouTubeG::Upload::AUTH_SUB_HEADER+derive_auth_token
+        else
+          return YouTubeG::Upload::CLIENT_LOGIN_HEADER+derive_auth_token
+        end 
+      end  
 
       private
 

data/test/test_upload.rb

@@ -4,9 +4,13 @@ require File.dirname(__FILE__) + '/../lib/youtube_g'
 class TestClient < Test::Unit::TestCase
   
   def setup
-    @uploader = YouTubeG::Upload::VideoUpload.new("user","pswd","dev_key")               
+    @uploader = YouTubeG::Upload::VideoUpload.new(@user,@pswd,@dev_key)               
     @uploader.auth_token = "auth_token_for_testing" 
-    @response = nil
+    @response = nil   
+    @user = "user"
+    @pswd = "pswd"
+    @dev_key = "dev_key"
+    @client_id = "client_id"
   end
 
   def test_logger_still_active_without_rails_default       
@@ -18,10 +22,10 @@ class TestClient < Test::Unit::TestCase
   end 
   
   def test_passing_auth_token_in_constructor         
-    upload = YouTubeG::Upload::VideoUpload.new("user","pswd","dev_key")
+    upload = YouTubeG::Upload::VideoUpload.new(@user,@pswd,@dev_key)
     assert_nil upload.auth_token  
     
-    upload = YouTubeG::Upload::VideoUpload.new("user","pswd","dev_key","client_id", :test_token)
+    upload = YouTubeG::Upload::VideoUpload.new(@user,@pswd,@dev_key,@client_id, :test_token)
     assert_equal :test_token, upload.auth_token
   end   
                         
@@ -47,7 +51,28 @@ class TestClient < Test::Unit::TestCase
     assert_raise YouTubeG::Upload::UploadError do          
       response = @uploader.upload("a_file")
     end
-  end     
+  end    
+     
+  def test_get_auth_header_for_auth_sub                                           
+    token = "1234554321"
+    upload = YouTubeG::Upload::VideoUpload.new(@user,@pswd,@dev_key,@client_id, token)
+    assert_equal YouTubeG::Upload::AUTH_SUB_HEADER+token, upload.get_auth_header
+  end
+
+  def test_get_auth_header_for_client_login  
+    token = "1234554321"
+    # YouTubeG::Upload.module_eval do 
+    #   def derive_auth_token()
+    #     token
+    #   end                                
+    # end          
+    
+    # mock the result of derive_auth_token
+    upload = YouTubeG::Upload::VideoUpload.new(@user,@pswd,@dev_key,@client_id)
+    upload.auth_token = token                                   
+    assert_equal YouTubeG::Upload::CLIENT_LOGIN_HEADER+token, upload.get_auth_header
+  end
+   
               
   # stubs
   class Net::HTTPForbidden < Net::HTTPClientError # 403

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msp-youtube-g
 version: !ruby/object:Gem::Version 
-  version: 0.4.8.3
+  version: 0.4.8.4
 platform: ruby
 authors: 
 - Shane Vitarana