msp-youtube-g 0.4.5 → 0.4.6

data/History.txt

@@ -1,5 +1,8 @@
 == trunk
 
+* Add error-handling for video upload errors. [FiXato]
+* Add error-handling for authentication errors from YouTube during video upload. [FiXato]
+* Add support for making videos private upon video upload. [FiXato]
 * Fix issue with REXML parsing of video upload response. [FiXato]
 * Fix issue with response code comparison. [FiXato]
 * Authcode is now retrieved for video uploads. [FiXato]

data/lib/youtube_g/request/video_upload.rb

@@ -7,6 +7,7 @@ class YouTubeG
 
   module Upload
     class UploadError < Exception; end
+    class AuthenticationError < Exception; end
 
     # require 'youtube_g'
     #
@@ -17,9 +18,23 @@ class YouTubeG
     #                                        :keywords => %w[cool blah test]
 
     class VideoUpload
-
-      def initialize user, pass, dev_key, client_id = 'youtube_g'
-        @user, @pass, @dev_key, @client_id = user, pass, dev_key, client_id
+      
+      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
+      end         
+        
+      # TODO merge this in with logger.rb or replace logger.rb
+      def logger      
+        if not Object.const_defined?(get_rails_default_logger_name)
+           Logger.new(STDOUT)
+        else
+           eval(get_rails_default_logger_name)
+        end
+      end  
+      
+      def get_rails_default_logger_name
+         "RAILS_DEFAULT_LOGGER"
       end
 
       #
@@ -32,8 +47,14 @@ class YouTubeG
       #   :description
       #   :category
       #   :keywords
+      #   :private
+      # Specifying :private will make the video private, otherwise it will be public.
       #
-
+      # When one of the fields is invalid according to YouTube,
+      # an UploadError will be returned. Its message contains a list of newline separated
+      # errors, containing the key and its error code.
+      # 
+      # When the authentication credentials are incorrect, an AuthenticationError will be raised.
       def upload data, opts = {}
         data = data.respond_to?(:read) ? data.read : data
         @opts = { :mime_type => 'video/mp4',
@@ -46,29 +67,33 @@ class YouTubeG
         upload_body = generate_upload_body(boundary, video_xml, data)
 
         upload_header = {
-        "Authorization"  => "GoogleLogin auth=#{auth_token}",
+        "Authorization"  => "GoogleLogin auth=#{derive_auth_token}",
         "X-GData-Client" => "#{@client_id}",
         "X-GData-Key"    => "key=#{@dev_key}",
         "Slug"           => "#{@opts[:filename]}",
         "Content-Type"   => "multipart/related; boundary=#{boundary}",
         "Content-Length" => "#{upload_body.length}",
         }
-        puts("MSP upload_header [#{upload_header}]")
+        logger.debug("upload_header [#{upload_header}]")
 
         direct_upload_url = "/feeds/api/users/#{@user}/uploads"
-        puts("MSP direct_upload_url [#{direct_upload_url}]")
+        logger.debug("direct_upload_url [#{direct_upload_url}]")
 
         Net::HTTP.start(base_url) do |upload|
           response = upload.post(direct_upload_url, upload_body, upload_header)
-          xml = REXML::Document.new(response.body)
-          if (xml.elements["//id"])
-            puts("MSP response xml [#{xml}]")
-            return xml.elements["//id"].text[/videos\/(.+)/, 1]
-          else
-            return xml
+          if response.code.to_i == 403
+            raise AuthenticationError, response.body[/<TITLE>(.+)<\/TITLE>/, 1]
+          elsif response.code.to_i != 201
+            upload_error = ''
+            xml = REXML::Document.new(response.body)
+            errors = xml.elements["//errors"]
+            errors.each do |error|
+              location = error.elements["location"].text[/media:group\/media:(.*)\/text\(\)/,1]
+              code = error.elements["code"].text
+              upload_error << sprintf("%s: %s\r\n", location, code)
+            end
+            raise UploadError, upload_error
           end
-
-
         end
 
       end
@@ -83,31 +108,34 @@ class YouTubeG
         "An43094fu"
       end
 
-      def auth_token
+      def derive_auth_token     
         unless @auth_token
           http = Net::HTTP.new("www.google.com", 443)
           http.use_ssl = true
           body = "Email=#{CGI::escape @user}&Passwd=#{CGI::escape @pass}&service=youtube&source=#{CGI::escape @client_id}"
-          puts("MSP auth body [#{body}]")
+          logger.debug("auth body [#{body}]")
           response = http.post("/youtube/accounts/ClientLogin", body, "Content-Type" => "application/x-www-form-urlencoded")
-          raise UploadError, "MSP "+response.body[/Error=(.+)/,1] if response.code.to_i != 200
-          puts("MSP response.body [#{response.body}]")
+          raise UploadError, ""+response.body[/Error=(.+)/,1] if response.code.to_i != 200
+          logger.debug("response.body [#{response.body}]")
           @auth_token = response.body[/Auth=(.+)/, 1]
 
         end
-        puts "MSP auth_token [#{@auth_token}]"
+        logger.debug "auth_token [#{@auth_token}]"
         @auth_token
       end
 
       def video_xml
-        %[<?xml version="1.0"?>
-           <entry xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xmlns:yt="http://gdata.youtube.com/schemas/2007">
-           <media:group>
-           <media:title type="plain">#{@opts[:title]}</media:title>
-           <media:description type="plain">#{@opts[:description]}</media:description>
-           <media:category scheme="http://gdata.youtube.com/schemas/2007/categories.cat">#{@opts[:category]}</media:category>
-           <media:keywords>#{@opts[:keywords].join ","}</media:keywords>
-           </media:group></entry> ]
+        video_xml = ''
+        video_xml << '<?xml version="1.0"?>'
+        video_xml << '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xmlns:yt="http://gdata.youtube.com/schemas/2007">'
+        video_xml << '<media:group>'
+        video_xml << '<media:title type="plain">%s</media:title>'               % @opts[:title]
+        video_xml << '<media:description type="plain">%s</media:description>'   % @opts[:description]
+        video_xml << '<media:keywords>%s</media:keywords>'                      % @opts[:keywords].join(",")
+        video_xml << '<media:category scheme="http://gdata.youtube.com/schemas/2007/categories.cat">%s</media:category>' % @opts[:category]
+        video_xml << '<yt:private/>' if @opts[:private]
+        video_xml << '</media:group>'
+        video_xml << '</entry>'
       end
 
       def generate_upload_body(boundary, video_xml, data)
@@ -119,8 +147,8 @@ class YouTubeG
         upload_body << "Content-Type: #{@opts[:mime_type]}\r\nContent-Transfer-Encoding: binary\r\n\r\n"
         upload_body << data
         upload_body << "\r\n--#{boundary}--\r\n"
-      end
-
+      end      
+     
     end
   end
 end

metadata

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