unshorten 0.1.3 → 0.2.0

data/lib/unshorten.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 require 'uri'
 
 # Get original URLs from shortened ones.
@@ -28,7 +29,8 @@ class Unshorten
     # @option options [Integer] :timeout Timeout in seconds, for every request
     # @option options [Regexp]  :short_hosts Hosts that provides short url
     #                                        services, only send requests if
-    #                                        host matches this regexp
+    #                                        host matches this regexp. Set to false
+    #                                        to follow all redirects.
     # @option options [Boolean] :use_cache Use cached result if available
     # @option options [Boolean] :add_missing_http add 'http://' if missing
     # @see DEFAULT_OPTIONS
@@ -70,10 +72,12 @@ class Unshorten
 
       uri = URI.parse(url) rescue nil
 
-      return url if uri.nil? or not uri.host =~ options[:short_hosts]
+      return url if uri.nil?
+      return url if options[:short_hosts] != false and not uri.host =~ options[:short_hosts]
 
       http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = options[:timeout]
+      http.use_ssl = true if uri.scheme == "https"
 
       response = http.request_head(uri.path.empty? ? '/' : uri.path) rescue nil
 

data/test/test_unshorten.rb

@@ -24,4 +24,19 @@ class UnshortenTest < Test::Unit::TestCase
         assert_equal SHORTENED_URL, Unshorten.unshorten(SHORTENED_URL, :short_hosts => /jmp/, :use_cache => false)
     end
 
+    HTTPS_LINK_1_FULL = 'https://github.com/aaronpk/unshorten'
+    HTTPS_LINK_1_SHORT = 'https://t.co/5204FqAr'
+
+    def test_https_link
+        assert_equal HTTPS_LINK_1_FULL, Unshorten.unshorten(HTTPS_LINK_1_SHORT, :short_hosts => /./, :use_cache => false)
+    end
+
+    def test_follow_all_redirects
+        assert_equal HTTPS_LINK_1_FULL, Unshorten.unshorten(HTTPS_LINK_1_SHORT, :short_hosts => false, :use_cache => false)
+    end
+
+    def test_only_tco_links
+        assert_equal "http://aaron.pk/649", Unshorten.unshorten(HTTPS_LINK_1_SHORT, :short_hosts => /t\.co/, :use_cache => false)
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unshorten
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies: []
 description: Get original URLs from shortened ones
 email: quark@lihdd.net
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Unshorten URLs