multipart-post 1.0.1 → 1.1.0

data/README.txt

@@ -12,7 +12,7 @@ supports other methods besides POST.
 * Appears to actually work. A good feature to have.
 * Encapsulates posting of file/binary parts and name/value parameter parts, similar to 
   most browsers' file upload forms.
-* Provides an UploadIO helper module to prepare IO objects for inclusion in the params
+* Provides an UploadIO helper class to prepare IO objects for inclusion in the params
   hash of the multipart post object.
 
 == SYNOPSIS:
@@ -40,7 +40,7 @@ gem install multipart-post
 
 (The MIT License)
 
-Copyright (c) 2007-2010 Nick Sieger <nick@nicksieger.com>
+Copyright (c) 2007-2011 Nick Sieger <nick@nicksieger.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,7 +1,8 @@
+require 'bundler/setup'
+
 begin
-  require 'rubygems'
   require 'hoe'
-  require 'lib/multipart_post'
+  require 'multipart_post'
 
   Hoe.plugin :gemcutter
   hoe = Hoe.spec("multipart-post") do |p|
@@ -13,12 +14,12 @@ begin
     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" }
+  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
+rescue LoadError 
   puts "You really need Hoe installed to be able to package this gem"
 end

data/lib/composite_io.rb

@@ -1,5 +1,5 @@
 #--
-# (c) Copyright 2007-2008 Nick Sieger.
+# (c) Copyright 2007-2011 Nick Sieger.
 # See the file README.txt included with the distribution for
 # software license details.
 #++
@@ -32,6 +32,7 @@ class CompositeReadIO
         @ios.shift
       end
 
+      result.force_encoding("BINARY") if result.respond_to?(:force_encoding)
       buffer << result if result
       partial_amount -= result.length if partial_amount && result != done
 
@@ -48,7 +49,7 @@ class CompositeReadIO
 end
 
 # Convenience methods for dealing with files and IO that are to be uploaded.
-module UploadIO
+class UploadIO
   # Create an upload IO suitable for including in the params hash of a
   # Net::HTTP::Post::Multipart.
   #
@@ -59,31 +60,34 @@ module UploadIO
   #
   #     UploadIO.new("file.txt", "text/plain")
   #     UploadIO.new(file_io, "text/plain", "file.txt")
-  def self.new(filename_or_io, content_type, filename = nil)
+  attr_reader :content_type, :original_filename, :local_path, :io
+
+  def initialize(filename_or_io, content_type, filename = nil)
     io = filename_or_io
-    unless io.respond_to? :read
+    local_path = ""
+    if io.respond_to? :read
+      local_path = filename_or_io.path
+    else
       io = File.open(filename_or_io)
-      filename = filename_or_io
+      local_path = filename_or_io
     end
-    convert!(io, content_type, File.basename(filename), filename)
-    io
+    filename ||= local_path
+
+    @content_type = content_type
+    @original_filename = File.basename(filename)
+    @local_path = local_path
+    @io = io
   end
 
-  # Enhance an existing IO for including in the params hash of a
-  # Net::HTTP::Post::Multipart by adding #content_type, #original_filename,
-  # and #local_path methods to the object's singleton class.
   def self.convert!(io, content_type, original_filename, local_path)
-    io.instance_eval(<<-EOS, __FILE__, __LINE__)
-      def content_type
-        "#{content_type}"
-      end
-      def original_filename
-        "#{original_filename}"
-      end
-      def local_path
-        "#{local_path}"
-      end
-    EOS
-    io
+    raise ArgumentError, "convert! has been removed. You must now wrap IOs using:\nUploadIO.new(filename_or_io, content_type, filename=nil)\nPlease update your code."
+  end
+
+  def method_missing(*args)
+    @io.send(*args)
+  end
+
+  def respond_to?(meth)
+    @io.respond_to?(meth) || super(meth)
   end
 end

data/test/net/http/post/test_multipart.rb

@@ -23,19 +23,19 @@ class Net::HTTP::Post::MultiPartTest < Test::Unit::TestCase
   def test_form_multipart_body
     File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
     @io = File.open(TEMP_FILE)
-    UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
+    @io = UploadIO.new @io, "text/plain", TEMP_FILE
     assert_results Net::HTTP::Post::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
   end
   def test_form_multipart_body_put
     File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
     @io = File.open(TEMP_FILE)
-    UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
+    @io = UploadIO.new @io, "text/plain", TEMP_FILE
     assert_results Net::HTTP::Put::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
   end
-  
+
   def test_form_multipart_body_with_stringio
     @io = StringIO.new("1234567890")
-    UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
+    @io = UploadIO.new @io, "text/plain", TEMP_FILE
     assert_results Net::HTTP::Post::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
   end
 

data/test/test_composite_io.rb

@@ -11,25 +11,35 @@ class CompositeReadIOTest < Test::Unit::TestCase
   def test_full_read_from_several_ios
     assert_equal 'the quick brown fox', @io.read
   end
-  
+
+  unless  RUBY_VERSION < '1.9'
+    def test_read_from_multibyte
+      utf8    = File.open(File.dirname(__FILE__)+'/multibyte.txt')
+      binary  = StringIO.new("\x86")
+      @io = CompositeReadIO.new(binary,utf8)
+      assert_equal "\x86\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\n", @io.read
+    end
+  end
+
+
   def test_partial_read
     assert_equal 'the quick', @io.read(9)
   end
-  
+
   def test_partial_read_to_boundary
-    assert_equal 'the quick ', @io.read(10)    
+    assert_equal 'the quick ', @io.read(10)
   end
-  
+
   def test_read_with_size_larger_than_available
     assert_equal 'the quick brown fox', @io.read(32)
   end
-  
+
   def test_read_into_buffer
     buf = ''
     @io.read(nil, buf)
     assert_equal 'the quick brown fox', buf
   end
-  
+
   def test_multiple_reads
     assert_equal 'the ', @io.read(4)
     assert_equal 'quic', @io.read(4)
@@ -37,7 +47,7 @@ class CompositeReadIOTest < Test::Unit::TestCase
     assert_equal 'own ', @io.read(4)
     assert_equal 'fox',  @io.read(4)
   end
-  
+
   def test_read_after_end
     @io.read
     assert_equal "", @io.read
@@ -47,4 +57,10 @@ class CompositeReadIOTest < Test::Unit::TestCase
     @io.read(32)
     assert_equal nil, @io.read(32)
   end
+
+  def test_convert_error
+    assert_raises(ArgumentError) {
+      UploadIO.convert!('tmp.txt', 'text/plain', 'tmp.txt', 'tmp.txt')
+    }
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multipart-post
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nick Sieger
@@ -14,23 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -05:00
+date: 2011-01-11 00:00:00 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id001
+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
 executables: []
@@ -61,23 +49,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Creates a multipart form post accessory for Net::HTTP.