multipart-post 1.1.2 → 1.1.3

data/lib/composite_io.rb

@@ -11,7 +11,7 @@
 #
 #     crio = CompositeReadIO.new(StringIO.new('one'), StringIO.new('two'), StringIO.new('three'))
 #     puts crio.read # => "onetwothree"
-#  
+#
 class CompositeReadIO
   # Create a new composite-read IO from the arguments, all of which should
   # respond to #read in a manner consistent with IO.
@@ -54,15 +54,21 @@ class UploadIO
   # Net::HTTP::Post::Multipart.
   #
   # Can take two forms. The first accepts a filename and content type, and
-  # opens the file for reading (to be closed by finalizer). The second accepts
-  # an already-open IO, but also requires a third argument, the filename from
-  # which it was opened.
+  # opens the file for reading (to be closed by finalizer).
+  #
+  # The second accepts an already-open IO, but also requires a third argument,
+  # the filename from which it was opened (particularly useful/recommended if
+  # uploading directly from a form in a framework, which often save the file to
+  # an arbitrarily named RackMultipart file in /tmp).
+  #
+  # Usage:
   #
   #     UploadIO.new("file.txt", "text/plain")
   #     UploadIO.new(file_io, "text/plain", "file.txt")
-  attr_reader :content_type, :original_filename, :local_path, :io
+  #
+  attr_reader :content_type, :original_filename, :local_path, :io, :opts
 
-  def initialize(filename_or_io, content_type, filename = nil)
+  def initialize(filename_or_io, content_type, filename = nil, opts = {})
     io = filename_or_io
     local_path = ""
     if io.respond_to? :read
@@ -79,6 +85,7 @@ class UploadIO
     @original_filename = File.basename(filename)
     @local_path = local_path
     @io = io
+    @opts = opts
   end
 
   def self.convert!(io, content_type, original_filename, local_path)

data/lib/multipartable.rb

@@ -6,7 +6,8 @@ require 'parts'
       parts = params.map {|k,v| Parts::Part.new(boundary, k, v)}
       parts << Parts::EpiloguePart.new(boundary)
       ios = parts.map{|p| p.to_io }
-      self.set_content_type("multipart/form-data", { "boundary" => boundary })
+      self.set_content_type(headers["Content-Type"] || "multipart/form-data",
+                            { "boundary" => boundary })
       self.content_length = parts.inject(0) {|sum,i| sum + i.length }
       self.body_stream = CompositeReadIO.new(*ios)
     end

data/lib/parts.rb

@@ -39,19 +39,26 @@ module Parts
     attr_reader :length
     def initialize(boundary, name, io)
       file_length = io.respond_to?(:length) ?  io.length : File.size(io.local_path)
-      @head = build_head(boundary, name, io.original_filename, io.content_type, file_length)
+      @head = build_head(boundary, name, io.original_filename, io.content_type, file_length,
+                         io.respond_to?(:opts) ? io.opts : {})
       @foot = "\r\n"
       @length = @head.length + file_length + @foot.length
       @io = CompositeReadIO.new(StringIO.new(@head), io, StringIO.new(@foot))
     end
 
-    def build_head(boundary, name, filename, type, content_len)
+    def build_head(boundary, name, filename, type, content_len, opts = {})
+      trans_encoding = opts["Content-Transfer-Encoding"] || "binary"
+      content_disposition = opts["Content-Disposition"] || "form-data"
+
       part = ''
       part << "--#{boundary}\r\n"
-      part << "Content-Disposition: form-data; name=\"#{name.to_s}\"; filename=\"#{filename}\"\r\n"
+      part << "Content-Disposition: #{content_disposition}; name=\"#{name.to_s}\"; filename=\"#{filename}\"\r\n"
       part << "Content-Length: #{content_len}\r\n"
+      if content_id = opts["Content-ID"]
+        part << "Content-ID: #{content_id}\r\n"
+      end
       part << "Content-Type: #{type}\r\n"
-      part << "Content-Transfer-Encoding: binary\r\n"
+      part << "Content-Transfer-Encoding: #{trans_encoding}\r\n"
       part << "\r\n"
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: multipart-post
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Nick Sieger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 Z
+date: 2011-07-25 00:00:00 Z
 dependencies: []
 
 description: "Use with Net::HTTP to do multipart form posts.  IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file."
@@ -47,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2078343466590708221
+      hash: 1793835851156969378
       segments: 
       - 0
       version: "0"