multipart-post 1.1.4 → 1.1.5

data/Gemfile

@@ -9,3 +9,6 @@ platforms :mri_18 do
   gem 'ruby-debug'
 end
 
+group :development, :test do
+  gem 'rake'
+end

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    multipart-post (1.1.3)
+    multipart-post (1.1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    columnize (0.3.1)
+    columnize (0.3.6)
     linecache (0.43)
-    linecache19 (0.5.11)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    rake (0.9.2.2)
     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)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -24,7 +25,7 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
 
 PLATFORMS
@@ -33,5 +34,6 @@ PLATFORMS
 
 DEPENDENCIES
   multipart-post!
+  rake
   ruby-debug
   ruby-debug19

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.1.5 / 2012-02-12
+
+- Fix length/bytesize of parts in 1.9 (#7, #14) (Jason Moore)
+- Allow CompositeIO objects to be re-read by rewinding, like other IO
+  objects. (Luke Redpath)
+
+=== 1.1.4 / 2011-11-23
+
+- Non-functional changes in release (switch to Bundler gem tasks)
+
 === 1.1.3 / 2011-07-25
 
 - More configurable header specification for parts (Gerrit Riessen)

data/README.txt

@@ -40,7 +40,7 @@ gem install multipart-post
 
 (The MIT License)
 
-Copyright (c) 2007-2011 Nick Sieger <nick@nicksieger.com>
+Copyright (c) 2007-2012 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/lib/composite_io.rb

@@ -1,5 +1,5 @@
 #--
-# (c) Copyright 2007-2011 Nick Sieger.
+# Copyright (c) 2007-2012 Nick Sieger.
 # See the file README.txt included with the distribution for
 # software license details.
 #++
@@ -24,12 +24,13 @@ class CompositeReadIO
     buffer = buf || ''
     done = if amount; nil; else ''; end
     partial_amount = amount
+    parts = @ios.dup
 
     loop do
       result = done
 
-      while !@ios.empty? && (result = @ios.first.read(partial_amount)) == done
-        @ios.shift
+      while !parts.empty? && (result = parts.first.read(partial_amount)) == done
+        parts.shift
       end
 
       result.force_encoding("BINARY") if result.respond_to?(:force_encoding)
@@ -46,6 +47,10 @@ class CompositeReadIO
       done
     end
   end
+  
+  def rewind
+    @ios.each { |io| io.rewind }
+  end
 end
 
 # Convenience methods for dealing with files and IO that are to be uploaded.

data/lib/multipart_post.rb

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

data/lib/multipartable.rb

@@ -1,3 +1,9 @@
+#--
+# Copyright (c) 2007-2012 Nick Sieger.
+# See the file README.txt included with the distribution for
+# software license details.
+#++
+
 require 'parts'
   module Multipartable
     DEFAULT_BOUNDARY = "-----------RubyMultipartPost"

data/lib/net/http/post/multipart.rb

@@ -1,5 +1,5 @@
 #--
-# (c) Copyright 2007-2008 Nick Sieger.
+# Copyright (c) 2007-2012 Nick Sieger.
 # See the file README.txt included with the distribution for
 # software license details.
 #++

data/lib/parts.rb

@@ -1,3 +1,9 @@
+#--
+# Copyright (c) 2007-2012 Nick Sieger.
+# See the file README.txt included with the distribution for
+# software license details.
+#++
+
 module Parts
   module Part #:nodoc:
     def self.new(boundary, name, value)
@@ -24,6 +30,10 @@ module Parts
       @io = StringIO.new(@part)
     end
 
+    def length
+     @part.bytesize
+    end 
+
     def build_part(boundary, name, value)
       part = ''
       part << "--#{boundary}\r\n"

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

@@ -1,10 +1,11 @@
 #--
-# (c) Copyright 2007-2008 Nick Sieger.
+# Copyright (c) 2007-2012 Nick Sieger.
 # See the file README.txt included with the distribution for
 # software license details.
 #++
 
 require 'net/http/post/multipart'
+require 'test/unit'
 
 class Net::HTTP::Post::MultiPartTest < Test::Unit::TestCase
   TEMP_FILE = "temp.txt"

data/test/test_composite_io.rb

@@ -1,3 +1,9 @@
+#--
+# Copyright (c) 2007-2012 Nick Sieger.
+# See the file README.txt included with the distribution for
+# software license details.
+#++
+
 require 'composite_io'
 require 'stringio'
 require 'test/unit'
@@ -56,6 +62,12 @@ class CompositeReadIOTest < Test::Unit::TestCase
     @io.read(32)
     assert_equal nil, @io.read(32)
   end
+  
+  def test_second_full_read_after_rewinding
+    @io.read
+    @io.rewind
+    assert_equal 'the quick brown fox', @io.read
+  end
 
   def test_convert_error
     assert_raises(ArgumentError) {

data/test/test_parts.rb

@@ -1,11 +1,29 @@
+#--
+# Copyright (c) 2007-2012 Nick Sieger.
+# See the file README.txt included with the distribution for
+# software license details.
+#++
+
 require 'test/unit'
 
 require 'parts'
 require 'stringio'
 require 'composite_io'
 
+
+MULTIBYTE = File.dirname(__FILE__)+'/multibyte.txt'
+TEMP_FILE = "temp.txt"
+
+module AssertPartLength
+  def assert_part_length(part)
+    bytes = part.to_io.read
+    bytesize = bytes.respond_to?(:bytesize) ? bytes.bytesize : bytes.length
+    assert_equal bytesize, part.length
+  end
+end
+
 class FilePartTest < Test::Unit::TestCase
-  TEMP_FILE = "temp.txt"
+  include AssertPartLength
 
   def setup
     File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
@@ -18,6 +36,22 @@ class FilePartTest < Test::Unit::TestCase
   end
 
   def test_correct_length
-    assert_equal @part.length, @part.to_io.read.length
+    assert_part_length @part
+  end
+
+  def test_multibyte_file_length
+    assert_part_length Parts::FilePart.new("boundary", "multibyte", UploadIO.new(MULTIBYTE, "text/plain"))
+  end
+end
+
+class ParamPartTest < Test::Unit::TestCase
+  include AssertPartLength
+
+  def setup
+    @part = Parts::ParamPart.new("boundary", "multibyte", File.read(MULTIBYTE))
+  end
+
+  def test_correct_length
+    assert_part_length @part
   end
 end

metadata

@@ -1,75 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multipart-post
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.5
   prerelease: 
-  version: 1.1.4
 platform: ruby
-authors: 
-  - Nick Sieger
+authors:
+- Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-23 00:00:00 Z
+date: 2012-02-13 00:00:00.000000000Z
 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
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .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
+files:
+- .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: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: caldersphere
-rubygems_version: 1.8.9
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A multipart form post accessory for Net::HTTP.
-test_files: 
-  - test/multibyte.txt
-  - test/net/http/post/test_multipart.rb
-  - test/test_composite_io.rb
-  - test/test_parts.rb
+test_files:
+- test/multibyte.txt
+- test/net/http/post/test_multipart.rb
+- test/test_composite_io.rb
+- test/test_parts.rb