unshorten 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 786f091853e66b01791b84ea4e1dae0fb45e0966
-  data.tar.gz: 533d25ed2aceed116ebbc6f682c533f00f6357b2
+  metadata.gz: c2b9a42013ddf0cf926f0140c790e5d4e2025b97
+  data.tar.gz: 6f4c7e0760df2695d85431f7e96a55b07bf109ac
 SHA512:
-  metadata.gz: 0be3b4e703d81938bb376198d44f95db28ce3d18f4434d235bac00b91aeea3a29ce767ef7876314b96ca1f8e6f9c89fff0f60f35c1c31a43a40ee942742fc4c7
-  data.tar.gz: 987b63583edf60f3dd90046efb29ee7b6ede8f02b174ee0e0e6a7e2e7c397731ed43d806fd834a792350d6d69fe97ebe7e0a299f4d58000111a855b6ff0753ad
+  metadata.gz: 5d50404774d8857a80fc6211e007af764c698482ebb46e79f8ede636b14a10713fa308e964b1d1d0e2afa39edd18ada8a825dcb1a209465d4ed160cccc8a0b50
+  data.tar.gz: 401735be116ba7642315be8582f0a1699edfcf6d8512649ea2f7a8949db059a9aa27292bd11ee31d67f4a79ddc45487cb7f7f1f4da4e4153f44d501fa21a5722

data/lib/unshorten.rb

@@ -14,6 +14,7 @@ module Unshorten
       :timeout => 2,
       :short_hosts => false,
       :short_urls => /^(?:https?:)?\/*[^\/]*\/*[^\/]*$/,
+      :follow_codes => [302, 301],
       :use_cache => true,
       :add_missing_http => true
   }
@@ -36,6 +37,11 @@ module Unshorten
     #                                        Only send requests when the URL
     #                                        match this regexp. Set to nil to
     #                                        follow all redirects.
+    # @option options [Array]   :follow_codes An array of HTTP status codes
+    #                                         (intergers). Only follow a
+    #                                         redirect if the response HTTP
+    #                                         code matches one item of the
+    #                                         array.
     # @option options [Boolean] :use_cache Use cached result if available
     # @option options [Boolean] :add_missing_http add 'http://' if missing
     # @see DEFAULT_OPTIONS
@@ -55,12 +61,6 @@ module Unshorten
       @@cache = { }
     end
 
-    def mix_options(old, *new) #:nodoc:
-      options = old.dup
-      new.each { |n| n.each { |k, v| options[k] = v } }
-      options
-    end
-
     def add_missing_http(url) #:nodoc:
       if url =~ /^https?:/i
         url
@@ -83,17 +83,14 @@ module Unshorten
       http = Net::HTTP.new(uri.host, uri.port)
       http.open_timeout = options[:timeout]
       http.read_timeout = options[:timeout]
-      http.use_ssl = true if uri.scheme == "https"
+      http.use_ssl = true if uri.scheme == 'https'
 
-      if uri.path && uri.query
-        response = http.request_head("#{uri.path}?#{uri.query}") rescue nil
-      elsif uri.path && !uri.query
-        response = http.request_head(uri.path) rescue nil
-      else
-        response = http.request_head('/') rescue nil
-      end
+      path = uri.path
+      path = '/' if !path || path.empty?
+      path += "?#{uri.query}" if uri.query
+      response = http.request_head(path) rescue nil
 
-      if response.is_a? Net::HTTPRedirection and response['location'] then
+      if response.is_a?(Net::HTTPRedirection) && options[:follow_codes].include?(response.code.to_i) && response['location'] then
         expire_cache if @@cache.size > CACHE_SIZE_LIMIT
         location = URI.encode(response['location'])
         location = (uri + location).to_s if location
@@ -108,4 +105,3 @@ module Unshorten
 end
 
 # vim:et:ts=2 sw=2
-

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unshorten
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jun Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -75,3 +75,4 @@ specification_version: 4
 summary: Unshorten URLs
 test_files:
 - test/test_unshorten.rb
+has_rdoc: