http 0.6.4 → 0.7.0

data/spec/http/content_type_spec.rb

@@ -1,47 +1,47 @@
 require 'spec_helper'
 
-describe HTTP::ContentType do
+RSpec.describe HTTP::ContentType do
   describe '.parse' do
     context 'with text/plain' do
       subject { described_class.parse 'text/plain' }
-      its(:mime_type) { should eq 'text/plain' }
-      its(:charset)   { should be_nil }
+      its(:mime_type) { is_expected.to eq 'text/plain' }
+      its(:charset)   { is_expected.to be_nil }
     end
 
     context 'with tEXT/plaIN' do
       subject { described_class.parse 'tEXT/plaIN' }
-      its(:mime_type) { should eq 'text/plain' }
-      its(:charset)   { should be_nil }
+      its(:mime_type) { is_expected.to eq 'text/plain' }
+      its(:charset)   { is_expected.to be_nil }
     end
 
     context 'with text/plain; charset=utf-8' do
       subject { described_class.parse 'text/plain; charset=utf-8' }
-      its(:mime_type) { should eq 'text/plain' }
-      its(:charset)   { should eq 'utf-8' }
+      its(:mime_type) { is_expected.to eq 'text/plain' }
+      its(:charset)   { is_expected.to eq 'utf-8' }
     end
 
     context 'with text/plain; charset="utf-8"' do
       subject { described_class.parse 'text/plain; charset="utf-8"' }
-      its(:mime_type) { should eq 'text/plain' }
-      its(:charset)   { should eq 'utf-8' }
+      its(:mime_type) { is_expected.to eq 'text/plain' }
+      its(:charset)   { is_expected.to eq 'utf-8' }
     end
 
     context 'with text/plain; charSET=utf-8' do
       subject { described_class.parse 'text/plain; charSET=utf-8' }
-      its(:mime_type) { should eq 'text/plain' }
-      its(:charset)   { should eq 'utf-8' }
+      its(:mime_type) { is_expected.to eq 'text/plain' }
+      its(:charset)   { is_expected.to eq 'utf-8' }
     end
 
     context 'with text/plain; foo=bar; charset=utf-8' do
       subject { described_class.parse 'text/plain; foo=bar; charset=utf-8' }
-      its(:mime_type) { should eq 'text/plain' }
-      its(:charset)   { should eq 'utf-8' }
+      its(:mime_type) { is_expected.to eq 'text/plain' }
+      its(:charset)   { is_expected.to eq 'utf-8' }
     end
 
     context 'with text/plain;charset=utf-8;foo=bar' do
       subject { described_class.parse 'text/plain;charset=utf-8;foo=bar' }
-      its(:mime_type) { should eq 'text/plain' }
-      its(:charset)   { should eq 'utf-8' }
+      its(:mime_type) { is_expected.to eq 'text/plain' }
+      its(:charset)   { is_expected.to eq 'utf-8' }
     end
   end
 end

data/spec/http/headers/mixin_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Headers::Mixin do
+RSpec.describe HTTP::Headers::Mixin do
   let :dummy_class do
     Class.new do
       include HTTP::Headers::Mixin

data/spec/http/headers_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Headers do
+RSpec.describe HTTP::Headers do
   subject(:headers) { described_class.new }
 
   it 'is Enumerable' do
@@ -26,8 +26,8 @@ describe HTTP::Headers do
 
     it 'allows set multiple values' do
       headers.set :set_cookie, 'hoo=ray'
-      headers.set :set_cookie, %w[hoo=ray woo=hoo]
-      expect(headers['Set-Cookie']).to eq %w[hoo=ray woo=hoo]
+      headers.set :set_cookie, %w(hoo=ray woo=hoo)
+      expect(headers['Set-Cookie']).to eq %w(hoo=ray woo=hoo)
     end
   end
 
@@ -50,8 +50,8 @@ describe HTTP::Headers do
 
     it 'allows set multiple values' do
       headers[:set_cookie] = 'hoo=ray'
-      headers[:set_cookie] = %w[hoo=ray woo=hoo]
-      expect(headers['Set-Cookie']).to eq %w[hoo=ray woo=hoo]
+      headers[:set_cookie] = %w(hoo=ray woo=hoo)
+      expect(headers['Set-Cookie']).to eq %w(hoo=ray woo=hoo)
     end
   end
 
@@ -83,13 +83,13 @@ describe HTTP::Headers do
     it 'appends new value if header exists' do
       headers.add :set_cookie, 'hoo=ray'
       headers.add :set_cookie, 'woo=hoo'
-      expect(headers['Set-Cookie']).to eq %w[hoo=ray woo=hoo]
+      expect(headers['Set-Cookie']).to eq %w(hoo=ray woo=hoo)
     end
 
     it 'allows append multiple values' do
       headers.add :set_cookie, 'hoo=ray'
