unwind 0.10.0 → 0.11.0

data/lib/unwind/version.rb

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

data/lib/unwind.rb

@@ -1,5 +1,6 @@
 require "unwind/version"
 require 'faraday'
+require 'addressable/uri'
 
 module Unwind
 
@@ -27,7 +28,7 @@ module Unwind
       current_url ||= self.original_url
       #adding this header because we really only care about resolving the url
       headers = (options || {}).merge({"accept-encoding" => "none"})
-      response = Faraday.get(current_url, headers)
+      response = Faraday.get(current_url, {}, headers)
 
       if is_response_redirect?(response)
         handle_redirect(redirect_url(response), current_url, response, headers)
@@ -62,9 +63,16 @@ module Unwind
 
     def handle_final_response(current_url, response)
       current_url = current_url.dup.to_s
-      if response.status == 200 &&  canonical = canonical_link?(response)
+      if response.status == 200 && canonical = canonical_link?(response)
         @redirects << current_url
-        @final_url = canonical
+        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}"
+        else
+          @final_url = canonical
+        end
+
       else
         @final_url = current_url
       end
@@ -82,7 +90,7 @@ module Unwind
         Addressable::URI.parse(body_match[0])
       else
         redirect_uri = Addressable::URI.parse(response['location'])
-        redirect_uri.relative? ? response.env[:url].join(response['location']) : redirect_uri
+        redirect_uri.relative? ? Addressable::URI.parse(response.env[:url]).join(response['location']) : redirect_uri
       end
     end
     
@@ -94,7 +102,7 @@ module Unwind
     end
 
     def canonical_link?(response)
-      body_match = response.body.match(/<link rel=[\'\"]canonical[\'\"] href=[\'\"](.*)[\'\"]/i)
+      body_match = response.body.match(/<link rel=[\'\"]canonical[\'\"] href=[\'\"](.*?)[\'\"]/i)
       body_match ? Addressable::URI.parse(body_match[1]).to_s : false
     end
     

data/test/redirect_follower_test.rb

@@ -1,3 +1,4 @@
+require 'minitest'
 require 'minitest/autorun'
 require 'vcr'
 require './lib/unwind'

data/unwind.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest"
   s.add_development_dependency "vcr", "~> 2.0.0"
   s.add_development_dependency "fakeweb"
-  s.add_runtime_dependency "faraday", '~> 0.7.0'
+  s.add_runtime_dependency "faraday", "~> 0.8.0"
+  s.add_runtime_dependency "addressable"
 end

metadata

@@ -1,71 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: unwind
 version: !ruby/object:Gem::Version
-  version: 0.10.0
   prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Scott Watermasysk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70362860376180 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: *70362860376180
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &70362860374680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: minitest
   type: :development
   prerelease: false
-  version_requirements: *70362860374680
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: &70362860373620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+    none: false
+  name: vcr
   type: :development
   prerelease: false
-  version_requirements: *70362860373620
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: &70362860393740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: fakeweb
   type: :development
   prerelease: false
-  version_requirements: *70362860393740
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: &70362860392120 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
     none: false
+  name: faraday
+  type: :runtime
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  name: addressable
   type: :runtime
   prerelease: false
-  version_requirements: *70362860392120
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: ! "\t\t\t\t\t\t\t\t\t\tFollows a chain of redirects and reports back
   on all the steps. \n\t\t\t\t\t\t\t\t\t\tHeavily inspired by John Nunemaker's blog
   post.\n\t\t\t\t\t\t\t\t\t\thttp://railstips.org/blog/archives/2009/03/04/following-redirects-with-nethttp/\n"
@@ -102,23 +143,22 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: unwind
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Follows a chain redirects.
 test_files:
 - test/redirect_follower_test.rb
-has_rdoc: