http-form_data 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89b84a117e41ca60f5962948d9ce6b4932497080
-  data.tar.gz: 93238b392e0c1817768d6f24d9d44cb9368b2c30
+  metadata.gz: f49eaa6a2789b48f0e43011a737fa95aad75e511
+  data.tar.gz: f0768565855e6777a5ef4206e827759871607e4b
 SHA512:
-  metadata.gz: 70d163f00ea75806e0268fed63956f554f706ce869bf22bffb13e1aa8f728f7b69b73e8a1ede97bf05efbbd85a62609d1ee4df7eddb81120b95e3f8f88731d36
-  data.tar.gz: be03a767b75746a513e78a56ac7dace8da976da47b35b5a3ba15c149c2807e4d2c8a3a06d107e09cd566703d34471cde4b47316a636f6ffd2fe8ce8a18357936
+  metadata.gz: c44060c6430184df6628fe2972656546744e6434a40446d649851de99e5c7e8be0d5dce0307a6aeff11794fa1b1d77a620d26a085f15fa8316b74aac39e91c2a
+  data.tar.gz: ed0d387052a1d0681a4b086fd5354e12f0a1a2776a1b35277611deda95d5f10285223bcd352447ffe4fe47af301b4fe97a91d628ae39702fb6b702411c5b432a

data/CHANGES.md

@@ -1,4 +1,11 @@
-## 2.0.0-pre1 (2017-05-10)
+## 2.0.0.pre2 (2017-05-11)
+
+* [#14](https://github.com/httprb/form_data/pull/14)
+  Enable streaming for urlencoded form data.
+  [@janko-m][]
+
+
+## 2.0.0.pre1 (2017-05-10)
 
 * [#12](https://github.com/httprb/form_data.rb/pull/12)
   Enable form data streaming.

data/lib/http/form_data/urlencoded.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
+require "http/form_data/readable"
+
 require "uri"
+require "stringio"
 
 module HTTP
   module FormData
     # `application/x-www-form-urlencoded` form data.
     class Urlencoded
+      include Readable
+
       # @param [#to_h, Hash] data form data key-value Hash
       def initialize(data)
-        @data = FormData.ensure_hash data
-      end
-
-      # Returns content to be used for HTTP request body.
-      #
-      # @return [String]
-      def to_s
-        ::URI.encode_www_form @data
+        uri_encoded_data = ::URI.encode_www_form FormData.ensure_hash(data)
+        @io = StringIO.new(uri_encoded_data)
       end
 
       # Returns MIME type to be used for HTTP request `Content-Type` header.
@@ -29,9 +28,7 @@ module HTTP
       # `Content-Length` header.
       #
       # @return [Integer]
-      def content_length
-        to_s.bytesize
-      end
+      alias content_length size
     end
   end
 end

data/lib/http/form_data/version.rb

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

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe HTTP::FormData::Multipart do
+  subject(:form_data) { HTTP::FormData::Multipart.new params }
+
   let(:file)          { HTTP::FormData::File.new fixture "the-http-gem.info" }
   let(:params)        { { :foo => :bar, :baz => file } }
   let(:boundary)      { /-{21}[a-f0-9]{42}/ }
-  subject(:form_data) { HTTP::FormData::Multipart.new params }
 
   describe "#to_s" do
     def disposition(params)
@@ -15,7 +16,7 @@ RSpec.describe HTTP::FormData::Multipart do
     let(:crlf) { "\r\n" }
 
     it "properly generates multipart data" do
-      boundary_value = form_data.content_type[/(#{boundary})$/, 1]
+      boundary_value = form_data.boundary
 
       expect(form_data.to_s).to eq [
         "--#{boundary_value}#{crlf}",
@@ -30,7 +31,9 @@ RSpec.describe HTTP::FormData::Multipart do
     end
 
     context "with user-defined boundary" do
-      let(:form_data) { HTTP::FormData::Multipart.new params, boundary: "my-boundary" }
+      subject(:form_data) do
+        HTTP::FormData::Multipart.new params, :boundary => "my-boundary"
+      end
 
       it "uses the given boundary" do
         expect(form_data.to_s).to eq [
@@ -108,10 +111,13 @@ RSpec.describe HTTP::FormData::Multipart do
     it { is_expected.to match(content_type) }
 
     context "with user-defined boundary" do
-      let(:form_data) { HTTP::FormData::Multipart.new params, boundary: "my-boundary" }
+      let(:form_data) do
+        HTTP::FormData::Multipart.new params, :boundary => "my-boundary"
+      end
 
       it "includes the given boundary" do
-        expect(form_data.content_type).to eq "multipart/form-data; boundary=my-boundary"
+        expect(form_data.content_type)
+          .to eq "multipart/form-data; boundary=my-boundary"
       end
     end
   end
@@ -127,7 +133,9 @@ RSpec.describe HTTP::FormData::Multipart do
     end
 
     context "with user-defined boundary" do
-      let(:form_data) { HTTP::FormData::Multipart.new params, boundary: "my-boundary" }
+      let(:form_data) do
+        HTTP::FormData::Multipart.new params, :boundary => "my-boundary"
+      end
 
       it "returns the given boundary" do
         expect(form_data.boundary).to eq "my-boundary"

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

@@ -29,4 +29,24 @@ RSpec.describe HTTP::FormData::Urlencoded do
       it { is_expected.to eq "foo%5Bbar%5D=%D1%82%D0%B5%D1%81%D1%82" }
     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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-form_data
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,7 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: http-form_data-2.0.0.pre1
+summary: http-form_data-2.0.0.pre2
 test_files:
 - spec/fixtures/expected-multipart-body.tpl
 - spec/fixtures/the-http-gem.info