mlangenberg-googlesearch 0.3.0 → 1.0.0

data/googlesearch.gemspec

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

data/lib/googlesearch.rb

@@ -10,6 +10,7 @@ require 'nokogiri'
 class GoogleSearch
   
   attr_reader :response
+  attr_reader :url
   
   def initialize(o = {}, search_request = SearchRequest.new)
 
@@ -90,15 +91,15 @@ class GoogleSearch
     # Optional. The c2coff parameter enables or disables the Simplified and Traditional Chinese Search feature. 
     
     
-    o[:client] ||= "google-csbe"
+    #o[:client] ||= "google-csbe"
     # Required!!! The client parameter must be set to google-csbe if you use Google Custom Search Service.
     
     
-    o[:cr] = "lang_#{o[:cr]}" if o[:cr]
+    #o[:cr] = "country#{o[:cr].upcase}" if o[:cr]
     # Optional. The cr parameter restricts search results to documents originating in a particular country.
     
     
-    o[:cx] ||= ""
+    #o[:cx] ||= ""
     # Required!!! The cx parameter specifies a unique code that identifies a custom search engine. You must specify a Custom Search Engine using the cx parameter to retrieve search results from that CSE.
     
     
@@ -117,11 +118,11 @@ class GoogleSearch
     #o[:ie] ||= "utf8"
     # Optional. The ie parameter sets the character encoding scheme that should be used to interpret the query string. The default ie value is latin1.
     
-    o[:lr] = "lang_#{o[:lr]}" if o[:lr]
+    #o[:lr] = "lang_#{o[:lr].downcase}" if o[:lr]
     # Optional. The lr (language restrict) parameter restricts search results to documents written in a particular language.
     
     
-    o[:num] ||= 10
+    #o[:num] ||= 10
     # Optional. The num parameter identifies the number of search results to return. The default num value is 10, and the maximum value is 20. If you request more than 20 results, only 20 results will be returned.
     
     
@@ -132,11 +133,11 @@ class GoogleSearch
     #o[:oe] ||= "utf8"
     # Optional. The oe parameter sets the character encoding scheme that should be used to decode the XML result. The default oe value is latin1.
     
-    o[:output] ||= "xml_no_dtd"
+    #o[:output] ||= "xml_no_dtd"
     # Required. The output parameter specifies the format of the XML results. The only valid values for this parameter are xml and xml_no_dtd. The chart below explains how these parameter values differ.
     
     
-    o[:q] ||= ""
+    #o[:q] ||= ""
     # Optional. The q parameter specifies the search query entered by the user. Even though this parameter is optional, you must specify a value for at least one of the query parameters (as_epq, as_lq, as_oq, as_q, as_rq) to get search results.
     
     
@@ -144,7 +145,7 @@ class GoogleSearch
     # Optional. The safe parameter indicates how search results should be filtered for adult and pornographic content. The default value for the safe parameter is off. Valid parameter values are: off, medium or high
     
     
-    o[:start] ||= 10
+    #o[:start] ||= 10
     # Optional. The start parameter indicates the first matching result that should be included in the search results. The start parameter uses a zero-based index, meaning the first result is 0, the second result is 1 and so forth.
     
     
@@ -162,9 +163,8 @@ class GoogleSearch
     
     
     # And finally:
-    @response = SearchResponse.new(
-      search_request.get("http://www.google.com/search?" + o.map {|key, value| "#{key}=#{value}"}.join('&')), o[:num], o[:start]
-    )
+    @url = "http://www.google.com/search?" + o.map {|key, value| "#{key}=#{value}"}.join('&')
+    @response = SearchResponse.new(search_request.get(url))
     
   end
 end
@@ -173,4 +173,4 @@ class SearchRequest
   def get(uri)
     open(uri)
   end
-end
+end

data/spec/google_search_spec.rb

@@ -3,12 +3,10 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 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?cx=unique-cse-id&cr=lang_nl&output=xml_no_dtd&q=adres&lr=lang_nl&client=google-csbe&start=0&num=10'
-    ).and_return('wat_xml')
+    request_mock.should_receive(:get).with('http://www.google.com/search?cx=unique-cse-id&q=adres&cr=countryNL&lr=lang_nl').and_return('wat_xml')
     
-    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)
+    SearchResponse.should_receive(:new).with('wat_xml').and_return('search-response-object')
+    search = GoogleSearch.new({:cx => 'unique-cse-id', :q => 'adres', :cr => 'countryNL', :lr => 'lang_nl'}, request_mock)
     search.response.should == 'search-response-object'
   end
 end

metadata

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