rest-client 0.5 → 0.5.1

data/Rakefile

@@ -31,7 +31,7 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'fileutils'
 
-version = "0.5"
+version = "0.5.1"
 name = "rest-client"
 
 spec = Gem::Specification.new do |s|

data/lib/request_errors.rb

@@ -1,17 +1,43 @@
 require 'rexml/document'
 
 module RestClient
+	# This is the base RestClient exception class. Rescue it if you want to
+	# catch any exception that your request might raise
+	class Exception < RuntimeError
+		def message(default=nil)
+			self.class::ErrorMessage
+		end
+	end
+
 	# A redirect was encountered; caught by execute to retry with the new url.
-	class Redirect < RuntimeError; end
+	class Redirect < Exception
+		ErrorMessage = "Redirect"
+
+		attr_accessor :url
+		def initialize(url)
+			@url = url
+		end
+	end
 
 	# Authorization is required to access the resource specified.
-	class Unauthorized < RuntimeError; end
+	class Unauthorized < Exception
+		ErrorMessage = 'Unauthorized'
+	end
+
+	# No resource was found at the given URL.
+	class ResourceNotFound < Exception
+		ErrorMessage = 'Resource not found'
+	end
 
 	# The server broke the connection prior to the request completing.
-	class ServerBrokeConnection < RuntimeError; end
+	class ServerBrokeConnection < Exception
+		ErrorMessage = 'Server broke connection'
+	end
 
 	# The server took too long to respond.
-	class RequestTimeout < RuntimeError; end
+	class RequestTimeout < Exception
+		ErrorMessage = 'Request timed out'
+	end
 
 	# The request failed, meaning the remote HTTP server returned a code other
 	# than success, unauthorized, or redirect.
@@ -22,19 +48,19 @@ module RestClient
 	# You can get the status code by e.http_code, or see anything about the
 	# response via e.response.  For example, the entire result body (which is
 	# probably an HTML error page) is e.response.body.
-	class RequestFailed < RuntimeError
+	class RequestFailed < Exception
 		attr_accessor :response
 
-		def initialize(response)
+		def initialize(response=nil)
 			@response = response
 		end
 
 		def http_code
-			@response.code.to_i
+			@response.code.to_i if @response
 		end
 
 		def message(default="Unknown error, HTTP status code #{http_code}")
-			return "Resource not found" if http_code == 404
+			return default unless @response
 			parse_error_xml rescue default
 		end
 
@@ -50,6 +76,8 @@ module RestClient
 end
 
 # backwards compatibility
-RestClient::Resource::Redirect = RestClient::Redirect
-RestClient::Resource::Unauthorized = RestClient::Unauthorized
-RestClient::Resource::RequestFailed = RestClient::RequestFailed
+class RestClient::Request
+	Redirect = RestClient::Redirect
+	Unauthorized = RestClient::Unauthorized
+	RequestFailed = RestClient::RequestFailed
+end

data/lib/resource.rb

@@ -70,13 +70,13 @@ module RestClient
 		# This is especially useful if you wish to define your site in one place and
 		# call it in multiple locations:
 		#
-		#   def product(id)
-		#     RestClient::Resource.new('http://example.com/products/#{id}', 'adam', 'mypasswd')
+		#   def orders
+		#     RestClient::Resource.new('http://example.com/orders', 'admin', 'mypasswd')
 		#   end
 		#
-		#   product(123).get
-		#   product(123).put params.to_xml
-		#   product(123).delete
+		#   orders.get                     # GET http://example.com/orders
+		#   orders['1'].get                # GET http://example.com/orders/1
+		#   orders['1/items'].delete       # DELETE http://example.com/orders/1/items
 		#
 		# Nest resources as far as you want:
 		#
@@ -91,8 +91,10 @@ module RestClient
 		end
 
 		def concat_urls(url, suburl)   # :nodoc:
+			url = url.to_s
+			suburl = suburl.to_s
 			if url.slice(-1, 1) == '/' or suburl.slice(0, 1) == '/'
-				"#{url}#{suburl}"
+				url + suburl
 			else
 				"#{url}/#{suburl}"
 			end

data/lib/rest_client.rb

