unshorten 0.1.2 → 0.1.3

data/lib/unshorten.rb

@@ -11,7 +11,7 @@ class Unshorten
   DEFAULT_OPTIONS = {
     :max_level => 10,
     :timeout => 2,
-    :short_hosts => /.*/,
+    :short_hosts => Regexp.union('url', /^[^.]{1,6}\.[^.]{1,2}$/i),
     :use_cache => true,
     :add_missing_http => true
   }
@@ -68,9 +68,9 @@ class Unshorten
       return @@cache[url] if options[:use_cache] and @@cache[url]
       return url if level >= options[:max_level]
 
-      uri = URI.parse(url)
+      uri = URI.parse(url) rescue nil
 
-      return url unless uri.host =~ options[:short_hosts]
+      return url if uri.nil? or not uri.host =~ options[:short_hosts]
 
       http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = options[:timeout]

data/test/test_unshorten.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'test/unit'
 require 'unshorten'
 
@@ -9,6 +11,11 @@ class UnshortenTest < Test::Unit::TestCase
         assert_equal ORIGINAL_URL, Unshorten[SHORTENED_URL, :use_cache => false]
     end
 
+    def test_illegal_urls
+        illegal_url = 'http://a汉字bc.那么/是非法的?url'
+        assert_equal illegal_url, Unshorten.unshorten(illegal_url, :use_cache => false)
+    end
+
     def test_option_max_level
         assert_equal SHORTENED_URL, Unshorten.unshorten(SHORTENED_URL, :max_level => 0, :use_cache => false)
     end
@@ -16,4 +23,5 @@ class UnshortenTest < Test::Unit::TestCase
     def test_option_short_hosts
         assert_equal SHORTENED_URL, Unshorten.unshorten(SHORTENED_URL, :short_hosts => /jmp/, :use_cache => false)
     end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unshorten
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors: