Merge branch 'master' of https://github.com/rails/rails

1 files changed, 6 insertions, 6 deletions

diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index b7befe110d..480f2fbecb 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/benchmark'
+require 'active_support/core_ext/uri'
 require 'net/https'
 require 'date'
 require 'time'
@@ -31,21 +32,20 @@ module ActiveResource
     def initialize(site, format = ActiveResource::Formats::XmlFormat)
       raise ArgumentError, 'Missing site URI' unless site
       @user = @password = nil
-      @uri_parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
       self.site = site
       self.format = format
     end
 
     # Set URI for remote service.
     def site=(site)
-      @site = site.is_a?(URI) ? site : @uri_parser.parse(site)
-      @user = @uri_parser.unescape(@site.user) if @site.user
-      @password = @uri_parser.unescape(@site.password) if @site.password
+      @site = site.is_a?(URI) ? site : URI.parser.parse(site)
+      @user = URI.parser.unescape(@site.user) if @site.user
+      @password = URI.parser.unescape(@site.password) if @site.password
     end
 
     # Set the proxy for remote service.
     def proxy=(proxy)
-      @proxy = proxy.is_a?(URI) ? proxy : @uri_parser.parse(proxy)
+      @proxy = proxy.is_a?(URI) ? proxy : URI.parser.parse(proxy)
     end
 
     # Sets the user for remote service.
@@ -76,7 +76,7 @@ module ActiveResource
     # Executes a GET request.
     # Used to get (find) resources.
     def get(path, headers = {})
-      with_auth { format.decode(request(:get, path, build_request_headers(headers, :get, self.site.merge(path))).body) }
+      with_auth { request(:get, path, build_request_headers(headers, :get, self.site.merge(path))) }
     end
 
     # Executes a DELETE request (see HTTP protocol documentation if unfamiliar).