aitch 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe92f9a37fda506090a65c10f58d0f1c404de82
-  data.tar.gz: e4802e77177c7b5da355d90861648c457af07baf
+  metadata.gz: 74de1f797705e033d093d57165a479c6b98f4586
+  data.tar.gz: ccad13b73ffdc1e648c666cbbb6d8fad162e08c8
 SHA512:
-  metadata.gz: 8a30b1ca7591ba25d71ee744500f8aee14bb53b518b3f00011eed86fec098b5f3d10d79992a692cc777233e787acc5b599b0d5050bcd640e2262309eb5032d97
-  data.tar.gz: 86f02583bf0a48e299115d5c4724e8f098074e4244c6ff0693cf56cbdcfbc8e3f88398b3a8f71e54bc20636a1925de7db399aed5d2266ccc6c926dd18952cff9
+  metadata.gz: 1849671f3d88abcee256d31d6200d7ce7831eebdc750fe272fdc75023faf20bfd048cc7cb5e32edf9a8c064abc3037f50f49f1f95b4b971cf0f18c86c44b5730
+  data.tar.gz: e4eac1e14d9a4a6a998c26cd3d33b32e2d349db37ef39cde837208407f834ca938af125ca6974d77e95c48043a1ac6a58458c5313e4a0268e4823f81b9b185e7

data/Gemfile.lock

@@ -1,61 +1,69 @@
 PATH
   remote: .
   specs:
-    aitch (0.2.1)
+    aitch (0.3.0)
       activesupport
       nokogiri (>= 1.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.10)
-    awesome_print (1.1.0)
-    coderay (1.0.9)
-    diff-lcs (1.2.4)
+    atomic (1.1.16)
+    awesome_print (1.2.0)
+    coderay (1.1.0)
+    columnize (0.3.6)
+    debugger (1.6.6)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.2)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.2)
+    diff-lcs (1.2.5)
     fakeweb (1.3.0)
-    i18n (0.6.4)
+    i18n (0.6.9)
     method_source (0.8.2)
-    mini_portile (0.5.1)
+    mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.7.7)
-    nokogiri (1.6.0)
+    multi_json (1.9.2)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     notifier (0.4.1)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-meta (0.0.5)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
+      pry (~> 0.9.10)
+    pry-meta (0.0.6)
       awesome_print
       pry
