RubyGems - rest-client - Versions diffs - 1.4.2 → 1.5.0.a - Mend

rest-client 1.4.2 → 1.5.0.a

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rest-client might be problematic. Click here for more details.

Files changed (13) hide show

data/README.rdoc +28 -0
data/VERSION +1 -1
data/history.md +11 -0
data/lib/restclient/abstract_response.rb +7 -8
data/lib/restclient/payload.rb +22 -7
data/lib/restclient/raw_response.rb +5 -2
data/lib/restclient/request.rb +27 -23
data/lib/restclient/response.rb +11 -33
data/spec/abstract_response_spec.rb +24 -3
data/spec/payload_spec.rb +25 -2
data/spec/request_spec.rb +16 -20
data/spec/response_spec.rb +12 -10
metadata +5 -4

data/README.rdoc CHANGED

@@ -17,6 +17,28 @@ of specifying actions: get, put, post, delete.
   RestClient.delete 'http://example.com/resource'
+  response = RestClient.get 'http://example.com/resource'
+  response.code
+  ➔ 200
+  response.cookies
+  ➔ {"Foo"=>"BAR", "QUUX"=>"QUUUUX"}
+  response.headers
+  ➔ {:content_type=>"text/html; charset=utf-8", :cache_control=>"private" ...
+  response.to_str
+  ➔ \n<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n   \"http://www.w3.org/TR/html4/strict.dtd\">\n\n<html ....
+  RestClient.post( url,
+    {
+      :transfer => {
+        :path => '/foo/bar',
+        :owner => 'that_guy',
+        :group => 'those_guys'
+      },
+       :upload => {
+        :file => File.new(path)
+      }
+    })
 == Multipart
 Yeah, that's right!  This does multipart sends for you!
@@ -226,6 +248,12 @@ Example:
   RestClient.get 'http://example.com'
+== More
+Need caching, more advanced logging or any ability provided by a rack middleware ?
+Have a look at rest-client-components http://github.com/crohr/rest-client-components
 == Meta
 Written by Adam Wiggins, major modifications by Blake Mizerany, maintained by Julien Kirch

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.4.2
1	+ 1.5.0.a

data/history.md CHANGED

@@ -1,3 +1,14 @@
+# 1.5.0
+- the response is now a string with the Response module
+- added AbstractResponse.to_i to improve semantic
+- multipart Payloads ignores the name attribute if it's not set (patch provided by Tekin Suleyman)
+- correctly takes into account user headers whose keys are strings (path provided by Cyril Rohr)
+- use binary mode for payload temp file
+- concatenate cookies with ';'
+- fixed deeper parameter handling
+- do not quote the boundary in the Content-Type header (patch provided by W. Andrew Loe III)
 # 1.4.2
 - fixed RestClient.add_before_execution_proc (patch provided by Nicholas Wieland)

data/lib/restclient/abstract_response.rb CHANGED

@@ -1,14 +1,9 @@
 module RestClient
-  class AbstractResponse
+  module AbstractResponse
     attr_reader :net_http_res, :args
-    def initialize net_http_res, args
-      @net_http_res = net_http_res
-      @args = args
-    end
     # HTTP status code
     def code
       @code ||= @net_http_res.code.to_i
@@ -17,7 +12,7 @@ module RestClient
     # A hash of the headers, beautified with symbols and underscores.
     # e.g. "Content-type" will become :content_type.
     def headers
-      @headers ||= self.class.beautify_headers(@net_http_res.to_hash)
+      @headers ||= AbstractResponse.beautify_headers(@net_http_res.to_hash)
     end
     # The raw headers.
@@ -63,7 +58,11 @@ module RestClient
       end
     end
-    def inspect
+    def to_i
+      code
+    end
+    def description
       "#{code} #{STATUSES[code]} | #{(headers[:content_type] || '').gsub(/;.*$/, '')} #{size} bytes\n"
     end

data/lib/restclient/payload.rb CHANGED

@@ -52,7 +52,7 @@ module RestClient
       end
       # Flatten parameters by converting hashes of hashes to flat hashes
-      # {keys1 => {keys2 => value}} will be transformed into {keys1[key2] => value}
+      # {keys1 => {keys2 => value}} will be transformed into [keys1[key2], value]
       def flatten_params(params, parent_key = nil)
         result = []
         params.each do |key, value|
@@ -60,9 +60,7 @@ module RestClient
           if value.is_a? Hash
             result += flatten_params(value, calculated_key)
           elsif value.is_a? Array
-            value.each do |elem|
-              result << ["#{calculated_key}[]", elem]
-            end
+            result += flatten_params_array(value, calculated_key)
           else
             result << [calculated_key, value]
           end
@@ -70,6 +68,20 @@ module RestClient
         result
       end
+      def flatten_params_array value, calculated_key
+        result = []
+        value.each do |elem|
+          if elem.is_a? Hash
+            result +=  flatten_params(elem, calculated_key)
+          elsif elem.is_a? Array
+            result += flatten_params_array(elem, calculated_key)
+          else
+            result << ["#{calculated_key}[]", elem]
+          end
+        end
+        result
+      end
       def headers
         { 'Content-Length' => size.to_s }
       end
@@ -91,7 +103,7 @@ module RestClient
       end
       def short_inspect
-        (size > 100 ? "#{size} byte(s) length" : inspect)
+        (size > 500 ? "#{size} byte(s) length" : inspect)
       end
     end
@@ -116,6 +128,7 @@ module RestClient
         b = "--#{boundary}"
         @stream = Tempfile.new("RESTClient.Stream.#{rand(1000)}")
+        @stream.binmode
         @stream.write(b + EOL)
         if params.is_a? Hash
@@ -149,7 +162,9 @@ module RestClient
       def create_file_field(s, k, v)
         begin
-          s.write("Content-Disposition: form-data; name=\"#{k}\"; filename=\"#{v.respond_to?(:original_filename) ? v.original_filename : File.basename(v.path)}\"#{EOL}")
+          s.write("Content-Disposition: form-data;")
+          s.write(" name=\"#{k}\";") unless (k.nil? || k=='')
+          s.write(" filename=\"#{v.respond_to?(:original_filename) ? v.original_filename : File.basename(v.path)}\"#{EOL}")
           s.write("Content-Type: #{v.respond_to?(:content_type) ? v.content_type : mime_for(v.path)}#{EOL}")
           s.write(EOL)
           while data = v.read(8124)
@@ -170,7 +185,7 @@ module RestClient
       end
       def headers
-        super.merge({'Content-Type' => %Q{multipart/form-data; boundary="#{boundary}"}})
+        super.merge({'Content-Type' => %Q{multipart/form-data; boundary=#{boundary}}})
       end
       def close

data/lib/restclient/raw_response.rb CHANGED

@@ -9,12 +9,15 @@ module RestClient
   # In addition, if you do not use the response as a string, you can access
   # a Tempfile object at res.file, which contains the path to the raw
   # downloaded request body.
-  class RawResponse < AbstractResponse
+  class RawResponse
+    include AbstractResponse
     attr_reader :file
     def initialize tempfile, net_http_res, args
-      super net_http_res, args
+      @net_http_res = net_http_res
+      @args = args
       @file = tempfile
     end

data/lib/restclient/request.rb CHANGED

@@ -57,28 +57,9 @@ module RestClient
     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}=#{val}" }.sort.join(';')
       end
-      headers = default_headers.merge(user_headers).inject({}) do |final, (key, value)|
-        target_key = key.to_s.gsub(/_/, '-').capitalize
-        if 'CONTENT-TYPE' == target_key.upcase
-          target_value = value.to_s
-          final[target_key] = MIME::Types.type_for_extension target_value
-        elsif 'ACCEPT' == target_key.upcase
-          # Accept can be composed of several comma-separated values
-          if value.is_a? Array
-            target_values = value
-          else
-            target_values = value.to_s.split ','
-          end
-          final[target_key] = target_values.map{ |ext| MIME::Types.type_for_extension(ext.to_s.strip)}.join(', ')
-        else
-          final[target_key] = value.to_s
-        end
-        final
-      end
+      headers = stringify_headers(default_headers).merge(stringify_headers(user_headers))
       headers.merge!(@payload.headers) if @payload
       headers
     end
@@ -195,7 +176,7 @@ module RestClient
         # We don't decode raw requests
         response = RawResponse.new(@tf, res, args)
       else
-        response = Response.new(Request.decode(res['content-encoding'], res.body), res, args)
+        response = Response.create(Request.decode(res['content-encoding'], res.body), res, args)
       end
       if block_given?
@@ -223,7 +204,7 @@ module RestClient
         out = []
         out << "RestClient.#{method} #{url.inspect}"
         out << payload.short_inspect if payload
-        out << processed_headers.inspect.gsub(/^\{/, '').gsub(/\}$/, '')
+        out << processed_headers.to_a.sort.map{|(k,v)| [k.inspect, v.inspect].join("=>")}.join(", ")
         RestClient.log << out.join(', ') + "\n"
       end
     end
@@ -235,9 +216,32 @@ module RestClient
       end
     end
+    # Return a hash of headers whose keys are capitalized strings
+    def stringify_headers headers
+      headers.inject({}) do |result, (key, value)|
+        target_key = key.to_s.split(/_/).map{|w| w.capitalize}.join('-')
+        if 'CONTENT-TYPE' == target_key.upcase
+          target_value = value.to_s
+          result[target_key] = MIME::Types.type_for_extension target_value
+        elsif 'ACCEPT' == target_key.upcase
+          # Accept can be composed of several comma-separated values
+          if value.is_a? Array
+            target_values = value
+          else
+            target_values = value.to_s.split ','
+          end
+          result[target_key] = target_values.map{ |ext| MIME::Types.type_for_extension(ext.to_s.strip)}.join(', ')
+        else
+          result[target_key] = value.to_s
+        end
+        result
+      end
+    end
     def default_headers
       { :accept => '*/*; q=0.5, application/xml', :accept_encoding => 'gzip, deflate' }
     end
   end
 end

data/lib/restclient/response.rb CHANGED

@@ -2,44 +2,22 @@ module RestClient
   # A Response from RestClient, you can access the response body, the code or the headers.
   #
-  class Response < AbstractResponse
+  module Response
-    attr_reader :body
+    include AbstractResponse
-    WARNING_MESSAGE = '[warning] The Response is no more a String and the Response content is now accessed through Response.body, please update your code'
+    attr_accessor :body, :net_http_res, :args
-    def initialize body, net_http_res, args
-      super net_http_res, args
-      @body = body || ""
+    def body
+      self
     end
-    def method_missing symbol, *args
-      if body.respond_to? symbol
-        warn WARNING_MESSAGE
-        body.send symbol, *args
-      else
-        super
-      end
-    end
-    def == o
-      if super
-        true
-      else
-        equal_body = (body == o)
-        if equal_body
-          warn WARNING_MESSAGE
-        end
-        equal_body
-      end
-    end
-    def to_s
-      body.to_s
-    end
-    def size
-      body.size
+    def Response.create body, net_http_res, args
+      result = body || ''
+      result.extend Response
+      result.net_http_res = net_http_res
+      result.args = args
+      result
     end
   end

data/spec/abstract_response_spec.rb CHANGED

@@ -1,9 +1,24 @@
 require File.dirname(__FILE__) + '/base'
 describe RestClient::AbstractResponse do
+  class MyAbstractResponse
+    include RestClient::AbstractResponse
+    attr_accessor :size
+    def initialize net_http_res, args
+      @net_http_res = net_http_res
+      @args = args
+    end
+  end
   before do
     @net_http_res = mock('net http response')
-    @response = RestClient::AbstractResponse.new(@net_http_res, {})
+    @response = MyAbstractResponse.new(@net_http_res, {})
   end
   it "fetches the numeric response code" do
@@ -11,13 +26,19 @@ describe RestClient::AbstractResponse do
     @response.code.should == 200
   end
+  it "has a nice description" do
+    @net_http_res.should_receive(:to_hash).and_return({'Content-Type' => 'application/pdf'})
+    @net_http_res.should_receive(:code).and_return('200')
+    @response.description == '200 OK | application/pdf  bytes\n'
+  end
   it "beautifies the headers by turning the keys to symbols" do
-    h = RestClient::Response.beautify_headers('content-type' => [ 'x' ])
+    h = RestClient::AbstractResponse.beautify_headers('content-type' => [ 'x' ])
     h.keys.first.should == :content_type
   end
   it "beautifies the headers by turning the values to strings instead of one-element arrays" do
-    h = RestClient::Response.beautify_headers('x' => [ 'text/html' ] )
+    h = RestClient::AbstractResponse.beautify_headers('x' => [ 'text/html' ] )
     h.values.first.should == 'text/html'
   end

data/spec/payload_spec.rb CHANGED

@@ -11,7 +11,7 @@ describe RestClient::Payload do
       RestClient::Payload::UrlEncoded.new({:foo => 'bar'}).to_s.
               should == "foo=bar"
       ["foo=bar&baz=qux", "baz=qux&foo=bar"].should include(
-      RestClient::Payload::UrlEncoded.new({:foo => 'bar', :baz => 'qux'}).to_s)
+              RestClient::Payload::UrlEncoded.new({:foo => 'bar', :baz => 'qux'}).to_s)
     end
     it "should properly handle hashes as parameter" do
@@ -26,6 +26,16 @@ describe RestClient::Payload do
       parameters.should include("foo[bar]=baz", "foo[baz]=qux")
     end
+    it "should handle attributes inside a an array inside an hash" do
+      parameters = RestClient::Payload::UrlEncoded.new({"foo" => [{"bar" => 'baz'}, {"bar" => 'qux'}]}).to_s
+      parameters.should include("foo[bar]=baz", "foo[bar]=qux")
+    end
+    it "should handle attributes inside a an array inside an array inside an hash" do
+      parameters = RestClient::Payload::UrlEncoded.new({"foo" => [ [{"bar" => 'baz'}, {"bar" => 'qux'}]]}).to_s
+      parameters.should include("foo[bar]=baz", "foo[bar]=qux")
+    end
     it "should form properly use symbols as parameters" do
       RestClient::Payload::UrlEncoded.new({:foo => :bar}).to_s.
               should == "foo=bar"
@@ -46,7 +56,7 @@ describe RestClient::Payload do
     it "should use standard enctype as default content-type" do
       m = RestClient::Payload::Multipart.new({})
       m.stub!(:boundary).and_return(123)
-      m.headers['Content-Type'].should == 'multipart/form-data; boundary="123"'
+      m.headers['Content-Type'].should == 'multipart/form-data; boundary=123'
     end
     it "should form properly separated multipart data" do
@@ -77,6 +87,19 @@ Content-Type: image/jpeg\r
       EOS
     end
+    it "should ignore the name attribute when it's not set" do
+      f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
+      m = RestClient::Payload::Multipart.new({nil => f})
+      m.to_s.should == <<-EOS
+--#{m.boundary}\r
+Content-Disposition: form-data; filename="master_shake.jpg"\r
+Content-Type: image/jpeg\r
+\r
+#{IO.read(f.path)}\r
+--#{m.boundary}--\r
+      EOS
+    end
     it "should detect optional (original) content type and filename" do
       f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
       f.instance_eval "def content_type; 'text/plain'; end"

data/spec/request_spec.rb CHANGED

@@ -99,7 +99,7 @@ describe RestClient::Request do
     URI.stub!(:parse).and_return(mock('uri', :user => nil, :password => nil))
     @request = RestClient::Request.new(:method => 'get', :url => 'example.com', :cookies => {:session_id => '1', :user_id => "someone" })
     @request.should_receive(:default_headers).and_return({'foo' => 'bar'})
-    headers = @request.make_headers({}).should == { 'Foo' => 'bar', 'Cookie' => 'session_id=1,user_id=someone'}
+    headers = @request.make_headers({}).should == { 'Foo' => 'bar', 'Cookie' => 'session_id=1;user_id=someone'}
   end
   it "determines the Net::HTTP class to instantiate by the method name" do
@@ -108,12 +108,12 @@ describe RestClient::Request do
   describe "user headers" do
     it "merges user headers with the default headers" do
-      @request.should_receive(:default_headers).and_return({ '1' => '2' })
-      headers = @request.make_headers('3' => '4')
-      headers.should have_key('1')
-      headers['1'].should == '2'
-      headers.should have_key('3')
-      headers['3'].should == '4'
+      @request.should_receive(:default_headers).and_return({ :accept => '*/*; q=0.5, application/xml', :accept_encoding => 'gzip, deflate' })
+      headers = @request.make_headers("Accept" => "application/json", :accept_encoding => 'gzip')
+      headers.should have_key "Accept-Encoding"
+      headers["Accept-Encoding"].should == "gzip"
+      headers.should have_key "Accept"
+      headers["Accept"].should == "application/json"
     end
     it "prefers the user header when the same header exists in the defaults" do
@@ -126,18 +126,18 @@ describe RestClient::Request do
   describe "header symbols" do
-    it "converts header symbols from :content_type to 'Content-type'" do
+    it "converts header symbols from :content_type to 'Content-Type'" do
       @request.should_receive(:default_headers).and_return({})
       headers = @request.make_headers(:content_type => 'abc')
-      headers.should have_key('Content-type')
-      headers['Content-type'].should == 'abc'
+      headers.should have_key('Content-Type')
+      headers['Content-Type'].should == 'abc'
     end
     it "converts content-type from extension to real content-type" do
       @request.should_receive(:default_headers).and_return({})
       headers = @request.make_headers(:content_type => 'json')
-      headers.should have_key('Content-type')
-      headers['Content-type'].should == 'application/json'
+      headers.should have_key('Content-Type')
+      headers['Content-Type'].should == 'application/json'
     end
     it "converts accept from extension(s) to real content-type(s)" do
@@ -282,29 +282,25 @@ describe RestClient::Request do
     it "logs a get request" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :get, :url => 'http://url').log_request
-      ['RestClient.get "http://url", "Accept-encoding"=>"gzip, deflate", "Accept"=>"*/*; q=0.5, application/xml"' + "\n",
-       'RestClient.get "http://url", "Accept"=>"*/*; q=0.5, application/xml", "Accept-encoding"=>"gzip, deflate"' + "\n"].should include(log[0])
+      log[0].should == %Q{RestClient.get "http://url", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate"\n}
     end
     it "logs a post request with a small payload" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :post, :url => 'http://url', :payload => 'foo').log_request
-      ['RestClient.post "http://url", "foo", "Accept-encoding"=>"gzip, deflate", "Content-Length"=>"3", "Accept"=>"*/*; q=0.5, application/xml"' + "\n",
-       'RestClient.post "http://url", "foo", "Accept"=>"*/*; q=0.5, application/xml", "Accept-encoding"=>"gzip, deflate", "Content-Length"=>"3"' + "\n"].should include(log[0])
+      log[0].should == %Q{RestClient.post "http://url", "foo", "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"3"\n}
     end
     it "logs a post request with a large payload" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :post, :url => 'http://url', :payload => ('x' * 1000)).log_request
-      ['RestClient.post "http://url", 1000 byte(s) length, "Accept-encoding"=>"gzip, deflate", "Content-Length"=>"1000", "Accept"=>"*/*; q=0.5, application/xml"' + "\n",
-       'RestClient.post "http://url", 1000 byte(s) length, "Accept"=>"*/*; q=0.5, application/xml", "Accept-encoding"=>"gzip, deflate", "Content-Length"=>"1000"' + "\n"].should include(log[0])
+      log[0].should == %Q{RestClient.post "http://url", 1000 byte(s) length, "Accept"=>"*/*; q=0.5, application/xml", "Accept-Encoding"=>"gzip, deflate", "Content-Length"=>"1000"\n}
     end
     it "logs input headers as a hash" do
       log = RestClient.log = []
       RestClient::Request.new(:method => :get, :url => 'http://url', :headers => { :accept => 'text/plain' }).log_request
-      ['RestClient.get "http://url", "Accept-encoding"=>"gzip, deflate", "Accept"=>"text/plain"' + "\n",
-       'RestClient.get "http://url", "Accept"=>"text/plain", "Accept-encoding"=>"gzip, deflate"' + "\n"].should include(log[0])
+      log[0].should == %Q{RestClient.get "http://url", "Accept"=>"text/plain", "Accept-Encoding"=>"gzip, deflate"\n}
     end
     it "logs a response including the status code, content type, and result body size in bytes" do

data/spec/response_spec.rb CHANGED

@@ -5,16 +5,18 @@ include WebMock
 describe RestClient::Response do
   before do
-    @net_http_res = mock('net http response', :to_hash => {"Status" => ["200 OK"]})
-    @response = RestClient::Response.new('abc', @net_http_res, {})
+    @net_http_res = mock('net http response', :to_hash => {"Status" => ["200 OK"]}, :code => 200)
+    @response = RestClient::Response.create('abc', @net_http_res, {})
   end
   it "behaves like string" do
     @response.should.to_s == 'abc'
+    @response.to_str.should == 'abc'
+    @response.to_i.should == 200
   end
   it "accepts nil strings and sets it to empty for the case of HEAD" do
-    RestClient::Response.new(nil, @net_http_res, {}).should.to_s == ""
+    RestClient::Response.create(nil, @net_http_res, {}).should.to_s == ""
   end
   it "test headers and raw headers" do
@@ -25,14 +27,14 @@ describe RestClient::Response do
   describe "cookie processing" do
     it "should correctly deal with one Set-Cookie header with one cookie inside" do
       net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT"]})
-      response = RestClient::Response.new('abc', net_http_res, {})
+      response = RestClient::Response.create('abc', net_http_res, {})
       response.headers[:set_cookie].should == ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT"]
       response.cookies.should == { "main_page" => "main_page_no_rewrite" }
     end
     it "should correctly deal with multiple cookies [multiple Set-Cookie headers]" do
       net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT", "remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT", "user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]})
