eat 0.1.7 → 0.1.8

data/lib/eat.rb

@@ -3,15 +3,24 @@ require 'httpclient'
 
 require 'eat/version'
 
-# http://weblog.jamisbuck.org/2007/2/7/infinity
-unless defined?(::Infinity)
-  ::Infinity = 1.0/0
-end
-
 module Eat
   # httpclient 2.2.3 inserts the platform info for you, albeit with problems
   # AGENT_NAME = "Mozilla/5.0 (#{::RUBY_PLATFORM}) Ruby/#{::RUBY_VERSION} HTTPClient/#{::HTTPClient::VERSION} eat/#{::Eat::VERSION}"
   AGENT_NAME = "eat/#{::Eat::VERSION}"
+  
+  # http://weblog.jamisbuck.org/2007/2/7/infinity  
+  INFINITY = 1.0/0
+  
+  # https://github.com/nahi/httpclient/blob/master/lib/httpclient.rb#L640
+  REDIRECT_HANDLER = ::Proc.new do |uri, res|
+    newuri = ::URI.parse(res.header['location'][0])
+    unless newuri.is_a?(::URI::HTTP)
+      newuri = uri + newuri
+    end
+    newuri
+  end
+  
+  TIMEOUT = 2
 
   module ObjectExtensions
     # <tt>url</tt> can be filesystem or http/https
@@ -26,7 +35,7 @@ module Eat
     #    eat('http://brighterplanet.com', :timeout => 10) #=> '...'
     #    eat('http://brighterplanet.com', :limit => 1)    #=> '.'
     def eat(url, options = {})
-      limit = options.fetch(:limit, ::Infinity)
+      limit = options.fetch(:limit, INFINITY)
       
       uri = ::URI.parse url.to_s
 
@@ -46,20 +55,20 @@ module Eat
         end
 
       when 'http', 'https'
-        timeout = options.fetch(:timeout, 2)
+        timeout = options.fetch(:timeout, TIMEOUT)
         openssl_verify_mode = options.fetch(:openssl_verify_mode, ::OpenSSL::SSL::VERIFY_PEER)
         if openssl_verify_mode == 'none'
           openssl_verify_mode = ::OpenSSL::SSL::VERIFY_NONE
         end
         http = ::HTTPClient.new
         http.agent_name = AGENT_NAME
-        http.redirect_uri_callback = ::Proc.new { |uri, res| ::URI.parse(res.header['location'][0]) }
+        http.redirect_uri_callback = REDIRECT_HANDLER
         http.transparent_gzip_decompression = true
         http.receive_timeout = timeout
         if uri.scheme == 'https'
           http.ssl_config.verify_mode = openssl_verify_mode
         end
-        if limit == ::Infinity
+        if limit == INFINITY
           body << http.get_content(uri.to_s)
         else
           catch :stop do
@@ -72,7 +81,7 @@ module Eat
         end
       end
 
-      limit == ::Infinity ? body.join : body.join[0...limit]
+      limit == INFINITY ? body.join : body.join[0...limit]
     end
   end
 end

data/lib/eat/version.rb

@@ -1,3 +1,3 @@
 module Eat
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/test/test_eat.rb

@@ -86,4 +86,12 @@ class TestEat < Test::Unit::TestCase
   def test_more_chunks
     assert eat('http://www.ebay.com/itm/ws/eBayISAPI.dll?ViewItem&item=260910713854?_trksid=p5197.m1256&_trkparms=clkid%3D4726644202417880745').include?('<title>')
   end
+  
+  def test_ignores_anchor
+    assert eat('http://www.orbitgum.com/#/home').include?('Orbit')
+  end
+  
+  def test_relative_redirect_handling
+    assert eat("http://www.crutchfield.com/p_054D3100/Nikon-D3100-Kit.html").include?('Product Information')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eat
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &2164292480 !ruby/object:Gem::Requirement
+  requirement: &2155438940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164292480
+  version_requirements: *2155438940
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2164292060 !ruby/object:Gem::Requirement
+  requirement: &2155438520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164292060
+  version_requirements: *2155438520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164291640 !ruby/object:Gem::Requirement
+  requirement: &2155437960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164291640
+  version_requirements: *2155437960
 description: A (better?) replacement for open-uri. Gets the contents of local and
   remote files as a String, no questions asked.
 email: