youtube_it 1.2.10 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.10
+1.3.0

data/lib/youtube_it/client.rb

@@ -12,7 +12,7 @@ class YouTubeIt
         @client_id             = hash_options[:client_id] || "youtube_it"
         @legacy_debug_flag     = hash_options[:debug]
       else
-        puts "* warning: the method YouTubeIt::Client.new(user, passwd, dev_key) is depricated, use YouTubeIt::Client.new(:username => 'user', :password => 'passwd', :dev_key => 'dev_key')"
+        puts "* warning: the method YouTubeIt::Client.new(user, passwd, dev_key) is deprecated, use YouTubeIt::Client.new(:username => 'user', :password => 'passwd', :dev_key => 'dev_key')"
         @user               = params.shift
         @pass               = params.shift
         @dev_key            = params.shift

data/lib/youtube_it/model/rating.rb

@@ -12,6 +12,12 @@ class YouTubeIt
       
       # *Fixnum*:: Indicates how many people have rated the video
       attr_reader :rater_count
+
+      # *Fixnum*:: Indicates how many people likes this video
+      attr_reader :likes
+
+      # *Fixnum*:: Indicates how many people dislikes this video
+      attr_reader :dislikes
     end
   end
 end

data/lib/youtube_it/parser.rb

@@ -106,10 +106,25 @@ class YouTubeIt
                      :name => author_element.elements["name"].text,
                      :uri => author_element.elements["uri"].text)
         end
-
         media_group = entry.elements["media:group"]
-        description = media_group.elements["media:description"].text
-        duration = media_group.elements["yt:duration"].attributes["seconds"].to_i
+
+        # if content is not available on certain region, there is no media:description, media:player or yt:duration
+        description = ""
+        unless media_group.elements["media:description"].nil?
+          description = media_group.elements["media:description"].text
+        end
+
+        # if content is not available on certain region, there is no media:description, media:player or yt:duration
+        duration = 0
+        unless media_group.elements["yt:duration"].nil?
+          duration = media_group.elements["yt:duration"].attributes["seconds"].to_i
+        end
+
+        # if content is not available on certain region, there is no media:description, media:player or yt:duration
+        player_url = ""
+        unless media_group.elements["media:player"].nil?
+          player_url = media_group.elements["media:player"].attributes["url"]
+        end
 
         unless media_group.elements["yt:aspectRatio"].nil?
           widescreen = media_group.elements["yt:aspectRatio"].text == 'widescreen' ? true : false
@@ -120,8 +135,6 @@ class YouTubeIt
           media_content << parse_media_content(mce)
         end
 
-        player_url = media_group.elements["media:player"].attributes["url"]
-
         # parse thumbnails
         thumbnails = []
         media_group.elements.each("media:thumbnail") do |thumb_element|
@@ -134,13 +147,23 @@ class YouTubeIt
         end
 
         rating_element = entry.elements["gd:rating"]
+        extended_rating_element = entry.elements["yt:rating"]
+
         rating = nil
         if rating_element
-          rating = YouTubeIt::Model::Rating.new(
-                     :min => rating_element.attributes["min"].to_i,
-                     :max => rating_element.attributes["max"].to_i,
-                     :rater_count => rating_element.attributes["numRaters"].to_i,
-                     :average => rating_element.attributes["average"].to_f)
+          rating_values = {
+            :min => rating_element.attributes["min"].to_i,
+            :max => rating_element.attributes["max"].to_i,
+            :rater_count => rating_element.attributes["numRaters"].to_i,
+            :average => rating_element.attributes["average"].to_f
+          }
+
+          if extended_rating_element
+            rating_values[:likes] = extended_rating_element.attributes["numLikes"].to_i,
+            rating_values[:dislikes] = extended_rating_element.attributes["numDislikes"].to_i
+          end
+
+          rating = YouTubeIt::Model::Rating.new(rating_values)
         end
 
         if (el = entry.elements["yt:statistics"])

data/lib/youtube_it/request/standard_search.rb

@@ -32,7 +32,8 @@ class YouTubeIt
           'max-results' => @max_results,
           'orderby' => @order_by,
           'start-index' => @offset,
-          'time' => @time
+          'time' => @time,
+          'v' => 2
         }
       end
     end

data/lib/youtube_it/request/user_search.rb

@@ -34,7 +34,8 @@ class YouTubeIt
         {
           'max-results' => @max_results,
           'orderby' => @order_by,
-          'start-index' => @offset
+          'start-index' => @offset,
+          'v' => 2
         }
       end
     end

data/lib/youtube_it/request/video_search.rb

