Fixed Ruby v1.9.3 bug with URI

Author: svyatov

CHANGELOG.md

@@ -6,8 +6,14 @@
 
     ```ruby
     http = HTTPWrapper.new
-    request = Net::HTTP::Head.new URI('http://example.com')
-    http.execute request
+    uri = URI 'http://example.com'
+
+    # Ruby v2.0.0
+    request = Net::HTTP::Head.new uri
+    # Ruby v1.9.3
+    request = Net::HTTP::Head.new uri.request_uri
+
+    http.execute request, uri
     ```
 
 * added ability to upload files with `multipart/form-data` content type

README.md

@@ -243,8 +243,14 @@ http.get sample_url, headers: { user_agent: 'custom user agent' }
 ### Perform own custom Net::HTTP requests
 
 ```ruby
-request = Net::HTTP::Head.new URI('http://example.com')
-http.execute request
+uri = URI 'http://example.com'
+
+# Ruby 2.0.0
+request = Net::HTTP::Head.new uri
+# Ruby 1.9.3
+request = Net::HTTP::Head.new uri.request_uri
+
+http.execute request, uri
 ```
 
 ### Full params hash example

lib/http_wrapper/http_wrapper.rb

@@ -37,8 +37,8 @@ def post_and_get_cookie(url, params = {})
     response.response['set-cookie']
   end
 
-  def execute(request)
-    connection = create_connection request.uri
+  def execute(request, uri)
+    connection = create_connection uri
     connection.request request
   end
 
@@ -55,7 +55,7 @@ def validate_options(options)
   def get_response(request, redirects_limit = @max_redirects)
     raise TooManyRedirectsError.new 'Too many redirects!' if redirects_limit == 0
 
-    response = execute request.create
+    response = execute request.create, request.uri
 
     if response.kind_of? Net::HTTPRedirection
       request.uri = response['location']

lib/http_wrapper/request.rb

@@ -76,7 +76,9 @@ def convert_symbol_headers_to_string
     end
 
     def create_http_request
-      @request = @method_class.new @uri, @headers
+      # Ruby v1.9.3 doesn't understand full URI object, it needs just path :(
+      uri = RUBY_VERSION =~ /\A2/ ? @uri : @uri.request_uri
+      @request = @method_class.new uri, @headers
       set_cookies
       set_body
       set_basic_auth

spec/http_wrapper_spec.rb

@@ -239,8 +239,15 @@
       it 'should perform request for custom Net::HTTP request instance' do
         stub_request :head, sample_url
         uri = URI sample_url
-        request = Net::HTTP::Head.new uri
-        subject.execute request
+
+        if RUBY_VERSION =~ /\A2/
+          request = Net::HTTP::Head.new uri
+          subject.execute request, request.uri
+        else
+          # Ruby v1.9.3 doesn't understand full URI object, it needs just path :(
+          request = Net::HTTP::Head.new uri.request_uri
+          subject.execute request, uri
+        end
       end
     end
   end