unwind 0.9.1 → 0.9.3

data/lib/unwind/version.rb

@@ -1,3 +1,3 @@
 module Unwind
-  VERSION = "0.9.1"
+  VERSION = "0.9.3"
 end

data/lib/unwind.rb

@@ -1,9 +1,10 @@
 require "unwind/version"
-require 'net/http'
+require 'faraday'
 
 module Unwind
 
 	class TooManyRedirects < StandardError; end
+	class MissingRedirectLocation < StandardError; end
 
 	class RedirectFollower
 
@@ -23,20 +24,24 @@ module Unwind
 			ok_to_continue?
 
 			current_url ||= self.original_url
+			response = Faraday.get(current_url)
 
-			response = Net::HTTP.get_response(URI.parse(current_url))
-
-			if response.kind_of?(Net::HTTPRedirection)
-				@redirects << current_url
+			if [301, 302, 307].include?(response.status)
+				@redirects << current_url.to_s
 				@redirect_limit -= 1
-				resolve(redirect_url(response))
+				resolve redirect_url(response).normalize
 			else
-				@final_url = current_url
+				@final_url = current_url.to_s
 				@response = response
 				self
 			end
 		end
 
+
+		def self.resolve(original_url, limit=5)
+			new(original_url, limit).resolve
+		end
+
 	private
 
 		def ok_to_continue?
@@ -45,9 +50,12 @@ module Unwind
 
 		def redirect_url(response)
 			if response['location'].nil?
-				response.body.match(/<a href=\"([^>]+)\">/i)[1]
+				body_match = response.body.match(/<a href=\"([^>]+)\">/i)
+				raise MissingRedirectLocation unless body_match
+				Addressable::URI.parse(body_match[0])
 			else
-				response['location']
+				redirect_uri = Addressable::URI.parse(response['location'])
+				redirect_uri.relative? ? response.env[:url].join(response['location']) : redirect_uri
 			end
 		end
 		

data/test/redirect_follower_test.rb

@@ -11,7 +11,7 @@ describe 'Tests :)' do
 
 	it 'should resolve the url' do 
 		VCR.use_cassette('xZVND1') do 
-			follower = Unwind::RedirectFollower.new('http://j.mp/xZVND1').resolve
+			follower = Unwind::RedirectFollower.resolve('http://j.mp/xZVND1')
 			assert_equal 'http://ow.ly/i/s1O0', follower.final_url 
 			assert_equal 'http://j.mp/xZVND1', follower.original_url
 			assert_equal 2, follower.redirects.count
@@ -19,9 +19,50 @@ describe 'Tests :)' do
 		end
 	end
 
+	it 'should handle relative redirects' do 
+		VCR.use_cassette('relative stackoverflow') do 
+			follower = Unwind::RedirectFollower.resolve('http://stackoverflow.com/q/9277007/871617?stw=1')
+			assert follower.redirected?
+			assert_equal 'http://stackoverflow.com/questions/9277007/gitlabhq-w-denied-for-rails', follower.final_url
+		end
+	end
+
+	it 'should still handine relative redirects' do 
+		# http://bit.ly/A4H3a2
+		VCR.use_cassette('relative stackoverflow 2') do 
+			follower = Unwind::RedirectFollower.resolve('http://bit.ly/A4H3a2')
+			assert follower.redirected?
+		end
+	end
+
+	it 'should handle redirects to pdfs' do 
+		VCR.use_cassette('pdf') do 
+			follower = Unwind::RedirectFollower.resolve('http://binged.it/wVSFs5')
+			assert follower.redirected? 
+			assert_equal 'https://microsoft.promo.eprize.com/bingtwitter/public/fulfillment/rules.pdf', follower.final_url
+		end
+	end
+
+	it 'should handle the lame amazon spaces' do 
+		VCR.use_cassette('amazon') do 
+			follower = Unwind::RedirectFollower.resolve('http://amzn.to/xrHQWS')
+			assert follower.redirected? 
+		end
+	end
+
+	#http://amzn.to/xrHQWS
+
+	it 'should handle a https redirect' do 
+		VCR.use_cassette('ssl tpope') do 
+			follower = Unwind::RedirectFollower.resolve('http://github.com/tpope/vim-rails')
+			assert follower.redirected?
+			assert_equal 'https://github.com/tpope/vim-rails', follower.final_url
+		end
+	end
+
 	it 'should not be redirected' do 
 		VCR.use_cassette('no redirect') do 
-			follower  = Unwind::RedirectFollower.new('http://www.scottw.com').resolve
+			follower  = Unwind::RedirectFollower.resolve('http://www.scottw.com')
 			assert !follower.redirected?
 		end	
 	end
@@ -34,4 +75,12 @@ describe 'Tests :)' do
 		end
 	end
 
+	it 'should raise MissingRedirectLocation' do 
+		VCR.use_cassette('missing redirect') do 
+			follower = Unwind::RedirectFollower.new('http://tinyurl.com/6oqzkff')
+			missing_redirect_location = lambda{follower.resolve}
+			missing_redirect_location.must_raise Unwind::MissingRedirectLocation
+		end
+	end
+
 end

data/unwind.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "vcr"
   s.add_development_dependency "fakeweb"
-  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "faraday", '~> 0.7'
 end