rest-client 1.5.1 → 1.6.0.a

data/README.rdoc

@@ -13,7 +13,9 @@ of specifying actions: get, put, post, delete.
 
   RestClient.get 'http://example.com/resource'
   
-  RestClient.get 'https://user:password@example.com/private/resource'
+  RestClient.get 'http://example.com/resource', {:params => {:id => 50, 'foo' => 'bar'}}
+
+  RestClient.get 'https://user:password@example.com/private/resource', {:accept => :json}
 
   RestClient.post 'http://example.com/resource', :param1 => 'one', :nested => { :param2 => 'two' }
 
@@ -77,8 +79,8 @@ See RestClient::Resource docs for details.
 
 == Exceptions (see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html)
 
-* for results code between 200 and 206 a RestClient::Response will be returned
-* for results code 301 and 302 the redirection will be followed if the request is a get or a head
+* for results code between 200 and 207 a RestClient::Response will be returned
+* for results code 301, 302 or 307 the redirection will be followed if the request is a get or a head
 * for result code 303 the redirection will be followed and the request transformed into a get
 * for other cases a RestClient::Exception holding the Response will be raised, a specific exception class will be thrown for know error codes
 
@@ -98,11 +100,11 @@ A block can be passed to the RestClient method, this block will then be called w
 Response.return! can be called to invoke the default response's behavior.
 
   # Don't raise exceptions but return the response
-  RestClient.get('http://example.com/resource'){|response| response }
+  RestClient.get('http://example.com/resource'){|response, request| response }
   ➔ 404 Resource Not Found | text/html 282 bytes
 
   # Manage a specific error code