-      pry-nav
+      pry-debugger
       pry-remote
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    pry-remote (0.1.7)
+    pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    rake (10.1.0)
+    rake (10.2.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    slop (3.4.6)
+    rspec-mocks (2.14.6)
+    slop (3.5.0)
     test_notifier (1.0.1)
       notifier
-    thread_safe (0.1.2)
-      atomic
-    tzinfo (0.3.37)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
@@ -64,7 +72,6 @@ DEPENDENCIES
   aitch!
   bundler
   fakeweb
-  nokogiri
   pry-meta
   rake
   rspec

data/aitch.gemspec

@@ -27,5 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-meta"
   spec.add_development_dependency "test_notifier"
   spec.add_development_dependency "fakeweb"
-  spec.add_development_dependency "nokogiri"
 end

data/lib/aitch.rb

@@ -10,6 +10,7 @@ require "aitch/utils"
 require "aitch/uri"
 require "aitch/dsl"
 require "aitch/namespace"
+require "aitch/location"
 require "aitch/configuration"
 require "aitch/errors"
 require "aitch/request"

data/lib/aitch/location.rb

@@ -0,0 +1,26 @@
+module Aitch
+  class Location
+    attr_reader :redirect_stack, :current_url
+
+    def initialize(redirect_stack, current_url)
+      @redirect_stack = redirect_stack
+      @current_url = current_url
+    end
+
+    def location
+      return current_url unless current_url.match(%r[\A/])
+
+      uri = find_uri_with_host
+      url = "#{uri.scheme}://#{uri.hostname}"
+      url << ":#{uri.port}" unless [80, 443].include?(uri.port)
+      url << current_url
+      url
+    end
+
+    def find_uri_with_host
+      redirect_stack.reverse
+        .map {|url| ::URI.parse(url) }
+        .find {|uri| uri.scheme }
+    end
+  end
+end

data/lib/aitch/request.rb

@@ -17,15 +17,19 @@ module Aitch
 
     def perform
       response = Response.new(options, client.request(request))
+      response.url = url
       redirect = Redirect.new(options)
 
       while redirect.follow?(response)
+        redirected_from ||= [url]
+        redirected_from << Location.new(redirected_from, response.location).location
         redirect.followed!
-        response = Aitch.get(response.location)
+        response = Aitch.get(redirected_from.last)
       end
 
       raise TooManyRedirectsError if redirect.enabled? && response.redirect?
 
+      response.redirected_from = redirected_from
       response
     rescue timeout_exception
       raise RequestTimeoutError

data/lib/aitch/response.rb

@@ -3,6 +3,7 @@ module Aitch
     extend Forwardable
 
     def_delegators :@http_response, :content_type
+    attr_accessor :redirected_from, :url
 
     def initialize(options, http_response)
       @options = options

data/lib/aitch/version.rb

@@ -1,3 +1,3 @@
 module Aitch
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/aitch/request_spec.rb

@@ -155,12 +155,15 @@ describe Aitch::Request do
       Aitch.configuration.redirect_limit = 5
 
       FakeWeb.register_uri(:get, "http://example.org/", location: "http://example.com/", status: 301)
-      FakeWeb.register_uri(:get, "http://example.com/", body: "Hello")
+      FakeWeb.register_uri(:get, "http://example.com/", location: "http://www.example.com/", status: 301)
+      FakeWeb.register_uri(:get, "http://www.example.com/", body: "Hello")
 
-      response = Aitch.get("http://example.org")
+      response = Aitch.get("http://example.org/")
 
       expect(response).not_to be_redirect
       expect(response.body).to eql("Hello")
+      expect(response.redirected_from).to eql(["http://example.org/", "http://example.com/"])
+      expect(response.url).to eql("http://www.example.com/")
     end
 
     it "raises when doing too many redirects" do

data/spec/aitch/response_spec.rb

@@ -7,6 +7,12 @@ describe Aitch::Response do
     expect(response.body).to eql("Hello")
   end
 
+  it "sets current url" do
+    FakeWeb.register_uri(:get, "http://example.org/", body: "Hello")
+    response = Aitch.get("http://example.org/")
+    expect(response.url).to eql("http://example.org/")
+  end
+
   it "parses gzip response" do
     stdio = StringIO.new
     gzipped = Zlib::GzipWriter.new(stdio)
@@ -98,6 +104,21 @@ describe Aitch::Response do
       response = Aitch.get("http://example.org/")
       expect(response.location).to eql("https://example.com/")
     end
+
+    it "follows absolute paths" do
+      Aitch.configuration.follow_redirect = true
+      Aitch.configuration.redirect_limit = 5
+
+      FakeWeb.register_uri(:get, "http://example.org/", status: 301, location: "/hello")
+      FakeWeb.register_uri(:get, "http://example.org/hello", status: 301, location: "/hi")
+      FakeWeb.register_uri(:get, "http://example.org/hi", status: 200, body: "Hi")
+
+      response = Aitch.get("http://example.org/")
+
+      expect(response.redirected_from).to eql(["http://example.org/", "http://example.org/hello"])
+      expect(response.url).to eql("http://example.org/hi")
+      expect(response.body).to eql("Hi")
+    end
   end
 
   context "status 4xx" do

metadata

@@ -1,139 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: aitch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test_notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple HTTP client
@@ -143,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -158,6 +144,7 @@ files:
 - lib/aitch/dsl.rb
 - lib/aitch/errors.rb
 - lib/aitch/html_parser.rb
+- lib/aitch/location.rb
 - lib/aitch/namespace.rb
 - lib/aitch/redirect.rb
 - lib/aitch/request.rb
@@ -190,17 +177,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple HTTP client