mlangenberg-googlesearch 0.1.0 → 0.2.0

data/googlesearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'googlesearch'
-  s.version = '0.1.0'
+  s.version = '0.2.0'
   s.date = '2009-01-14'
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = false

data/lib/googlesearch/search_page.rb

@@ -1,7 +1,8 @@
 class SearchPage
   #index is zero-based
-  def initialize(index, results_per_page)
+  def initialize(index, response_start_index, results_per_page)
     @index = index
+    @response_start_index = response_start_index
     @results_per_page = results_per_page
   end
   
@@ -12,4 +13,8 @@ class SearchPage
   def start_index
     @index*@results_per_page
   end
+  
+  def current_page?
+    start_index == @response_start_index
+  end
 end

data/lib/googlesearch/search_response.rb

@@ -1,6 +1,8 @@
 class SearchResponse
-  attr_reader :total_server_time, :total_number_of_results, :results, :index_of_first_result, :index_of_last_result, :requested_number_of_search_results
-  def initialize(xml, requested_number_of_search_results=nil)
+  attr_reader :total_server_time, :total_number_of_results, 
+              :results, :index_of_first_result, :index_of_last_result, 
+              :requested_number_of_search_results, :start_index
+  def initialize(xml, requested_number_of_search_results=nil, start_index=nil)
     doc = Nokogiri::XML(xml)
     @total_server_time = doc.root.xpath('TM').text.to_f 
     @index_of_first_result = doc.root.xpath('RES/@SN').text.to_i
@@ -8,6 +10,7 @@ class SearchResponse
     @total_number_of_results = doc.root.xpath('RES/M').text.to_i
     @results = doc.root.xpath('RES//R').map { |res_doc| SearchResult.new(res_doc) }
     @requested_number_of_search_results = requested_number_of_search_results ||= 10
+    @start_index = start_index ||= 0
   end
   
   def number_of_pages
@@ -15,6 +18,18 @@ class SearchResponse
   end
   
   def pages
-    @pages ||= number_of_pages.enum_for(:times).collect { |page_index| SearchPage.new(page_index, requested_number_of_search_results) }
+    @pages ||= number_of_pages.enum_for(:times).collect { |page_index| SearchPage.new(page_index, start_index, requested_number_of_search_results) }
+  end
+  
+  def current_page
+    pages.find { |p| p.current_page? }
+  end
+  
+  def previous_page
+    start_index == 0 ? nil : pages[pages.index(current_page)-1]
+  end
+  
+  def next_page
+    pages[pages.index(current_page)+1]
   end
 end

data/spec/search_page_spec.rb

@@ -2,17 +2,27 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe SearchPage do
   it "should have page number of 1" do
-    p = SearchPage.new(0, 10)
+    p = SearchPage.new(0, 0, 10)
     p.page_number.should == 1
   end
   
   it "should have a start index of 0 when the index is 0" do
-    p = SearchPage.new(0, 10)
+    p = SearchPage.new(0, 0, 10)
     p.start_index.should == 0
   end
   
   it "should have a start index of 10 when the index is 1 and the requested number of results is 10" do
-    p = SearchPage.new(1, 10)
+    p = SearchPage.new(1, 0, 10)
     p.start_index.should == 10
   end
+  
+  it "should know that it is the current page if the given page index equals the start index" do
+    p = SearchPage.new(1, 10, 10)
+    p.should be_current_page
+  end
+  
+  it "should know that it is not the current page if the given page index does not equal the start index" do
+    p = SearchPage.new(0, 10, 10)
+    p.should_not be_current_page
+  end
 end

data/spec/search_response_spec.rb

@@ -23,6 +23,15 @@ describe SearchResponse do
     @response.index_of_last_result.should == 5
   end
   
+  it "should return 5 for the start index" do
+    @response = SearchResponse.new(@example_xml, 0, 5)
+    @response.start_index.should == 5
+  end
+  
+  it "should return 0 for the start index as default" do
+    @response.start_index.should == 0
+  end
+  
   it "should return 5 for the requested number of search results" do
     @response.requested_number_of_search_results.should == 5
   end
@@ -44,4 +53,16 @@ describe SearchResponse do
     @response.pages[0].page_number.should == 1
     @response.pages[0].start_index.should == 0
   end
+  
+  it "should be able to return the current page" do
+    @response.current_page.should == @response.pages[0]
+  end
+  
+  it "should be able to return the next page" do
+    @response.next_page.should == @response.pages[1]
+  end
+  
+  it "should return nil for the previous page" do
+    @response.previous_page.should == nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mlangenberg-googlesearch
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Rene Heino