Skip to content

Commit

Permalink
Empty string is now considered an invalid query
Browse files Browse the repository at this point in the history
  • Loading branch information
tj committed Jul 23, 2009
1 parent 993fdf3 commit 13d7f2b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/google-search/search/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def get_uri
#:nodoc:

def get_uri_params
raise Error, "invalid query `#{query}'" unless query.respond_to? :to_str
raise Error, "invalid query `#{query}'" unless query.respond_to?(:to_str) && !query.to_str.empty?
raise Error, "invalid API version `#{version}'" unless Numeric === version
[[:start, offset],
[:rsz, size],
Expand Down
20 changes: 13 additions & 7 deletions spec/search_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,20 @@
search.get_uri.should == 'http://www.google.com/uds/GwebSearch?start=0&rsz=large&hl=en&key=notsupplied&v=1.0&q=foo&foo=bar'
end

it "should raise an error when no query string is present" do
@search.query = nil
lambda { @search.get_uri }.should raise_error(Google::Search::Error, /query/)
describe "query" do
it "should raise an error when no query string is present" do
@search.query = nil
lambda { @search.get_uri }.should raise_error(Google::Search::Error, /query/)
@search.query = ''
lambda { @search.get_uri }.should raise_error(Google::Search::Error, /query/)
end
end

it "should raise an error when version is not present" do
@search.version = nil
lambda { @search.get_uri }.should raise_error(Google::Search::Error, /version/)
describe "version" do
it "should raise an error when it is not present" do
@search.version = nil
lambda { @search.get_uri }.should raise_error(Google::Search::Error, /version/)
end
end
end

Expand Down Expand Up @@ -90,7 +96,7 @@
end

describe "#get_uri" do
describe "#filter" do
describe "filter" do
it "should default to 1" do
@search.get_uri.should include('filter=1')
end
Expand Down

0 comments on commit 13d7f2b

Please sign in to comment.