yahoo-se 1.0.7 → 1.0.8

data/lib/yahoo-se/exceptions.rb

@@ -1,6 +1,12 @@
 module Yahoo
   module SE
     class ApplicationIDNotSet < RuntimeError; end
-    class RateLimitExceeded < RuntimeError; end
+    class ResponseError < RuntimeError
+      def initialize(errors)
+        title = errors["Title"]
+        message = errors["Message"]
+        puts "#{title} : #{message}"
+      end
+    end
   end
 end

data/lib/yahoo-se/response.rb

@@ -3,7 +3,6 @@ module Yahoo
     class Response
       def initialize(response_body)
         @body = response_body
-        raise RateLimitExceeded unless @body.to_json["Error"].nil?
       end
       
       # The number of URLs returned. This may be lower than the number of results requested if there were fewer total results available.
@@ -18,7 +17,7 @@ module Yahoo
       
       # The result objects returned from the request
       def results
-        begin
+        unless errors
           if total_results_available == 1
             [Yahoo::SE::Result.new(self.to_json["ResultSet"]["Result"])]
           else
@@ -26,8 +25,13 @@ module Yahoo
               Yahoo::SE::Result.new(result_hash)
             end
           end
-        rescue
-          []
+        end
+      end
+      
+      def errors
+        @errors = self.to_json["Error"]
+        if @errors
+          raise ResponseError, @errors
         end
       end
       

data/lib/yahoo-se/version.rb

@@ -1,5 +1,5 @@
 module Yahoo
   module SE
-    VERSION = "1.0.7" unless defined?(Yahoo::SE::VERSION)
+    VERSION = "1.0.8" unless defined?(Yahoo::SE::VERSION)
   end
 end

data/spec/fixtures/exceed_error.json

@@ -0,0 +1 @@
+{"Error":{"Title":"The following errors were detected:","Message":["invalid value: request exceeds position 1000"]}}

data/spec/fixtures/rate_limit_exceeded.json

@@ -1 +1 @@
-{"Error":{"Message":"limit exceeded"}}
+{"Error":{"Title":"The following errors were detected:","Message":["limit exceeded"]}}

data/spec/yahoo-se/request_spec.rb

@@ -10,6 +10,7 @@ describe Yahoo::SE::Request do
   describe "instances" do
     before do
       Yahoo::SE.application_id = "123"
+      Yahoo::SE::Request.stub!(:hash_to_query).and_return("appid=123&query=http://erbmicha.com&output=json")
       @result = mock(Yahoo::SE::Result)
       @il_request = Yahoo::SE::Request.new(Yahoo::SE::Inlinks::SERVICE_PATH, :query => "http://erbmicha.com")
       @pages_request = Yahoo::SE::Request.new(Yahoo::SE::Pages::SERVICE_PATH, :query => "http://erbmicha.com")
@@ -28,23 +29,23 @@ describe Yahoo::SE::Request do
     
     it "should form a valid request to inlink data" do
       Yahoo::SE::Result.should_receive(:new).exactly(100).times.and_return(@result)
-      @il_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/inlinkData?appid=123&query=http://erbmicha.com&output=json").and_return(@json_bl_file)
+      @il_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/inlinkData?appid=123&query=http://erbmicha.com&output=json", {"User-Agent"=>"Ruby/Yahoo Site Explorer Gem vV1"}).and_return(@json_bl_file)
       @il_request.results.size.should == 100
     end
     
     it "should form a valid request to page data" do
       Yahoo::SE::Result.should_receive(:new).exactly(50).times.and_return(@result)
-      @pages_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/pageData?appid=123&query=http://erbmicha.com&output=json").and_return(@json_pages_file)
+      @pages_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/pageData?appid=123&query=http://erbmicha.com&output=json", {"User-Agent"=>"Ruby/Yahoo Site Explorer Gem vV1"}).and_return(@json_pages_file)
       @pages_request.results.size.should == 50
     end
     
     it "should form a valid request to ping a site" do
-      @ping_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/ping?appid=123&sitemap=http://erbmicha.com&output=json").and_return(@json_ping_file)
+      @ping_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/ping?appid=123&query=http://erbmicha.com&output=json", {"User-Agent"=>"Ruby/Yahoo Site Explorer Gem vV1"}).and_return(@json_ping_file)
       @ping_request.response
     end
     
     it "should form a valid request to the update notification service" do
-      @update_notification_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=123&url=http://erbmicha.com&output=json").and_return(@json_ping_file)
+      @update_notification_request.should_receive("open").with("http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=123&query=http://erbmicha.com&output=json", {"User-Agent"=>"Ruby/Yahoo Site Explorer Gem vV1"}).and_return(@json_ping_file)
       @update_notification_request.response
     end
   end

data/spec/yahoo-se/response_spec.rb

@@ -17,7 +17,10 @@ describe Yahoo::SE::Response do
     @response.total_results_available.should == 328
   end
   
-  it "should raise RateLimitExceeded when there are too many requests" do
-    lambda {Yahoo::SE::Response.new(fixture("rate_limit_exceeded.json"))}.should raise_error(Yahoo::SE::RateLimitExceeded)
+  describe "Errors" do
+    it "should raise an exception if the response is a exceed error" do
+      @response = Yahoo::SE::Response.new(fixture("exceed_error.json"))
+      lambda { @response.results }.should raise_error(Yahoo::SE::ResponseError)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yahoo-se
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - Lance Carlson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-04 00:00:00 -05:00
+date: 2008-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,7 @@ files:
 - spec/fixtures/erbmicha.com_backlinks.json
 - spec/fixtures/erbmicha.com_pages.json
 - spec/fixtures/erbmicha.com_ping.json
+- spec/fixtures/exceed_error.json
 - spec/fixtures/rate_limit_exceeded.json
 - spec/spec.opts
 - spec/spec_helper.rb