multipart 0.2 → 0.2.1

data/multipart.rb

@@ -145,23 +145,23 @@ module Net
                              boundary1="paranguaricutirimirruaru0xdeadbeef",
                              boundary2="paranguaricutirimirruaru0x20132")
 
-        self.content_type = "multipart/form-data, boundary=\"#{boundary1}\""
+        self.content_type = "multipart/form-data; boundary=\"#{boundary1}\""
 
         tmp = StringIO.new('r+b')
 
         # let's do the easy ones first
         other_params.each do |key,val|
-          tmp.write "\n--#{boundary1}\n"
-          tmp.write "content-disposition: form-data; name=\"#{key}\"\n"
-          tmp.write "\n"
-          tmp.write "#{val}"
+          tmp.write "--#{boundary1}\r\n"
+          tmp.write "content-disposition: form-data; name=\"#{key}\"\r\n"
+          tmp.write "\r\n"
+          tmp.write "#{val}\r\n"
         end
 
         # now handle the files...
         files_params.each do |name, file|
-          tmp.write "\n--#{boundary1}\n"
+          tmp.write "\r\n--#{boundary1}\r\n"
 
-          # no \n
+          # no \r\n
           tmp.write "content-disposition: form-data; name=\"#{name}\""
 
           if not file.is_a? Enumerable
@@ -169,46 +169,48 @@ module Net
 
             if file.filename
               # right in content-dispo line
-              tmp.write "; filename=\"#{file.filename}\"\n"
+              tmp.write "; filename=\"#{file.filename}\"\r\n"
             else
-              tmp.write "\n"
+              tmp.write "\r\n"
             end
 
-            tmp.write "Content-Type: #{file.mimetype}\n"
-            tmp.write "Content-Transfer-Encoding: binary\n"
-            tmp.write "\n"
+            tmp.write "Content-Type: #{file.mimetype}\r\n"
+            tmp.write "Content-Transfer-Encoding: binary\r\n"
+            tmp.write "\r\n"
             tmp.write(file.read())
             file.maybeclose
           else
             # multiple-file parameter (multipart/mixed)
-            tmp.write "\n"
-            tmp.write "Content-Type: multipart/mixed,"
-            tmp.write " boundary=\"#{boundary2}\"\n"
+            tmp.write "\r\n"
+            tmp.write "Content-Type: multipart/mixed;"
+            tmp.write " boundary=\"#{boundary2}\"\r\n"
 
             file.each do |f|
-              tmp.write "\n--#{boundary2}\n"
+              tmp.write "\r\n--#{boundary2}\r\n"
 
               tmp.write "Content-disposition: attachment"
               if f.filename
-                tmp.write "; filename=\"#{f.filename}\"\n"
+                tmp.write "; filename=\"#{f.filename}\"\r\n"
               else
-                tmp.write "\n"
+                tmp.write "\r\n"
               end
 
-              tmp.write "Content-Type: #{f.mimetype}\n"
-              tmp.write "Content-Transfer-Encoding: binary\n"
-              tmp.write "\n"
+              tmp.write "Content-Type: #{f.mimetype}\r\n"
+              tmp.write "Content-Transfer-Encoding: binary\r\n"
+              tmp.write "\r\n"
               tmp.write(f.read())
               f.maybeclose
             end
-            tmp.write "\n--#{boundary2}\n"
+            tmp.write "\r\n--#{boundary2}--\r\n"
           end
         end
-        tmp.write "\n--#{boundary1}\n"
-
-        tmp.flush.seek(0)
+        tmp.write "--#{boundary1}--\r\n"
 
+        
+        tmp.flush
+        self.content_length = tmp.size
         self.body_stream = tmp
+        self.body_stream.seek(0)
         nil
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multipart
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Leonardo Boiko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-05 00:00:00 -03:00
+date: 2009-04-04 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: multipart
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: add multipart (file upload) support to Net::HTTP::Post