htty 1.0.0 → 1.1.0

data/{app → lib}/htty/requests_util.rb

@@ -1,6 +1,5 @@
-# Defines HTTY::RequestsUtil.
-
 require 'net/http'
+require 'net/https'
 require 'uri'
 require File.expand_path("#{File.dirname __FILE__}/response")
 
@@ -74,7 +73,7 @@ private
 
   def self.request(request)
     http = Net::HTTP.new(request.uri.host, request.uri.port)
-    http.use_ssl = true if (request.uri === URI::HTTPS)
+    http.use_ssl = true if request.uri.kind_of?(URI::HTTPS)
     http.start do |host|
       http_response = yield(host)
       headers = []

data/{app → lib}/htty/response.rb

@@ -1,5 +1,3 @@
-# Defines HTTY::Response.
-
 require File.expand_path("#{File.dirname __FILE__}/cookies_util")
 require File.expand_path("#{File.dirname __FILE__}/payload")
 
@@ -8,7 +6,8 @@ module HTTY; end
 # Encapsulates an HTTP(S) response.
 class HTTY::Response < HTTY::Payload
 
-  COOKIES_HEADER_NAME = 'Set-Cookie'
+  COOKIES_HEADER_NAME  = 'Set-Cookie'
+  LOCATION_HEADER_NAME = 'Location'
 
   # Returns the HTTP status associated with the response.
   attr_reader :status

data/{app → lib}/htty/session.rb

@@ -1,5 +1,3 @@
-# Defines HTTY::Session.
-
 require File.expand_path("#{File.dirname __FILE__}/request")
 
 module HTTY; end

data/spec/unit/htty/cli_spec.rb

@@ -1,27 +1,22 @@
 require 'spec'
-require File.expand_path("#{File.dirname __FILE__}/../../../app/htty/cli")
-require File.expand_path("#{File.dirname __FILE__}/../../../app/htty/request")
+require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/cli")
+require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/request")
 
 describe HTTY::CLI do
   describe 'with empty arguments' do
-    before :each do
-      @cli = HTTY::CLI.new([])
-    end
-
     it 'should have a session with the URI http://0.0.0.0:80/' do
-      @cli.session.requests.should == [HTTY::Request.new('http://0.0.0.0:80/')]
+      cli = HTTY::CLI.new([])
+      cli.session.requests.should == [HTTY::Request.new('http://0.0.0.0:80/')]
     end
   end
 
   describe 'with an address argument' do
-    before :each do
-      @cli = HTTY::CLI.new(%w(http://njonsson@github.com/njonsson/htty))
-    end
-
     it 'should have a session with a URI corresponding to the address' do
-      @cli.session.requests.should == [HTTY::Request.new('http://'             +
-                                                         'njonsson@github.com' +
-                                                         '/njonsson/htty')]
+      cli = HTTY::CLI.new(%w(https://njonsson@github.com/njonsson/htty))
+      cli.session.requests.should == [HTTY::Request.new('https://'            +
+                                                        'njonsson@github.com' +
+                                                        ':443'                +
+                                                        '/njonsson/htty')]
     end
   end
 end

data/spec/unit/htty/ordered_hash_spec.rb

@@ -1,53 +1,49 @@
 require 'spec'
-require File.expand_path("#{File.dirname __FILE__}/../../../app/htty/ordered_hash")
+require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/ordered_hash")
 
 describe HTTY::OrderedHash do
   describe 'that is empty' do
-    before :each do
-      @hash = HTTY::OrderedHash.new
-    end
+    let(:hash) { HTTY::OrderedHash.new }
 
     it 'should be empty' do
-      @hash.should be_empty
+      hash.should be_empty
     end
 
     describe '-- when values are added out of order' do
       before :each do
-        @hash['foo'] = 'bar'
-        @hash['baz'] = 'qux'
+        hash['foo'] = 'bar'
+        hash['baz'] = 'qux'
       end
 
       it '-- should have the expected values' do
-        @hash.should == {'foo' => 'bar', 'baz' => 'qux'}
+        hash.should == {'foo' => 'bar', 'baz' => 'qux'}
       end
 
       it '-- should return the expected array when sent #to_a' do
-        @hash.to_a.should == [%w(foo bar), %w(baz qux)]
+        hash.to_a.should == [%w(foo bar), %w(baz qux)]
       end
     end
   end
 
   describe 'that has values out of order' do
-    before :each do
-      @hash = HTTY::OrderedHash.new('foo' => 'bar', 'baz' => 'qux')
-    end
+    let(:hash) { HTTY::OrderedHash.new('foo' => 'bar', 'baz' => 'qux') }
 
     it 'should have the expected values' do
-      @hash.should == {'foo' => 'bar', 'baz' => 'qux'}
+      hash.should == {'foo' => 'bar', 'baz' => 'qux'}
     end
 
     it 'should index the values as expected' do
-      @hash['foo'].should == 'bar'
-      @hash['baz'].should == 'qux'
+      hash['foo'].should == 'bar'
+      hash['baz'].should == 'qux'
     end
 
     describe '-- when sent #clear' do
       before :each do
-        @hash.clear
+        hash.clear
       end
 
       it '-- should be empty' do
-        @hash.should be_empty
+        hash.should be_empty
       end
     end
   end

data/spec/unit/htty/request_spec.rb

@@ -1,10 +1,25 @@
 require 'spec'
-require File.expand_path("#{File.dirname __FILE__}/../../../app/htty/request")
-require File.expand_path("#{File.dirname __FILE__}/../../../app/htty/response")
+require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/request")
+require File.expand_path("#{File.dirname __FILE__}/../../../lib/htty/response")
 
 shared_examples_for 'an empty request' do
   it 'should have only the default headers' do
-    @request.headers.should == [%w(User-Agent htty/1.0.0)]
+    @request.headers.should == [%w(User-Agent htty/1.1.0)]
+  end
+
+  it 'should have no body' do
+    @request.body.should be_nil
+  end
+
+  it 'should have no response' do
+    @request.response.should be_nil
+  end
+end
+
+shared_examples_for 'an empty, authenticated request' do
+  it 'should the expected Authorization header plus the default headers' do
+    @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                ['Authorization', 'Basic bmpvbnNzb24=']]
   end
 
   it 'should have no body' do
@@ -21,50 +36,50 @@ describe HTTY::Request do
     describe 'an invalid IPv4 address having' do
       describe 'consecutive dots' do
         it 'should raise URI::InvalidURIError' do
-          lambda {
+          expect {
             HTTY::Request.new '1.2.3..4'
-          }.should raise_error(URI::InvalidURIError)
+          }.to raise_error(URI::InvalidURIError)
         end
       end
 
       describe 'no dots' do
         it 'should raise URI::InvalidURIError' do
-          lambda {
+          expect {
             HTTY::Request.new '1234'
-          }.should raise_error(URI::InvalidURIError)
+          }.to raise_error(URI::InvalidURIError)
         end
       end
 
       describe 'too few dotted decimals' do
         it 'should raise URI::InvalidURIError' do
-          lambda {
+          expect {
             HTTY::Request.new '1.2.3'
-          }.should raise_error(URI::InvalidURIError)
+          }.to raise_error(URI::InvalidURIError)
         end
       end
 
       describe 'too many dotted decimals' do
         it 'should raise URI::InvalidURIError' do
-          lambda {
+          expect {
             HTTY::Request.new '1.2.3.4.5'
-          }.should raise_error(URI::InvalidURIError)
+          }.to raise_error(URI::InvalidURIError)
         end
       end
 
       describe 'a dotted decimal out of range' do
         it 'should raise URI::InvalidURIError' do
-          lambda {
+          expect {
             HTTY::Request.new '1.2.3.1000'
-          }.should raise_error(URI::InvalidURIError)
+          }.to raise_error(URI::InvalidURIError)
         end
       end
     end
 
     describe 'an invalid hostname having a leading hyphen' do
       it 'should raise URI::InvalidURIError' do
-        lambda {
+        expect {
           HTTY::Request.new '-google.com'
-        }.should raise_error(URI::InvalidURIError)
+        }.to raise_error(URI::InvalidURIError)
       end
     end
   end
@@ -156,6 +171,18 @@ describe HTTY::Request do
       it_should_behave_like 'an empty request'
     end
 
+    describe 'the HTTPS scheme, userinfo, and a hostname' do
+      before :each do
+        @request = HTTY::Request.new('https://njonsson@github.com')
+      end
+
+      it 'should have an HTTPS URI for host with that userinfo' do
+        @request.uri.should == URI.parse('https://njonsson@github.com:443/')
+      end
+
+      it_should_behave_like 'an empty, authenticated request'
+    end
+
     describe 'a hostname and the root path' do
       before :each do
         @request = HTTY::Request.new('github.com/')
@@ -168,6 +195,18 @@ describe HTTY::Request do
       it_should_behave_like 'an empty request'
     end
 
+    describe 'a hostname, port 443, and the root path' do
+      before :each do
+        @request = HTTY::Request.new('github.com:443/')
+      end
+
+      it 'should have an HTTPS URI for the root of that host' do
+        @request.uri.should == URI.parse('https://github.com:443/')
+      end
+
+      it_should_behave_like 'an empty request'
+    end
+
     describe 'the HTTP scheme, a hostname, port 443, and the root path' do
       before :each do
         @request = HTTY::Request.new('http://github.com:443/')
@@ -249,10 +288,10 @@ describe HTTY::Request do
       it_should_behave_like 'an empty request'
     end
 
-    describe 'the HTTP scheme, userinfo, a hostname, a port, a path, a query ' +
-             'string, and a fragment' do
+    describe 'the HTTPS scheme, userinfo, a hostname, a port, a path, a ' +
+             'query string, and a fragment' do
       before :each do
-        @request = HTTY::Request.new('http://njonsson@github.com:123' +
+        @request = HTTY::Request.new('https://njonsson@github.com:123' +
                                      '/search/deep?q=http&lang=en#content')
       end
 
@@ -262,15 +301,15 @@ describe HTTY::Request do
         end
 
         describe '-- and is untouched --' do
-          it 'should have an HTTP URI for that query string and that '    +
+          it 'should have an HTTPS URI for that query string and that '   +
              'fragment of that path on that host on that port with that ' +
              'userinfo' do
-            @request.uri.should == URI.parse('http://njonsson@github.com:123' +
-                                             '/search/deep?q=http&lang=en'    +
+            @request.uri.should == URI.parse('https://njonsson@github.com:123' +
+                                             '/search/deep?q=http&lang=en'     +
                                              '#content')
           end
 
-          it_should_behave_like 'an empty request'
+          it_should_behave_like 'an empty, authenticated request'
         end
 
         describe '-- when sent #address with an address consisting of' do
@@ -290,7 +329,19 @@ describe HTTY::Request do
                                                '#flames')
             end
 
-            it_should_behave_like 'an empty request'
+            it 'should the expected Authorization header plus the default ' +
+               'headers' do
+              @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                          ['Authorization', 'Basic c3RldmU=']]
+            end
+
+            it 'should have no body' do
+              @request.body.should be_nil
+            end
+
+            it 'should have no response' do
+              @request.response.should be_nil
+            end
           end
 
           describe 'a different hostname --' do
@@ -309,17 +360,32 @@ describe HTTY::Request do
         describe '-- when sent #scheme_set with' do
           describe 'the same scheme --' do
             before :each do
-              @request.scheme_set 'http'
+              @request.scheme_set 'https'
             end
 
             it 'should have an unchanged URI' do
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
+                                               ':123'                        +
+                                               '/search/deep?q=http&lang=en' +
+                                               '#content')
+            end
+
+            it_should_behave_like 'an empty, authenticated request'
+          end
+
+          describe 'a different scheme --' do
+            before :each do
+              @request.scheme_set 'http'
+            end
+
+            it 'should have the same URI, with the changed scheme' do
               @request.uri.should == URI.parse('http://njonsson@github.com'  +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
         end
 
@@ -330,27 +396,67 @@ describe HTTY::Request do
             end
 
             it 'should have an unchanged URI' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
-          describe 'different userinfo --' do
-            before :each do
-              @request.userinfo_set 'nils'
-            end
+          describe 'different userinfo' do
+            describe "that does not contain '@' --" do
+              before :each do
+                @request.userinfo_set 'nils'
+              end
 
-            it 'should have the same URI, with the changed userinfo' do
-              @request.uri.should == URI.parse('http://nils@github.com:123'  +
-                                               '/search/deep?q=http&lang=en' +
-                                               '#content')
+              it 'should have the same URI, with the changed userinfo' do
+                @request.uri.should == URI.parse('https://nils@github.com:123' +
+                                                 '/search/deep?q=http&lang=en' +
+                                                 '#content')
+              end
+
+              it 'should the expected Authorization header plus the default ' +
+                 'headers' do
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic bmlscw==']]
+              end
+
+              it 'should have no body' do
+                @request.body.should be_nil
+              end
+
+              it 'should have no response' do
+                @request.response.should be_nil
+              end
             end
 
-            it_should_behave_like 'an empty request'
+            describe "that contains an escaped '@' --" do
+              before :each do
+                @request.userinfo_set 'n%45'
+              end
+
+              it 'should have the same URI, with the changed userinfo' do
+                @request.uri.should == URI.parse('https://n%45@github.com:123' +
+                                                 '/search/deep?q=http&lang=en' +
+                                                 '#content')
+              end
+
+              it 'should the expected Authorization header plus the default ' +
+                 'headers' do
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic bkU=']]
+              end
+
+              it 'should have no body' do
+                @request.body.should be_nil
+              end
+
+              it 'should have no response' do
+                @request.response.should be_nil
+              end
+            end
           end
         end
 
@@ -360,7 +466,7 @@ describe HTTY::Request do
           end
 
           it 'should have the same URI, without userinfo' do
-            @request.uri.should == URI.parse('http://github.com:123'       +
+            @request.uri.should == URI.parse('https://github.com:123'      +
                                              '/search/deep?q=http&lang=en' +
                                              '#content')
           end
@@ -375,13 +481,13 @@ describe HTTY::Request do
             end
 
             it 'should have an unchanged URI' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'a different host --' do
@@ -390,13 +496,13 @@ describe HTTY::Request do
             end
 
             it 'should have the same URI, with the changed scheme' do
-              @request.uri.should == URI.parse('http://'                      +
+              @request.uri.should == URI.parse('https://'                     +
                                                'njonsson@gist.github.com:123' +
                                                '/search/deep?q=http&lang=en'  +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
         end
 
@@ -407,13 +513,13 @@ describe HTTY::Request do
             end
 
             it 'should have an unchanged URI' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'a different port --' do
@@ -422,13 +528,13 @@ describe HTTY::Request do
             end
 
             it 'should have the same URI, with the changed scheme' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':8888'                       +
                                                '/search/deep?q=http&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
         end
 
@@ -439,13 +545,13 @@ describe HTTY::Request do
             end
 
             it 'should have the same URI, descending to the expected path' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep/foo'            +
                                                '?q=http&lang=en#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'a parent reference --' do
@@ -454,12 +560,12 @@ describe HTTY::Request do
             end
 
             it 'should have the same URI, ascending to the expected path' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search?q=http&lang=en#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'an absolute reference --' do
@@ -468,13 +574,13 @@ describe HTTY::Request do
             end
 
             it 'should have the same URI, changing to the expected path' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/foo/bar?q=http&lang=en'     +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
         end
 
@@ -485,14 +591,14 @@ describe HTTY::Request do
             end
 
             it 'should have a URI including the new query parameter' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep'                +
                                                '?q=http&lang=en&foo=bar'     +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'with a new value for the first query parameter --' do
@@ -501,13 +607,13 @@ describe HTTY::Request do
             end
 
             it 'should have a URI with the new value of the query parameter' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=ruby&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'with a new value for the second query parameter --' do
@@ -517,13 +623,13 @@ describe HTTY::Request do
 
             it 'should have a URI with the new value of the second query ' +
                'parameter' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=fr' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
         end
 
@@ -534,13 +640,13 @@ describe HTTY::Request do
             end
 
             it 'should have an unchanged URI' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'with the first query parameter --' do
@@ -549,12 +655,12 @@ describe HTTY::Request do
             end
 
             it 'should have a URI missing the first query parameter' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?lang=en#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'with the second query parameter --' do
@@ -563,12 +669,12 @@ describe HTTY::Request do
             end
 
             it 'should have a URI missing the second query parameter' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
         end
 
@@ -578,11 +684,11 @@ describe HTTY::Request do
           end
 
           it 'should have a URI having no query string' do
-            @request.uri.should == URI.parse('http://njonsson@github.com:123' +
+            @request.uri.should == URI.parse('https://njonsson@github.com:123' +
                                              '/search/deep#content')
           end
 
-          it_should_behave_like 'an empty request'
+          it_should_behave_like 'an empty, authenticated request'
         end
 
         describe '-- when sent #fragment_set with' do
@@ -592,13 +698,13 @@ describe HTTY::Request do
             end
 
             it 'should have an unchanged URI' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=en' +
                                                '#content')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
 
           describe 'different fragment --' do
@@ -607,13 +713,13 @@ describe HTTY::Request do
             end
 
             it 'should have the same URI, with the changed fragment' do
-              @request.uri.should == URI.parse('http://njonsson@github.com'  +
+              @request.uri.should == URI.parse('https://njonsson@github.com' +
                                                ':123'                        +
                                                '/search/deep?q=http&lang=en' +
                                                '#details')
             end
 
-            it_should_behave_like 'an empty request'
+            it_should_behave_like 'an empty, authenticated request'
           end
         end
 
@@ -623,11 +729,11 @@ describe HTTY::Request do
           end
 
           it 'should have the same URI, without fragment' do
-            @request.uri.should == URI.parse('http://njonsson@github.com:123' +
+            @request.uri.should == URI.parse('https://njonsson@github.com:123' +
                                              '/search/deep?q=http&lang=en')
           end
 
-          it_should_behave_like 'an empty request'
+          it_should_behave_like 'an empty, authenticated request'
         end
 
         describe '-- when sent #header_set with a new header' do
@@ -636,15 +742,17 @@ describe HTTY::Request do
           end
 
           it 'should have an unchanged URI' do
-            @request.uri.should == URI.parse('http://njonsson@github.com:123' +
-                                             '/search/deep?q=http&lang=en'    +
+            @request.uri.should == URI.parse('https://njonsson@github.com:123' +
+                                             '/search/deep?q=http&lang=en'     +
                                              '#content')
           end
 
           describe '--' do
             it 'should have the header, plus the default headers' do
-              @request.headers.should == [%w(User-Agent htty/1.0.0),
-                                          %w(foo        bar)]
+              @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                          ['Authorization', 'Basic ' +
+                                                            'bmpvbnNzb24='],
+                                          ['foo',           'bar']]
             end
           end
 
@@ -655,7 +763,9 @@ describe HTTY::Request do
               end
 
               it 'should have only the default headers' do
-                @request.headers.should == [%w(User-Agent htty/1.0.0)]
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic ' +
+                                                              'bmpvbnNzb24=']]
               end
             end
 
@@ -665,8 +775,10 @@ describe HTTY::Request do
               end
 
               it 'should have the header, plus the default headers' do
-                @request.headers.should == [%w(User-Agent htty/1.0.0),
-                                            %w(foo        bar)]
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic ' +
+                                                              'bmpvbnNzb24='],
+                                            ['foo',           'bar']]
               end
             end
           end
@@ -688,8 +800,8 @@ describe HTTY::Request do
           end
 
           it 'should have an unchanged URI' do
-            @request.uri.should == URI.parse('http://njonsson@github.com:123' +
-                                             '/search/deep?q=http&lang=en'    +
+            @request.uri.should == URI.parse('https://njonsson@github.com:123' +
+                                             '/search/deep?q=http&lang=en'     +
                                              '#content')
           end
 
@@ -699,8 +811,10 @@ describe HTTY::Request do
             end
 
             it 'should have the cookie header, plus the default headers' do
-              @request.headers.should == [%w(User-Agent htty/1.0.0),
-                                          %w(Cookie     foo=bar)]
+              @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                          ['Authorization', 'Basic ' +
+                                                            'bmpvbnNzb24='],
+                                          ['Cookie',        'foo=bar']]
             end
           end
 
@@ -716,8 +830,11 @@ describe HTTY::Request do
 
               it 'should have the new cookie header, plus the default ' +
                  'headers' do
-                @request.headers.should == [['User-Agent', 'htty/1.0.0'],
-                                            ['Cookie',     'foo=bar; foo=qux']]
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic ' +
+                                                              'bmpvbnNzb24='],
+                                            ['Cookie',        'foo=bar; ' +
+                                                              'foo=qux']]
               end
             end
 
@@ -732,8 +849,11 @@ describe HTTY::Request do
 
               it 'should have the new cookie header, plus the default ' +
                  'headers' do
-                @request.headers.should == [['User-Agent', 'htty/1.0.0'],
-                                            ['Cookie',     'foo=bar; baz=qux']]
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic ' +
+                                                              'bmpvbnNzb24='],
+                                            ['Cookie',        'foo=bar; ' +
+                                                              'baz=qux']]
               end
             end
 
