http-form_data 1.0.3 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a6ca603a4fcbd166b6144c239780cfc3b5d536c
-  data.tar.gz: a5ba2c8cd037579a827425a29d25aa6ffe5c385d
+  metadata.gz: 89b84a117e41ca60f5962948d9ce6b4932497080
+  data.tar.gz: 93238b392e0c1817768d6f24d9d44cb9368b2c30
 SHA512:
-  metadata.gz: f448941c9efd96ba33381419853940a1eb4059160d516f302d02656fb7b3109402c8e6511bbe28ea885e586d8086c011f26b538b33ea5152cbeff6a141a7e0bd
-  data.tar.gz: d4a2cd9d878a62f6b25e38f6656056c414576944587553096c6f3a4d6ce68f6e5b8d7f3179081069e40f29aef614befe3f4ec2fe007cd49e4bad06ebaba57074
+  metadata.gz: 70d163f00ea75806e0268fed63956f554f706ce869bf22bffb13e1aa8f728f7b69b73e8a1ede97bf05efbbd85a62609d1ee4df7eddb81120b95e3f8f88731d36
+  data.tar.gz: be03a767b75746a513e78a56ac7dace8da976da47b35b5a3ba15c149c2807e4d2c8a3a06d107e09cd566703d34471cde4b47316a636f6ffd2fe8ce8a18357936

data/.travis.yml

@@ -15,9 +15,7 @@ env: JRUBY_OPTS="$JRUBY_OPTS --debug"
 
 rvm:
   # Include JRuby first because it takes the longest
-  - jruby-1.7.27
   - jruby-9.1.8.0
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
@@ -26,6 +24,9 @@ rvm:
 
 matrix:
   fast_finish: true
+  include:
+  - rvm: 2.4.1
+    env: SUITE="rubocop"
 
 branches:
   only:

data/CHANGES.md

@@ -1,18 +1,18 @@
-## 1.0.2 (2017-05-18)
+## 2.0.0-pre1 (2017-05-10)
 
