diff options
author | Emilio Tagua <miloops@gmail.com> | 2010-09-28 07:57:26 +0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-09-28 11:38:35 +0800 |
commit | 71acc2737aa346ee57f9fc21252a508ae83367a4 (patch) | |
tree | ddb12b7813d20b4003c874604620d0aef7ace31a /activeresource/lib/active_resource/connection.rb | |
parent | b7934afe326f8bba9cdcacdfac93062dff155efe (diff) | |
download | rails-71acc2737aa346ee57f9fc21252a508ae83367a4.tar.gz rails-71acc2737aa346ee57f9fc21252a508ae83367a4.tar.bz2 rails-71acc2737aa346ee57f9fc21252a508ae83367a4.zip |
Move uri parser to AS as URI.parser method to reuse it in AP and ARes.
Diffstat (limited to 'activeresource/lib/active_resource/connection.rb')
-rw-r--r-- | activeresource/lib/active_resource/connection.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb index c587225e24..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. |