@@ -748,8 +868,10 @@ describe HTTY::Request do
 
               it 'should have the new cookie header, plus the default ' +
                  'headers' do
-                @request.headers.should == [['User-Agent', 'htty/1.0.0'],
-                                            ['Cookie',     'foo=bar; baz']]
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic ' +
+                                                              'bmpvbnNzb24='],
+                                            ['Cookie',        'foo=bar; baz']]
               end
             end
           end
@@ -765,7 +887,9 @@ describe HTTY::Request do
               end
 
               it 'should have only the default headers' do
-                @request.headers.should == [%w(User-Agent htty/1.0.0)]
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic ' +
+                                                              'bmpvbnNzb24=']]
               end
             end
 
@@ -779,8 +903,10 @@ describe HTTY::Request do
               end
 
               it 'should have the cookie header, plus the default headers' do
-                @request.headers.should == [%w(User-Agent htty/1.0.0),
-                                            %w(Cookie     foo=bar)]
+                @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                            ['Authorization', 'Basic ' +
+                                                              'bmpvbnNzb24='],
+                                            ['Cookie',        'foo=bar']]
               end
             end
           end
@@ -795,7 +921,9 @@ describe HTTY::Request do
             end
 
             it 'should have only the default headers' do
-              @request.headers.should == [%w(User-Agent htty/1.0.0)]
+              @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                          ['Authorization', 'Basic ' +
+                                                            'bmpvbnNzb24=']]
             end
           end
 