-      headers.add :set_cookie, %w[woo=hoo yup=pie]
-      expect(headers['Set-Cookie']).to eq %w[hoo=ray woo=hoo yup=pie]
+      headers.add :set_cookie, %w(woo=hoo yup=pie)
+      expect(headers['Set-Cookie']).to eq %w(hoo=ray woo=hoo yup=pie)
     end
   end
 
@@ -97,11 +97,11 @@ describe HTTP::Headers do
     before { headers.set 'Content-Type', 'application/json' }
 
     it 'returns array of associated values' do
-      expect(headers.get 'Content-Type').to eq %w[application/json]
+      expect(headers.get 'Content-Type').to eq %w(application/json)
     end
 
     it 'normalizes header name' do
-      expect(headers.get :content_type).to eq %w[application/json]
+      expect(headers.get :content_type).to eq %w(application/json)
     end
 
     context 'when header does not exists' do
@@ -141,7 +141,7 @@ describe HTTP::Headers do
       end
 
       it 'returns array of associated values' do
-        expect(headers[:set_cookie]).to eq %w[hoo=ray woo=hoo]
+        expect(headers[:set_cookie]).to eq %w(hoo=ray woo=hoo)
       end
     end
   end
@@ -154,11 +154,11 @@ describe HTTP::Headers do
     end
 
     it 'returns a Hash' do
-      expect(headers.to_h).to be_a Hash
+      expect(headers.to_h).to be_a ::Hash
     end
 
     it 'returns Hash with normalized keys' do
-      expect(headers.to_h.keys).to match_array %w[Content-Type Set-Cookie]
+      expect(headers.to_h.keys).to match_array %w(Content-Type Set-Cookie)
     end
 
     context 'for a header with single value' do
@@ -169,7 +169,7 @@ describe HTTP::Headers do
 
     context 'for a header with multiple values' do
       it 'provides an array of values' do
-        expect(headers.to_h['Set-Cookie']).to eq %w[hoo=ray woo=hoo]
+        expect(headers.to_h['Set-Cookie']).to eq %w(hoo=ray woo=hoo)
       end
     end
   end
@@ -187,18 +187,18 @@ describe HTTP::Headers do
 
     it 'returns Array of key/value pairs with normalized keys' do
       expect(headers.to_a).to eq [
-        %w[Content-Type application/json],
-        %w[Set-Cookie hoo=ray],
-        %w[Set-Cookie woo=hoo]
+        %w(Content-Type application/json),
+        %w(Set-Cookie hoo=ray),
+        %w(Set-Cookie woo=hoo)
       ]
     end
   end
 
   describe '#inspect' do
-    before  { headers.set :set_cookie, %w[hoo=ray woo=hoo] }
+    before  { headers.set :set_cookie, %w(hoo=ray woo=hoo) }
     subject { headers.inspect }
 
-    it { should eq '#<HTTP::Headers {"Set-Cookie"=>["hoo=ray", "woo=hoo"]}>' }
+    it { is_expected.to eq '#<HTTP::Headers {"Set-Cookie"=>["hoo=ray", "woo=hoo"]}>' }
   end
 
   describe '#keys' do
@@ -209,7 +209,7 @@ describe HTTP::Headers do
     end
 
     it 'returns uniq keys only' do
-      expect(headers.keys).to have_exactly(2).items
+      expect(headers.keys.size).to eq 2
     end
 
     it 'normalizes keys' do
@@ -230,9 +230,9 @@ describe HTTP::Headers do
 
     it 'yields headers in the same order they were added' do
       expect { |b| headers.each(&b) }.to yield_successive_args(
-        %w[Set-Cookie hoo=ray],
-        %w[Content-Type application/json],
-        %w[Set-Cookie woo=hoo]
+        %w(Set-Cookie hoo=ray),
+        %w(Content-Type application/json),
+        %w(Set-Cookie woo=hoo)
       )
     end
   end
@@ -241,12 +241,12 @@ describe HTTP::Headers do
     subject { headers.empty? }
 
     context 'initially' do
-      it { should be_true }
+      it { is_expected.to be true }
     end
 
     context 'when header exists' do
       before { headers.add :accept, 'text/plain' }
-      it { should be_false }
+      it { is_expected.to be false }
     end
 
     context 'when last header was removed' do
@@ -255,7 +255,7 @@ describe HTTP::Headers do
         headers.delete :accept
       end
 
-      it { should be_true }
+      it { is_expected.to be true }
     end
   end
 
@@ -284,7 +284,7 @@ describe HTTP::Headers do
 
     it 'allows comparison with Array of key/value pairs' do
       left.add :accept, 'text/plain'
-      expect(left).to eq [%w[Accept text/plain]]
+      expect(left).to eq [%w(Accept text/plain)]
     end
 
     it 'sensitive to headers order' do
