http-form_data 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91e7ff4611e0a772489c8106a841d5ca29fe86bb
-  data.tar.gz: 2ccf8a6814414a191f016462568ccec8d230b956
+SHA256:
+  metadata.gz: e09c6384f02137e31adab5115524beb33decdf03cff1e52b6e37f660a5956256
+  data.tar.gz: 5a2e181da1de4da73edb2be5d970b9ad4afbe2f2c9edcc8421ba3c885908f7a5
 SHA512:
-  metadata.gz: 31bcdd5a50c1a3941723999b26037c2d6eceb19f6878ac11e1adecd0fb0ddc12dff07bb01b4267170ade30bbb20889e99fdba458cb443bf137cef329d00ff3c9
-  data.tar.gz: 3a2f82eaab7a8a7cf40e5b0d9e4e33c3c7ba7e0d880787175396142fbb04dac7c9e554fbc7d1bb29b40d3592a8aca569a70d923a7a45cf32febc524f65e7117d
+  metadata.gz: ade103ecd25eb756f92421d673ab68af8629c40ed6b2633af6cdf0d5173c4a9332aa7bf33970c85e2b1926ee5c4b3d2dc0d33f4eaa506512b36da398e9a4b402
+  data.tar.gz: d89facbae50f67e1fb8f08b4395e37b6477a21c5d83bbe4efcebef488204020f100ef525e5141fbfa7186e905815662c8093a90b576ac8d19b3976c5e1d1da3a

data/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.ruby-version
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/.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:

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 2.2.0 (2020-01-09)
+
+* [#28](https://github.com/httprb/form_data/pull/28)
+  Ruby 2.7 compatibility.
+  [@janko][]
+
+
 ## 2.1.1 (2018-06-01)
 
 * [#23](https://github.com/httprb/form_data/pull/23)

data/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.

data/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

data/lib/http/form_data/composite_io.rb

@@ -29,23 +29,12 @@ module HTTP
       #
       # @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 @@ module HTTP
 
       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]

data/lib/http/form_data/version.rb

@@ -3,6 +3,6 @@
 module HTTP
   module FormData
     # Gem version.
-    VERSION = "2.1.1"
+    VERSION = "2.2.0"
   end
 end

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

@@ -57,7 +57,7 @@ RSpec.describe HTTP::FormData::Multipart do
 
     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 @@ RSpec.describe HTTP::FormData::Multipart do
 
     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]

data/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 }

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: http-form_data
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+date: 2020-01-09 00:00:00.000000000 Z
+dependencies: []
 description: Utility-belt to build form data request bodies. Provides support for
   `application/x-www-form-urlencoded` and `multipart/form-data` types.
 email:
@@ -32,6 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -83,11 +70,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: http-form_data-2.1.1
+summary: http-form_data-2.2.0
 test_files:
 - spec/fixtures/expected-multipart-body.tpl
 - spec/fixtures/the-http-gem.info