youtube_search 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    youtube_search (0.1.0)
+    youtube_search (0.1.1)
 
 GEM
   remote: http://rubygems.org/

data/Readme.md

@@ -25,10 +25,24 @@ Usage
       ...
     }
 
+page / per_page are supported
+
+    YoutubeSearch.search('cats', :page => 10, :per_page => 4).first
+
+and [standard youtube options](http://code.google.com/apis/youtube/2.0/developers_guide_protocol.html#Standard_parameters)
+
+    YoutubeSearch.search('cats', :page => 10, :per_page => 4).first
+
+I can haz iframe:
+
+    # DISCLAIMER this iframe may steal 4 minutes of your life ;)
+    id = YoutubeSearch.search('lolcats').first['video_id']
+    %{<iframe src="http://www.youtube.com/embed/#{id}" width=640 height=480 frameborder=0></iframe>}
+
 TODO
 ====
  - more detailed xml parsing (atm only name and value is read)
- - parse dates into objects
+ - parse dates into ruby objects
 
 
 Author

data/lib/youtube_search/version.rb

@@ -1,3 +1,3 @@
 module YoutubeSearch
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/youtube_search.rb

@@ -3,8 +3,10 @@ require 'cgi'
 require 'open-uri'
 
 module YoutubeSearch
-  def self.search(query)
-    xml = open("http://gdata.youtube.com/feeds/api/videos/-/#{CGI.escape(query)}").read
+  def self.search(query, options={})
+    options = options_with_per_page_and_page(options)
+    query = options.merge(:q => query).map{|k,v| "#{CGI.escape k.to_s}=#{CGI.escape v.to_s}" }.join('&')
+    xml = open("http://gdata.youtube.com/feeds/api/videos?#{query}").read
     parse(xml)
   end
 
@@ -21,4 +23,21 @@ module YoutubeSearch
     end
     entries
   end
+
+  private
+
+  def self.options_with_per_page_and_page(options)
+    options = options.dup
+    if per_page = options.delete(:per_page)
+      options['max-results'] = per_page
+    else
+      per_page = options['max-results']
+    end
+
+    if per_page and page = options.delete(:page)
+      options['start-index'] = per_page.to_i * ([page.to_i, 1].max - 1)
+    end
+
+    options
+  end
 end

data/spec/youtube_search_spec.rb

@@ -5,26 +5,64 @@ describe YoutubeSearch do
     YoutubeSearch::VERSION.should =~ /^[\.\da-z]+$/
   end
 
-  it "can parse xml" do
-    # convert to array so we get a nice diff in case of errors
-    YoutubeSearch.parse(File.read('spec/fixtures/search_boat.xml')).first.sort.should == [
-      ["author",nil],
-      ["category", nil],
-      ["comments",nil],
-      ["content","Top YouTube Videos on tubecrunch.blogspot.com A killer whale swims right up to a boat and shows off his best sounding motor impression."],
-      ["group", nil],
-      ["id","http://gdata.youtube.com/feeds/api/videos/0b2U5r7Jwkc"],
-      ["link",nil],
-      ["published","2011-09-29T15:30:43.000Z"],
-      ["rating", nil],
-      ["statistics",nil],
-      ["title","Killer Whale Imitates Boat Motor"],
-      ["updated","2011-10-14T07:40:00.000Z"],
-      ["video_id", "0b2U5r7Jwkc"],
-    ]
+  describe 'parse' do
+    it "can parse xml" do
+      # convert to array so we get a nice diff in case of errors
+      YoutubeSearch.parse(File.read('spec/fixtures/search_boat.xml')).first.sort.should == [
+        ["author",nil],
+        ["category", nil],
+        ["comments",nil],
+        ["content","Top YouTube Videos on tubecrunch.blogspot.com A killer whale swims right up to a boat and shows off his best sounding motor impression."],
+        ["group", nil],
+        ["id","http://gdata.youtube.com/feeds/api/videos/0b2U5r7Jwkc"],
+        ["link",nil],
+        ["published","2011-09-29T15:30:43.000Z"],
+        ["rating", nil],
+        ["statistics",nil],
+        ["title","Killer Whale Imitates Boat Motor"],
+        ["updated","2011-10-14T07:40:00.000Z"],
+        ["video_id", "0b2U5r7Jwkc"],
+      ]
+    end
   end
 
-  it "can search" do
-    YoutubeSearch.search('boat').size.should == 25
+  describe 'search' do
+    it "can search" do
+      YoutubeSearch.search('boat').size.should == 25
+    end
+
+    it "can search for complex examples" do
+      YoutubeSearch.search('Left 4 Dead 2').size.should == 25
+    end
+
+    it "can search with options" do
+      YoutubeSearch.search('Left 4 Dead 2', 'max-results' => 2).size.should == 2
+    end
+
+    it "can search with :per_page" do
+      YoutubeSearch.search('Left 4 Dead 2', :per_page => 2).size.should == 2
+    end
+  end
+
+  describe 'options_with_per_page_and_page' do
+    it "converts :page and :per_page" do
+      YoutubeSearch.send(:options_with_per_page_and_page, {:page => 2, :per_page => 4}).should ==
+        {"max-results"=>4, "start-index"=>4}
+    end
+
+    it "assumes page 1 for nil/0 page" do
+      YoutubeSearch.send(:options_with_per_page_and_page, {:page => '', :per_page => 4}).should ==
+        {"max-results"=>4, "start-index"=>0}
+    end
+
+    it "uses :page + max-results" do
+      YoutubeSearch.send(:options_with_per_page_and_page, {:page => 2, 'max-results' => 4}).should ==
+        {"max-results"=>4, "start-index"=>4}
+    end
+
+    it "uses start-index + :per_page" do
+      YoutubeSearch.send(:options_with_per_page_and_page, {'start-index' => 2, :per_page => 4}).should ==
+        {"max-results"=>4, "start-index"=>2}
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: youtube_search
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Grosser