gdata 1.0.1 → 1.1.0

data/Rakefile

@@ -50,7 +50,7 @@ spec = Gem::Specification.new do |s|
   s.summary = "Google Data APIs Ruby Utility Library"
   s.rubyforge_project = 'gdata'
   s.name = 'gdata'
-  s.version = '1.0.1'
+  s.version = '1.1.0'
   s.requirements << 'none'
   s.require_path = 'lib'
   s.test_files = FileList['test/ts_gdata.rb']

data/lib/gdata/auth/authsub.rb

@@ -100,8 +100,7 @@ module GData
         service = GData::HTTP::DefaultService.new
         response = service.make_request(request)
         if response.status_code != 200
-          raise GData::Client::AuthorizationError, 
-            "#{response.status_code} : #{response.body}"
+          raise GData::Client::AuthorizationError.new(response)
         end
         
         @token = response.body[/Token=(.*)/,1]
@@ -117,8 +116,7 @@ module GData
         service = GData::HTTP::DefaultService.new
         response = service.make_request(request)
         if response.status_code != 200
-          raise GData::Client::AuthorizationError, 
-            "#{response.status_code} : #{response.body}"
+          raise GData::Client::AuthorizationError.new(response)
         end
         
         result = {}
@@ -136,8 +134,7 @@ module GData
         service = GData::HTTP::DefaultService.new
         response = service.make_request(request)
         if response.status_code != 200
-          raise GData::Client::AuthorizationError, 
-            "#{response.status_code} : #{response.body}"
+          raise GData::Client::AuthorizationError.new(response)
         end
 
       end

data/lib/gdata/auth/clientlogin.rb

@@ -81,7 +81,7 @@ module GData
               "#{error} : #{url}"
           end
           
-          raise GData::Client::AuthorizationError, "#{error} : #{url}"
+          raise GData::Client::AuthorizationError.new(response)
         end
         
         @token = response.body[/Auth=(.*)/,1]
@@ -92,7 +92,7 @@ module GData
       # object.
       def sign_request!(request)
         if @token == nil
-          raise RuntimeError, "Cannot sign request without credentials"
+          raise GData::Client::Error, "Cannot sign request without credentials"
         end
         
         request.headers['Authorization'] = "GoogleLogin auth=#{@token}" 

data/lib/gdata/client.rb

@@ -31,10 +31,31 @@ require 'gdata/client/youtube'
   
 module GData
   module Client
-    class AuthorizationError < RuntimeError
+
+    # Base class for GData::Client errors
+    class Error < RuntimeError
+    end
+
+    # Base class for errors raised due to requests
+    class RequestError < Error
+
+      # The Net::HTTPResponse that caused this error.
+      attr_accessor :response
+
+      # Creates a new RequestError from Net::HTTPResponse +response+ with a
+      # message containing the error code and response body.
+      def initialize(response)
+        @response = response
+
+        super "request error #{response.status_code}: #{response.body}"
+      end
+
+    end
+
+    class AuthorizationError < RequestError
     end
     
-    class BadRequestError < RuntimeError
+    class BadRequestError < RequestError
     end
     
     # An error caused by ClientLogin issuing a CAPTCHA error.
@@ -50,13 +71,13 @@ module GData
       end
     end
     
-    class ServerError < RuntimeError
+    class ServerError < RequestError
     end
     
-    class UnknownError < RuntimeError
+    class UnknownError < RequestError
     end
     
-    class VersionConflictError < RuntimeError
+    class VersionConflictError < RequestError
     end  
     
   end

data/lib/gdata/client/base.rb

@@ -84,15 +84,15 @@ module GData
         when 200, 201, 302
           #Do nothing, it's a success.
         when 401, 403
-          raise AuthorizationError, response.body
+          raise AuthorizationError.new(response)
         when 400
           raise BadRequestError, response.body
         when 409
-          raise VersionConflictError, response.body
+          raise VersionConflictError.new(response)
         when 500
-          raise ServerError, response.body
+          raise ServerError.new(response)
         else
-          raise UnknownError, "#{response.status_code} #{response.body}"
+          raise UnknownError.new(response)
         end
         
         return response
@@ -174,7 +174,7 @@ module GData
         if @auth_handler.class == GData::Auth::AuthSub
           @auth_handler.private_key = key
         else
-          raise RuntimeError, "An AuthSub token must be set first."
+          raise Error, "An AuthSub token must be set first."
         end
       end
     end

data/lib/gdata/http/response.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'gdata/client'
+
 module GData
   module HTTP
   
@@ -31,7 +33,7 @@ module GData
           begin
             return REXML::Document.new(@body).root
           rescue
-            raise RuntimeError, "Response body not XML."
+            raise GData::Client::Error, "Response body not XML."
           end
         else
           return nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gdata
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jeff Fisher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: []