@@ -52,7 +52,7 @@ module RestClient
 		def execute
 			execute_inner
 		rescue Redirect => e
-			@url = e.message
+			@url = e.url
 			execute
 		end
 
@@ -124,6 +124,8 @@ module RestClient
 				raise Redirect, res.header['Location']
 			elsif res.code == "401"
 				raise Unauthorized
+			elsif res.code == "404"
+				raise ResourceNotFound
 			else
 				raise RequestFailed, res
 			end

data/spec/request_errors_spec.rb

@@ -1,8 +1,19 @@
 require File.dirname(__FILE__) + '/base'
 
+describe RestClient::Exception do
+	it "sets the exception message to ErrorMessage" do
+		RestClient::ResourceNotFound.new.message.should == 'Resource not found'
+	end
+
+	it "contains exceptions in RestClient" do
+		RestClient::Unauthorized.new.should be_a_kind_of(RestClient::Exception)
+		RestClient::ServerBrokeConnection.new.should be_a_kind_of(RestClient::Exception)
+	end
+end
+
 describe RestClient::RequestFailed do
 	before do
-		@error = RestClient::RequestFailed.new(nil)
+		@error = RestClient::RequestFailed.new
 	end
 
 	it "extracts the error message from xml" do
@@ -27,15 +38,15 @@ describe RestClient::RequestFailed do
 end
 
 describe "backwards compatibility" do
-	it "alias RestClient::Resource::Redirect to RestClient::Redirect" do
-		RestClient::Resource::Redirect.should == RestClient::Redirect
+	it "alias RestClient::Request::Redirect to RestClient::Redirect" do
+		RestClient::Request::Redirect.should == RestClient::Redirect
 	end
 
-	it "alias RestClient::Resource::Unauthorized to RestClient::Unauthorized" do
-		RestClient::Resource::Unauthorized.should == RestClient::Unauthorized
+	it "alias RestClient::Request::Unauthorized to RestClient::Unauthorized" do
+		RestClient::Request::Unauthorized.should == RestClient::Unauthorized
 	end
 
-	it "alias RestClient::Resource::RequestFailed to RestClient::RequestFailed" do
-		RestClient::Resource::RequestFailed.should == RestClient::RequestFailed
+	it "alias RestClient::Request::RequestFailed to RestClient::RequestFailed" do
+		RestClient::Request::RequestFailed.should == RestClient::RequestFailed
 	end
 end

data/spec/resource_spec.rb

@@ -41,8 +41,8 @@ describe RestClient::Resource do
 		@resource.concat_urls('http://example.com', '/resource').should == 'http://example.com/resource'
 	end
 
-	it "concatinates even non-string urls (i.e. 'posts' + 1)" do
-		@resource.concat_urls('posts/', 1).should == 'posts/1'
+	it "concatinates even non-string urls, :posts + 1 => 'posts/1'" do
+		@resource.concat_urls(:posts, 1).should == 'posts/1'
 	end
 
 	it "offers subresources via []" do

data/spec/rest_client_spec.rb

@@ -181,7 +181,7 @@ describe RestClient do
 
 		it "raises a Redirect with the new location when the response is in the 30x range" do
 			res = mock('response', :code => '301', :header => { 'Location' => 'http://new/resource' })
-			lambda { @request.process_result(res) }.should raise_error(RestClient::Redirect, 'http://new/resource')
+			lambda { @request.process_result(res) }.should raise_error(RestClient::Redirect) { |e| e.url.should == 'http://new/resource'}
 		end
 
 		it "raises Unauthorized when the response is 401" do
@@ -189,6 +189,11 @@ describe RestClient do
 			lambda { @request.process_result(res) }.should raise_error(RestClient::Unauthorized)
 		end
 
+		it "raises ResourceNotFound when the response is 404" do
+			res = mock('response', :code => '404')
+			lambda { @request.process_result(res) }.should raise_error(RestClient::ResourceNotFound)
+		end
+
 		it "raises RequestFailed otherwise" do
 			res = mock('response', :code => '500')
 			lambda { @request.process_result(res) }.should raise_error(RestClient::RequestFailed)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rest-client
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-20 00:00:00 -07:00
+date: 2008-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rest-client
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Simple REST client for Ruby, inspired by microframework syntax for specifying actions.