-      response = RestClient::Response.new('abc', net_http_res, {})
+      response = RestClient::Response.create('abc', net_http_res, {})
       response.headers[:set_cookie].should == ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT", "remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT", "user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]
       response.cookies.should == {
               "main_page" => "main_page_no_rewrite",
@@ -43,7 +45,7 @@ describe RestClient::Response do
     it "should correctly deal with multiple cookies [one Set-Cookie header with multiple cookies]" do
       net_http_res = mock('net http response', :to_hash => {"etag" => ["\"e1ac1a2df945942ef4cac8116366baad\""], "set-cookie" => ["main_page=main_page_no_rewrite; path=/; expires=Tue, 20-Jan-2015 15:03:14 GMT, remember_me=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT, user=somebody; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"]})
-      response = RestClient::Response.new('abc', net_http_res, {})
+      response = RestClient::Response.create('abc', net_http_res, {})
       response.cookies.should == {
               "main_page" => "main_page_no_rewrite",
               "remember_me" => "",
@@ -56,7 +58,7 @@ describe RestClient::Response do
     it "should return itself for normal codes" do
       (200..206).each do |code|
         net_http_res = mock('net http response', :code => '200')
-        response = RestClient::Response.new('abc', net_http_res, {})
+        response = RestClient::Response.create('abc', net_http_res, {})
         response.return!
       end
     end
@@ -65,7 +67,7 @@ describe RestClient::Response do
       RestClient::Exceptions::EXCEPTIONS_MAP.each_key do |code|
         unless (200..206).include? code
           net_http_res = mock('net http response', :code => code.to_i)
-          response = RestClient::Response.new('abc', net_http_res, {})
+          response = RestClient::Response.create('abc', net_http_res, {})
           lambda { response.return!}.should raise_error
         end
       end
@@ -83,13 +85,13 @@ describe RestClient::Response do
     it "doesn't follow a redirection when the request is a post" do
       net_http_res = mock('net http response', :code => 301)
-      response = RestClient::Response.new('abc', net_http_res, {:method => :post})
+      response = RestClient::Response.create('abc', net_http_res, {:method => :post})
       lambda { response.return!}.should raise_error(RestClient::MovedPermanently)
     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.new('abc', net_http_res, {:method => :put})
+      response = RestClient::Response.create('abc', net_http_res, {:method => :put})
       lambda { response.return!}.should raise_error(RestClient::MovedPermanently)
     end

metadata CHANGED

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rest-client
 version: !ruby/object:Gem::Version
-  prerelease: false
+  prerelease: true
   segments:
   - 1
-  - 4
-  - 2
-  version: 1.4.2
+  - 5
+  - 0
+  - a
+  version: 1.5.0.a
 platform: ruby
 authors:
 - Adam Wiggins