@@ -810,7 +938,7 @@ describe HTTY::Request do
               end
 
               it 'should have the cookie header, plus the default headers' do
-                @request.headers.should == [%w(User-Agent htty/1.0.0),
+                @request.headers.should == [%w(User-Agent htty/1.1.0),
                                             %w(Cookie     foo=bar)]
               end
             end
@@ -826,7 +954,7 @@ describe HTTY::Request do
               end
 
               it 'should have only the default headers' do
-                @request.headers.should == [%w(User-Agent htty/1.0.0)]
+                @request.headers.should == [%w(User-Agent htty/1.1.0)]
               end
             end
           end
@@ -843,8 +971,10 @@ describe HTTY::Request do
             end
 
             it 'should have the cookie header, plus the default headers' do
-              @request.headers.should == [%w(User-Agent htty/1.0.0),
-                                          %w(Cookie     foo=bar=baz=qux)]
+              @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                          ['Authorization', 'Basic ' +
+                                                            'bmpvbnNzb24='],
+                                          ['Cookie',        'foo=bar=baz=qux']]
             end
           end
         end
@@ -855,8 +985,8 @@ describe HTTY::Request do
           end
 
           it 'should have an unchanged URI' do
-            @request.uri.should == URI.parse('http://njonsson@github.com:123' +
-                                             '/search/deep?q=http&lang=en'    +
+            @request.uri.should == URI.parse('https://njonsson@github.com:123' +
+                                             '/search/deep?q=http&lang=en'     +
                                              '#content')
           end
 
@@ -866,14 +996,20 @@ describe HTTY::Request do
             end
 
             it 'should have only the default headers' do
-              @request.headers.should == [%w(User-Agent htty/1.0.0)]
+              @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                          ['Authorization', 'Basic ' +
+                                                            'bmpvbnNzb24=']]
             end
 
             it "should have the expected 'Content-Length' header, plus the " +
                "'User-Agent' header if we do not exclude the "               +
                "'Content-Length' header" do
