multipart-post 1.1.5 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    multipart-post (1.1.4)
+    multipart-post (1.2.0)
 
 GEM
   remote: http://rubygems.org/

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.2.0 / 2013-02-25
+
+- #25: Ruby 2 compatibility (thanks mislav)
+
 === 1.1.5 / 2012-02-12
 
 - Fix length/bytesize of parts in 1.9 (#7, #14) (Jason Moore)

data/lib/composite_io.rb

@@ -17,39 +17,40 @@ class CompositeReadIO
   # respond to #read in a manner consistent with IO.
   def initialize(*ios)
     @ios = ios.flatten
+    @index = 0
   end
 
-  # Read from the IO object, overlapping across underlying streams as necessary.
-  def read(amount = nil, buf = nil)
-    buffer = buf || ''
-    done = if amount; nil; else ''; end
-    partial_amount = amount
-    parts = @ios.dup
+  # Read from IOs in order until `length` bytes have been received.
+  def read(length = nil, outbuf = nil)
+    got_result = false
+    outbuf = outbuf ? outbuf.replace("") : ""
 
-    loop do
-      result = done
-
-      while !parts.empty? && (result = parts.first.read(partial_amount)) == done
-        parts.shift
+    while io = current_io
+      if result = io.read(length)
+        got_result ||= !result.nil?
+        result.force_encoding("BINARY") if result.respond_to?(:force_encoding)
+        outbuf << result
+        length -= result.length if length
+        break if length == 0
       end
-
-      result.force_encoding("BINARY") if result.respond_to?(:force_encoding)
-      buffer << result if result
-      partial_amount -= result.length if partial_amount && result != done
-
-      break if partial_amount && partial_amount <= 0
-      break if result == done
-    end
-
-    if buffer.length > 0
-      buffer
-    else
-      done
+      advance_io
     end
+    (!got_result && length) ? nil : outbuf
   end
-  
+
   def rewind
     @ios.each { |io| io.rewind }
+    @index = 0
+  end
+
+  private
+
+  def current_io
+    @ios[@index]
+  end
+
+  def advance_io
+    @index += 1
   end
 end
 

data/lib/multipart_post.rb

@@ -1,9 +1,9 @@
 #--
-# Copyright (c) 2007-2012 Nick Sieger.
+# Copyright (c) 2007-2013 Nick Sieger.
 # See the file README.txt included with the distribution for
 # software license details.
 #++
 
 module MultipartPost
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

data/multipart-post.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   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.license     = "MIT"
   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"

data/test/test_composite_io.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2007-2012 Nick Sieger.
+# Copyright (c) 2007-2013 Nick Sieger.
 # See the file README.txt included with the distribution for
 # software license details.
 #++
@@ -7,6 +7,7 @@
 require 'composite_io'
 require 'stringio'
 require 'test/unit'
+require 'timeout'
 
 class CompositeReadIOTest < Test::Unit::TestCase
   def setup
@@ -23,7 +24,10 @@ class CompositeReadIOTest < Test::Unit::TestCase
       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
+
+      expect  = "\x86\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\n"
+      expect.force_encoding('BINARY') if expect.respond_to?(:force_encoding)
+      assert_equal expect, @io.read
     end
   end
 
@@ -74,4 +78,38 @@ class CompositeReadIOTest < Test::Unit::TestCase
       UploadIO.convert!('tmp.txt', 'text/plain', 'tmp.txt', 'tmp.txt')
     }
   end
+
+  ## FIXME excluding on JRuby due to
+  ## http://jira.codehaus.org/browse/JRUBY-7109
+  if IO.respond_to?(:copy_stream) && !defined?(JRUBY_VERSION)
+    def test_compatible_with_copy_stream
+      target_io = StringIO.new
+      Timeout.timeout(1) do
+        IO.copy_stream(@io, target_io)
+      end
+      assert_equal "the quick brown fox", target_io.string
+    end
+  end
+
+  def test_empty
+    io = CompositeReadIO.new
+    assert_equal "", io.read
+  end
+
+  def test_empty_limited
+    io = CompositeReadIO.new
+    assert_nil io.read(1)
+  end
+
+  def test_empty_parts
+    io = CompositeReadIO.new(StringIO.new, StringIO.new('the '), StringIO.new, StringIO.new('quick'))
+    assert_equal "the", io.read(3)
+    assert_equal " qu", io.read(3)
+    assert_equal "ick", io.read(4)
+  end
+
+  def test_all_empty_parts
+    io = CompositeReadIO.new(StringIO.new, StringIO.new)
+    assert_nil io.read(1)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multipart-post
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
+date: 2013-02-26 00:00:00.000000000 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.'
@@ -38,7 +38,8 @@ files:
 - test/test_composite_io.rb
 - test/test_parts.rb
 homepage: https://github.com/nicksieger/multipart-post
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: caldersphere
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A multipart form post accessory for Net::HTTP.