dancroak-twitter-search 0.5.5 → 0.5.6

data/CHANGELOG.textile

@@ -1,3 +1,8 @@
+h2. 0.5.6 (June 6, 2009)
+
+* When Twitter returns a 404, raise a TwitterSearch::SearchServerError instead
+of a JSON parse error. (Luke Francl)
+
 h2. 0.5.5 (May 18, 2009)
 
 * raise error when query contains :near or :within:. (Dan Croak)

data/Rakefile

@@ -13,7 +13,7 @@ task :default => :test
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "twitter-search"
-  gem_spec.version     = "0.5.5"
+  gem_spec.version     = "0.5.6"
   gem_spec.summary     = "Ruby client for Twitter Search. Includes trends."
   gem_spec.email       = "dcroak@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/dancroak/twitter-search"

data/lib/twitter_search.rb

@@ -9,6 +9,8 @@ require File.join(File.dirname(__FILE__), 'trends')
 module TwitterSearch
   class SearchOperatorError < ArgumentError
   end
+  class SearchServerError < RuntimeError
+  end
 
   class Client
     TWITTER_SEARCH_API_URL = 'http://search.twitter.com/search.json'
@@ -38,9 +40,16 @@ module TwitterSearch
       http = Net::HTTP.new(url.host, url.port)
       http.read_timeout = timeout
 
-      json = http.start { |http|
+      res = http.start { |http|
         http.get("#{url.path}?#{url.query}", headers)
-      }.body
+      }
+      
+      if res.code == '404'
+        raise TwitterSearch::SearchServerError, "Twitter responded with a 404 for your query. It is likely too complicated to process."
+      end
+      
+      json = res.body
+      
       Tweets.new JSON.parse(json)
     end
 
@@ -57,6 +66,7 @@ module TwitterSearch
       json = http.start { |http|
         http.get("#{url.path}?#{url.query}", headers)
       }.body
+      
       Trends.new JSON.parse(json)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dancroak-twitter-search
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Dustin Sallings
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 21:00:00 -07:00
+date: 2009-06-05 21:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency