Merge pull request #11 from swiftype/master

Make PostRank::URI.valid? work with punycode and Unicode domain names
postrank-labs · May 8, 2013 · 2b93565 · 2b93565
2 parents 707b7c0 + ab96afc
commit 2b93565
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/postrank-uri.rb b/lib/postrank-uri.rb
@@ -224,7 +224,7 @@ def valid?(uri)
       cleaned_uri = clean(uri, :raw => true)
 
       if host = cleaned_uri.host
-        is_valid = PublicSuffix.valid?(host)
+        is_valid = PublicSuffix.valid?(Addressable::IDNA.to_unicode(host))
       end
 
       is_valid

diff --git a/spec/postrank-uri_spec.rb b/spec/postrank-uri_spec.rb
@@ -350,5 +350,13 @@ def e(text)
     it 'marks www.test.com as valid' do
       PostRank::URI.valid?('http://www.test.com').should be_true
     end
+
+    it 'marks Unicode domain as valid (NOTE: works only with a scheme)' do
+      PostRank::URI.valid?('http://президент.рф').should be_true
+    end
+
+    it 'marks punycode domain domain as valid' do
+      PostRank::URI.valid?('xn--d1abbgf6aiiy.xn--p1ai').should be_true
+    end
   end
 end