mlangenberg-googlesearch 0.0.2 → 0.0.3

data/googlesearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'googlesearch'
-  s.version = '0.0.2'
-  s.date = '2009-01-13'
+  s.version = '0.0.3'
+  s.date = '2009-01-14'
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = false
   s.summary = 'Google CSE implementation'

data/lib/googlesearch/search_response.rb

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 class SearchResponse
   def initialize(xml)
     doc = Nokogiri::XML(xml)

data/lib/googlesearch/search_result.rb

@@ -1,9 +1,11 @@
 class SearchResult
-  attr_reader :url, :index, :title, :excerpt
+  attr_reader :url, :index, :title, :excerpt, :language, :mime_type
   def initialize(doc)
+    @index = doc.attributes["N"].text.to_i
+    @mime_type = doc.attributes["MIME"] ? doc.attributes["MIME"].text : nil
     @url = doc.xpath('U').text
-    @index = doc.attributes["N"].to_i
     @title = doc.xpath('T').text
     @excerpt = doc.xpath('S').text
+    @language = doc.xpath('LANG').text
   end
 end

data/lib/googlesearch.rb

@@ -1,13 +1,16 @@
+require 'rubygems'
 require 'googlesearch/search_response'
 require 'googlesearch/search_result'
 require 'open-uri'
+require 'nokogiri'
+
 
 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]}")
+    @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]}")
   end
 end
 

data/spec/google_search_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe GoogleSearch do
-  it 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'
+      'http://www.google.com/search?&q=adres&client=google-csbe&output=xml&cx=unique-cse-id&cr=lang_nl&lr=lang_nl'
     ).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'}, request_mock)
+    search = GoogleSearch.new({:cx => 'unique-cse-id', :q => 'adres', :cr => 'nl', :lr => 'nl'}, request_mock)
     search.response.should == 'search-response-object'
   end
 end

data/spec/search_response_spec.rb

@@ -15,19 +15,7 @@ describe SearchResponse do
     @response.total_number_of_results.should == 5
   end
   
-  it "should be able to return the first URL of the results" do
-    @response.results.first.url.should == 'http://i3.shop-r.nl/language/nl/pages/39'
-  end
-  
-  it "should be able to return the second index of the results" do
-    @response.results[1].index.should == 2
-  end
-  
-  it "should be able to return the last title of the results" do
-    @response.results.last.title.should == 'caesar - more'
-  end
-  
-  it "should be able to return the third text of the results" do
-    @response.results[2].excerpt.should == %[De &#39;NV <b>Intercodam</b>&#39; is opgericht op 16 september 1919 en handelde in de meest <br>  uiteenlopende producten. In 1972 werd deze NV omgezet in een Beheer B.V. <b>...</b>]
+  it "should be able to return an array of SearchResult objects" do
+     @response.results.map { |r| r.class }.should == [SearchResult]*5
   end
 end

metadata

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