mlangenberg-googlesearch 0.0.3 → 0.0.4

data/googlesearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'googlesearch'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.date = '2009-01-14'
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = false
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
                   "spec/search_response_spec.rb",
                   "spec/spec_helper.rb",
                   "spec/result_example.xml"]
-  s.add_dependency("nokogiri", ["> 0.0.0"])
+  s.add_dependency("nokogiri", [">= 1.1.1"])
 end
 
 

data/lib/googlesearch/search_response.rb

@@ -1,23 +1,11 @@
 class SearchResponse
+  attr_reader :total_server_time, :total_number_of_results, :results, :index_of_first_result, :index_of_last_result
   def initialize(xml)
     doc = Nokogiri::XML(xml)
-    @tm = doc.root.xpath('TM').text.to_f 
-    @m = doc.root.xpath('RES/M').text.to_i
-    @results = []
-    doc.root.xpath('RES//R').each do |res_doc|
-      @results << SearchResult.new(res_doc)
-    end
-  end
-  
-  def total_server_time
-    @tm
-  end
-  
-  def total_number_of_results
-    @m
-  end
-  
-  def results
-    @results
+    @total_server_time = doc.root.xpath('TM').text.to_f 
+    @index_of_first_result = doc.root.xpath('RES/@SN').text.to_i
+    @index_of_last_result = doc.root.xpath('RES/@EN').text.to_i
+    @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) }
   end
 end

data/lib/googlesearch.rb

@@ -9,8 +9,8 @@ class GoogleSearch
   
   attr_reader :response
   
-  def initialize(options, search_request = SearchRequest.new)
-    @response = SearchResponse.new search_request.get("http://www.google.com/search?&q=#{options[:q]}&client=google-csbe&output=xml&cx=#{options[:cx]}&cr=lang_#{options[:cr]}&lr=lang_#{options[:lr]}")
+  def initialize(o = {}, search_request = SearchRequest.new)
+    @response = SearchResponse.new search_request.get("http://www.google.com/search?&q=#{o[:q]}&client=google-csbe&output=xml_no_dtd&cx=#{o[:cx]}&cr=lang_#{o[:cr]}&lr=lang_#{o[:lr]}&start=#{o[:start]}&num=#{o[:num]}")
   end
 end
 

data/spec/google_search_spec.rb

@@ -4,11 +4,11 @@ describe GoogleSearch do
   it "should be able to create a search query" do
     request_mock = mock('request')
     request_mock.should_receive(:get).with(
-      'http://www.google.com/search?&q=adres&client=google-csbe&output=xml&cx=unique-cse-id&cr=lang_nl&lr=lang_nl'
+      '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').and_return('search-response-object')
-    search = GoogleSearch.new({:cx => 'unique-cse-id', :q => 'adres', :cr => 'nl', :lr => 'nl'}, request_mock)
+    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
 end

data/spec/result_example.xml

@@ -7,7 +7,7 @@
 <PARAM name="output" value="xml" original_value="xml"/>
 <PARAM name="cx" value="unique-cse-id" original_value="unique-cse-id"/>
 <Context><title>Shopr</title></Context><RES SN="1" EN="5">
-<M>5</M>
+<M>520</M>
 <FI/><XT/>
 <R N="1"><U>http://i3.shop-r.nl/language/nl/pages/39</U><UE>http://i3.shop-r.nl/language/nl/pages/39</UE><T>&lt;b&gt;Intercodam&lt;/b&gt; Tegels B.V.</T><RK>0</RK><S>&lt;b&gt;Intercodam&lt;/b&gt; B.V.. Amstel 135 (vlak naast theater Carre) 1018 EN Amsterdam &lt;b&gt;...&lt;/b&gt; &lt;br&gt;  &lt;b&gt;Intercodam&lt;/b&gt; Tegels B.V. 2008. Aenean eget mi. Fusce mattis est id diam. &lt;b&gt;...&lt;/b&gt;</S><LANG>nl</LANG><Label>_cse_4a4weggqfu8</Label><HAS><L/><C SZ="7k" CID="sleD4FLqURwJ"/><RT/></HAS></R>
 

data/spec/search_response_spec.rb

@@ -12,7 +12,15 @@ describe SearchResponse do
   end
   
   it "should be able to return total number of results" do
-    @response.total_number_of_results.should == 5
+    @response.total_number_of_results.should == 520
+  end
+  
+  it "should be able to return the index of the first search result returned in the result set" do
+    @response.index_of_first_result.should == 1
+  end
+  
+  it "should be able to return the index of the last search result returned in the result set" do
+    @response.index_of_last_result.should == 5
   end
   
   it "should be able to return an array of SearchResult objects" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mlangenberg-googlesearch
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Rene Heino
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 1.1.1
     version: 
 description: Abstraction of the Google CSE XML API
 email: rails@newminds.nl