-              @request.headers(true).should == [%w(User-Agent     htty/1.0.0),
-                                                %w(Content-Length 3)]
+              @request.headers(true).should == [['User-Agent',     'htty/' +
+                                                                   '1.1.0'],
+                                                ['Authorization',  'Basic '   +
+                                                                   'bmpvbnNz' +
+                                                                   'b24='],
+                                                ['Content-Length', '3']]
             end
           end
 
@@ -887,7 +1023,9 @@ describe HTTY::Request do
             end
 
             it 'should have only the default headers' do
-              @request.headers.should == [%w(User-Agent htty/1.0.0)]
+              @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                          ['Authorization', 'Basic ' +
+                                                            'bmpvbnNzb24=']]
             end
           end
         end
@@ -900,13 +1038,15 @@ describe HTTY::Request do
         end
 
         it 'should not affect the URI' do
-          @request.uri.should == URI.parse('http://njonsson@github.com:123' +
-                                           '/search/deep?q=http&lang=en'    +
+          @request.uri.should == URI.parse('https://njonsson@github.com:123' +
+                                           '/search/deep?q=http&lang=en'     +
                                            '#content')
         end
 
         it 'should not affect the headers' do
-          @request.headers.should == [%w(User-Agent htty/1.0.0)]
+          @request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                      ['Authorization', 'Basic ' +
+                                                        'bmpvbnNzb24=']]
         end
 
         it 'should not affect the body' do
