youtube_it 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/youtube_it/client.rb

@@ -166,7 +166,7 @@ class YouTubeIt
     private
 
     def client
-      @client ||= YouTubeIt::Upload::VideoUpload.new(@user, @pass, @dev_key)
+      @client ||= YouTubeIt::Upload::VideoUpload.new(:username => @user, :password => @pass, :dev_key => @dev_key)
     end
 
     def calculate_offset(page, per_page)
@@ -179,6 +179,74 @@ class YouTubeIt
     end
   end
 
+  class AuthSubClient < Client
+    def initialize *params
+      if params.first.is_a?(Hash)
+        hash_options = params.first
+        @authsub_token                 = hash_options[:token]
+        @dev_key                       = hash_options[:dev_key]
+        @client_id                     = hash_options[:client_id] || "youtube_it"
+        @legacy_debug_flag             = hash_options[:debug]
+      else
+        puts "* warning: the method YouTubeIt::AuthSubClient.new(token, dev_key) is depricated, use YouTubeIt::AuthSubClient.new(:token => 'token', :dev_key => 'dev_key')"
+        @authsub_token              = params.shift
+        @dev_key                    = params.shift
+        @client_id                  = params.shift || "youtube_it"
+        @legacy_debug_flag          = params.shift
+      end
+    end
+
+    def create_session_token
+      response = nil
+      session_token_url = "/accounts/AuthSubSessionToken"
+
+      http_connection do |session|
+        response = session.get2('https://%s' % session_token_url,session_token_header).body
+      end
+      @authsub_token = response.sub('Token=','')
+    end
+
+    def revoke_session_token
+      response = nil
+      session_token_url = "/accounts/AuthSubRevokeToken"
+
+      http_connection do |session|
+        response = session.get2('https://%s' % session_token_url,session_token_header).code
+      end
+      response.to_s == '200' ? true : false
+    end
+
+    def session_token_info
+      response = nil
+      session_token_url = "/accounts/AuthSubTokenInfo"
+
+      http_connection do |session|
+        response = session.get2('https://%s' % session_token_url,session_token_header)
+      end
+      {:code => response.code, :body => response.body }
+    end
+    
+    private
+      def client
+        @client ||= YouTubeIt::Upload::VideoUpload.new(:dev_key => @dev_key, :authsub_token => @authsub_token)
+      end
+      
+      def session_token_header
+        {
+          "Content-Type"   => "application/x-www-form-urlencoded",
+          "Authorization"  => "AuthSub token=#{@authsub_token}"
+        }        
+      end
+      
+      def http_connection
+        http = Net::HTTP.new("www.google.com")
+        http.set_debug_output(logger) if @http_debugging
+        http.start do |session|
+          yield(session)
+        end
+      end
+  end
+
   class OAuthClient < Client
     def initialize *params
       if params.first.is_a?(Hash)
@@ -191,12 +259,12 @@ class YouTubeIt
         @legacy_debug_flag             = hash_options[:debug]
       else
         puts "* warning: the method YouTubeIt::OAuthClient.new(consumer_key, consumer_secrect, dev_key) is depricated, use YouTubeIt::OAuthClient.new(:consumer_key => 'consumer key', :consumer_secret => 'consumer secret', :dev_key => 'dev_key')"
-        @consumer_key               = params.shift
-        @consumer_secret            = params.shift
-        @dev_key                    = params.shift
-        @user                       = params.shift
-        @client_id                  = params.shift || "youtube_it"
-        @legacy_debug_flag          = params.shift
+        @consumer_key                  = params.shift
+        @consumer_secret               = params.shift
+        @dev_key                       = params.shift
+        @user                          = params.shift
+        @client_id                     = params.shift || "youtube_it"
+        @legacy_debug_flag             = params.shift
       end
     end
 
@@ -231,11 +299,12 @@ class YouTubeIt
       REXML::Document.new(body).elements["entry"].elements['author'].elements['name'].text
     end
 
+
     private
 
     def client
       # IMPORTANT: make sure authorize_from_access is called before client is fetched
-      @client ||= YouTubeIt::Upload::VideoUpload.new(@user, "", @dev_key, "youtube_it", access_token)
+      @client ||= YouTubeIt::Upload::VideoUpload.new(:username => current_user, :dev_key => @dev_key, :acces_token => access_token)
     end
 
   end