-* [#16](https://github.com/httprb/form_data/issues/16)
-  Fix ruby < 2.0.0 support.
-  [@ixti][]
+* [#12](https://github.com/httprb/form_data.rb/pull/12)
+  Enable form data streaming.
+  [@janko-m][]
 
 
 ## 1.0.2 (2017-05-08)
 
 * [#5](https://github.com/httprb/form_data.rb/issues/5)
-  Allow setting Content-Type non-file parts.
+  Allow setting Content-Type non-file parts 
   [@abotalov][]
 
 * [#6](https://github.com/httprb/form_data.rb/issues/6)
-  Creation of file parts without filename.
+  Creation of file parts without filename
   [@abotalov][]
 
 * [#11](https://github.com/httprb/form_data.rb/pull/11)
@@ -43,3 +43,4 @@
 
 [@ixti]: https://github.com/ixti
 [@abotalov]: https://github.com/abotalov
+[@janko-m]: https://github.com/janko-m

data/Gemfile

@@ -4,8 +4,22 @@ source "https://rubygems.org"
 
 gem "rake"
 
+group :development do
+  gem "guard"
+  gem "guard-rspec", :require => false
+  gem "pry"
+end
+
 group :test do
-  gem "rspec", "~> 3.1"
+  gem "coveralls"
+  gem "rspec",      "~> 3.1"
+  gem "rubocop",    "= 0.48.1"
+  gem "simplecov",  ">= 0.9"
+end
+
+group :doc do
+  gem "redcarpet"
+  gem "yard"
 end
 
 # Specify your gem's dependencies in form_data.gemspec

data/README.md

@@ -1,4 +1,4 @@
-# FormData
+# HTTP::FormData
 
 [![Gem Version](https://badge.fury.io/rb/http-form_data.png)](http://rubygems.org/gems/http-form_data)
 [![Build Status](https://secure.travis-ci.org/httprb/form_data.rb.png?branch=master)](http://travis-ci.org/httprb/form_data.rb)
@@ -58,13 +58,10 @@ form = HTTP::FormData.create({
 This library aims to support and is [tested against][ci] the following Ruby
 versions:
 
-* Ruby 1.9.x
-* Ruby 2.0.x
 * Ruby 2.1.x
 * Ruby 2.2.x
 * Ruby 2.3.x
 * Ruby 2.4.x
-* JRuby 1.7.x
 * JRuby 9.1.x.x
 
 If something doesn't work on one of these versions, it's a bug.

data/Rakefile

@@ -5,4 +5,20 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+begin
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts "RuboCop is disabled"
+  end
+end
+
+if ENV["CI"].nil?
+  task :default => %i[spec rubocop]
+else
+  case ENV["SUITE"]
+  when "rubocop" then task :default => :rubocop
+  else                task :default => :spec
+  end
+end

data/http-form_data.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   > `multipart/form-data` types.
   DESC
 
-  spec.required_ruby_version = ">= 1.9"
-
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin\/}).map { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)\/})

data/lib/http/form_data/composite_io.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "stringio"
+
+module HTTP
+  module FormData
+    # Provides IO interface across multiple IO objects.
+    class CompositeIO
+      # @param [Array<IO>] ios Array of IO objects
+      def initialize(ios)
+        @index  = 0
+        @buffer = String.new
+        @ios    = ios.map do |io|
+          if io.is_a?(String)
+            StringIO.new(io)
+          elsif io.respond_to?(:read)
+            io
+          else
+            raise ArgumentError,
+              "#{io.inspect} is neither a String nor an IO object"
+          end
+        end
+      end
+
+      # Reads and returns partial content acrosss multiple IO objects.
+      #
+      # @param [Integer] length Number of bytes to retrieve
+      # @param [String] outbuf String to be replaced with retrieved data
+      #
+      # @return [String, nil]
+      def read(length = nil, outbuf = nil)
+        outbuf = outbuf.to_s.replace("")
+
+        while current_io
+          current_io.read(length, @buffer)
+          outbuf << @buffer
+
+          if length
+            length -= @buffer.length
+            break if length.zero?
+          end
+
+          advance_io
+        end
+
+        outbuf unless length && outbuf.empty?
+      end
+
+      # Returns sum of all IO sizes.
+      def size
+        @size ||= @ios.map(&:size).inject(0, :+)
+      end
+
+      # Rewinds all IO objects and set cursor to the first IO object.
+      def rewind
+        @ios.each(&:rewind)
+        @index = 0
+      end
+
+      private
+
+      # Returns IO object under the cursor.
+      def current_io
+        @ios[@index]
+      end
+
+      # Advances cursor to the next IO object.
+      def advance_io
+        @index += 1
+      end
+    end
+  end
+end

data/lib/http/form_data/file.rb

@@ -26,15 +26,14 @@ module HTTP
       alias mime_type content_type
 
       # @see DEFAULT_MIME
-      # @param [String, StringIO, File] file_or_io Filename or IO instance.
+      # @param [String, Pathname, IO] path_or_io Filename or IO instance.
       # @param [#to_h] opts
       # @option opts [#to_s] :content_type (DEFAULT_MIME)
       #   Value of Content-Type header
       # @option opts [#to_s] :filename
-      #   When `file` is a String, defaults to basename of `file`.
-      #   When `file` is a File, defaults to basename of `file`.
-      #   When `file` is a StringIO, defaults to `"stream-{object_id}"`
-      def initialize(file_or_io, opts = {})
+      #   When `path_or_io` is a String, Pathname or File, defaults to basename.
+      #   When `path_or_io` is a IO, defaults to `"stream-{object_id}"`.
+      def initialize(path_or_io, opts = {})
         opts = FormData.ensure_hash(opts)
 
         if opts.key? :mime_type
@@ -42,40 +41,28 @@ module HTTP
           opts[:content_type] = opts[:mime_type]
         end
 
-        @file_or_io   = file_or_io
+        @io           = make_io(path_or_io)
         @content_type = opts.fetch(:content_type, DEFAULT_MIME).to_s
-        @filename     = opts.fetch :filename do
-          case file_or_io
-          when String then ::File.basename file_or_io
-          when ::File then ::File.basename file_or_io.path
-          else             "stream-#{file_or_io.object_id}"
-          end
-        end
+        @filename     = opts.fetch(:filename, filename_for(@io))
       end
 
-      # Returns content size.
-      #
-      # @return [Integer]
-      def size
-        with_io(&:size)
-      end
+      private
 
-      # Returns content of a file of IO.
-      #
-      # @return [String]
-      def to_s
-        with_io(&:read)
+      def make_io(path_or_io)
+        if path_or_io.is_a?(String)
+          ::File.open(path_or_io, :binmode => true)
+        elsif defined?(Pathname) && path_or_io.is_a?(Pathname)
+          path_or_io.open(:binmode => true)
+        else
+          path_or_io
+        end
       end
 
-      private
-
-      # @yield [io] Gives IO instance to the block
-      # @return result of yielded block
-      def with_io
-        if @file_or_io.is_a?(::File) || @file_or_io.is_a?(StringIO)
-          yield @file_or_io
+      def filename_for(io)
+        if io.respond_to?(:path)
+          ::File.basename io.path
         else
-          ::File.open(@file_or_io, "rb") { |io| yield io }
+          "stream-#{io.object_id}"
         end
       end
     end

data/lib/http/form_data/multipart.rb

@@ -3,23 +3,31 @@
 require "securerandom"
 
 require "http/form_data/multipart/param"
+require "http/form_data/readable"
+require "http/form_data/composite_io"
 
 module HTTP
   module FormData
     # `multipart/form-data` form data.
     class Multipart
+      include Readable
+
+      attr_reader :boundary
+
       # @param [#to_h, Hash] data form data key-value Hash
-      def initialize(data)
-        @parts          = Param.coerce FormData.ensure_hash data
-        @boundary       = (Array.new(21, "-") << SecureRandom.hex(21)).join("")
-        @content_length = nil
+      def initialize(data, boundary: self.class.generate_boundary)
+        parts = Param.coerce FormData.ensure_hash data
+
+        @boundary = boundary.to_s.freeze
+        @io = CompositeIO.new [*parts.flat_map { |part| [glue, part] }, tail]
       end
 
-      # Returns content to be used for HTTP request body.
+      # Generates a string suitable for using as a boundary in multipart form
+      # data.
       #
       # @return [String]
-      def to_s
-        head + @parts.map(&:to_s).join(glue) + tail
+      def self.generate_boundary
+        ("-" * 21) << SecureRandom.hex(21)
       end
 
       # Returns MIME type to be used for HTTP request `Content-Type` header.
@@ -33,31 +41,18 @@ module HTTP
       # `Content-Length` header.
       #
       # @return [Integer]
-      def content_length
-        unless @content_length
-          @content_length  = head.bytesize + tail.bytesize
-          @content_length += @parts.map(&:size).reduce(:+)
-          @content_length += (glue.bytesize * (@parts.count - 1))
-        end
-
-        @content_length
-      end
+      alias content_length size
 
       private
 
-      # @return [String]
-      def head
-        @head ||= "--#{@boundary}#{CRLF}"
-      end
-
       # @return [String]
       def glue
-        @glue ||= "#{CRLF}--#{@boundary}#{CRLF}"
+        @glue ||= "--#{@boundary}#{CRLF}"
       end
 
       # @return [String]
       def tail
-        @tail ||= "#{CRLF}--#{@boundary}--"
+        @tail ||= "--#{@boundary}--"
       end
     end
   end

data/lib/http/form_data/multipart/param.rb

@@ -1,34 +1,16 @@
 # frozen_string_literal: true
 
+require "http/form_data/readable"
+require "http/form_data/composite_io"
+
 module HTTP
   module FormData
     class Multipart
       # Utility class to represent multi-part chunks
       class Param
-        # @param [#to_s] name
-        # @param [FormData::File, FormData::Part, #to_s] value
-        def initialize(name, value)
-          @name = name.to_s
-
-          @part =
-            if value.is_a?(FormData::Part)
-              value
-            else
-              FormData::Part.new(value)
-            end
-
-          parameters = { :name => @name }
-          parameters[:filename] = @part.filename if @part.filename
-          parameters = parameters.map { |k, v| "#{k}=#{v.inspect}" }.join("; ")
+        include Readable
 
-          @header = "Content-Disposition: form-data; #{parameters}"
-
-          return unless @part.content_type
-
-          @header += "#{CRLF}Content-Type: #{@part.content_type}"
-        end
-
-        # Returns body part with headers and data.
+        # Initializes body part with headers and data.
         #
         # @example With {FormData::File} value
         #
@@ -44,15 +26,19 @@ module HTTP
         #   ixti
         #
         # @return [String]
-        def to_s
-          "#{@header}#{CRLF * 2}#{@part}"
-        end
+        # @param [#to_s] name
+        # @param [FormData::File, FormData::Part, #to_s] value
+        def initialize(name, value)
+          @name = name.to_s
 
-        # Calculates size of a part (headers + body).
-        #
-        # @return [Integer]
-        def size
-          @header.bytesize + (CRLF.bytesize * 2) + @part.size
+          @part =
+            if value.is_a?(FormData::Part)
+              value
+            else
+              FormData::Part.new(value)
+            end
+
+          @io = CompositeIO.new [header, @part, footer]
         end
 
         # Flattens given `data` Hash into an array of `Param`'s.
@@ -72,6 +58,34 @@ module HTTP
 
           params
         end
+
+        private
+
+        def header
+          header = String.new
+          header << "Content-Disposition: form-data; #{parameters}#{CRLF}"
+          header << "Content-Type: #{content_type}#{CRLF}" if content_type
+          header << CRLF
+          header
+        end
+
+        def parameters
+          parameters = { :name => @name }
+          parameters[:filename] = filename if filename
+          parameters.map { |k, v| "#{k}=#{v.inspect}" }.join("; ")
+        end
+
+        def content_type
+          @part.content_type
+        end
+
+        def filename
+          @part.filename
+        end
+
+        def footer
+          CRLF.dup
+        end
       end
     end
   end

data/lib/http/form_data/part.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "stringio"
+
+require "http/form_data/readable"
+
 module HTTP
   module FormData
     # Represents a body part of multipart/form-data request.
@@ -9,30 +13,17 @@ module HTTP
     #  body = "Message"
     #  FormData::Part.new body, :content_type => 'foobar.txt; charset="UTF-8"'
     class Part
-      attr_reader :content_type, :filename
+      include Readable
 
-      # @param body [#to_s]
-      # @param opts [Hash]
-      # @option opts [String] :content_type Value of Content-Type header
-      # @option opts [String] :filename     Value of filename parameter
-      def initialize(body, opts = {})
-        @body = body.to_s
-        @content_type = opts[:content_type]
-        @filename = opts[:filename]
-      end
-
-      # Returns content size.
-      #
-      # @return [Integer]
-      def size
-        @body.bytesize
-      end
+      attr_reader :content_type, :filename
 
-      # Returns content of a file of IO.
-      #
-      # @return [String]
-      def to_s
-        @body
+      # @param [#to_s] body
+      # @param [String] content_type Value of Content-Type header
+      # @param [String] filename     Value of filename parameter
+      def initialize(body, content_type: nil, filename: nil)
+        @io = StringIO.new(body.to_s)
+        @content_type = content_type
+        @filename = filename
       end
     end
   end

data/lib/http/form_data/readable.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module HTTP
+  module FormData
+    # Common behaviour for objects defined by an IO object.
+    module Readable
+      # Returns IO content.
+      #
+      # @return [String]
+      def to_s
+        rewind
+        read
+      end
+
+      # Reads and returns part of IO content.
+      #
+      # @param [Integer] length Number of bytes to retrieve
+      # @param [String] outbuf String to be replaced with retrieved data
+      #
+      # @return [String, nil]
+      def read(length = nil, outbuf = nil)
+        @io.read(length, outbuf)
+      end
+
+      # Returns IO size.
+      #
+      # @return [Integer]
+      def size
+        @io.size
+      end
+
+      # Rewinds the IO.
+      def rewind
+        @io.rewind
+      end
+    end
+  end
+end

data/lib/http/form_data/version.rb

@@ -3,6 +3,6 @@
 module HTTP
   module FormData
     # Gem version.
-    VERSION = "1.0.3"
+    VERSION = "2.0.0.pre1"
   end
 end

data/spec/lib/http/form_data/composite_io_spec.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+RSpec.describe HTTP::FormData::CompositeIO do
+  subject(:composite_io) { HTTP::FormData::CompositeIO.new(ios) }
+
+  let(:ios) { ["Hello", " ", "", "world", "!"].map { |s| StringIO.new(s) } }
+
+  describe "#initialize" do
+    it "accepts IOs and strings" do
+      io = HTTP::FormData::CompositeIO.new(["Hello ", StringIO.new("world!")])
+      expect(io.read).to eq "Hello world!"
+    end
+
+    it "fails if an IO is neither a String nor an IO" do
+      expect { HTTP::FormData::CompositeIO.new %i[hello world] }
+        .to raise_error(ArgumentError)
+    end
+  end
+
+  describe "#read" do
+    it "reads all data" do
+      expect(composite_io.read).to eq "Hello world!"
+    end
+
+    it "reads partial data" do
+      expect(composite_io.read(3)).to eq "Hel"
+      expect(composite_io.read(2)).to eq "lo"
+      expect(composite_io.read(1)).to eq " "
+      expect(composite_io.read(6)).to eq "world!"
+    end
+
+    it "returns empty string when no data was retrieved" do
+      composite_io.read
+      expect(composite_io.read).to eq ""
+    end
+
+    it "returns nil when no partial data was retrieved" do
+      composite_io.read
+      expect(composite_io.read(3)).to eq nil
+    end
+
+    it "reads partial data with a buffer" do
+      outbuf = String.new
+      expect(composite_io.read(3, outbuf)).to eq "Hel"
+      expect(composite_io.read(2, outbuf)).to eq "lo"
+      expect(composite_io.read(1, outbuf)).to eq " "
+      expect(composite_io.read(6, outbuf)).to eq "world!"
+    end
+
+    it "fills the buffer with retrieved content" do
+      outbuf = String.new
+      composite_io.read(3, outbuf)
+      expect(outbuf).to eq "Hel"
+      composite_io.read(2, outbuf)
+      expect(outbuf).to eq "lo"
+      composite_io.read(1, outbuf)
+      expect(outbuf).to eq " "
+      composite_io.read(6, outbuf)
+      expect(outbuf).to eq "world!"
+    end
+
+    it "returns nil when no partial data was retrieved with a buffer" do
+      outbuf = String.new("content")
+      composite_io.read
+      expect(composite_io.read(3, outbuf)).to eq nil
+      expect(outbuf).to eq ""
+    end
+  end
+
+  describe "#rewind" do
+    it "rewinds all IOs" do
+      composite_io.read
+      composite_io.rewind
+      expect(composite_io.read).to eq "Hello world!"
+    end
+  end
+
+  describe "#size" do
+    it "returns sum of all IO sizes" do
+      expect(composite_io.size).to eq 12
+    end
+
+    it "returns 0 when there are no IOs" do
+      empty_composite_io = HTTP::FormData::CompositeIO.new []
+      expect(empty_composite_io.size).to eq 0
+    end
+  end
+end

data/spec/lib/http/form_data/file_spec.rb

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+# coding: utf-8
 
 RSpec.describe HTTP::FormData::File do
   let(:opts) { nil }
@@ -12,9 +12,9 @@ RSpec.describe HTTP::FormData::File do
       it { is_expected.to eq fixture("the-http-gem.info").size }
     end
 
-    context "when file given as StringIO" do
-      let(:file) { StringIO.new "привет мир!" }
-      it { is_expected.to eq 20 }
+    context "when file given as a Pathname" do
+      let(:file) { fixture("the-http-gem.info") }
+      it { is_expected.to eq fixture("the-http-gem.info").size }
     end
 
     context "when file given as File" do
@@ -22,6 +22,11 @@ RSpec.describe HTTP::FormData::File do
       after { file.close }
       it { is_expected.to eq fixture("the-http-gem.info").size }
     end
+
+    context "when file given as IO" do
+      let(:file) { StringIO.new "привет мир!" }
+      it { is_expected.to eq 20 }
+    end
   end
 
   describe "#to_s" do
@@ -32,16 +37,91 @@ RSpec.describe HTTP::FormData::File do
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
     end
 
-    context "when file given as StringIO" do
+    context "when file given as a Pathname" do
+      let(:file) { fixture("the-http-gem.info") }
+      it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
+    end
+
+    context "when file given as File" do
+      let(:file) { fixture("the-http-gem.info").open("rb") }
+      after { file.close }
+      it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
+    end
+
+    context "when file given as IO" do
       let(:file) { StringIO.new "привет мир!" }
       it { is_expected.to eq "привет мир!" }
     end
+  end
+
+  describe "#read" do
+    subject { described_class.new(file, opts).read }
+
+    context "when file given as a String" do
+      let(:file) { fixture("the-http-gem.info").to_s }
+      it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
+    end
+
+    context "when file given as a Pathname" do
+      let(:file) { fixture("the-http-gem.info") }
+      it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
+    end
 
     context "when file given as File" do
       let(:file) { fixture("the-http-gem.info").open("rb") }
       after { file.close }
       it { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
     end
+
+    context "when file given as IO" do
+      let(:file) { StringIO.new "привет мир!" }
+      it { is_expected.to eq "привет мир!" }
+    end
+  end
+
+  describe "#rewind" do
+    subject { described_class.new(file, opts) }
+
+    context "when file given as a String" do
+      let(:file) { fixture("the-http-gem.info").to_s }
+
+      it "rewinds the underlying IO object" do
+        content = subject.read
+        subject.rewind
+        expect(subject.read).to eq content
+      end
+    end
+
+    context "when file given as a Pathname" do
+      let(:file) { fixture("the-http-gem.info") }
+
+      it "rewinds the underlying IO object" do
+        content = subject.read
+        subject.rewind
+        expect(subject.read).to eq content
+      end
+    end
+
+    context "when file given as File" do
+      let(:file) { fixture("the-http-gem.info").open("rb") }
+      after { file.close }
+
+      it "rewinds the underlying IO object" do
+        content = subject.read
+        subject.rewind
+        expect(subject.read).to eq content
+      end
+    end
+
+    context "when file given as IO" do
+      let(:file) { StringIO.new "привет мир!" }
+
+      it "rewinds the underlying IO object" do
+        content = subject.read
+        subject.rewind
+        expect(subject.read).to eq content
+      end
+    end
   end
 
   describe "#filename" do
@@ -58,10 +138,10 @@ RSpec.describe HTTP::FormData::File do
       end
     end
 
-    context "when file given as StringIO" do
-      let(:file) { StringIO.new }
+    context "when file given as a Pathname" do
+      let(:file) { fixture("the-http-gem.info") }
 
-      it { is_expected.to eq "stream-#{file.object_id}" }
+      it { is_expected.to eq ::File.basename file }
 
       context "and filename given with options" do
         let(:opts) { { :filename => "foobar.txt" } }
@@ -80,6 +160,17 @@ RSpec.describe HTTP::FormData::File do
         it { is_expected.to eq "foobar.txt" }
       end
     end
+
+    context "when file given as IO" do
+      let(:file) { StringIO.new }
+
+      it { is_expected.to eq "stream-#{file.object_id}" }
+
+      context "and filename given with options" do
+        let(:opts) { { :filename => "foobar.txt" } }
+        it { is_expected.to eq "foobar.txt" }
+      end
+    end
   end
 
   describe "#content_type" do

data/spec/lib/http/form_data/multipart_spec.rb

@@ -6,19 +6,6 @@ RSpec.describe HTTP::FormData::Multipart do
   let(:boundary)      { /-{21}[a-f0-9]{42}/ }
   subject(:form_data) { HTTP::FormData::Multipart.new params }
 
-  describe "#content_type" do
-    subject { form_data.content_type }
-
-    let(:content_type) { %r{^multipart\/form-data; boundary=#{boundary}$} }
-
-    it { is_expected.to match(content_type) }
-  end
-
-  describe "#content_length" do
-    subject { form_data.content_length }
-    it { is_expected.to eq form_data.to_s.bytesize }
-  end
-
   describe "#to_s" do
     def disposition(params)
       params = params.map { |k, v| "#{k}=#{v.inspect}" }.join("; ")
@@ -36,14 +23,31 @@ RSpec.describe HTTP::FormData::Multipart do
         "#{crlf}bar#{crlf}",
         "--#{boundary_value}#{crlf}",
         "#{disposition 'name' => 'baz', 'filename' => file.filename}#{crlf}",
-        "Content-Type: #{file.mime_type}#{crlf}",
+        "Content-Type: #{file.content_type}#{crlf}",
         "#{crlf}#{file}#{crlf}",
         "--#{boundary_value}--"
       ].join("")
     end
 
+    context "with user-defined boundary" do
+      let(:form_data) { HTTP::FormData::Multipart.new params, boundary: "my-boundary" }
+
+      it "uses the given boundary" do
+        expect(form_data.to_s).to eq [
+          "--my-boundary#{crlf}",
+          "#{disposition 'name' => 'foo'}#{crlf}",
+          "#{crlf}bar#{crlf}",
+          "--my-boundary#{crlf}",
+          "#{disposition 'name' => 'baz', 'filename' => file.filename}#{crlf}",
+          "Content-Type: #{file.content_type}#{crlf}",
+          "#{crlf}#{file}#{crlf}",
+          "--my-boundary--"
+        ].join("")
+      end
+    end
+
     context "with filename set to nil" do
-      let(:part) { HTTP::FormData::Part.new("s", :filename => nil) }
+      let(:part) { HTTP::FormData::Part.new("s", :content_type => "mime/type") }
       let(:form_data) { HTTP::FormData::Multipart.new(:foo => part) }
 
       it "doesn't include a filename" do
@@ -52,10 +56,88 @@ RSpec.describe HTTP::FormData::Multipart do
         expect(form_data.to_s).to eq [
           "--#{boundary_value}#{crlf}",
           "#{disposition 'name' => 'foo'}#{crlf}",
+          "Content-Type: #{part.content_type}#{crlf}",
           "#{crlf}s#{crlf}",
           "--#{boundary_value}--"
         ].join("")
       end
     end
+
+    context "with content type set to nil" do
+      let(:part) { HTTP::FormData::Part.new("s") }
+      let(:form_data) { HTTP::FormData::Multipart.new(:foo => part) }
+
+      it "doesn't include a filename" do
+        boundary_value = form_data.content_type[/(#{boundary})$/, 1]
+
+        expect(form_data.to_s).to eq [
+          "--#{boundary_value}#{crlf}",
+          "#{disposition 'name' => 'foo'}#{crlf}",
+          "#{crlf}s#{crlf}",
+          "--#{boundary_value}--"
+        ].join("")
+      end
+    end
+  end
+
+  describe "#size" do
+    it "returns bytesize of multipart data" do
+      expect(form_data.size).to eq form_data.to_s.bytesize
+    end
+  end
+
+  describe "#read" do
+    it "returns multipart data" do
+      expect(form_data.read).to eq form_data.to_s
+    end
+  end
+
+  describe "#rewind" do
+    it "rewinds the multipart data IO" do
+      form_data.read
+      form_data.rewind
+      expect(form_data.read).to eq form_data.to_s
+    end
+  end
+
+  describe "#content_type" do
+    subject { form_data.content_type }
+
+    let(:content_type) { %r{^multipart\/form-data; boundary=#{boundary}$} }
+
+    it { is_expected.to match(content_type) }
+
+    context "with user-defined boundary" do
+      let(:form_data) { HTTP::FormData::Multipart.new params, boundary: "my-boundary" }
+
+      it "includes the given boundary" do
+        expect(form_data.content_type).to eq "multipart/form-data; boundary=my-boundary"
+      end
+    end
+  end
+
+  describe "#content_length" do
+    subject { form_data.content_length }
+    it { is_expected.to eq form_data.to_s.bytesize }
+  end
+
+  describe "#boundary" do
+    it "returns a new boundary" do
+      expect(form_data.boundary).to match(boundary)
+    end
+
+    context "with user-defined boundary" do
+      let(:form_data) { HTTP::FormData::Multipart.new params, boundary: "my-boundary" }
+
+      it "returns the given boundary" do
+        expect(form_data.boundary).to eq "my-boundary"
+      end
+    end
+  end
+
+  describe ".generate_boundary" do
+    it "returns a string suitable as a multipart boundary" do
+      expect(form_data.class.generate_boundary).to match(boundary)
+    end
   end
 end

data/spec/lib/http/form_data/part_spec.rb

@@ -1,12 +1,12 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 RSpec.describe HTTP::FormData::Part do
-  let(:body) { "" }
-  let(:opts) { {} }
+  let(:body)     { "" }
+  let(:opts)     { {} }
+  subject(:part) { HTTP::FormData::Part.new(body, opts) }
 
   describe "#size" do
-    subject { described_class.new(body, opts).size }
+    subject { part.size }
 
     context "when body given as a String" do
       let(:body) { "привет мир!" }
@@ -15,7 +15,7 @@ RSpec.describe HTTP::FormData::Part do
   end
 
   describe "#to_s" do
-    subject { described_class.new(body, opts).to_s }
+    subject! { part.to_s }
 
     context "when body given as String" do
       let(:body) { "привет мир!" }
@@ -23,8 +23,29 @@ RSpec.describe HTTP::FormData::Part do
     end
   end
 
+  describe "#read" do
+    subject { part.read }
+
+    context "when body given as String" do
+      let(:body) { "привет мир!" }
+      it { is_expected.to eq "привет мир!" }
+    end
+  end
+
+  describe "#rewind" do
+    context "when body given as String" do
+      let(:body) { "привет мир!" }
+
+      it "rewinds the underlying IO object" do
+        part.read
+        part.rewind
+        expect(part.read).to eq "привет мир!"
+      end
+    end
+  end
+
   describe "#filename" do
-    subject { described_class.new(body, opts).filename }
+    subject { part.filename }
 
     it { is_expected.to eq nil }
 
@@ -35,7 +56,7 @@ RSpec.describe HTTP::FormData::Part do
   end
 
   describe "#content_type" do
-    subject { described_class.new(body, opts).content_type }
+    subject { part.content_type }
 
     it { is_expected.to eq nil }
 

data/spec/lib/http/form_data/urlencoded_spec.rb

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+# coding: utf-8
 
 RSpec.describe HTTP::FormData::Urlencoded do
   let(:data) { { "foo[bar]" => "test" } }

data/spec/lib/http/form_data_spec.rb

@@ -10,14 +10,14 @@ RSpec.describe HTTP::FormData do
     end
 
     context "when form has at least one file param" do
-      let(:gemspec) { HTTP::FormData::File.new "gemspec" }
-      let(:params)  { { :foo => :bar, :baz => gemspec } }
+      let(:file) { HTTP::FormData::File.new(fixture("the-http-gem.info").to_s) }
+      let(:params) { { :foo => :bar, :baz => file } }
       it { is_expected.to be_a HTTP::FormData::Multipart }
     end
 
     context "when form has file in an array param" do
-      let(:gemspec) { HTTP::FormData::File.new "gemspec" }
-      let(:params)  { { :foo => :bar, :baz => [gemspec] } }
+      let(:file) { HTTP::FormData::File.new(fixture("the-http-gem.info").to_s) }
+      let(:params) { { :foo => :bar, :baz => [file] } }
       it { is_expected.to be_a HTTP::FormData::Multipart }
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,15 @@
 # frozen_string_literal: true
 
+require "simplecov"
+require "coveralls"
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start { add_filter "/spec/" }
+
 require "http/form_data"
 require "support/fixtures_helper"
 

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: http-form_data
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Aleksey V Zapparov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -46,14 +46,17 @@ files:
 - appveyor.yml
 - http-form_data.gemspec
 - lib/http/form_data.rb
+- lib/http/form_data/composite_io.rb
 - lib/http/form_data/file.rb
 - lib/http/form_data/multipart.rb
 - lib/http/form_data/multipart/param.rb
 - lib/http/form_data/part.rb
+- lib/http/form_data/readable.rb
 - lib/http/form_data/urlencoded.rb
 - lib/http/form_data/version.rb
 - spec/fixtures/expected-multipart-body.tpl
 - spec/fixtures/the-http-gem.info
+- spec/lib/http/form_data/composite_io_spec.rb
 - spec/lib/http/form_data/file_spec.rb
 - spec/lib/http/form_data/multipart_spec.rb
 - spec/lib/http/form_data/part_spec.rb
@@ -65,7 +68,7 @@ homepage: https://github.com/httprb/form_data.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -73,21 +76,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.11
+signing_key: 
 specification_version: 4
-summary: http-form_data-1.0.3
+summary: http-form_data-2.0.0.pre1
 test_files:
 - spec/fixtures/expected-multipart-body.tpl
 - spec/fixtures/the-http-gem.info
+- spec/lib/http/form_data/composite_io_spec.rb
 - spec/lib/http/form_data/file_spec.rb
 - spec/lib/http/form_data/multipart_spec.rb
 - spec/lib/http/form_data/part_spec.rb