Merge remote-tracking branch 'pchambino/payload_to_s' into ab-urlparams

Conflicts:
	lib/restclient/payload.rb

lib/restclient/payload.rb

@@ -64,7 +64,11 @@ module RestClient
         @stream.read(*args)
       end
 
-      alias :to_s :read
+      def to_s
+        result = read
+        @stream.seek(0)
+        result
+      end
 
       # Flatten parameters by converting hashes of hashes to flat hashes
       # {keys1 => {keys2 => value}} will be transformed into [keys1[key2], value]
@@ -113,9 +117,7 @@ module RestClient
 
       def inspect
         # TODO: make this not pretend to be a string (ugh)
-        result = to_s.inspect
-        @stream.seek(0)
-        result
+        to_s.inspect
       end
 
       def short_inspect

spec/unit/payload_spec.rb

@@ -3,6 +3,14 @@
 require_relative '_lib'
 
 describe RestClient::Payload do
+  context "Base Payload" do
+    it "should reset stream after to_s" do
+      payload = RestClient::Payload::Base.new('foobar')
+      payload.to_s.should eq 'foobar'
+      payload.to_s.should eq 'foobar'
+    end
+  end
+
   context "A regular Payload" do
     it "should use standard enctype as default content-type" do
       RestClient::Payload::UrlEncoded.new({}).headers['Content-Type'].