@@ -311,8 +311,8 @@ describe HTTP::Headers do
 
     subject(:dupped) { headers.dup }
 
-    it { should be_a described_class }
-    it { should_not be headers }
+    it { is_expected.to be_a described_class }
+    it { is_expected.not_to be headers }
 
     it 'has headers copied' do
       expect(dupped[:content_type]).to eq 'application/json'
@@ -335,7 +335,7 @@ describe HTTP::Headers do
     before do
       headers.set :host, 'example.com'
       headers.set :accept, 'application/json'
-      headers.merge! :accept => 'plain/text', :cookie => %w[hoo=ray woo=hoo]
+      headers.merge! :accept => 'plain/text', :cookie => %w(hoo=ray woo=hoo)
     end
 
     it 'leaves headers not presented in other as is' do
@@ -347,7 +347,7 @@ describe HTTP::Headers do
     end
 
     it 'appends other headers, not presented in base' do
-      expect(headers[:cookie]).to eq %w[hoo=ray woo=hoo]
+      expect(headers[:cookie]).to eq %w(hoo=ray woo=hoo)
     end
   end
 
@@ -358,11 +358,11 @@ describe HTTP::Headers do
     end
 
     subject(:merged) do
-      headers.merge :accept => 'plain/text', :cookie => %w[hoo=ray woo=hoo]
+      headers.merge :accept => 'plain/text', :cookie => %w(hoo=ray woo=hoo)
     end
 
-    it { should be_a described_class }
-    it { should_not be headers }
+    it { is_expected.to be_a described_class }
+    it { is_expected.not_to be headers }
 
     it 'does not affects original headers' do
       expect(merged.to_h).to_not eq headers.to_h
@@ -377,7 +377,7 @@ describe HTTP::Headers do
     end
 
     it 'appends other headers, not presented in base' do
-      expect(merged[:cookie]).to eq %w[hoo=ray woo=hoo]
+      expect(merged[:cookie]).to eq %w(hoo=ray woo=hoo)
     end
   end
 
@@ -395,7 +395,7 @@ describe HTTP::Headers do
     end
 
     it 'accepts any object that respond to #to_a' do
-      hashie = double :to_a => [%w[accept json]]
+      hashie = double :to_a => [%w(accept json)]
       expect(described_class.coerce(hashie)['accept']).to eq 'json'
     end
 
@@ -408,10 +408,14 @@ describe HTTP::Headers do
 
       it 'adds all headers' do
         expect(described_class.coerce(headers).to_a).to match_array([
-          %w[Set-Cookie hoo=ray],
-          %w[Set-Cookie woo=hoo]
+          %w(Set-Cookie hoo=ray),
+          %w(Set-Cookie woo=hoo)
         ])
       end
     end
+
+    it 'is aliased as .[]' do
+      expect(described_class.method :coerce).to eq described_class.method(:[])
+    end
   end
 end

data/spec/http/options/body_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options, 'body' do
+RSpec.describe HTTP::Options, 'body' do
 
   let(:opts) { HTTP::Options.new }
 

data/spec/http/options/form_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options, 'form' do
+RSpec.describe HTTP::Options, 'form' do
 
   let(:opts) { HTTP::Options.new }
 

data/spec/http/options/headers_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options, 'headers' do
+RSpec.describe HTTP::Options, 'headers' do
 
   let(:opts) { HTTP::Options.new }
 
@@ -11,7 +11,7 @@ describe HTTP::Options, 'headers' do
   it 'may be specified with with_headers' do
     opts2 = opts.with_headers('accept' => 'json')
     expect(opts.headers).to be_empty
-    expect(opts2.headers).to eq([%w[Accept json]])
+    expect(opts2.headers).to eq([%w(Accept json)])
   end
 
   it 'accepts any object that respond to :to_hash' do

data/spec/http/options/json_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options, 'json' do
+RSpec.describe HTTP::Options, 'json' do
 
   let(:opts) { HTTP::Options.new }
 

data/spec/http/options/merge_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options, 'merge' do
+RSpec.describe HTTP::Options, 'merge' do
   let(:opts) { HTTP::Options.new }
 
   it 'supports a Hash' do

data/spec/http/options/new_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options, 'new' do
+RSpec.describe HTTP::Options, 'new' do
   it 'supports a Options instance' do
     opts = HTTP::Options.new
     expect(HTTP::Options.new(opts)).to eq(opts)
@@ -14,7 +14,7 @@ describe HTTP::Options, 'new' do
 
     it 'coerces :headers correctly' do
       opts = HTTP::Options.new(:headers => {:accept => 'json'})
-      expect(opts.headers).to eq([%w[Accept json]])
+      expect(opts.headers).to eq([%w(Accept json)])
     end
 
     it 'coerces :proxy correctly' do

