Urlencoding all params

lib/google-search/search/base.rb

@@ -123,7 +123,7 @@ def all_items
     def get_uri
       URI + "/G#{@type}Search?" + 
         (get_uri_params + options.to_a).
-          map { |key, value| "#{key}=#{value}" unless value.nil? }.compact.join('&')
+          map { |key, value| "#{key}=#{Search.url_encode(value)}" unless value.nil? }.compact.join('&')
     end
 
     #:nodoc:
@@ -136,7 +136,7 @@ def get_uri_params
       [:hl, language],
       [:key, api_key],
       [:v, version],
-      [:q, Search.url_encode(query.to_str)]]
+      [:q, query]]
     end
 
     ##
@@ -203,7 +203,7 @@ def self.json_decode string
     # Url encode _string_.
 
     def self.url_encode string
-      string.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
+      string.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
         '%' + $1.unpack('H2' * $1.size).join('%').upcase
       }.tr(' ', '+')
     end

lib/google-search/search/news.rb

@@ -17,8 +17,7 @@ class News < self
                :elections, :politics, :entertainment, :sports, :health
 
       ##
-      # Relative to city, state, province,
-      # zipcode, etc.
+      # Relative to city, state, province, zipcode, etc.
 
       attr_accessor :relative_to
 
@@ -55,7 +54,7 @@ def initialize options = {}, &block
       #:nodoc:
 
       def get_uri_params
-        raise Error, "invalid topic `#{topic}'" unless topic.nil? || TOPICS.include?(topic)
+        validate(:topic) { |topic| topic.nil? || TOPICS.include?(topic) }
         super + [
           [:geo, relative_to],
           [:topic, topic],

spec/search_news_spec.rb

@@ -0,0 +1,23 @@
+
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Google::Search::News do
+  before :each do
+    @search = Google::Search::News.new :query => 'foo'  
+  end
+
+  describe "#get_uri" do
+    describe "relative_to" do
+      it "should set relative to geo" do
+        @search.relative_to = 'Edmonton Alberta'
+        @search.get_uri.should_not include('geo=Edmonton%20Alberta')
+      end
+    end
+  end
+end
+
+__END__
+
+       [:geo, relative_to],
+        [:topic, topic],
+        [:ned, edition]

spec/search_patent_spec.rb

@@ -7,18 +7,6 @@
   end
 
   describe "#get_uri" do
-    describe "order_by" do
-      it "should validate" do
-        @search.order_by = :date
-        lambda { @search.get_uri }.should_not raise_error
-      end
-
-      it "should raise an error when invalid" do
-        @search.order_by = :foo
-        lambda { @search.get_uri }.should raise_error(Google::Search::Error, /order/)
-      end
-    end
-
     describe "issued_only" do
       it "should return issued and filed by default" do
         @search.get_uri.should_not include('as_psrg')