http-form_data 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1a44d108e4522fc194181bc81f9a69852f69048a
-  data.tar.gz: fd416ada1943d0bf92f534af8ef1ba54002105f6
+SHA256:
+  metadata.gz: 909d3d6b05b19fec60fcea6016be93adcde0cc4c86e62d918dd47e1dc52580f1
+  data.tar.gz: 55cf57b3b18b038cf4b7641cd56e790f61686e77ff10589c4c2d942685f771b2
 SHA512:
-  metadata.gz: c6a9f12d474e4265941ef81db33ba70aee2eba6754e341948fbc82b94c0d7957b3df970329cc1ca658659b605ec00d845d4777b47daa5f4d1fc702d2c0a1c5b3
-  data.tar.gz: 0f6558ffbef78b44bf5851154de0ed8b115f67763d8aa548c5ef6544f7ba4b2c50cc136a9b0d6666b543ebf628eebf777f012277e87b94ab4450ccebe6b6103f
+  metadata.gz: 29b89bd6588b76241ea70d08c919ef70e68acbf8705386a0b4e99532e648cc58df298faaab1982206a7c86c27c8a1e59c28f7e60b3328459bc02f1a79ea66395
+  data.tar.gz: fd703850f29023873d4ecf7026a457e763a33e1cd76c97d67656eb06e6bcaf59f7599066b02d490cf83b2598e4c5e01631cd1cdb9ba2930d6cc61b90922e4b12

data/.rubocop.yml

@@ -33,6 +33,9 @@ Style/HashSyntax:
 Style/IndentHash:
   EnforcedStyle: consistent
 
+Style/IndentArray:
+  EnforcedStyle: consistent
+
 # New lambda syntax is as ugly to me as new syntax of Hash.
 Style/Lambda:
   Enabled: false

data/CHANGES.md

