francois-rest-client 1.1.5 → 1.1.6

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/restclient/payload.rb

@@ -64,6 +64,7 @@ module RestClient
 
 			def inspect
 				to_s.inspect
+				@stream.seek(0)
 			end
 		end
 
@@ -115,7 +116,7 @@ module RestClient
 			def create_file_field(s, k, v)
 				begin
 					s.write("Content-Disposition: multipart/form-data; name=\"#{k}\"; filename=\"#{File.basename(v.path)}\"#{EOL}")
-					s.write("Content-Type: #{mime_for(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)
 						s.write(data)

data/spec/payload_spec.rb

@@ -45,6 +45,20 @@ Content-Type: image/jpeg\r
 \r
 #{IO.read(f.path)}\r
 --#{m.boundary}--\r
+EOS
+		end
+
+		it "should detect content type if tempfile responds to content_type" do
+			f = File.new(File.dirname(__FILE__) + "/master_shake.jpg")
+      f.instance_eval "def content_type; 'text/plain'; end" 
+			m = RestClient::Payload::Multipart.new({:foo => f})
+			m.to_s.should == <<-EOS
+--#{m.boundary}\r
+Content-Disposition: multipart/form-data; name="foo"; filename="master_shake.jpg"\r
+Content-Type: text/plain\r
+\r
+#{IO.read(f.path)}\r
+--#{m.boundary}--\r
 EOS
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francois-rest-client
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: restclient
 dependencies: []