@@ -28,7 +28,7 @@ class YouTubeIt
         @dev_key = params[:dev_key] if params[:dev_key]
 
         # Return a single video (base_url + /T7YazwP8GtY)
-        return @url << "/" << params[:video_id] if params[:video_id]
+        return @url << "/" << params[:video_id] << "?v=2" if params[:video_id]
 
         @url << "/-/" if (params[:categories] || params[:tags])
         @url << categories_to_params(params.delete(:categories)) if params[:categories]
@@ -54,7 +54,8 @@ class YouTubeIt
           'max-results' => @max_results,
           'orderby' => @order_by,
           'start-index' => @offset,
-          'vq' => @query,
+          'v' => 2,
+          'q' => @query,
           'alt' => @response_format,
           'format' => @video_format,
           'racy' => @racy,

data/lib/youtube_it/request/video_upload.rb

@@ -414,8 +414,6 @@ class YouTubeIt
           response = @access_token.get("http://gdata.youtube.com/feeds/api/users/default")
         end
 
-puts "========= response body #{response.body}"
-puts "========= response body #{response.to_yaml}"
         raise_on_faulty_response(response)
         REXML::Document.new(response.body).elements["entry"].elements['author'].elements['name'].text
       end
@@ -474,8 +472,8 @@ puts "========= response body #{response.to_yaml}"
 
       def raise_on_faulty_response(response)
         response_code = response.code.to_i
-        #if response_code == 403 || response_code == 401
-        if response_code / 10 == 40
+        if response_code == 403 || response_code == 401
+        #if response_code / 10 == 40
           raise AuthenticationError, response.body[/<TITLE>(.+)<\/TITLE>/, 1]
         elsif response_code / 10 != 20 # Response in 20x means success
           raise UploadError, parse_upload_error_from(response.body.gsub(/\n/,''))

data/test/test_client.rb

@@ -16,7 +16,7 @@ class TestClient < Test::Unit::TestCase
   def test_should_respond_to_a_basic_query
     response = @client.videos_by(:query => "penguin")
   
-    assert_equal "http://gdata.youtube.com/feeds/api/videos", response.feed_id
+    assert_equal "tag:youtube.com,2008:videos", response.feed_id
     assert_equal 25, response.max_result_count
     assert_equal 25, response.videos.length
     assert_equal 1, response.offset
@@ -29,7 +29,7 @@ class TestClient < Test::Unit::TestCase
     def test_should_respond_to_a_basic_query_with_offset_and_max_results
     response = @client.videos_by(:query => "penguin", :offset => 15, :max_results => 30)
   
-    assert_equal "http://gdata.youtube.com/feeds/api/videos", response.feed_id
+    assert_equal "tag:youtube.com,2008:videos", response.feed_id
     assert_equal 30, response.max_result_count
     assert_equal 30, response.videos.length
     assert_equal 15, response.offset
@@ -41,17 +41,17 @@ class TestClient < Test::Unit::TestCase
   
   def test_should_respond_to_a_basic_query_with_paging
     response = @client.videos_by(:query => "penguin")
-    assert_equal "http://gdata.youtube.com/feeds/api/videos", response.feed_id
+    assert_equal "tag:youtube.com,2008:videos", response.feed_id
     assert_equal 25, response.max_result_count
     assert_equal 1, response.offset
   
       response = @client.videos_by(:query => "penguin", :page => 2)
-    assert_equal "http://gdata.youtube.com/feeds/api/videos", response.feed_id
+    assert_equal "tag:youtube.com,2008:videos", response.feed_id
     assert_equal 25, response.max_result_count
     assert_equal 26, response.offset
   
     response2 = @client.videos_by(:query => "penguin", :page => 3)
-    assert_equal "http://gdata.youtube.com/feeds/api/videos", response2.feed_id
+    assert_equal "tag:youtube.com,2008:videos", response2.feed_id
     assert_equal 25, response2.max_result_count
     assert_equal 51, response2.offset
   end
@@ -59,7 +59,7 @@ class TestClient < Test::Unit::TestCase
   def test_should_get_videos_for_multiword_metasearch_query
     response = @client.videos_by(:query => 'christina ricci')
   
-    assert_equal "http://gdata.youtube.com/feeds/api/videos", response.feed_id
+    assert_equal "tag:youtube.com,2008:videos", response.feed_id
     assert_equal 25, response.max_result_count
     assert_equal 25, response.videos.length
     assert_equal 1, response.offset
@@ -139,7 +139,7 @@ class TestClient < Test::Unit::TestCase
   
   def test_should_get_favorite_videos_by_user
     response = @client.videos_by(:favorites, :user => 'drnicwilliams')
