unwind 0.11.0 → 0.11.1

data/lib/unwind/version.rb

@@ -1,3 +1,3 @@
 module Unwind
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/lib/unwind.rb

@@ -32,7 +32,7 @@ module Unwind
 
       if is_response_redirect?(response)
         handle_redirect(redirect_url(response), current_url, response, headers)
-      elsif meta_uri = meta_refresh?(response)
+      elsif meta_uri = meta_refresh?(current_url, response)
         handle_redirect(meta_uri, current_url, response, headers)
       else
         handle_final_response(current_url, response)
@@ -66,9 +66,7 @@ module Unwind
       if response.status == 200 && canonical = canonical_link?(response)
         @redirects << current_url
         if Addressable::URI.parse(canonical).relative?
-          current_uri = Addressable::URI.parse(current_url)
-          # Is there a cleaner way of doing this?
-          @final_url = "#{current_uri.scheme}://#{current_uri.host}#{canonical}"
+          @final_url = make_url_absolute(current_url, Addressable::URI.parse(canonical)).to_s
         else
           @final_url = canonical
         end
@@ -94,10 +92,13 @@ module Unwind
       end
     end
     
-    def meta_refresh?(response)
+    def meta_refresh?(current_url, response)
       if response.status == 200
-        body_match = response.body.match(/<meta http-equiv=\"refresh\" content=\"0; URL=(.*)\">/i)
-        Addressable::URI.parse(body_match[1]) if body_match
+        body_match = response.body.match(/<meta http-equiv=\"refresh\" content=\"0; URL=(.*?)\"\s*\/*>/i)
+        if body_match
+          uri = Addressable::URI.parse(body_match[1])
+          make_url_absolute(current_url, uri)
+        end
       end
     end
 
@@ -115,6 +116,23 @@ module Unwind
       end
     end
 
+    def make_url_absolute(current_url, relative_url)
+      current_uri = Addressable::URI.parse(current_url)
+      if (relative_url.relative?)
+        url = Addressable::URI.new(
+          :scheme => current_uri.scheme,
+          :user => current_uri.user,
+          :password => current_uri.password,
+          :host => current_uri.host,
+          :port => current_uri.port,
+          :path => relative_url.path,
+          :query => relative_url.query,
+          :fragment => relative_url.fragment)
+      else
+        relative_url
+      end
+    end
+
   end
 
   #borrowed (stolen) from HTTParty with minor updates

data/test/redirect_follower_test.rb

@@ -109,5 +109,21 @@ describe Unwind::RedirectFollower do
       assert_equal 'http://www.google.com/', follower.final_url
     end
   end
+  
+  it 'should handle a relative meta-refresh' do
+    VCR.use_cassette('relative meta refresh') do
+      follower = Unwind::RedirectFollower.resolve('http://fb.me/2JYu23acx')
+      assert follower.redirected?
+      assert_equal 'https://www.facebook.com/londonswf/posts/696389650411604?_fb_noscript=1', follower.final_url
+    end
+  end
+  
+  it 'should handle a relative canonical url' do
+    VCR.use_cassette('relative canonical url') do
+      follower = Unwind::RedirectFollower.resolve('http://youtu.be/hPJ0oLahGDg')
+      assert follower.redirected?
+      assert_equal 'http://www.youtube.com/watch?v=hPJ0oLahGDg', follower.final_url
+    end
+  end
 
 end