Normalize urls with URI adapter to allow International Domain Names support (#668)

* Normalize urls with URI adapter to allow idns support

* Fix normalization update specs

Gemfile

@@ -16,6 +16,7 @@ group :test do
   gem 'aruba'
   gem 'cucumber', '~> 2.3'
   gem 'webmock'
+  gem 'addressable'
 end
 
 group :development, :test do

lib/httparty/request.rb

@@ -71,7 +71,7 @@ module HTTParty
       @path = if uri.is_a?(uri_adapter)
         uri
       elsif String.try_convert(uri)
-        uri_adapter.parse uri
+        uri_adapter.parse(uri).normalize
       else
         raise ArgumentError,
           "bad argument (expected #{uri_adapter} object or URI string)"
@@ -95,9 +95,9 @@ module HTTParty
       end
 
       if path.relative? && path.host
-        new_uri = options[:uri_adapter].parse("#{@last_uri.scheme}:#{path}")
+        new_uri = options[:uri_adapter].parse("#{@last_uri.scheme}:#{path}").normalize
       elsif path.relative?
-        new_uri = options[:uri_adapter].parse("#{base_uri}#{path}")
+        new_uri = options[:uri_adapter].parse("#{base_uri}#{path}").normalize
       else
         new_uri = path.clone
       end
@@ -305,7 +305,7 @@ module HTTParty
 
     def handle_host_redirection
       check_duplicate_location_header
-      redirect_path = options[:uri_adapter].parse last_response['location']
+      redirect_path = options[:uri_adapter].parse(last_response['location']).normalize
       return if redirect_path.relative? || path.host == redirect_path.host
       @changed_hosts = true
     end

spec/httparty_spec.rb

@@ -405,18 +405,37 @@ RSpec.describe HTTParty do
   end
 
   describe "uri_adapter" do
+    context 'with Addressable::URI' do
+      before do
+        @klass.uri_adapter(Addressable::URI)
+      end
 
+      it 'handles international domains' do
+        uri = 'http://xn--i-7iqv272g.ws/'
+        stub_request(:get, uri).to_return(body: 'stuff')
+
+        response = @klass.get('http://i❤️.ws')
+        expect(response.parsed_response).to eq('stuff')
+        expect(response.request.uri.to_s).to eq(uri)
+      end
+    end
+
+    context 'with custom URI Adaptor' do
       require 'forwardable'
       class CustomURIAdaptor
         extend Forwardable
         def_delegators :@uri, :userinfo, :relative?, :query, :query=, :scheme, :path, :host, :port
 
-      def initialize uri
+        def initialize(uri)
           @uri = uri
         end
 
-      def self.parse uri
+        def self.parse(uri)
-        new URI.parse uri
+          new(URI.parse(uri))
+        end
+
+        def normalize
+          self
         end
       end
 
@@ -440,7 +459,7 @@ RSpec.describe HTTParty do
         @klass.uri_adapter uri_adapter
         expect(@klass.get(uri).parsed_response).to eq('stuff')
       end
-
+    end
   end
 
   describe "connection_adapter" do