youtube_it 2.1.5 → 2.1.7

data/README.rdoc

@@ -36,6 +36,8 @@ You can see to youtube_it in action here: http://youtube-it.heroku.com
 
 == ESTABLISHING A CLIENT
 
+Important: The Account Authentication API for OAuth 1.0, AuthSub and Client Login has been officially deprecated as of April 20, 2012. It will continue to work as per our deprecation policy(https://developers.google.com/accounts/terms), but we encourage you to migrate to OAuth 2.0 authentication as soon as possible. If you are building a new application, you should use OAuth 2.0 authentication.
+
 Creating a client:
   $ require 'youtube_it'
   $ client = YouTubeIt::Client.new
@@ -60,6 +62,8 @@ If your access token is still valid (be careful, access tokens may only be valid
 
   $ client.refresh_access_token!
 
+* You can see more about oauth 2 in the wiki: https://github.com/kylejginavan/youtube_it/wiki/How-To:-Use-OAuth-2
+
 == PROFILES
   you can use multiple profiles in the same account like that
 
@@ -208,7 +212,7 @@ Add Video To Playlist:
   $ client.add_video_to_playlist(playlist_id, video_id)
 
 Remove Video From Playlist:
-  $ client.remove_video_from_playlist(playlist_id, playlist_entry_id)
+  $ client.delete_video_from_playlist(playlist_id, playlist_entry_id)
 
 Select All Videos From your Watch Later Playlist:
   $ watcher_later = client.watcherlater(user) #default: current user
@@ -218,7 +222,7 @@ Add Video To Watcher Later Playlist:
   $ client.add_video_to_watchlater(video_id)
 
 Remove Video From Watch Later Playlist:
-  $ client.remove_video_from_watchlater(watchlater_entry_id)
+  $ client.delete_video_from_watchlater(watchlater_entry_id)
 
 
 List Related Videos

data/lib/youtube_it/client.rb

@@ -291,6 +291,7 @@ class YouTubeIt
 
   class AuthSubClient < Client
     def initialize *params
+      puts "* AuthSubClient will be deprecated. Use OAuth2 Client."
       if params.first.is_a?(Hash)
         hash_options = params.first
         @authsub_token                 = hash_options[:token]
@@ -310,9 +311,11 @@ class YouTubeIt
       response = nil
       session_token_url = "/accounts/AuthSubSessionToken"
 
-      http_connection do |session|
-        response = session.get2('https://%s' % session_token_url,session_token_header).body
-      end
+      response = http_connection.get do |req|
+        req.url session_token_url
+        req.headers = session_token_header
+      end.body
+
       @authsub_token = response.sub('Token=','')
     end
 
@@ -320,9 +323,11 @@ class YouTubeIt
       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 = http_connection.get do |req|
+        req.url session_token_url
+        req.headers = session_token_header
+      end.status
+      
       response.to_s == '200' ? true : false
     end
 
@@ -330,10 +335,12 @@ class YouTubeIt
       response = nil
       session_token_url = "/accounts/AuthSubTokenInfo"
 
-      http_connection do |session|
-        response = session.get2('https://%s' % session_token_url,session_token_header)
+      response = http_connection.get do |req|
+        req.url session_token_url
+        req.headers = session_token_header
       end
-      {:code => response.code, :body => response.body }
+      
+      {:code => response.status, :body => response.body }
     end
 
     private
@@ -349,16 +356,18 @@ class YouTubeIt
       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)
+        Faraday.new(:url => 'https://www.google.com', :ssl => {:verify => false}) do |builder|
+          builder.request  :url_encoded
+          builder.response :logger if @legacy_debug_flag
+          builder.adapter  Faraday.default_adapter
         end
       end
+      
   end
 
   class OAuthClient < Client
     def initialize *params
+      puts "* OAuth 1.0 Client will be deprecated. Use OAuth2 Client."
       if params.first.is_a?(Hash)
         hash_options = params.first
         @consumer_key                  = hash_options[:consumer_key]
@@ -444,13 +453,16 @@ class YouTubeIt
       @client_token_expires_at = options[:client_token_expires_at]
       @dev_key                 = options[:dev_key]
       @legacy_debug_flag       = options[:debug]
+      @connection_opts         = options[:connection_opts]   
     end
 
     def oauth_client
-      @oauth_client ||= ::OAuth2::Client.new(@client_id, @client_secret,
-                                             :site => "https://accounts.google.com",
-                                             :authorize_url => '/o/oauth2/auth',
-                                             :token_url => '/o/oauth2/token')
+      options = {:site => "https://accounts.google.com",
+        :authorize_url => '/o/oauth2/auth',
+        :token_url => '/o/oauth2/token'
+       }
+      options.merge(:connection_opts => @connection_opts) if @connection_opts
+      @oauth_client ||= ::OAuth2::Client.new(@client_id, @client_secret, options)
     end
     
     def access_token

data/lib/youtube_it/middleware/faraday_youtubeit.rb

@@ -1,19 +1,20 @@
 module Faraday
   class Response::YouTubeIt < Response::Middleware
     def parse_upload_error_from(string)
-      begin
-        REXML::Document.new(string).elements["//errors"].inject('') do | all_faults, error|
-          if error.elements["internalReason"]
-            msg_error = error.elements["internalReason"].text
-          elsif error.elements["location"]
-            msg_error = error.elements["location"].text[/media:group\/media:(.*)\/text\(\)/,1]
+      xml = Nokogiri::XML(string).at('errors')
+      if xml
+        xml.css("error").inject('') do |all_faults, error|
+          if error.at("internalReason")
+            msg_error = error.at("internalReason").text
+          elsif error.at("location")
+            msg_error = error.at("location").text[/media:group\/media:(.*)\/text\(\)/,1]
           else
             msg_error = "Unspecified error"
           end
-          code = error.elements["code"].text if error.elements["code"]
+          code = error.at("code").text if error.at("code")
           all_faults + sprintf("%s: %s\n", msg_error, code)
         end
-      rescue
+      else
         string[/<TITLE>(.+)<\/TITLE>/, 1] || string
       end
     end

data/lib/youtube_it/model/video.rb

@@ -82,6 +82,9 @@ class YouTubeIt
       # *Time*:: When the video's was uploaded.
       attr_reader :uploaded_at
 
+      # *Time*:: When the video's was recorded.
+      attr_reader :recorded_at
+
       # *Array*:: A array of YouTubeIt::Model::Category objects that describe the videos categories.
       attr_reader :categories
 

data/lib/youtube_it/parser.rb

@@ -17,6 +17,11 @@ class YouTubeIt
         parse_content @content
       end
 
+      def parse_single_entry
+        doc = Nokogiri::XML(@content)
+        parse_entry(doc.at("entry") || doc)
+      end
+
       def parse_videos
         doc = Nokogiri::XML(@content)
         videos = []
@@ -72,7 +77,7 @@ class YouTubeIt
 
       def parse_content(content)
         xml = Nokogiri::XML(content.body)
-        entry = xml.at("entry") || xml.at("feed")
+        entry = xml.at("feed") || xml.at("entry")
         YouTubeIt::Model::Playlist.new(
           :title         => entry.at("title") && entry.at("title").text,
           :summary       => ((entry.at("summary") || entry.at_xpath("media:group").at_xpath("media:description")).text rescue nil),
@@ -376,6 +381,7 @@ class YouTubeIt
         published_at = entry.at("published") ? Time.parse(entry.at("published").text) : nil
         uploaded_at = entry.at_xpath("media:group/yt:uploaded") ? Time.parse(entry.at_xpath("media:group/yt:uploaded").text) : nil
         updated_at = entry.at("updated") ? Time.parse(entry.at("updated").text) : nil
+        recorded_at = entry.at_xpath("yt:recorded") ? Time.parse(entry.at_xpath("yt:recorded").text) : nil
 
         # parse the category and keyword lists
         categories = []
@@ -479,7 +485,6 @@ class YouTubeIt
 
         comment_feed = entry.at_xpath('gd:comments/gd:feedLink[@rel="http://gdata.youtube.com/schemas/2007#comments"]')
         comment_count = comment_feed ? comment_feed['countHint'].to_i : 0
-        #puts comment_count.inspect
 
         access_control = entry.xpath('yt:accessControl').map do |e|
           { e['action'] => e['permission'] }
@@ -515,6 +520,7 @@ class YouTubeIt
           :published_at   => published_at,
           :updated_at     => updated_at,
           :uploaded_at    => uploaded_at,
+          :recorded_at    => recorded_at,
           :categories     => categories,
           :keywords       => keywords,
           :title          => title,

data/lib/youtube_it/request/video_search.rb

@@ -25,6 +25,8 @@ class YouTubeIt
       attr_reader :uploader
       attr_reader :region
       attr_reader :paid_content
+      attr_reader :location
+      attr_reader :location_radius
       
       
       def initialize(params={})
@@ -35,7 +37,7 @@ class YouTubeIt
         @response_format, @video_format,
         @safe_search, @author, @lang,
         @duration, @time, @hd, @caption,
-        @uploader, @region, @paid_content = nil
+        @uploader, @region, @location, @location_radius, @paid_content = nil
         @url = base_url
         @dev_key = params[:dev_key] if params[:dev_key]
 
@@ -80,6 +82,8 @@ class YouTubeIt
           'hd' => @hd,
           'caption' => @caption,
           'region' => @region,
+          'location' => @location,
+          'location-radius' => @location_radius,
           'paid-content' => @paid_content,
           'uploader' => @uploader
         }

data/lib/youtube_it/request/video_upload.rb

@@ -195,8 +195,8 @@ class YouTubeIt
         comment_body = comment_xml_for(:comment => comment, :reply_to => reply_to_url(video_id, reply_to))
         comment_url  = "/feeds/api/videos/%s/comments" % video_id
         response     = yt_session.post(comment_url, comment_body)
-
-        return {:code => response.status, :body => response.body}
+        comment = YouTubeIt::Parser::CommentsFeedParser.new(response.body).parse_single_entry
+        return {:code => response.status, :body => response.body, :comment => comment}
       end
 
       def delete_comment(video_id, comment_id)
@@ -238,26 +238,26 @@ class YouTubeIt
       def profiles(usernames_to_fetch)
         usernames_to_fetch.each_slice(50).map do |usernames|
           post = Nokogiri::XML <<-BATCH
-              <?xml version="1.0" encoding="UTF-8"?>
-              <feed xmlns='http://www.w3.org/2005/Atom'
-                    xmlns:media='http://search.yahoo.com/mrss/'
-                    xmlns:batch='http://schemas.google.com/gdata/batch'
-                    xmlns:yt='http://gdata.youtube.com/schemas/2007'>
-                <batch:operation type="query" />
+              <feed 
+                xmlns='http://www.w3.org/2005/Atom'
+                xmlns:media='http://search.yahoo.com/mrss/'
+                xmlns:batch='http://schemas.google.com/gdata/batch'
+                xmlns:yt='http://gdata.youtube.com/schemas/2007'>
               </feed>
             BATCH
           usernames.each do |username|
             post.at('feed').add_child <<-ENTRY
-              <entry xmlns:batch='http://schemas.google.com/gdata/batch'>
+              <entry>
+                <batch:operation type="query" />
                 <id>#{profile_url(username)}</id>
                 <batch:id>#{username}</batch:id>
               </entry>
             ENTRY
           end
 
-          post_body = ''
+          post_body = StringIO.new('')
           post.write_to( post_body, :indent => 2 )
-          post_body_io = StringIO.new(post_body)
+          post_body_io = StringIO.new(post_body.string)
 
           response = yt_session.post('feeds/api/users/batch', post_body_io )
           YouTubeIt::Parser::BatchProfileFeedParser.new(response).parse
@@ -450,8 +450,9 @@ class YouTubeIt
       end
 
       def parse_upload_error_from(string)
-        begin
-          Nokogiri::XML(string).xpath("//errors").inject('') do | all_faults, error|
+        xml = Nokogiri::XML(string).at('errors')
+        if xml
+          xml.css("error").inject('') do |all_faults, error|
             if error.at("internalReason")
               msg_error = error.at("internalReason").text
             elsif error.at("location")
@@ -462,7 +463,7 @@ class YouTubeIt
             code = error.at("code").text if error.at("code")
             all_faults + sprintf("%s: %s\n", msg_error, code)
           end
-        rescue
+        else
           string[/<TITLE>(.+)<\/TITLE>/, 1] || string
         end
       end

data/lib/youtube_it/version.rb

@@ -1,4 +1,4 @@
 class YouTubeIt
-  VERSION = '2.1.5'
+  VERSION = '2.1.7'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: youtube_it
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70301580031620 !ruby/object:Gem::Requirement
+  requirement: &70273407416220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70301580031620
+  version_requirements: *70273407416220
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70301580031120 !ruby/object:Gem::Requirement
+  requirement: &70273407413640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70301580031120
+  version_requirements: *70273407413640
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70301580030660 !ruby/object:Gem::Requirement
+  requirement: &70273407413140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70301580030660
+  version_requirements: *70273407413140
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70301580030200 !ruby/object:Gem::Requirement
+  requirement: &70273407412680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70301580030200
+  version_requirements: *70273407412680
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70301580029740 !ruby/object:Gem::Requirement
+  requirement: &70273407412060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70301580029740
+  version_requirements: *70273407412060
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70301580029280 !ruby/object:Gem::Requirement
+  requirement: &70273407411540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,7 +78,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301580029280
+  version_requirements: *70273407411540
 description: Upload, delete, update, comment on youtube videos all from one gem.
 email:
 - kylejginavan@gmail.com