unshorten 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6329c6a3dd7b90a2b2eed9cf4453a71ccf5f867
-  data.tar.gz: a2240e636da07934700d6be5907e4bb1f6873329
+  metadata.gz: 786f091853e66b01791b84ea4e1dae0fb45e0966
+  data.tar.gz: 533d25ed2aceed116ebbc6f682c533f00f6357b2
 SHA512:
-  metadata.gz: 4737f041e8f4860a77774c43eb12f1f4e8de3405223928c6e8b69eb806c79e8f1b027aa8ce7083ff70901c496bd3e6bc6487851d551646bc80f9bf88c76942eb
-  data.tar.gz: e5c4b34c62a1589a9496c291aa27edfc7ab5b93b02b2713c184c5ea01a453699c7a03d9be7f0fcbbcab3b77e23d61211f1f0b4852a62aadd93a10737b5bc5d34
+  metadata.gz: 0be3b4e703d81938bb376198d44f95db28ce3d18f4434d235bac00b91aeea3a29ce767ef7876314b96ca1f8e6f9c89fff0f60f35c1c31a43a40ee942742fc4c7
+  data.tar.gz: 987b63583edf60f3dd90046efb29ee7b6ede8f02b174ee0e0e6a7e2e7c397731ed43d806fd834a792350d6d69fe97ebe7e0a299f4d58000111a855b6ff0753ad

data/lib/unshorten.rb

@@ -1,9 +1,10 @@
 require 'net/http'
 require 'net/https'
 require 'uri'
+require 'version'
 
 # Get original URLs from shortened ones.
-class Unshorten
+module Unshorten
   # Cache entities limit
   CACHE_SIZE_LIMIT = 1024
 
@@ -84,9 +85,9 @@ class Unshorten
       http.read_timeout = options[:timeout]
       http.use_ssl = true if uri.scheme == "https"
 
-      if uri.path.present? && uri.query.present?
+      if uri.path && uri.query
         response = http.request_head("#{uri.path}?#{uri.query}") rescue nil
-      elsif uri.path.present? && !uri.query
+      elsif uri.path && !uri.query
         response = http.request_head(uri.path) rescue nil
       else
         response = http.request_head('/') rescue nil
@@ -94,7 +95,7 @@ class Unshorten
 
       if response.is_a? Net::HTTPRedirection and response['location'] then
         expire_cache if @@cache.size > CACHE_SIZE_LIMIT
-        location = response['location']
+        location = URI.encode(response['location'])
         location = (uri + location).to_s if location
         @@cache[url] = follow(location, options, level + 1)
       else

data/lib/version.rb

@@ -0,0 +1,3 @@
+module Unshorten
+  VERSION = '0.3.2'
+end

data/test/test_unshorten.rb

@@ -16,6 +16,12 @@ class UnshortenTest < MiniTest::Test
     assert_equal illegal_url, Unshorten.unshorten(illegal_url, :use_cache => false)
   end
 
+  def test_illegal_url_results
+    shortened_url = 'http://bit.ly/1r904rG'
+    original_url  = 'http://www.fwi.co.uk/articles/02/09/2014/146471/willow-diversification-secures-beef-farm39s-future.htm?cmpid=SOC|Twitter|FarmersWeekly|sf4488038|sf4488038'
+    assert_equal URI.encode(original_url), Unshorten.unshorten(shortened_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
@@ -46,7 +52,7 @@ class UnshortenTest < MiniTest::Test
   end
 
   def test_relative_url
-    assert_equal 'http://waterpigs.co.uk/articles/getting-started-with-microformats2/', Unshorten.unshorten('http://bit.ly/1l1Dz6K', :short_urls => nil, :use_cache => false)
+    assert_equal 'http://waterpigs.co.uk/articles/getting-started-with-microformats2/?utm_content=buffer79474&utm_medium=social&utm_source=twitter.com&utm_campaign=buffer', Unshorten.unshorten('http://bit.ly/1l1Dz6K', :short_urls => nil, :use_cache => false)
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unshorten
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jun Wu
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 description: Get original URLs from shortened ones
 email: quark@lihdd.net
 executables:
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - bin/unshorten
 - lib/unshorten.rb
+- lib/version.rb
 - test/test_unshorten.rb
 homepage: https://github.com/quark-zju/unshorten
 licenses: