rest-client 0.5.1 → 0.6

data/Rakefile

@@ -31,7 +31,7 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'fileutils'
 
-version = "0.5.1"
+version = "0.6"
 name = "rest-client"
 
 spec = Gem::Specification.new do |s|
@@ -48,6 +48,7 @@ spec = Gem::Specification.new do |s|
 	s.has_rdoc = true
 	
 	s.files = %w(Rakefile) + Dir.glob("{lib,spec}/**/*")
+	s.executables = ['restclient']
 	
 	s.require_path = "lib"
 end

data/bin/restclient

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__) + "/../lib"
+require 'rest_client'
+
+require "yaml"
+
+def usage(why = nil)
+	puts "failed for reason: #{why}" if why
+	puts "usage: restclient url|name [username] [password]"
+	exit(1)
+end
+
+@url = ARGV.shift || 'http://localhost:4567'
+
+config = YAML.load(File.read(ENV['HOME'] + "/.restclient")) rescue {}
+
+@url, @username, @password = if c = config[@url]
+	[c[:url], c[:username], c[:password]]
+else
+	[@url, *ARGV]
+end
+
+usage("invalid url '#{@url}") unless @url =~ /^https?/
+usage("to few args") unless ARGV.size < 3
+
+def r
+	@r ||= RestClient::Resource.new(@url, @username, @password)
+end
+
+r # force rc to load
+
+%w(get post put delete).each do |m|
+ eval <<-end_eval
+def #{m}(path, *args, &b)
+	r[path].#{m}(*args, &b)
+end
+ end_eval
+end
+
+def method_missing(s, *args, &b)
+	super unless r.respond_to?(s)
+	begin
+		r.send(s, *args, &b)
+	rescue RestClient::RequestFailed => e
+		puts e.response.body
+		raise e
+	end
+end
+
+require 'irb'
+require 'irb/completion'
+
+if File.exists? ".irbrc"
+	ENV['IRBRC'] = ".irbrc"
+end
+
+if File.exists?(rcfile = "~/.restclientrc")
+	load(rcfile)
+end
+
+ARGV.clear
+
+IRB.start
+exit!

data/lib/request_errors.rb

@@ -1,5 +1,3 @@
-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
@@ -59,14 +57,8 @@ module RestClient
 			@response.code.to_i if @response
 		end
 
-		def message(default="Unknown error, HTTP status code #{http_code}")
-			return default unless @response
-			parse_error_xml rescue default
-		end
-
-		def parse_error_xml
-			xml_errors = REXML::Document.new(@response.body).elements.to_a("//errors/error")
-			xml_errors.empty? ? raise : xml_errors.map { |a| a.text }.join(" / ")
+		def message
+			"HTTP status code #{http_code}"
 		end
 
 		def to_s

data/lib/rest_client.rb

@@ -71,7 +71,7 @@ module RestClient
 		end
 
 		def net_http_class(method)
-			Object.module_eval "Net::HTTP::#{method.to_s.capitalize}"
+			Net::HTTP.const_get(method.to_s.capitalize)
 		end
 
 		def parse_url(url)
@@ -121,7 +121,15 @@ module RestClient
 			if %w(200 201 202).include? res.code
 				res.body
 			elsif %w(301 302 303).include? res.code
-				raise Redirect, res.header['Location']
+				url = res.header['Location']
+
+				if url !~ /^http/
+					uri = URI.parse(@url)
+					uri.path = "/#{url}".squeeze('/')
+					url = uri.to_s
+				end
+
+				raise Redirect, url
 			elsif res.code == "401"
 				raise Unauthorized
 			elsif res.code == "404"

data/spec/request_errors_spec.rb

@@ -12,28 +12,20 @@ describe RestClient::Exception do
 end
 
 describe RestClient::RequestFailed do
-	before do
-		@error = RestClient::RequestFailed.new
+	it "stores the http response on the exception" do
+		begin
+			raise RestClient::RequestFailed, :response
+		rescue RestClient::RequestFailed => e
+			e.response.should == :response
+		end
 	end
 
-	it "extracts the error message from xml" do
-		@error.response = mock('response', :code => '422', :body => '<errors><error>Error 1</error><error>Error 2</error></errors>')
-		@error.message.should == 'Error 1 / Error 2'
+	it "http_code convenience method for fetching the code as an integer" do
+		RestClient::RequestFailed.new(mock('res', :code => '502')).http_code.should == 502
 	end
 
-	it "ignores responses without xml since they might contain sensitive data" do
-		@error.response = mock('response', :code => '500', :body => 'Syntax error in SQL query: SELECT * FROM ...')
-		@error.message.should == 'Unknown error, HTTP status code 500'
-	end
-
-	it "accepts a default error message" do
-		@error.response = mock('response', :code => '500', :body => 'Internal Server Error')
-		@error.message('Custom default message').should == 'Custom default message'
-	end
-
-	it "doesn't show the default error message when there's something in the xml" do
-		@error.response = mock('response', :code => '422', :body => '<errors><error>Specific error message</error></errors>')
-		@error.message('Custom default message').should == 'Specific error message'
+	it "shows the status code in the message" do
+		RestClient::RequestFailed.new(mock('res', :code => '502')).to_s.should match(/502/)
 	end
 end
 

data/spec/rest_client_spec.rb

@@ -184,6 +184,17 @@ describe RestClient do
 			lambda { @request.process_result(res) }.should raise_error(RestClient::Redirect) { |e| e.url.should == 'http://new/resource'}
 		end
 
+		it "handles redirects with relative paths" do
+			res = mock('response', :code => '301', :header => { 'Location' => 'index' })
+			lambda { @request.process_result(res) }.should raise_error(RestClient::Redirect) { |e| e.url.should == 'http://some/index' }
+		end
+
+		it "handles redirects with absolute paths" do
+			@request.instance_variable_set('@url', 'http://some/place/else')
+			res = mock('response', :code => '301', :header => { 'Location' => '/index' })
+			lambda { @request.process_result(res) }.should raise_error(RestClient::Redirect) { |e| e.url.should == 'http://some/index' }
+		end
+
 		it "raises Unauthorized when the response is 401" do
 			res = mock('response', :code => '401')
 			lambda { @request.process_result(res) }.should raise_error(RestClient::Unauthorized)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rest-client
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: "0.6"
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-01 00:00:00 -07:00
+date: 2008-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: "A simple REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
 email: adam@heroku.com
-executables: []
-
+executables: 
+- restclient
 extensions: []
 
 extra_rdoc_files: []