data/lib/youtube_it/request/video_upload.rb

@@ -16,11 +16,32 @@ class YouTubeIt
     #
     class VideoUpload
       include YouTubeIt::Logging
-      def initialize user, pass, dev_key, client_id = 'youtube_it', access_token = nil
-        @user, @pass, @dev_key, @client_id, @access_token = user, pass, dev_key, client_id, access_token
+      def initialize user, pass, dev_key, access_token = nil, authsub_token = nil, client_id = 'youtube_it'
+        @user, @password, @dev_key, @access_token, @authsub_token, @client_id  = user, pass, dev_key, access_token, authsub_token, client_id
         @http_debugging = false
       end
 
+      def initialize *params
+        if params.first.is_a?(Hash)
+          hash_options = params.first
+          @user                          = hash_options[:username]
+          @password                      = hash_options[:password]
+          @dev_key                       = hash_options[:dev_key]
+          @access_token                  = hash_options[:access_token]
+          @authsub_token                 = hash_options[:authsub_token]
+          @client_id                     = hash_options[:client_id] || "youtube_it"
+        else
+          puts "* warning: the method YouTubeIt::Upload::VideoUpload.new(username, password, dev_key) is depricated, use YouTubeIt::Upload::VideoUpload.new(:username => 'user', :password => 'passwd', :dev_key => 'dev_key')"
+          @user                          = params.shift
+          @password                      = params.shift
+          @dev_key                       = params.shift
+          @access_token                  = params.shift
+          @authsub_token                 = params.shift
+          @client_id                     = params.shift || "youtube_it"
+        end
+      end
+
+
       def enable_http_debugging
         @http_debugging = true
       end
@@ -396,12 +417,17 @@ class YouTubeIt
       end
 
       def authorization_headers
-        {
-          "Authorization"  => "GoogleLogin auth=#{auth_token}",
-          "X-GData-Client" => "#{@client_id}",
-          "X-GData-Key"    => "key=#{@dev_key}",
-          "GData-Version" => "2",
-        }
+        header = {
+                  "X-GData-Client" => "#{@client_id}",
+                  "X-GData-Key"    => "key=#{@dev_key}",
+                  "GData-Version" => "2",
+                }
+        if @authsub_token
+          header.merge!("Authorization"  => "AuthSub token=#{@authsub_token}")
+        else
+          header.merge!("Authorization"  => "GoogleLogin auth=#{auth_token}")
+        end
+        header
       end
 
       def parse_upload_error_from(string)
@@ -457,7 +483,7 @@ class YouTubeIt
         @auth_token ||= begin
           http = Net::HTTP.new("www.google.com", 443)
           http.use_ssl = true
-          body = "Email=#{YouTubeIt.esc @user}&Passwd=#{YouTubeIt.esc @pass}&service=youtube&source=#{YouTubeIt.esc @client_id}"
+          body = "Email=#{YouTubeIt.esc @user}&Passwd=#{YouTubeIt.esc @password}&service=youtube&source=#{YouTubeIt.esc @client_id}"
           response = http.post("/youtube/accounts/ClientLogin", body, "Content-Type" => "application/x-www-form-urlencoded")
           raise UploadError, response.body[/Error=(.+)/,1] if response.code.to_i != 200
           @auth_token = response.body[/Auth=(.+)/, 1]

data/youtube_it.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{youtube_it}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["chebyte", "kylejginavan"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2010-11-28}
   s.description = %q{Upload, delete, update, comment on youtube videos all from one gem.}
   s.email = %q{kylejginavan@gmail.com}
   s.extra_rdoc_files = [
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
      "lib/youtube_it/version.rb",
      "pkg/youtube_it-0.0.8.gem",
      "pkg/youtube_it-1.0.0.gem",
+     "pkg/youtube_it-1.1.0.gem",
      "test/helper.rb",
      "test/test.mov",
      "test/test_chain_io.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - chebyte
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -06:00
+date: 2010-11-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - lib/youtube_it/version.rb
 - pkg/youtube_it-0.0.8.gem
 - pkg/youtube_it-1.0.0.gem
+- pkg/youtube_it-1.1.0.gem
 - test/helper.rb
 - test/test.mov
 - test/test_chain_io.rb