@@ -1,3 +1,14 @@
+## 2.1.0 (2018-03-05)
+
+* [#21](https://github.com/httprb/form_data/pull/21)
+  Rewind content at the end of `Readable#to_s`.
+  [@janko-m][]
+
+* [#19](https://github.com/httprb/form_data/pull/19)
+  Fix buffer encoding.
+  [@HoneyryderChuck][]
+
+
 ## 2.0.0 (2017-10-01)
 
 * [#17](https://github.com/httprb/form_data/pull/17)
@@ -59,3 +70,4 @@
 [@abotalov]: https://github.com/abotalov
 [@janko-m]: https://github.com/janko-m
 [@mhickman]: https://github.com/mhickman
+[@HoneyryderChuck]: https://github.com/HoneyryderChuck

data/Gemfile

@@ -18,7 +18,7 @@ group :test do
 end
 
 group :doc do
-  gem "redcarpet"
+  gem "redcarpet", :platform => :mri
   gem "yard"
 end
 

data/lib/http/form_data/composite_io.rb

@@ -9,7 +9,7 @@ module HTTP
       # @param [Array<IO>] ios Array of IO objects
       def initialize(ios)
         @index  = 0
-        @buffer = String.new
+        @buffer = "".b
         @ios    = ios.map do |io|
           if io.is_a?(String)
             StringIO.new(io)
@@ -29,14 +29,16 @@ module HTTP
       #
       # @return [String, nil]
       def read(length = nil, outbuf = nil)
-        outbuf = outbuf.to_s.replace("")
+        outbuf = outbuf.to_s.clear
+        # buffer in JRuby is sometimes US-ASCII, force to ASCII-8BIT
+        outbuf.force_encoding(Encoding::BINARY)
 
         while current_io
           current_io.read(length, @buffer)
-          outbuf << @buffer
+          outbuf << @buffer.force_encoding(Encoding::BINARY)
 
           if length
-            length -= @buffer.length
+            length -= @buffer.bytesize
             break if length.zero?
           end
 

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

@@ -62,7 +62,7 @@ module HTTP
         private
 
         def header
-          header = String.new
+          header = "".b
           header << "Content-Disposition: form-data; #{parameters}#{CRLF}"
           header << "Content-Type: #{content_type}#{CRLF}" if content_type
           header << CRLF

data/lib/http/form_data/readable.rb

@@ -9,7 +9,9 @@ module HTTP
       # @return [String]
       def to_s
         rewind
-        read
+        content = read
+        rewind
+        content
       end
 
       # Reads and returns part of IO content.

data/lib/http/form_data/version.rb

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

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

@@ -65,6 +65,27 @@ RSpec.describe HTTP::FormData::CompositeIO do
       expect(composite_io.read(3, outbuf)).to eq nil
       expect(outbuf).to eq ""
     end
+
+    it "returns data in binary encoding" do
+      io = HTTP::FormData::CompositeIO.new(%w[Janko Marohnić])
+
+      expect(io.read(5).encoding).to eq Encoding::BINARY
+      expect(io.read(9).encoding).to eq Encoding::BINARY
+
+      io.rewind
+      expect(io.read.encoding).to eq Encoding::BINARY
+      expect(io.read.encoding).to eq Encoding::BINARY
+    end
+
+    it "reads data in bytes" do
+      emoji = "😃"
+      io = HTTP::FormData::CompositeIO.new([emoji])
+
+      expect(io.read(1)).to eq emoji.b[0]
+      expect(io.read(1)).to eq emoji.b[1]
+      expect(io.read(1)).to eq emoji.b[2]
+      expect(io.read(1)).to eq emoji.b[3]
+    end
   end
 
   describe "#rewind" do

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

@@ -2,10 +2,11 @@
 # coding: utf-8
 
 RSpec.describe HTTP::FormData::File do
-  let(:opts) { nil }
+  let(:opts)      { nil }
+  let(:form_file) { described_class.new(file, opts) }
 
   describe "#size" do
-    subject { described_class.new(file, opts).size }
+    subject { form_file.size }
 
     context "when file given as a String" do
       let(:file) { fixture("the-http-gem.info").to_s }
@@ -30,32 +31,56 @@ RSpec.describe HTTP::FormData::File do
   end
 
   describe "#to_s" do
-    subject { described_class.new(file, opts).to_s }
+    subject { form_file.to_s }
 
     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") }
+
+      it "rewinds content" do
+        content = form_file.read
+        expect(form_file.to_s).to eq content
+        expect(form_file.read).to eq content
+      end
     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") }
+
+      it "rewinds content" do
+        content = form_file.read
+        expect(form_file.to_s).to eq content
+        expect(form_file.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 { is_expected.to eq fixture("the-http-gem.info").read(:mode => "rb") }
+
+      it "rewinds content" do
+        content = form_file.read
+        expect(form_file.to_s).to eq content
+        expect(form_file.read).to eq content
+      end
     end
 
     context "when file given as IO" do
       let(:file) { StringIO.new "привет мир!" }
       it { is_expected.to eq "привет мир!" }
+
+      it "rewinds content" do
+        content = form_file.read
+        expect(form_file.to_s).to eq content
+        expect(form_file.read).to eq content
+      end
     end
   end
 
   describe "#read" do
-    subject { described_class.new(file, opts).read }
+    subject { form_file.read }
 
     context "when file given as a String" do
       let(:file) { fixture("the-http-gem.info").to_s }
@@ -80,15 +105,13 @@ RSpec.describe HTTP::FormData::File do
   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
+        content = form_file.read
+        form_file.rewind
+        expect(form_file.read).to eq content
       end
     end
 
@@ -96,9 +119,9 @@ RSpec.describe HTTP::FormData::File 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
+        content = form_file.read
+        form_file.rewind
+        expect(form_file.read).to eq content
       end
     end
 
@@ -107,9 +130,9 @@ RSpec.describe HTTP::FormData::File do
       after { file.close }
 
       it "rewinds the underlying IO object" do
-        content = subject.read
-        subject.rewind
-        expect(subject.read).to eq content
+        content = form_file.read
+        form_file.rewind
+        expect(form_file.read).to eq content
       end
     end
 
@@ -117,15 +140,15 @@ RSpec.describe HTTP::FormData::File do
       let(:file) { StringIO.new "привет мир!" }
 
       it "rewinds the underlying IO object" do
-        content = subject.read
-        subject.rewind
-        expect(subject.read).to eq content
+        content = form_file.read
+        form_file.rewind
+        expect(form_file.read).to eq content
       end
     end
   end
 
   describe "#filename" do
-    subject { described_class.new(file, opts).filename }
+    subject { form_file.filename }
 
     context "when file given as a String" do
       let(:file) { fixture("the-http-gem.info").to_s }
@@ -174,7 +197,8 @@ RSpec.describe HTTP::FormData::File do
   end
 
   describe "#content_type" do
-    subject { described_class.new(StringIO.new, opts).content_type }
+    let(:file) { StringIO.new }
+    subject    { form_file.content_type }
 
     it { is_expected.to eq "application/octet-stream" }
 

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

@@ -30,6 +30,12 @@ RSpec.describe HTTP::FormData::Multipart do
       ].join("")
     end
 
+    it "rewinds content" do
+      content = form_data.read
+      expect(form_data.to_s).to eq content
+      expect(form_data.read).to eq content
+    end
+
     context "with user-defined boundary" do
       subject(:form_data) do
         HTTP::FormData::Multipart.new params, :boundary => "my-boundary"

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

@@ -20,6 +20,12 @@ RSpec.describe HTTP::FormData::Part do
     context "when body given as String" do
       let(:body) { "привет мир!" }
       it { is_expected.to eq "привет мир!" }
+
+      it "rewinds content" do
+        content = part.read
+        expect(part.to_s).to eq content
+        expect(part.read).to eq content
+      end
     end
   end
 

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

@@ -28,6 +28,12 @@ RSpec.describe HTTP::FormData::Urlencoded do
       let(:data) { { "foo[bar]" => "тест" } }
       it { is_expected.to eq "foo%5Bbar%5D=%D1%82%D0%B5%D1%81%D1%82" }
     end
+
+    it "rewinds content" do
+      content = form_data.read
+      expect(form_data.to_s).to eq content
+      expect(form_data.read).to eq content
+    end
   end
 
   describe "#size" do

data/spec/spec_helper.rb

@@ -3,10 +3,10 @@
 require "simplecov"
 require "coveralls"
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 
 SimpleCov.start { add_filter "/spec/" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-form_data
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,10 +84,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
-summary: http-form_data-2.0.0
+summary: http-form_data-2.1.0
 test_files:
 - spec/fixtures/expected-multipart-body.tpl
 - spec/fixtures/the-http-gem.info