@@ -956,10 +1096,10 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI having the changed ' +
              'userinfo' do
-            @new_request.uri.should == URI.parse('http://nils@github.com' +
-                                                 ':123'                   +
-                                                 '/search/deep'           +
-                                                 '?q=http&lang=en'        +
+            @new_request.uri.should == URI.parse('https://nils@github.com' +
+                                                 ':123'                    +
+                                                 '/search/deep'            +
+                                                 '?q=http&lang=en'         +
                                                  '#content')
           end
 
@@ -974,7 +1114,7 @@ describe HTTY::Request do
           end
 
           it 'should return a request with the same URI not having userinfo' do
-            @new_request.uri.should == URI.parse('http://github.com:123'       +
+            @new_request.uri.should == URI.parse('https://github.com:123'      +
                                                  '/search/deep?q=http&lang=en' +
                                                  '#content')
           end
@@ -991,7 +1131,7 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI having the changed ' +
              'host' do
-            @new_request.uri.should == URI.parse('http://'                     +
+            @new_request.uri.should == URI.parse('https://'                    +
                                                  'njonsson@gist.github.com'    +
                                                  ':123'                        +
                                                  '/search/deep?q=http&lang=en' +
@@ -1010,7 +1150,7 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI having the changed ' +
              'port' do
-            @new_request.uri.should == URI.parse('http://njonsson@github.com'  +
+            @new_request.uri.should == URI.parse('https://njonsson@github.com' +
                                                  ':8888'                       +
                                                  '/search/deep?q=http&lang=en' +
                                                  '#content')
@@ -1028,7 +1168,7 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI having the changed ' +
              'path' do
-            @new_request.uri.should == URI.parse('http://njonsson@github.com'  +
+            @new_request.uri.should == URI.parse('https://njonsson@github.com' +
                                                  ':123'                        +
                                                  '/search/deep/foo'            +
                                                  '?q=http&lang=en#content')
@@ -1046,7 +1186,7 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI having the new query ' +
              'parameter' do
-            @new_request.uri.should == URI.parse('http://njonsson@github.com'  +
+            @new_request.uri.should == URI.parse('https://njonsson@github.com' +
                                                  ':123'                        +
                                                  '/search/deep'                +
                                                  '?q=http&lang=en&foo=bar'     +
@@ -1066,7 +1206,7 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI missing the first ' +
              'query parameter' do
-            @new_request.uri.should == URI.parse('http://njonsson@github.com'  +
+            @new_request.uri.should == URI.parse('https://njonsson@github.com' +
                                                  ':123'                        +
                                                  '/search/deep?lang=en#content')
           end
@@ -1083,7 +1223,7 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI having no query ' +
              'string' do
-            @new_request.uri.should == URI.parse('http://'                 +
+            @new_request.uri.should == URI.parse('https://'                +
                                                  'njonsson@github.com:123' +
                                                  '/search/deep#content')
           end
@@ -1100,7 +1240,7 @@ describe HTTY::Request do
 
           it 'should return a request with the same URI having the changed ' +
              'fragment' do
-            @new_request.uri.should == URI.parse('http://njonsson@github.com'  +
+            @new_request.uri.should == URI.parse('https://njonsson@github.com' +
                                                  ':123'                        +
                                                  '/search/deep?q=http&lang=en' +
                                                  '#details')
@@ -1117,7 +1257,7 @@ describe HTTY::Request do
           end
 
           it 'should return a request with the same URI missing the fragment' do
-            @new_request.uri.should == URI.parse('http://'                 +
+            @new_request.uri.should == URI.parse('https://'                +
                                                  'njonsson@github.com:123' +
                                                  '/search/deep?q=http&lang=en')
           end
@@ -1133,7 +1273,7 @@ describe HTTY::Request do
           end
 
           it 'should return a request with an unchanged URI' do
-            @new_request.uri.should == URI.parse('http://'                     +
+            @new_request.uri.should == URI.parse('https://'                    +
                                                  'njonsson@github.com:123'     +
                                                  '/search/deep?q=http&lang=en' +
                                                  '#content')
@@ -1146,8 +1286,10 @@ describe HTTY::Request do
           describe '--' do
             it 'should return a request with the header, plus the default ' +
                'headers' do
-              @new_request.headers.should == [%w(User-Agent htty/1.0.0),
-                                              %w(foo        bar)]
+              @new_request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                              ['Authorization', 'Basic ' +
+                                                                'bmpvbnNzb24='],
+                                              ['foo',           'bar']]
             end
 
             it 'should return a request without a response' do
@@ -1162,7 +1304,10 @@ describe HTTY::Request do
               end
 
               it 'should return a request with only the default headers' do
-                @new_request.headers.should == [%w(User-Agent htty/1.0.0)]
+                @new_request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                                ['Authorization', 'Basic '     +
+                                                                  'bmpvbnNzb2' +
+                                                                  '4=']]
               end
             end
           end
@@ -1184,7 +1329,7 @@ describe HTTY::Request do
           end
 
           it 'should return a request with an unchanged URI' do
-            @new_request.uri.should == URI.parse('http://'                     +
+            @new_request.uri.should == URI.parse('https://'                    +
                                                  'njonsson@github.com:123'     +
                                                  '/search/deep?q=http&lang=en' +
                                                  '#content')
@@ -1200,14 +1345,20 @@ describe HTTY::Request do
             end
 
             it 'should return a request with only the default headers' do
-              @new_request.headers.should == [%w(User-Agent htty/1.0.0)]
+              @new_request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                              ['Authorization', 'Basic '     +
+                                                                'bmpvbnNzb2' +
+                                                                '4=']]
             end
 
             it "should return a request with the expected 'Content-Length' " +
                "header, plus the 'User-Agent' header if we do not exclude "  +
                "the 'Content-Length' header" do
-              @new_request.headers(true).should == [['User-Agent',     'htty/' +
-                                                                       '1.0.0'],
+              @new_request.headers(true).should == [['User-Agent',    'htty/' +
+                                                                      '1.1.0'],
+                                                    ['Authorization', 'Basic ' +
+                                                                      'bmpvbn' +
+                                                                      'Nzb24='],
                                                     ['Content-Length', '3']]
             end
 
@@ -1226,7 +1377,10 @@ describe HTTY::Request do
             end
 
             it 'should return a request with only the default headers' do
-              @new_request.headers.should == [%w(User-Agent htty/1.0.0)]
+              @new_request.headers.should == [['User-Agent',    'htty/1.1.0'],
+                                              ['Authorization', 'Basic '     +
+                                                                'bmpvbnNzb2' +
+                                                                '4=']]
             end
           end
         end