multipart-post 1.1.5 → 2.1.1

data/spec/parts_spec.rb

@@ -0,0 +1,102 @@
+# Copyright, 2012, by Nick Sieger.
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'parts'
+require 'stringio'
+require 'composite_io'
+require 'tempfile'
+
+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
+    expect(bytesize).to be == part.length
+  end
+end
+
+RSpec.describe Parts do
+  let(:string_with_content_type) do
+    Class.new(String) do
+      def content_type; 'application/data'; end
+    end
+  end
+
+  it "test_file_with_upload_io" do
+    expect(Parts::Part.file?(UploadIO.new(__FILE__, "text/plain"))).to be true
+  end
+
+  it "test_file_with_modified_string" do
+    expect(Parts::Part.file?(string_with_content_type.new("Hello"))).to be false
+  end
+
+  it "test_new_with_modified_string" do
+    expect(Parts::Part.new("boundary", "multibyte", string_with_content_type.new("Hello"))).to be_kind_of(Parts::ParamPart)
+  end
+end
+
+RSpec.describe Parts::FilePart do
+  include AssertPartLength
+
+  before(:each) do
+    File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
+    io =  UploadIO.new(TEMP_FILE, "text/plain")
+    @part = Parts::FilePart.new("boundary", "afile", io)
+  end
+
+  after(:each) do
+    File.delete(TEMP_FILE) rescue nil
+  end
+
+  it "test_correct_length" do
+    assert_part_length @part
+  end
+
+  it "test_multibyte_file_length" do
+    assert_part_length Parts::FilePart.new("boundary", "multibyte", UploadIO.new(MULTIBYTE, "text/plain"))
+  end
+
+  it "test_multibyte_filename" do
+    name = File.read(MULTIBYTE, 300)
+    file = Tempfile.new(name.respond_to?(:force_encoding) ? name.force_encoding("UTF-8") : name)
+    assert_part_length Parts::FilePart.new("boundary", "multibyte", UploadIO.new(file, "text/plain"))
+    file.close
+  end
+
+   it "test_force_content_type_header" do
+    part = Parts::FilePart.new("boundary", "afile", UploadIO.new(TEMP_FILE, "text/plain"), { "Content-Type" => "application/pdf" })
+    expect(part.to_io.read).to match(/Content-Type: application\/pdf/)
+  end
+end
+
+RSpec.describe Parts::ParamPart do
+  include AssertPartLength
+
+  before(:each) do
+    @part = Parts::ParamPart.new("boundary", "multibyte", File.read(MULTIBYTE))
+  end
+
+  it "test_correct_length" do
+    assert_part_length @part
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+
+if ENV['COVERAGE']
+	begin
+		require 'simplecov'
+		
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+		
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "multipart_post"
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

metadata

@@ -1,31 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: multipart-post
 version: !ruby/object:Gem::Version
-  version: 1.1.5
-  prerelease: 
+  version: 2.1.1
 platform: ruby
 authors:
 - Nick Sieger
+- Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
-dependencies: []
-description: ! 'Use with Net::HTTP to do multipart form posts.  IO values that have
+date: 2019-05-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'Use with Net::HTTP to do multipart form postspec. IO values that have
   #content_type, #original_filename, and #local_path will be posted as a binary file.'
 email:
 - nick@nicksieger.com
+- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
-- Gemfile.lock
 - History.txt
+- LICENSE
 - Manifest.txt
-- README.txt
+- README.md
 - Rakefile
 - lib/composite_io.rb
 - lib/multipart_post.rb
@@ -33,36 +84,37 @@ files:
 - 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
+- spec/composite_io_spec.rb
+- spec/multibyte.txt
+- spec/net/http/post/multipart_spec.rb
+- spec/parts_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/nicksieger/multipart-post
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 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
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: caldersphere
-rubygems_version: 1.8.6
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 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
+- spec/composite_io_spec.rb
+- spec/multibyte.txt
+- spec/net/http/post/multipart_spec.rb
+- spec/parts_spec.rb
+- spec/spec_helper.rb

data/Gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: .
-  specs:
-    multipart-post (1.1.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.6)
-    linecache (0.43)
-    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.25)
-      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.5)
-      archive-tar-minitar (>= 0.5.2)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  multipart-post!
-  rake
-  ruby-debug
-  ruby-debug19

data/README.txt

@@ -1,62 +0,0 @@
-= multipart-post
-
-* http://github.com/nicksieger/multipart-post
-
-== DESCRIPTION:
-
-Adds a streamy multipart form post capability to Net::HTTP. Also
-supports other methods besides POST.
-
-== FEATURES/PROBLEMS:
-
-* 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 class to prepare IO objects for inclusion in the params
-  hash of the multipart post object.
-
-== SYNOPSIS:
-
-    require 'net/http/post/multipart'
-
-    url = URI.parse('http://www.example.com/upload')
-    File.open("./image.jpg") do |jpg|
-      req = Net::HTTP::Post::Multipart.new url.path,
-        "file" => UploadIO.new(jpg, "image/jpeg", "image.jpg")
-      res = Net::HTTP.start(url.host, url.port) do |http|
-        http.request(req)
-      end
-    end
-
-== REQUIREMENTS:
-
-None
-
-== INSTALL:
-
-gem install multipart-post
-
-== LICENSE:
-
-(The MIT License)
-
-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
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -1,56 +0,0 @@
-#--
-# 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"
-
-  HTTPPost = Struct.new("HTTPPost", :content_length, :body_stream, :content_type)
-  HTTPPost.module_eval do
-    def set_content_type(type, params = {})
-      self.content_type = type + params.map{|k,v|"; #{k}=#{v}"}.join('')
-    end
-  end
-
-  def teardown
-    File.delete(TEMP_FILE) rescue nil
-  end
-
-  def test_form_multipart_body
-    File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
-    @io = File.open(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)
-    @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")
-    @io = UploadIO.new @io, "text/plain", TEMP_FILE
-    assert_results Net::HTTP::Post::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
-  end
-
-  def assert_results(post)
-    assert post.content_length && post.content_length > 0
-    assert post.body_stream
-    assert_equal "multipart/form-data; boundary=#{Multipartable::DEFAULT_BOUNDARY}", post['content-type']
-    body = post.body_stream.read
-    boundary_regex = Regexp.quote Multipartable::DEFAULT_BOUNDARY
-    assert body =~ /1234567890/
-    # ensure there is at least one boundary
-    assert body =~ /^--#{boundary_regex}\r\n/
-    # ensure there is an epilogue
-    assert body =~ /^--#{boundary_regex}--\r\n/
-    assert body =~ /text\/plain/
-  end
-end

data/test/test_composite_io.rb

@@ -1,77 +0,0 @@
-#--
-# 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'
-
-class CompositeReadIOTest < Test::Unit::TestCase
-  def setup
-    @io = CompositeReadIO.new(CompositeReadIO.new(StringIO.new('the '), StringIO.new('quick ')),
-            StringIO.new('brown '), StringIO.new('fox'))
-  end
-
-  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)
-  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)
-    assert_equal 'k br', @io.read(4)
-    assert_equal 'own ', @io.read(4)
-    assert_equal 'fox',  @io.read(4)
-  end
-
-  def test_read_after_end
-    @io.read
-    assert_equal "", @io.read
-  end
-
-  def test_read_after_end_with_amount
-    @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) {
-      UploadIO.convert!('tmp.txt', 'text/plain', 'tmp.txt', 'tmp.txt')
-    }
-  end
-end