-    assert_equal "http://gdata.youtube.com/feeds/api/users/drnicwilliams/favorites", response.feed_id
+    assert_equal "tag:youtube.com,2008:user:drnicwilliams:favorites", response.feed_id
     response.videos.each { |v| assert_valid_video v }
   end
   

data/test/test_video_search.rb

@@ -4,79 +4,79 @@ class TestVideoSearch < Test::Unit::TestCase
 
   def test_should_build_basic_query_url
     request = YouTubeIt::Request::VideoSearch.new(:query => "penguin")
-    assert_equal "http://gdata.youtube.com/feeds/api/videos?vq=penguin", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos?q=penguin&v=2", request.url
   end
 
   def test_should_build_multiword_metasearch_query_url
     request = YouTubeIt::Request::VideoSearch.new(:query => 'christina ricci')
-    assert_equal "http://gdata.youtube.com/feeds/api/videos?vq=christina+ricci", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos?q=christina+ricci&v=2", request.url
   end
 
   def test_should_build_video_id_url
     request = YouTubeIt::Request::VideoSearch.new(:video_id => 'T7YazwP8GtY')
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/T7YazwP8GtY", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/T7YazwP8GtY?v=2", request.url
   end
 
-  def test_should_build_one_tag_querl_url
+  def test_should_build_one_tag_query_url
     request = YouTubeIt::Request::VideoSearch.new(:tags => ['panther'])
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/panther/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/panther/?v=2", request.url
   end
 
   def test_should_build_multiple_tags_query_url
     request = YouTubeIt::Request::VideoSearch.new(:tags => ['tiger', 'leopard'])
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/tiger/leopard/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/tiger/leopard/?v=2", request.url
   end
 
   def test_should_build_one_category_query_url
     request = YouTubeIt::Request::VideoSearch.new(:categories => [:news])
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News/?v=2", request.url
   end
 
   def test_should_build_multiple_categories_query_url
     request = YouTubeIt::Request::VideoSearch.new(:categories => [:news, :sports])
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News/Sports/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News/Sports/?v=2", request.url
   end
 
   def test_should_build_categories_and_tags_query_url
     request = YouTubeIt::Request::VideoSearch.new(:categories => [:news, :sports], :tags => ['soccer', 'football'])
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News/Sports/soccer/football/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News/Sports/soccer/football/?v=2", request.url
   end
 
   def test_should_build_categories_and_tags_url_with_max_results
     request = YouTubeIt::Request::VideoSearch.new(:categories => [:music], :tags => ['classic', 'rock'], :max_results => 2)
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/Music/classic/rock/?max-results=2", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/Music/classic/rock/?max-results=2&v=2", request.url
   end
 
   def test_should_build_author_query_url
     request = YouTubeIt::Request::VideoSearch.new(:author => "davidguetta")
-    assert_equal "http://gdata.youtube.com/feeds/api/videos?author=davidguetta", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos?author=davidguetta&v=2", request.url
   end
 
   def test_should_build_language_query_url
     request = YouTubeIt::Request::VideoSearch.new(:query => 'christina ricci', :lang => 'pt')
-    assert_equal "http://gdata.youtube.com/feeds/api/videos?lr=pt&vq=christina+ricci", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos?lr=pt&q=christina+ricci&v=2", request.url
   end
 
   # -- Standard Feeds --------------------------------------------------------------------------------
 
   def test_should_build_url_for_most_viewed
     request = YouTubeIt::Request::StandardSearch.new(:most_viewed)
-    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed?v=2", request.url
   end
 
   def test_should_build_url_for_top_rated_for_today
     request = YouTubeIt::Request::StandardSearch.new(:top_rated, :time => :today)
-    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?time=today", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?time=today&v=2", request.url
   end
 
   def test_should_build_url_for_most_viewed_offset_and_max_results_without_time
     request = YouTubeIt::Request::StandardSearch.new(:top_rated, :offset => 5, :max_results => 10)
-    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?max-results=10&start-index=5", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?max-results=10&start-index=5&v=2", request.url
   end
 
   def test_should_build_url_for_most_viewed_offset_and_max_results_with_time
     request = YouTubeIt::Request::StandardSearch.new(:top_rated, :offset => 5, :max_results => 10, :time => :today)
-    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?max-results=10&start-index=5&time=today", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?max-results=10&start-index=5&time=today&v=2", request.url
   end
 
   def test_should_raise_exception_for_invalid_type
