mlangenberg-googlesearch 0.2.2 → 0.2.3

data/googlesearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'googlesearch'
-  s.version = '0.2.2'
-  s.date = '2009-01-20'
+  s.version = '0.2.3'
+  s.date = '2009-01-21'
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = false
   s.summary = 'Google CSE implementation'

data/lib/googlesearch/search_page.rb

@@ -1,8 +1,8 @@
 class SearchPage
   #index is zero-based
-  def initialize(index, response_start_index, results_per_page)
+  def initialize(index, index_of_last_result, results_per_page)
     @index = index
-    @response_start_index = response_start_index
+    @index_of_last_result = index_of_last_result
     @results_per_page = results_per_page
   end
   
@@ -15,6 +15,6 @@ class SearchPage
   end
   
   def current_page?
-    start_index == @response_start_index.to_i
+    (@index_of_last_result/@results_per_page) == page_number
   end
 end

data/lib/googlesearch/search_response.rb

@@ -18,7 +18,7 @@ class SearchResponse
   end
   
   def pages
-    @pages ||= number_of_pages.enum_for(:times).collect { |page_index| SearchPage.new(page_index, start_index, requested_number_of_search_results) }
+    @pages ||= number_of_pages.enum_for(:times).collect { |page_index| SearchPage.new(page_index, index_of_last_result, requested_number_of_search_results) }
   end
   
   def current_page
@@ -30,6 +30,7 @@ class SearchResponse
   end
   
   def next_page
+    return nil if pages.empty?
     pages[pages.index(current_page)+1]
   end
 end

data/spec/google_search_spec.rb

@@ -7,7 +7,7 @@ describe GoogleSearch do
       'http://www.google.com/search?&q=adres&client=google-csbe&output=xml_no_dtd&cx=unique-cse-id&cr=lang_nl&lr=lang_nl&start=0&num=10'
     ).and_return('wat_xml')
     
-    SearchResponse.should_receive(:new).with('wat_xml', 10).and_return('search-response-object')
+    SearchResponse.should_receive(:new).with('wat_xml', 10, 0).and_return('search-response-object')
     search = GoogleSearch.new({:cx => 'unique-cse-id', :q => 'adres', :cr => 'nl', :lr => 'nl', :start => 0, :num => 10 }, request_mock)
     search.response.should == 'search-response-object'
   end

data/spec/search_page_spec.rb

@@ -2,27 +2,28 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe SearchPage do
   it "should have page number of 1" do
-    p = SearchPage.new(0, 0, 10)
+    p = SearchPage.new(0, 10, 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, 0, 10)
+    p = SearchPage.new(0, 10, 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, 0, 10)
+    p = SearchPage.new(1, 10, 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)
+  it "should be the current page" do
+    p = SearchPage.new(1, 20, 10)
+    p.page_number.should == 2
     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)
+  it "should not be the current page" do
+    p = SearchPage.new(0, 20, 10)
     p.should_not be_current_page
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mlangenberg-googlesearch
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Rene Heino
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency