unshorten 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b5c2d553a05779d8a45cec5d288152a2ee9840
-  data.tar.gz: 4a0c1dfe4bbfe38e0c276023d1f1d1a64a0e9465
+  metadata.gz: d6329c6a3dd7b90a2b2eed9cf4453a71ccf5f867
+  data.tar.gz: a2240e636da07934700d6be5907e4bb1f6873329
 SHA512:
-  metadata.gz: 40481e8187e84d1d7921ae79b52836e9033813d0cebf6b27c6b1b7e331c28eb8ad3677e8b1ae03cee2402e180c28cc2c6d58cd16a315afbba08933280d908c04
-  data.tar.gz: e4f1bd8db26b1801c8ffc57f503a0882197633faf9b95733fd2ecd32b1bfaf6c38b05f338b0622fd6669b360b3cedc50728be96ebda1473e4c41da5539f8bb3f
+  metadata.gz: 4737f041e8f4860a77774c43eb12f1f4e8de3405223928c6e8b69eb806c79e8f1b027aa8ce7083ff70901c496bd3e6bc6487851d551646bc80f9bf88c76942eb
+  data.tar.gz: e5c4b34c62a1589a9496c291aa27edfc7ab5b93b02b2713c184c5ea01a453699c7a03d9be7f0fcbbcab3b77e23d61211f1f0b4852a62aadd93a10737b5bc5d34

data/lib/unshorten.rb

@@ -4,18 +4,17 @@ require 'uri'
 
 # Get original URLs from shortened ones.
 class Unshorten
-
   # Cache entities limit
   CACHE_SIZE_LIMIT = 1024
 
   # Default options for unshorten
   DEFAULT_OPTIONS = {
-    :max_level => 10,
-    :timeout => 2,
-    :short_hosts => false,
-    :short_urls => /^(?:https?:)?\/*[^\/]*\/*[^\/]*$/,
-    :use_cache => true,
-    :add_missing_http => true
+      :max_level => 10,
+      :timeout => 2,
+      :short_hosts => false,
+      :short_urls => /^(?:https?:)?\/*[^\/]*\/*[^\/]*$/,
+      :use_cache => true,
+      :add_missing_http => true
   }
 
   @@cache = { }
@@ -30,7 +29,7 @@ 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. Set to 
+    #                                        host matches this regexp. Set to
     #                                        nil to follow all redirects.
     # @option options [Regexp]  :short_urls  URLs that looks like a short one.
     #                                        Only send requests when the URL
@@ -75,7 +74,6 @@ class Unshorten
       return @@cache[url] if options[:use_cache] and @@cache[url]
       return url if level >= options[:max_level]
       return url if options[:short_urls] && ! (url =~ options[:short_urls])
-
       uri = URI.parse(url) rescue nil
 
       return url if uri.nil?
@@ -86,7 +84,13 @@ class Unshorten
       http.read_timeout = options[:timeout]
       http.use_ssl = true if uri.scheme == "https"
 
-      response = http.request_head(uri.path.empty? ? '/' : uri.path) rescue nil
+      if uri.path.present? && uri.query.present?
+        response = http.request_head("#{uri.path}?#{uri.query}") rescue nil
+      elsif uri.path.present? && !uri.query
+        response = http.request_head(uri.path) rescue nil
+      else
+        response = http.request_head('/') rescue nil
+      end
 
       if response.is_a? Net::HTTPRedirection and response['location'] then
         expire_cache if @@cache.size > CACHE_SIZE_LIMIT

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unshorten
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jun Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Get original URLs from shortened ones
@@ -49,7 +49,8 @@ files:
 - lib/unshorten.rb
 - test/test_unshorten.rb
 homepage: https://github.com/quark-zju/unshorten
-licenses: []
+licenses:
+- BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []