normalize_url treats nil url as blank

git-svn-id: http://svn.rubyonrails.org/rails/plugins/open_id_authentication@8931 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
geemus · Feb 27, 2008 · 27db6c7 · 27db6c7
1 parent b00b0c6
commit 27db6c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/open_id_authentication.rb b/lib/open_id_authentication.rb
@@ -1,3 +1,5 @@
+require 'uri'
+
 module OpenIdAuthentication
   OPEN_ID_AUTHENTICATION_DIR = RAILS_ROOT + "/tmp/openids"
 
@@ -57,7 +59,7 @@ def message
   end
 
   def self.normalize_url(url)
-    uri = URI.parse(url.strip)
+    uri = URI.parse(url.to_s.strip)
     uri = URI.parse("http://#{uri}") unless uri.scheme
     uri.scheme = uri.scheme.downcase  # URI should do this
     uri.normalize.to_s

diff --git a/test/normalize_test.rb b/test/normalize_test.rb
@@ -29,8 +29,9 @@ def test_normalizations
       assert_equal to, normalize_url(from)
     end
   end
-  
+
   def test_broken_open_id
+    assert_raises(InvalidOpenId) { normalize_url(nil) }
     assert_raises(InvalidOpenId) { normalize_url("=name") }
   end
 end