@@ -89,53 +89,52 @@ class TestVideoSearch < Test::Unit::TestCase
 
   def test_should_build_url_for_boolean_or_case_for_categories
     request = YouTubeIt::Request::VideoSearch.new(:categories => { :either => [:news, :sports] })
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/?v=2", request.url
   end
 
   def test_should_build_url_for_boolean_or_and_exclude_case_for_categories
     request = YouTubeIt::Request::VideoSearch.new(:categories => { :either => [:news, :sports], :exclude => [:comedy] })
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/-Comedy/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/-Comedy/?v=2", request.url
   end
 
   def test_should_build_url_for_exclude_case_for_tags
     request = YouTubeIt::Request::VideoSearch.new(:categories => { :either => [:news, :sports], :exclude => [:comedy] },
                                                  :tags => { :include => ['football'], :exclude => ['soccer'] })
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/-Comedy/football/-soccer/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/-Comedy/football/-soccer/?v=2", request.url
   end
 
   def test_should_build_url_for_either_case_for_tags
     request = YouTubeIt::Request::VideoSearch.new(:categories => { :either => [:news, :sports], :exclude => [:comedy] },
                                                  :tags => { :either => ['soccer', 'football', 'donkey'] })
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/-Comedy/soccer%7Cfootball%7Cdonkey/", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/News%7CSports/-Comedy/soccer%7Cfootball%7Cdonkey/?v=2", request.url
   end
 
   def test_should_build_url_for_query_search_with_categories_excluded
     request = YouTubeIt::Request::VideoSearch.new(:query => 'bench press',
                                                  :categories => { :exclude => [:comedy, :entertainment] },
                                                  :max_results => 10)
-    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/-Comedy/-Entertainment/?max-results=10&vq=bench+press", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/videos/-/-Comedy/-Entertainment/?max-results=10&q=bench+press&v=2", request.url
   end
 
   # -- User Queries ---------------------------------------------------------------------------------
 
   def test_should_build_url_for_videos_by_user
     request = YouTubeIt::Request::UserSearch.new(:user => 'liz')
-    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/uploads", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/uploads?v=2", request.url
   end
 
   def test_should_build_url_for_videos_by_user_paginate_and_order
     request = YouTubeIt::Request::UserSearch.new(:user => 'liz', :offset => 20, :max_results => 10, :order_by => 'published')
-    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/uploads?max-results=10&orderby=published&start-index=20", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/uploads?max-results=10&orderby=published&start-index=20&v=2", request.url
   end
 
   def test_should_build_url_for_favorite_videos_by_user
     request = YouTubeIt::Request::UserSearch.new(:favorites, :user => 'liz')
-    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/favorites", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/favorites?v=2", request.url
   end
 
   def test_should_build_url_for_favorite_videos_by_user_paginate
     request = YouTubeIt::Request::UserSearch.new(:favorites, :user => 'liz', :offset => 20, :max_results => 10)
-    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/favorites?max-results=10&start-index=20", request.url
+    assert_equal "http://gdata.youtube.com/feeds/api/users/liz/favorites?max-results=10&start-index=20&v=2", request.url
   end
 end
-

data/youtube_it.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{youtube_it}
-  s.version = "1.2.10"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["chebyte", "kylejginavan"]
-  s.date = %q{2011-02-02}
+  s.date = %q{2011-02-22}
   s.description = %q{Upload, delete, update, comment on youtube videos all from one gem.}
   s.email = %q{kylejginavan@gmail.com}
   s.extra_rdoc_files = [
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
     "lib/youtube_it/request/video_upload.rb",
     "lib/youtube_it/response/video_search.rb",
     "lib/youtube_it/version.rb",
-    "pkg/youtube_it-1.2.9.gem",
     "test/helper.rb",
     "test/test.mov",
     "test/test_chain_io.rb",
@@ -54,7 +53,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/kylejginavan/youtube_it}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{The most complete Ruby wrapper for youtube api's}
   s.test_files = [
     "test/helper.rb",
@@ -65,7 +64,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: youtube_it
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 10
-  version: 1.2.10
+  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors: 
 - chebyte
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -06:00
+date: 2011-02-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 4
         version: 0.4.4
   type: :runtime
   version_requirements: *id001
@@ -41,8 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -82,7 +72,6 @@ files:
 - lib/youtube_it/request/video_upload.rb
 - lib/youtube_it/response/video_search.rb
 - lib/youtube_it/version.rb
-- pkg/youtube_it-1.2.9.gem
 - test/helper.rb
 - test/test.mov
 - test/test_chain_io.rb
@@ -104,21 +93,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: The most complete Ruby wrapper for youtube api's