Merge pull request #28 from janko/ruby-2-7-compatibility

Ruby 2.7 compatibility

Author: ixti

.travis.yml

@@ -6,7 +6,7 @@ cache: bundler
 before_install:
   - gem update --system
   - gem --version
-  - gem install bundler --no-rdoc --no-ri
+  - gem install bundler --no-document
   - bundle --version
 
 install: bundle install --without development doc
@@ -18,14 +18,15 @@ env: JRUBY_OPTS="$JRUBY_OPTS --debug"
 rvm:
   # Include JRuby first because it takes the longest
   - jruby-9.1.13.0
-  - 2.2
-  - 2.3.4
-  - 2.4.1
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.4.1
+  - rvm: 2.7
     env: SUITE="rubocop"
 
 branches:

README.md

@@ -58,10 +58,10 @@ form = HTTP::FormData.create({
 This library aims to support and is [tested against][ci] the following Ruby
 versions:
 
-* Ruby 2.1.x
-* Ruby 2.2.x
-* Ruby 2.3.x
 * Ruby 2.4.x
+* Ruby 2.5.x
+* Ruby 2.6.x
+* Ruby 2.7.x
 * JRuby 9.1.x.x
 
 If something doesn't work on one of these versions, it's a bug.

http-form_data.gemspec

@@ -22,6 +22,4 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin\/}).map { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)\/})
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
 end

lib/http/form_data/composite_io.rb

@@ -29,23 +29,12 @@ def initialize(ios)
       #
       # @return [String, nil]
       def read(length = nil, outbuf = nil)
-        outbuf = outbuf.to_s.clear
-        # buffer in JRuby is sometimes US-ASCII, force to ASCII-8BIT
-        outbuf.force_encoding(Encoding::BINARY)
+        data   = outbuf.clear.force_encoding(Encoding::BINARY) if outbuf
+        data ||= "".b
 
-        while current_io
-          current_io.read(length, @buffer)
-          outbuf << @buffer.force_encoding(Encoding::BINARY)
-
-          if length
-            length -= @buffer.bytesize
-            break if length.zero?
-          end
-
-          advance_io
-        end
+        read_chunks(length) { |chunk| data << chunk }
 
-        outbuf unless length && outbuf.empty?
+        data unless length && data.empty?
       end
 
       # Returns sum of all IO sizes.
@@ -61,6 +50,30 @@ def rewind
 
       private
 
+      # Yields chunks with total length up to `length`.
+      def read_chunks(length = nil)
+        while (chunk = readpartial(length))
+          yield chunk.force_encoding(Encoding::BINARY)
+
+          next if length.nil?
+
+          length -= chunk.bytesize
+
+          break if length.zero?
+        end
+      end
+
+      # Reads chunk from current IO with length up to `max_length`.
+      def readpartial(max_length = nil)
+        while current_io
+          chunk = current_io.read(max_length, @buffer)
+
+          return chunk if chunk && !chunk.empty?
+
+          advance_io
+        end
+      end
+
       # Returns IO object under the cursor.
       def current_io
         @ios[@index]

spec/lib/http/form_data/multipart_spec.rb

@@ -57,7 +57,7 @@ def disposition(params)
 
     context "with filename set to nil" do
       let(:part) { HTTP::FormData::Part.new("s", :content_type => "mime/type") }
-      let(:form_data) { HTTP::FormData::Multipart.new(:foo => part) }
+      let(:form_data) { HTTP::FormData::Multipart.new({ :foo => part }) }
 
       it "doesn't include a filename" do
         boundary_value = form_data.content_type[/(#{boundary})$/, 1]
@@ -74,7 +74,7 @@ def disposition(params)
 
     context "with content type set to nil" do
       let(:part) { HTTP::FormData::Part.new("s") }
-      let(:form_data) { HTTP::FormData::Multipart.new(:foo => part) }
+      let(:form_data) { HTTP::FormData::Multipart.new({ :foo => part }) }
 
       it "doesn't include a filename" do
         boundary_value = form_data.content_type[/(#{boundary})$/, 1]

spec/lib/http/form_data/part_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe HTTP::FormData::Part do
   let(:body)     { "" }
   let(:opts)     { {} }
-  subject(:part) { HTTP::FormData::Part.new(body, opts) }
+  subject(:part) { HTTP::FormData::Part.new(body, **opts) }
 
   describe "#size" do
     subject { part.size }