multipart-post 1.1.2 → 1.1.4

data/.gitignore

@@ -0,0 +1,5 @@
+doc
+pkg
+*~
+*.swo
+*.swp

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+branches:
+  only:
+    - master

data/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+gemspec
+
+platforms :mri_19 do
+  gem 'ruby-debug19'
+end
+
+platforms :mri_18 do
+  gem 'ruby-debug'
+end
+

data/Gemfile.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    multipart-post (1.1.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.1)
+    linecache (0.43)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  multipart-post!
+  ruby-debug
+  ruby-debug19

data/History.txt

@@ -0,0 +1,33 @@
+=== 1.1.3 / 2011-07-25
+
+- More configurable header specification for parts (Gerrit Riessen)
+
+=== 1.1.2 / 2011-05-24
+
+- Fix CRLF file part miscalculation (Johannes Wagener)
+- Fix Epilogue CRLF issue (suggestion by Neil Spring)
+
+=== 1.1.1 / 2011-05-13
+
+- GH# 9: Fixed Ruby 1.9.2 StringIO bug (thanks Alex Koppel)
+
+=== 1.1.0 / 2011-01-11
+
+- API CHANGE: UploadIO.convert! removed in favor of UploadIO.new
+  (Jeff Hodges)
+
+=== 1.0.1 / 2010-04-27
+
+- Doc updates, make gemspec based on more modern Rubygems
+
+=== 1.0 / 2009-02-12
+
+- Many fixes from mlooney, seems to work now. Putting the 0.9 seal of
+  approval on it.
+
+=== 0.1 / 2008-08-12
+
+* 1 major enhancement
+
+  * Birthday!
+

data/Rakefile

@@ -1,25 +1,9 @@
-require 'bundler/setup'
+require "bundler/gem_tasks"
 
-begin
-  require 'hoe'
-  require 'multipart_post'
+task :default => :test
 
-  Hoe.plugin :rubyforge
-  hoe = Hoe.spec("multipart-post") do |p|
-    p.version = MultipartPost::VERSION
-    p.rubyforge_name = "caldersphere"
-    p.author = "Nick Sieger"
-    p.url = "http://github.com/nicksieger/multipart-post"
-    p.email = "nick@nicksieger.com"
-    p.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."
-    p.summary = "Creates a multipart form post accessory for Net::HTTP."
-  end
-  hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" || dep.name == "rubyforge" }
-
-  task :gemspec do
-    File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
-  end
-  task :package => :gemspec
-rescue LoadError
-  puts "You really need Hoe installed to be able to package this gem"
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/test*.rb']
 end

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/multipart_post.rb

@@ -0,0 +1,3 @@
+module MultipartPost
+  VERSION = "1.1.4"
+end

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

data/multipart-post.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "multipart_post"
+
+Gem::Specification.new do |s|
+  s.name        = "multipart-post"
+  s.version     = MultipartPost::VERSION
+  s.authors     = ["Nick Sieger"]
+  s.email       = ["nick@nicksieger.com"]
+  s.homepage    = "https://github.com/nicksieger/multipart-post"
+  s.summary     = %q{A multipart form post accessory for Net::HTTP.}
+  s.description = %q{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.}
+
+  s.rubyforge_project = "caldersphere"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/test/multibyte.txt

@@ -0,0 +1 @@
+ファイル

metadata

@@ -2,69 +2,74 @@
 name: multipart-post
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors: 
-- Nick Sieger
+  - Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 Z
+date: 2011-11-23 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."
-email: nick@nicksieger.com
+email: 
+  - nick@nicksieger.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
-- lib/composite_io.rb
-- lib/multipartable.rb
-- lib/parts.rb
-- lib/net/http/post/multipart.rb
-- Manifest.txt
-- Rakefile
-- README.txt
-- test/test_composite_io.rb
-- test/net/http/post/test_multipart.rb
-- test/test_parts.rb
-homepage: http://github.com/nicksieger/multipart-post
+  - .gitignore
+  - .travis.yml
+  - Gemfile
+  - Gemfile.lock
+  - History.txt
+  - Manifest.txt
+  - README.txt
+  - Rakefile
+  - lib/composite_io.rb
+  - lib/multipart_post.rb
+  - lib/multipartable.rb
+  - lib/net/http/post/multipart.rb
+  - lib/parts.rb
+  - multipart-post.gemspec
+  - test/multibyte.txt
+  - test/net/http/post/test_multipart.rb
+  - test/test_composite_io.rb
+  - test/test_parts.rb
+homepage: https://github.com/nicksieger/multipart-post
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2078343466590708221
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.7.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
-summary: Creates a multipart form post accessory for Net::HTTP.
+summary: A multipart form post accessory for Net::HTTP.
 test_files: 
-- test/net/http/post/test_multipart.rb
-- test/test_composite_io.rb
-- test/test_parts.rb
+  - test/multibyte.txt
+  - test/net/http/post/test_multipart.rb
+  - test/test_composite_io.rb
+  - test/test_parts.rb