dubdubdub 0.2.4 → 0.2.5

data/dubdubdub.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dubdubdub"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Hu"]
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "spec/vcr/follow_url/proxied.yml",
     "spec/vcr/follow_url/proxy.yml",
     "spec/vcr/follow_url/proxy_forbidden.yml",
+    "spec/vcr/follow_url/relative_redirects.yml",
     "spec/vcr/get/basic.yml",
     "spec/vcr/get/params.yml",
     "spec/vcr/get/proxy.yml"

data/lib/dubdubdub.rb

@@ -1,6 +1,6 @@
 class DubDubDub
   # Version
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 
   attr_accessor :client
 

data/lib/dubdubdub/client.rb

@@ -118,6 +118,7 @@ class DubDubDub::Client
     options = default_options.merge(options)
 
     at_base = false
+    previous_uri = nil  # Keep track of previous uri for relative path redirects
     response = nil
     user_agents = [
       'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.79 Safari/535.11',
@@ -172,16 +173,28 @@ class DubDubDub::Client
         end
 
       # If any of these exceptions get thrown, return the current url
-      rescue SocketError, URI::InvalidURIError, EOFError
+      rescue SocketError, EOFError
         at_base = true
+      rescue URI::InvalidURIError
+        return url  # Just return it
       end
 
       urls << url
 
       break if at_base
+
+      previous_uri = uri   # Keep track of previous uri
       yield(url) if block_given?
     end
 
-    url
+    end_uri = URI.parse(url)
+
+    # If there is no host, it's due to a relative 301 redirect. Use previous uri's host, port, etc
+    if !end_uri.host and previous_uri
+      end_uri = previous_uri
+      end_uri.path = url
+    end
+
+    end_uri.to_s
   end
 end

data/spec/dubdubdub_spec.rb

@@ -230,6 +230,10 @@ describe DubDubDub do
       www.follow_url("google.com").should == "google.com"
     end
 
+    it "works with relative path redirects", vcr: { cassette_name: "follow_url/relative_redirects", record: :once } do
+      www.follow_url("http://www.retailmenot.com/out/4223117").should == "http://www.papajohns.com/index.html"
+    end
+
     it "raises forbidden properly on a bad proxy", vcr: { cassette_name: "follow_url/proxy_forbidden", record: :once } do
       www.proxy = "190.202.116.101:3128"
       lambda { www.follow_url("http://yfrog.us/evlb0z:medium").should }.should raise_error(DubDubDub::Forbidden)

data/spec/vcr/follow_url/relative_redirects.yml

@@ -0,0 +1,122 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.retailmenot.com/out/4223117
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      accept:
+      - ! '*/*'
+      user-agent:
+      - Ruby
+  response:
+    status:
+      code: 302
+      message: Found
+    headers:
+      content-type:
+      - text/html; charset=utf-8
+      date:
+      - Tue, 04 Dec 2012 02:09:53 GMT
+      location:
+      - http://papajohns.com
+      server:
+      - nginx
+      set-cookie:
+      - cid=deleted; expires=Mon, 05-Dec-2011 02:09:59 GMT; path=/; domain=retailmenot.com
+      - ppage=deleted; expires=Mon, 05-Dec-2011 02:09:59 GMT; path=/; domain=retailmenot.com
+      - ouid=deleted; expires=Mon, 05-Dec-2011 02:09:59 GMT; path=/; domain=retailmenot.com
+      - ut=16388; expires=Tue, 18-Dec-2012 02:10:00 GMT; path=/; domain=retailmenot.com
+      - userFlashVersion=KI7ON5J5tS; expires=Sun, 03-Dec-2017 02:10:00 GMT; path=/;
+        domain=retailmenot.com
+      vary:
+      - Accept-Encoding
+      content-length:
+      - '0'
+      connection:
+      - Close
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: '1.1'
+  recorded_at: Tue, 04 Dec 2012 02:09:53 GMT
+- request:
+    method: get
+    uri: http://papajohns.com/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      accept:
+      - ! '*/*'
+      user-agent:
+      - Ruby
+  response:
+    status:
+      code: 301
+      message: Moved Permanently
+    headers:
+      server:
+      - AkamaiGHost
+      content-length:
+      - '0'
+      location:
+      - http://www.papajohns.com/
+      date:
+      - Tue, 04 Dec 2012 02:09:53 GMT
+      connection:
+      - close
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: '1.1'
+  recorded_at: Tue, 04 Dec 2012 02:09:54 GMT
+- request:
+    method: get
+    uri: http://www.papajohns.com/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      accept:
+      - ! '*/*'
+      user-agent:
+      - Ruby
+  response:
+    status:
+      code: 302
+      message: Moved Temporarily
+    headers:
+      server:
+      - Microsoft-IIS/6.0
+      x-powered-by:
+      - ASP.NET
+      location:
+      - /index.html
+      content-length:
+      - '132'
+      content-type:
+      - text/html
+      cache-control:
+      - private
+      vary:
+      - Accept-Encoding
+      date:
+      - Tue, 04 Dec 2012 02:09:54 GMT
+      connection:
+      - close
+      set-cookie:
+      - ASPSESSIONIDQCTDRBDC=HKLJKGECGKICNAAEFJPFIADI; path=/
+      - BIGipServerPRD_WEB_HTTP=2256924991.20480.0000; path=/
+    body:
+      encoding: US-ASCII
+      string: ! '<head><title>Object moved</title></head>
+
+        <body><h1>Object Moved</h1>This object may be found <a HREF="/index.html">here</a>.</body>
+
+'
+    http_version: '1.1'
+  recorded_at: Tue, 04 Dec 2012 02:09:54 GMT
+recorded_with: VCR 2.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dubdubdub
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -189,6 +189,7 @@ files:
 - spec/vcr/follow_url/proxied.yml
 - spec/vcr/follow_url/proxy.yml
 - spec/vcr/follow_url/proxy_forbidden.yml
+- spec/vcr/follow_url/relative_redirects.yml
 - spec/vcr/get/basic.yml
 - spec/vcr/get/params.yml
 - spec/vcr/get/proxy.yml
@@ -207,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3214768176018659868
+      hash: 1311831286708000735
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: