@@ -24,7 +24,7 @@ class YouTubeG # pair for which the value is non-nil u = '?' item_count = 0 - params.keys.each do |key| + params.keys.sort.each do |key| value = params[key] next if value.nil? lib/youtube_g/request/base_search.rb @@ -6,16 +6,17 @@ class YouTubeG attr_reader :offset # start-index def initialize(params, options={}) + @max_results, @order_by, @offset = nil @url = base_url if params == :favorites @url << "#{options[:user]}/favorites" + set_instance_variables(options) elsif params[:user] @url << "#{params[:user]}/uploads" + set_instance_variables(params) end - set_instance_variables(params) - @url << build_query_params(to_youtube_params) end lib/youtube_g/request/user_search.rb @@ -52,7 +52,6 @@ class TestClient < Test::Unit::TestCase assert_equal 51, response2.offset end - def test_should_get_videos_for_multiword_metasearch_query response = @client.videos_by(:query => 'christina ricci') @@ -132,6 +131,13 @@ class TestClient < Test::Unit::TestCase response = @client.videos_by(:user => 'liz') response.videos.each { |v| assert_valid_video v } end + + def test_should_get_videos_by_user_with_pagination_and_ordering + response = @client.videos_by(:user => 'liz', :page => 2, :per_page => '2', :order_by => 'published') + response.videos.each { |v| assert_valid_video v } + assert_equal 3, response.offset + assert_equal 2, response.max_result_count + end # HTTP 403 Error # def test_should_get_favorite_videos_by_user test/test_client.rb @@ -74,7 +74,7 @@ class TestVideoSearch < Test::Unit::TestCase def test_should_build_url_for_most_viewed_offset_and_max_results_with_time request = YouTubeG::Request::StandardSearch.new(:top_rated, :offset => 5, :max_results => 10, :time => :today) - assert_equal "http://gdata.youtube.com/feeds/api/standardfeeds/top_rated?time=today&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&time=today", request.url end def test_should_raise_exception_for_invalid_type @@ -111,7 +111,7 @@ class TestVideoSearch < Test::Unit::TestCase request = YouTubeG::Request::VideoSearch.new(:query => 'bench press', :categories => { :exclude => [:comedy, :entertainment] }, :max_results => 10) - assert_equal "http://gdata.youtube.com/feeds/api/videos/-/-Comedy/-Entertainment/?vq=bench+press&max-results=10", request.url + assert_equal "http://gdata.youtube.com/feeds/api/videos/-/-Comedy/-Entertainment/?max-results=10&vq=bench+press", request.url end # -- User Queries --------------------------------------------------------------------------------- @@ -121,8 +121,18 @@ class TestVideoSearch < Test::Unit::TestCase assert_equal "http://gdata.youtube.com/feeds/api/users/liz/uploads", request.url end + def test_should_build_url_for_videos_by_user_paginate_and_order + request = YouTubeG::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 + end + def test_should_build_url_for_favorite_videos_by_user request = YouTubeG::Request::UserSearch.new(:favorites, :user => 'liz') assert_equal "http://gdata.youtube.com/feeds/api/users/liz/favorites", request.url end + + def test_should_build_url_for_favorite_videos_by_user_paginate + request = YouTubeG::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 + end end test/test_video_search.rb d7c871c0f720d1bc8604f8a4545ea5353d142ed1 Layton Wedgeworth laytonw@layton.local http://github.com/tmm1/youtube-g/commit/7257f254d731443b85c0ccb119febdba978352de 7257f254d731443b85c0ccb119febdba978352de 2008-08-16T12:58:15-07:00 2008-08-16T12:58:15-07:00 Added test for UserSearch pagination, Made URL param building determenistic by sorting param keys 252516b4d6993a9508bf1ec31e9e1b90000596bb Layton Wedgeworth laytonw@layton.local