-  RestClient.get('http://my-rest-service.com/resource'){ |response, &block|
+  RestClient.get('http://my-rest-service.com/resource'){ |response, request, &block|
     case response.code
     when 200
       p "It worked !"
@@ -110,19 +112,19 @@ Response.return! can be called to invoke the default response's behavior.
     when 423
       raise SomeCustomExceptionIfYouWant
     else
-      response.return! &block
+      response.return!(request, &block)
     end
   }
 
   # Follow redirections for all request types and not only for get and head
-  # RFC : "If the 301 (or 302) status code is received in response to a request other than GET or HEAD,
+  # RFC : "If the 301, 302 or 307 status code is received in response to a request other than GET or HEAD,
   #        the user agent MUST NOT automatically redirect the request unless it can be confirmed by the user,
   #        since this might change the conditions under which the request was issued."
-  RestClient.get('http://my-rest-service.com/resource'){ |response, &block|
-    if [301, 302].include? response.code
-      response.follow_redirection &block
+  RestClient.get('http://my-rest-service.com/resource'){ |response, request, &block|
+    if [301, 302, 307].include? response.code
+      response.follow_redirection(request, &block)
     else
-      response.return! &block
+      response.return!(request, &block)
     end
   }
 

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0.a

data/history.md

@@ -1,3 +1,15 @@
+# 1.6.0
+
+- forgot to include rest-client.rb in the gem
+- user, password and user-defined headers should survive a redirect
+- added all missing status codes
+- added parameter passing for get request using the :param key in header
+- the warning about the logger when using a string was a bad idea
+- multipart parameters names should not be escaped
+- remove the cookie escaping introduced by migrating to CGI cookie parsing in 1.5.1
+- add a streamed payload type (patch provided by Caleb Land)
+- Exception#http_body works even when no response
+
 # 1.5.1
 
 - only converts headers keys which are Symbols

data/lib/rest-client.rb

@@ -0,0 +1,2 @@
+# More logical way to require 'rest-client'
+require File.dirname(__FILE__) + '/restclient'

data/lib/restclient.rb

@@ -92,9 +92,6 @@ module RestClient
   # Value should be a logger but can can be stdout, stderr, or a filename.
   # You can also configure logging by the environment variable RESTCLIENT_LOG.
   def self.log= log
-    if log.is_a? String
-      warn "[warning] You should set the log with a logger"
-    end
     @@log = create_log log
   end
 

data/lib/restclient/abstract_response.rb

@@ -27,7 +27,7 @@ module RestClient
       @cookies ||= (self.headers[:set_cookie] || {}).inject({}) do |out, cookie_content|
         CGI::Cookie::parse(cookie_content).each do |key, cookie|
           unless ['expires', 'path'].include? key
-            out[key] = cookie.value[0] || ''
+            out[CGI::escape(key)] = cookie.value[0] ? (CGI::escape(cookie.value[0]) || '') : ''
           end
         end
         out
@@ -35,20 +35,20 @@ module RestClient
     end
 
     # Return the default behavior corresponding to the response code:
-    # the response itself for code in 200..206, redirection for 301 and 302 in get and head cases, redirection for 303 and an exception in other cases
-    def return! &block
-      if (200..206).include? code
+    # the response itself for code in 200..206, redirection for 301, 302 and 307 in get and head cases, redirection for 303 and an exception in other cases
+    def return! request  = nil, &block
+      if (200..207).include? code
         self
-      elsif [301, 302].include? code
+      elsif [301, 302, 307].include? code
         unless [:get, :head].include? args[:method]
           raise Exceptions::EXCEPTIONS_MAP[code], self
         else
-          follow_redirection(&block)
+          follow_redirection(request, &block)
         end
       elsif code == 303
         args[:method] = :get
         args.delete :payload
-        follow_redirection(&block)
+        follow_redirection(request, &block)
       elsif Exceptions::EXCEPTIONS_MAP[code]
         raise Exceptions::EXCEPTIONS_MAP[code], self
       else
@@ -65,18 +65,23 @@ module RestClient
     end
 
     # Follow a redirection
-    def follow_redirection &block
+    def follow_redirection request = nil, &block
       url = headers[:location]
       if url !~ /^http/
         url = URI.parse(args[:url]).merge(url).to_s
       end
       args[:url] = url
+      if request
+        args[:password] = request.password
+        args[:user] = request.user
+        args[:headers] = request.headers
+      end
       Request.execute args, &block
     end
 
     def AbstractResponse.beautify_headers(headers)
       headers.inject({}) do |out, (key, value)|
-        out[key.gsub(/-/, '_').downcase.to_sym] = %w{set-cookie}.include?(key.downcase) ? value : value.first
+        out[key.gsub(/-/, '_').downcase.to_sym] = %w{ set-cookie }.include?(key.downcase) ? value : value.first
         out
       end
     end

data/lib/restclient/exceptions.rb

@@ -2,21 +2,29 @@ module RestClient
 
   STATUSES = {100 => 'Continue',
               101 => 'Switching Protocols',
+              102 => 'Processing', #WebDAV
+
               200 => 'OK',
               201 => 'Created',
               202 => 'Accepted',
-              203 => 'Non-Authoritative Information',
+              203 => 'Non-Authoritative Information', # http/1.1
               204 => 'No Content',
               205 => 'Reset Content',
               206 => 'Partial Content',
+              207 => 'Multi-Status', #WebDAV
+
               300 => 'Multiple Choices',
               301 => 'Moved Permanently',
               302 => 'Found',
-              303 => 'See Other',
+              303 => 'See Other', # http/1.1
               304 => 'Not Modified',
-              305 => 'Use Proxy',
+              305 => 'Use Proxy', # http/1.1
+              306 => 'Switch Proxy', # no longer used
+              307 => 'Temporary Redirect', # http/1.1
+              
               400 => 'Bad Request',
               401 => 'Unauthorized',
+              402 => 'Payment Required',
               403 => 'Forbidden',
               404 => 'Resource Not Found',
               405 => 'Method Not Allowed',
@@ -32,12 +40,26 @@ module RestClient
               415 => 'Unsupported Media Type',
               416 => 'Requested Range Not Satisfiable',
               417 => 'Expectation Failed',
+              418 => 'I\'m A Teapot',
+              421 => 'Too Many Connections From This IP',
+              422 => 'Unprocessable Entity', #WebDAV
+              423 => 'Locked', #WebDAV
+              424 => 'Failed Dependency', #WebDAV
+              425 => 'Unordered Collection', #WebDAV
+              426 => 'Upgrade Required', 
+              449 => 'Retry With', #Microsoft
+              450 => 'Blocked By Windows Parental Controls', #Microsoft
+
               500 => 'Internal Server Error',
               501 => 'Not Implemented',
               502 => 'Bad Gateway',
               503 => 'Service Unavailable',
               504 => 'Gateway Timeout',
-              505 => 'HTTP Version Not Supported'}
+              505 => 'HTTP Version Not Supported',
+              506 => 'Variant Also Negotiates',
+              507 => 'Insufficient Storage', #WebDAV
+              509 => 'Bandwidth Limit Exceeded', #Apache
+              510 => 'Not Extended'}
 
   # Compatibility : make the Response act like a Net::HTTPResponse when needed
   module ResponseForException
@@ -73,7 +95,7 @@ module RestClient
     end
 
     def http_body
-      @response.body
+      @response.body if @response
     end
 
     def inspect
@@ -111,7 +133,7 @@ module RestClient
     klass = Class.new(superclass) do
       send(:define_method, :message) {message}
     end
-    klass_constant = const_set message.gsub(/ /, '').gsub(/-/, ''), klass
+    klass_constant = const_set message.delete(' \-\''), klass
     Exceptions::EXCEPTIONS_MAP[code] = klass_constant
   end
 

data/lib/restclient/payload.rb

@@ -9,6 +9,8 @@ module RestClient
     def generate(params)
       if params.is_a?(String)
         Base.new(params)
+      elsif params.respond_to?(:read)
+        Streamed.new(params)
       elsif params
         if params.delete(:multipart) == true || has_file?(params)
           Multipart.new(params)
@@ -47,16 +49,12 @@ module RestClient
 
       alias :to_s :read
 
-      def escape(v)
-        URI.escape(v.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-      end
-
       # Flatten parameters by converting hashes of hashes to flat hashes
       # {keys1 => {keys2 => value}} will be transformed into [keys1[key2], value]
       def flatten_params(params, parent_key = nil)
         result = []
         params.each do |key, value|
-          calculated_key = parent_key ? "#{parent_key}[#{escape key}]" : escape(key)
+          calculated_key = parent_key ? "#{parent_key}[#{handle_key(key)}]" : handle_key(key)
           if value.is_a? Hash
             result += flatten_params(value, calculated_key)
           elsif value.is_a? Array
@@ -83,7 +81,7 @@ module RestClient
       end
 
       def headers
-        { 'Content-Length' => size.to_s }
+        {'Content-Length' => size.to_s}
       end
 
       def size
@@ -108,16 +106,37 @@ module RestClient
 
     end
 
+    class Streamed < Base
+      def build_stream(params = nil)
+        @stream = params
+      end
+
+      def size
+        if @stream.respond_to?(:size)
+          @stream.size
+        elsif @stream.is_a?(IO)
+          @stream.stat.size
+        end
+      end
+
+      alias :length :size
+    end
+
     class UrlEncoded < Base
       def build_stream(params = nil)
         @stream = StringIO.new(flatten_params(params).collect do |entry|
-          "#{entry[0]}=#{escape(entry[1])}"
+          "#{entry[0]}=#{handle_key(entry[1])}"
         end.join("&"))
         @stream.seek(0)
       end
 
+      # for UrlEncoded escape the keys
+      def handle_key key
+        URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      end
+
       def headers
-        super.merge({ 'Content-Type' => 'application/x-www-form-urlencoded' })
+        super.merge({'Content-Type' => 'application/x-www-form-urlencoded'})
       end
     end
 
@@ -139,7 +158,7 @@ module RestClient
 
         last_index = x.length - 1
         x.each_with_index do |a, index|
-          k, v = *a
+          k, v = * a
           if v.respond_to?(:read) && v.respond_to?(:path)
             create_file_field(@stream, k, v)
           else
@@ -184,6 +203,11 @@ module RestClient
         @boundary ||= rand(1_000_000).to_s
       end
 
+      # for Multipart do not escape the keys
+      def handle_key key
+        key
+      end
+
       def headers
         super.merge({'Content-Type' => %Q{multipart/form-data; boundary=#{boundary}}})
       end

data/lib/restclient/request.rb

@@ -27,14 +27,18 @@ module RestClient
                 :open_timeout, :raw_response, :verify_ssl, :ssl_client_cert,
                 :ssl_client_key, :ssl_ca_file, :processed_headers, :args
 
-    def self.execute(args, &block)
-      new(args).execute(&block)
+    def self.execute(args, & block)
+      new(args).execute(& block)
     end
 
     def initialize args
       @method = args[:method] or raise ArgumentError, "must pass :method"
-      @url = args[:url] or raise ArgumentError, "must pass :url"
       @headers = args[:headers] || {}
+      if args[:url]
+        @url = process_get_params(args[:url], headers)
+      else
+        raise ArgumentError, "must pass :url"
+      end
       @cookies = @headers.delete(:cookies) || args[:cookies] || {}
       @payload = Payload.generate(args[:payload])
       @user = args[:user]
@@ -51,14 +55,37 @@ module RestClient
       @args = args
     end
 
-    def execute &block
+    def execute & block
       uri = parse_url_with_auth(url)
-      transmit uri, net_http_request_class(method).new(uri.request_uri, processed_headers), payload, &block
+      transmit uri, net_http_request_class(method).new(uri.request_uri, processed_headers), payload, & block
+    end
+
+    # Extract the query parameters for get request and append them to the url
+    def process_get_params url, headers
+      if method == :get
+        get_params = {}
+        headers.delete_if do |key, value|
+          if 'params' == key.to_s.downcase && value.is_a?(Hash)
+            get_params.merge! value
+            true
+          else
+            false
+          end
+        end
+        unless get_params.empty?
+          query_string = get_params.collect { |k, v| "#{k.to_s}=#{CGI::escape(v.to_s)}" }.join('&')
+          url + "?#{query_string}"
+        else
+          url
+        end
+      else
+        url
+      end
     end
 
     def make_headers user_headers
       unless @cookies.empty?
-        user_headers[:cookie] = @cookies.map {|(key, val)| "#{key.to_s}=#{val}" }.sort.join(';')
+        user_headers[:cookie] = @cookies.map { |(key, val)| "#{key.to_s}=#{CGI::unescape(val)}" }.sort.join(';')
       end
       headers = stringify_headers(default_headers).merge(stringify_headers(user_headers))
       headers.merge!(@payload.headers) if @payload
@@ -107,7 +134,7 @@ module RestClient
       end
     end
 
-    def transmit uri, req, payload, &block
+    def transmit uri, req, payload, & block
       setup_credentials req
 
       net = net_http_class.new(uri.host, uri.port)
@@ -139,7 +166,7 @@ module RestClient
       net.start do |http|
         res = http.request(req, payload) { |http_response| fetch_body(http_response) }
         log_response res
-        process_result res, &block
+        process_result res, & block
       end
     rescue EOFError
       raise RestClient::ServerBrokeConnection
@@ -179,7 +206,7 @@ module RestClient
       http_response
     end
 
-    def process_result res, &block
+    def process_result res, & block
       if @raw_response
         # We don't decode raw requests
         response = RawResponse.new(@tf, res, args)
@@ -188,9 +215,9 @@ module RestClient
       end
 
       if block_given?
-        block.call response, &block
+        block.call(response, self, & block)
       else
-        response.return!(&block)
+        response.return!(self, & block)
       end
 
     end
@@ -212,7 +239,7 @@ module RestClient
         out = []
         out << "RestClient.#{method} #{url.inspect}"
         out << payload.short_inspect if payload
-        out << processed_headers.to_a.sort.map{|(k,v)| [k.inspect, v.inspect].join("=>")}.join(", ")
+        out << processed_headers.to_a.sort.map { |(k, v)| [k.inspect, v.inspect].join("=>") }.join(", ")
         RestClient.log << out.join(', ') + "\n"
       end
     end
@@ -228,7 +255,7 @@ module RestClient
     def stringify_headers headers
       headers.inject({}) do |result, (key, value)|
         if key.is_a? Symbol
-          key = key.to_s.split(/_/).map{|w| w.capitalize}.join('-')
+          key = key.to_s.split(/_/).map { |w| w.capitalize }.join('-')
         end
         if 'CONTENT-TYPE' == key.upcase
           target_value = value.to_s
@@ -240,7 +267,7 @@ module RestClient
           else
             target_values = value.to_s.split ','
           end
-          result[key] = target_values.map{ |ext| MIME::Types.type_for_extension(ext.to_s.strip)}.join(', ')
+          result[key] = target_values.map { |ext| MIME::Types.type_for_extension(ext.to_s.strip) }.join(', ')
         else
           result[key] = value.to_s
         end
@@ -249,7 +276,7 @@ module RestClient
     end
 
     def default_headers
-      { :accept => '*/*; q=0.5, application/xml', :accept_encoding => 'gzip, deflate' }
+      {:accept => '*/*; q=0.5, application/xml', :accept_encoding => 'gzip, deflate'}
     end
 
   end

data/spec/abstract_response_spec.rb

@@ -53,7 +53,12 @@ describe RestClient::AbstractResponse do
 
   it "extract strange cookies" do
     @net_http_res.should_receive(:to_hash).and_return('set-cookie' => ['session_id=ZJ/HQVH6YE+rVkTpn0zvTQ==; path=/'])
-    @response.cookies.should == { 'session_id' => 'ZJ/HQVH6YE rVkTpn0zvTQ==' }
+    @response.cookies.should == { 'session_id' => 'ZJ%2FHQVH6YE+rVkTpn0zvTQ%3D%3D' }
+  end
+
+  it "doesn't escape cookies" do
+    @net_http_res.should_receive(:to_hash).and_return('set-cookie' => ['session_id=BAh7BzoNYXBwX25hbWUiEGFwcGxpY2F0aW9uOgpsb2dpbiIKYWRtaW4%3D%0A--08114ba654f17c04d20dcc5228ec672508f738ca; path=/'])
+    @response.cookies.should == { 'session_id' => 'BAh7BzoNYXBwX25hbWUiEGFwcGxpY2F0aW9uOgpsb2dpbiIKYWRtaW4%3D%0A--08114ba654f17c04d20dcc5228ec672508f738ca' }
   end
 
   it "can access the net http result directly" do

data/spec/payload_spec.rb

@@ -14,6 +14,11 @@ describe RestClient::Payload do
               RestClient::Payload::UrlEncoded.new({:foo => 'bar', :baz => 'qux'}).to_s)
     end
 
+    it "should escape parameters" do
+      RestClient::Payload::UrlEncoded.new({'foo ' => 'bar'}).to_s.
+              should == "foo%20=bar"
+    end
+
     it "should properly handle hashes as parameter" do
       RestClient::Payload::UrlEncoded.new({:foo => {:bar => 'baz' }}).to_s.
               should == "foo[bar]=baz"
@@ -74,6 +79,17 @@ bar\r
       EOS
     end
 
+    it "should not escape parameters names" do
+      m = RestClient::Payload::Multipart.new([["bar ", "baz"]])
+      m.to_s.should == <<-EOS
+--#{m.boundary}\r
+Content-Disposition: form-data; name="bar "\r
+\r
+baz\r
+--#{m.boundary}--\r
+      EOS
+    end
+
     it "should form properly separated multipart data" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       m = RestClient::Payload::Multipart.new({:foo => f})
@@ -141,6 +157,33 @@ Content-Type: text/plain\r
 
   end
 
+  context "streamed payloads" do
+    it "should properly determine the size of file payloads" do
+      f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
+      payload = RestClient::Payload.generate(f)
+      payload.size.should == 22_545
+      payload.length.should == 22_545
+    end
+
+    it "should properly determine the size of other kinds of streaming payloads" do
+      s = StringIO.new 'foo'
+      payload = RestClient::Payload.generate(s)
+      payload.size.should == 3
+      payload.length.should == 3
+
+      begin
+        f = Tempfile.new "rest-client"
+        f.write 'foo bar'
+
+        payload = RestClient::Payload.generate(f)
+        payload.size.should == 7
+        payload.length.should == 7
+      ensure
+        f.close
+      end
+    end
+  end
+
   context "Payload generation" do
     it "should recognize standard urlencoded params" do
       RestClient::Payload.generate({"foo" => 'bar'}).should be_kind_of(RestClient::Payload::UrlEncoded)
@@ -164,5 +207,13 @@ Content-Type: text/plain\r
       RestClient::Payload.generate({"foo" => {"file" => f}}).should be_kind_of(RestClient::Payload::Multipart)
     end
 
+    it "should recognize file payloads that can be streamed" do
+      f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
+      RestClient::Payload.generate(f).should be_kind_of(RestClient::Payload::Streamed)
+    end
+
+    it "should recognize other payloads that can be streamed" do
+      RestClient::Payload.generate(StringIO.new('foo')).should be_kind_of(RestClient::Payload::Streamed)
+    end
   end
 end

data/spec/request2_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/base'
+
+require 'webmock/rspec'
+include WebMock
+
+describe RestClient::Request do
+
+  it "manage params for get requests" do
+    stub_request(:get, 'http://some/resource?a=b&c=d').with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Foo'=>'bar'}).to_return(:body => 'foo', :status => 200)
+    RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :headers => {:foo => :bar, :params => {:a => :b, 'c' => 'd'}}).body.should == 'foo'
+
+    stub_request(:get, 'http://some/resource').with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Foo'=>'bar', 'params' => 'a'}).to_return(:body => 'foo', :status => 200)
+    RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :headers => {:foo => :bar, :params => :a}).body.should == 'foo'
+  end
+
+end
+

data/spec/request_spec.rb

@@ -59,7 +59,7 @@ describe RestClient::Request do
   end
 
   it "doesn't classify successful requests as failed" do
-    203.upto(206) do |code|
+    203.upto(207) do |code|
       res = mock("result")
       res.stub!(:code).and_return(code.to_s)
       res.stub!(:body).and_return("")
@@ -276,7 +276,7 @@ describe RestClient::Request do
   describe "block usage" do
     it "returns what asked to" do
       res = mock('response', :code => '401', :[] => ['content-encoding' => ''], :body => '' )
-      @request.process_result(res){|response| "foo"}.should == "foo"
+      @request.process_result(res){|response, request| "foo"}.should == "foo"
     end
   end
 

data/spec/resource_spec.rb

@@ -5,32 +5,32 @@ include WebMock
 
 describe RestClient::Resource do
   before do
-    @resource = RestClient::Resource.new('http://some/resource', :user => 'jane', :password => 'mypass', :headers => { 'X-Something' => '1'})
+    @resource = RestClient::Resource.new('http://some/resource', :user => 'jane', :password => 'mypass', :headers => {'X-Something' => '1'})
   end
 
   context "Resource delegation" do
     it "GET" do
-      RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => { 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => {'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
       @resource.get
     end
 
     it "POST" do
-      RestClient::Request.should_receive(:execute).with(:method => :post, :url => 'http://some/resource', :payload => 'abc', :headers => { :content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      RestClient::Request.should_receive(:execute).with(:method => :post, :url => 'http://some/resource', :payload => 'abc', :headers => {:content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
       @resource.post 'abc', :content_type => 'image/jpg'
     end
 
     it "PUT" do
-      RestClient::Request.should_receive(:execute).with(:method => :put, :url => 'http://some/resource', :payload => 'abc', :headers => { :content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      RestClient::Request.should_receive(:execute).with(:method => :put, :url => 'http://some/resource', :payload => 'abc', :headers => {:content_type => 'image/jpg', 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
       @resource.put 'abc', :content_type => 'image/jpg'
     end
 
     it "DELETE" do
-      RestClient::Request.should_receive(:execute).with(:method => :delete, :url => 'http://some/resource', :headers => { 'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
+      RestClient::Request.should_receive(:execute).with(:method => :delete, :url => 'http://some/resource', :headers => {'X-Something' => '1'}, :user => 'jane', :password => 'mypass')
       @resource.delete
     end
 
     it "overrides resource headers" do
-      RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => { 'X-Something' => '2'}, :user => 'jane', :password => 'mypass')
+      RestClient::Request.should_receive(:execute).with(:method => :get, :url => 'http://some/resource', :headers => {'X-Something' => '2'}, :user => 'jane', :password => 'mypass')
       @resource.get 'X-Something' => '2'
     end
   end
@@ -79,20 +79,20 @@ describe RestClient::Resource do
   describe 'block' do
     it 'can use block when creating the resource' do
       stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
-      resource = RestClient::Resource.new('www.example.com'){|response| 'foo'}
+      resource = RestClient::Resource.new('www.example.com') { |response, request| 'foo' }
       resource.get.should == 'foo'
     end
 
     it 'can use block when executing the resource' do
       stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
       resource = RestClient::Resource.new('www.example.com')
-      resource.get{|response| 'foo'}.should == 'foo'
+      resource.get { |response, request| 'foo' }.should == 'foo'
     end
 
     it 'execution block override resource block' do
       stub_request(:get, 'www.example.com').to_return(:body => '', :status => 404)
-      resource = RestClient::Resource.new('www.example.com'){|response| 'foo'}
-      resource.get{|response| 'bar'}.should == 'bar'
+      resource = RestClient::Resource.new('www.example.com') { |response, request| 'foo' }
+      resource.get { |response, request| 'bar' }.should == 'bar'
     end
 
   end

data/spec/response_spec.rb

@@ -6,6 +6,7 @@ include WebMock
 describe RestClient::Response do
   before do
     @net_http_res = mock('net http response', :to_hash => {"Status" => ["200 OK"]}, :code => 200)
+    @request = mock('http request', :user => nil, :password => nil)
     @response = RestClient::Response.create('abc', @net_http_res, {})
   end
 
@@ -59,13 +60,13 @@ describe RestClient::Response do
       (200..206).each do |code|
         net_http_res = mock('net http response', :code => '200')
         response = RestClient::Response.create('abc', net_http_res, {})
-        response.return!
+        response.return! @request
       end
     end
 
     it "should throw an exception for other codes" do
       RestClient::Exceptions::EXCEPTIONS_MAP.each_key do |code|
-        unless (200..206).include? code
+        unless (200..207).include? code
           net_http_res = mock('net http response', :code => code.to_i)
           response = RestClient::Response.create('abc', net_http_res, {})
           lambda { response.return!}.should raise_error
@@ -83,16 +84,34 @@ describe RestClient::Response do
       RestClient::Request.execute(:url => 'http://some/resource', :method => :get).body.should == 'Foo'
     end
 
-    it "doesn't follow a redirection when the request is a post" do
+    it "follows a redirection and keep the parameters" do
+      stub_request(:get, 'http://foo:bar@some/resource').with(:headers => {'Accept' => 'application/json'}).to_return(:body => '', :status => 301, :headers => {'Location' => 'http://new/resource'})
+      stub_request(:get, 'http://foo:bar@new/resource').with(:headers => {'Accept' => 'application/json'}).to_return(:body => 'Foo')
+      RestClient::Request.execute(:url => 'http://some/resource', :method => :get, :user => 'foo', :password => 'bar', :headers => {:accept => :json}).body.should == 'Foo'
+    end
+
+    it "doesn't follow a 301 when the request is a post" do
       net_http_res = mock('net http response', :code => 301)
       response = RestClient::Response.create('abc', net_http_res, {:method => :post})
-      lambda { response.return!}.should raise_error(RestClient::MovedPermanently)
+      lambda { response.return!(@request)}.should raise_error(RestClient::MovedPermanently)
+    end
+
+    it "doesn't follow a 302 when the request is a post" do
+      net_http_res = mock('net http response', :code => 302)
+      response = RestClient::Response.create('abc', net_http_res, {:method => :post})
+      lambda { response.return!(@request)}.should raise_error(RestClient::Found)
+    end
+
+    it "doesn't follow a 307 when the request is a post" do
+      net_http_res = mock('net http response', :code => 307)
+      response = RestClient::Response.create('abc', net_http_res, {:method => :post})
+      lambda { response.return!(@request)}.should raise_error(RestClient::TemporaryRedirect)
     end
 
     it "doesn't follow a redirection when the request is a put" do
       net_http_res = mock('net http response', :code => 301)
       response = RestClient::Response.create('abc', net_http_res, {:method => :put})
-      lambda { response.return!}.should raise_error(RestClient::MovedPermanently)
+      lambda { response.return!(@request)}.should raise_error(RestClient::MovedPermanently)
     end
 
     it "follows a redirection when the request is a post and result is a 303" do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rest-client
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 10
+  prerelease: true
   segments: 
   - 1
-  - 5
-  - 1
-  version: 1.5.1
+  - 6
+  - 0
+  - a
+  version: 1.6.0.a
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 +01:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: restclient
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +50,7 @@ files:
 - VERSION
 - bin/restclient
 - lib/rest_client.rb
+- lib/rest-client.rb
 - lib/restclient.rb
 - lib/restclient/exceptions.rb
 - lib/restclient/abstract_response.rb
@@ -66,6 +68,7 @@ files:
 - spec/payload_spec.rb
 - spec/raw_response_spec.rb
 - spec/request_spec.rb
+- spec/request2_spec.rb
 - spec/resource_spec.rb
 - spec/response_spec.rb
 - spec/restclient_spec.rb
@@ -115,6 +118,7 @@ test_files:
 - spec/payload_spec.rb
 - spec/raw_response_spec.rb
 - spec/request_spec.rb
+- spec/request2_spec.rb
 - spec/resource_spec.rb
 - spec/response_spec.rb
 - spec/restclient_spec.rb