0
@@ -204,8 +204,8 @@
0
           @site = nil
0
         else
0
           @site = create_site_uri_from(site)
0
-          @user = @site.user if @site.user
0
-          @password = @site.password if @site.password
0
+          @user = URI.decode(@site.user) if @site.user
0
+          @password = URI.decode(@site.password) if @site.password
0
         end
0
       end
0
 

0
@@ -76,8 +76,8 @@
0
     # Set URI for remote service.
0
     def site=(site)
0
       @site = site.is_a?(URI) ? site : URI.parse(site)
0
-      @user = @site.user if @site.user
0
-      @password = @site.password if @site.password
0
+      @user = URI.decode(@site.user) if @site.user
0
+      @password = URI.decode(@site.password) if @site.password
0
     end
0
 
0
     # Set user for remote service.

0
@@ -45,6 +45,15 @@
0
     assert_equal ["", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
0
   end
0
   
0
+  def test_authorization_header_with_decoded_credentials_from_url
0
+    @conn = ActiveResource::Connection.new("http://my%40email.com:%31%32%33@localhost")
0
+    authorization_header = @conn.send!(:authorization_header)
0
+    authorization = authorization_header["Authorization"].to_s.split
0
+
0
+    assert_equal "Basic", authorization[0]
0
+    assert_equal ["my@email.com", "123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
0
+  end
0
+
0
   def test_authorization_header_explicitly_setting_username_and_password
0
     @authenticated_conn = ActiveResource::Connection.new("http://@localhost")
0
     @authenticated_conn.user = 'david'

0
@@ -103,6 +103,13 @@
0
     assert_nil actor.connection.password
0
   end
0
 
0
+  def test_credentials_from_site_are_decoded
0
+    actor = Class.new(ActiveResource::Base)
0
+    actor.site = 'http://my%40email.com:%31%32%33@cinema'
0
+    assert_equal("my@email.com", actor.user)
0
+    assert_equal("123", actor.password)
0
+  end
0
+
0
   def test_site_reader_uses_superclass_site_until_written
0
     # Superclass is Object so returns nil.
0
     assert_nil ActiveResource::Base.site