data/spec/http/options/proxy_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options, 'proxy' do
+RSpec.describe HTTP::Options, 'proxy' do
 
   let(:opts) { HTTP::Options.new }
 

data/spec/http/options_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Options do
+RSpec.describe HTTP::Options do
   subject { described_class.new(:response => :body) }
 
   it 'behaves like a Hash for reading' do

data/spec/http/redirector_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HTTP::Redirector do
+RSpec.describe HTTP::Redirector do
   def simple_response(status, body = '', headers = {})
     HTTP::Response.new(status, '1.1', headers, body)
   end

data/spec/http/request/writer_spec.rb

@@ -2,42 +2,90 @@
 
 require 'spec_helper'
 
-describe HTTP::Request::Writer do
+RSpec.describe HTTP::Request::Writer do
+  let(:io)          { StringIO.new }
+  let(:body)        { '' }
+  let(:headers)     { HTTP::Headers.new }
+  let(:headerstart) { 'GET /test HTTP/1.1' }
+
+  subject(:writer)  { described_class.new(io, body, headers, headerstart) }
+
   describe '#initalize' do
-    def construct(body)
-      HTTP::Request::Writer.new(nil, body, [], '')
-    end
+    context 'when body is nil' do
+      let(:body) { nil }
 
-    it "doesn't throw on a nil body" do
-      expect { construct nil }.not_to raise_error
+      it 'does not raise an error' do
+        expect { writer }.not_to raise_error
+      end
     end
 
-    it "doesn't throw on a String body" do
-      expect { construct 'string body' }.not_to raise_error
-    end
+    context 'when body is a string' do
+      let(:body) { 'string body' }
 
-    it "doesn't throw on an Enumerable body" do
-      expect { construct %w[bees cows] }.not_to raise_error
+      it 'does not raise an error' do
+        expect { writer }.not_to raise_error
+      end
     end
 
-    it "does throw on a body that isn't string, enumerable or nil" do
-      expect { construct true }.to raise_error
+    context 'when body is an Enumerable' do
+      let(:body) { %w(bees cows) }
+
+      it 'does not raise an error' do
+        expect { writer }.not_to raise_error
+      end
     end
 
-    it 'writes a chunked request from an Enumerable correctly' do
-      io = StringIO.new
-      writer = HTTP::Request::Writer.new(io, %w[bees cows], [], '')
-      writer.send_request_body
-      io.rewind
-      expect(io.string).to eq "4\r\nbees\r\n4\r\ncows\r\n0\r\n\r\n"
+    context 'when body is not string, enumerable or nil' do
+      let(:body) { 123 }
+
+      it 'raises an error' do
+        expect { writer }.to raise_error
+      end
     end
   end
 
-  describe '#add_body_type_headers' do
-    it 'properly calculates length of unicode string' do
-      writer = HTTP::Request::Writer.new(nil, 'Привет, мир!', {}, '')
-      writer.add_body_type_headers
-      expect(writer.join_headers).to match(/\r\nContent-Length: 21\r\n/)
+  describe '#stream' do
+    context 'when body is Enumerable' do
+      let(:body)    { %w(bees cows) }
+      let(:headers) { HTTP::Headers.coerce 'Transfer-Encoding' => 'chunked' }
+
+      it 'writes a chunked request from an Enumerable correctly' do
+        writer.stream
+        expect(io.string).to end_with "\r\n4\r\nbees\r\n4\r\ncows\r\n0\r\n\r\n"
+      end
+
+      it 'writes Transfer-Encoding header only once' do
+        writer.stream
+        expect(io.string).to start_with "#{headerstart}\r\nTransfer-Encoding: chunked\r\n\r\n"
+      end
+
+      context 'when Transfer-Encoding not set' do
+        let(:headers) { HTTP::Headers.new }
+        specify { expect { writer.stream }.to raise_error }
+      end
+
+      context 'when Transfer-Encoding is not chunked' do
+        let(:headers) { HTTP::Headers.coerce 'Transfer-Encoding' => 'gzip' }
+        specify { expect { writer.stream }.to raise_error }
+      end
+    end
+
+    context 'when body is a unicode String' do
+      let(:body) { 'Привет, мир!' }
+
+      it 'properly calculates Content-Length if needed' do
+        writer.stream
+        expect(io.string).to start_with "#{headerstart}\r\nContent-Length: 21\r\n\r\n"
+      end
+
+      context 'when Content-Length explicitly set' do
+        let(:headers) { HTTP::Headers.coerce 'Content-Length' => 12 }
+
+        it 'keeps given value' do
+          writer.stream
+          expect(io.string).to start_with "#{headerstart}\r\nContent-Length: 12\r\n\r\n"
+        end
+      end
     end
   end
 end