eat 0.1.2 → 0.1.3

data/README.rdoc

@@ -15,9 +15,9 @@ Try <tt>#eat</tt>, which ALWAYS returns a <tt>String</tt>:
 
 ==Options
 
-    eat('http://yahoo.com', :timeout => 10)                  # timeout after 10 seconds
-    eat('http://yahoo.com', :limit => 1024)                  # only read the first 1024 chars
-    eat('https://yahoo.com', :openssl_verify_mode => 'none)  # don't bother verifying SSL certificate
+    eat('http://yahoo.com', :timeout => 10)                   # timeout after 10 seconds
+    eat('http://yahoo.com', :limit => 1024)                   # only read the first 1024 chars
+    eat('https://yahoo.com', :openssl_verify_mode => 'none')  # don't bother verifying SSL certificate
 
 ==Warning: DOES verify SSL certs
 

data/eat.gemspec

@@ -18,5 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_runtime_dependency 'httpclient'
   s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'rake'
 end

data/lib/eat.rb

@@ -1,5 +1,4 @@
 require 'uri'
-require 'singleton'
 
 # http://weblog.jamisbuck.org/2007/2/7/infinity
 unless defined?(::Infinity)
@@ -20,9 +19,7 @@ module Eat
     #    eat('http://brighterplanet.com', :timeout => 10) #=> '...'
     #    eat('http://brighterplanet.com', :limit => 1)    #=> '.'
     def eat(url, options = {})
-      timeout = options[:timeout] || options['timeout'] || 2
-      limit = options[:limit] || options['limit'] || ::Infinity
-      openssl_verify_mode = options[:openssl_verify_mode] || options['openssl_verify_mode']
+      limit = options.fetch(:limit, ::Infinity)
       
       uri = ::URI.parse url.to_s
 
@@ -42,26 +39,25 @@ module Eat
         end
 
       when 'http', 'https'
-        require 'net/http'
-        require 'net/https' if uri.scheme == 'https'
-        (defined?(::SystemTimer) ? ::SystemTimer : ::Timeout).timeout(timeout) do
-          http = ::Net::HTTP.new uri.host, uri.port
-          if uri.scheme == 'https'
-            http.use_ssl = true
-            http.verify_mode = ::OpenSSL::SSL::VERIFY_NONE if openssl_verify_mode.to_s == 'none'
-          end
-          http.start do |session|
-            catch :stop do
-              session.get(uri.request_uri, 'Accept-Encoding' => '') do |chunk|
-                throw :stop if read_so_far > limit
-                read_so_far += chunk.length
-                body << chunk
-              end
-              session.finish
-            end
+        require 'httpclient'
+        timeout = options.fetch(:timeout, 2)
+        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.redirect_uri_callback = ::Proc.new { |uri, res| ::URI.parse(res.header['location'][0]) }
+        http.receive_timeout = timeout
+        if uri.scheme == 'https'
+          http.ssl_config.verify_mode = openssl_verify_mode
+        end
+        catch :stop do
+          http.get_content(uri.to_s) do |chunk|
+            throw :stop if read_so_far > limit
+            read_so_far += chunk.length
+            body << chunk
           end
         end
-
       end
 
       limit == ::Infinity ? body.join : body.join[0...limit]

data/lib/eat/version.rb

@@ -1,3 +1,3 @@
 module Eat
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/test_eat.rb

@@ -70,4 +70,8 @@ class TestEat < Test::Unit::TestCase
       eat 'https://foo.bar.brighterplanet.com', :openssl_verify_mode => 'none'
     end
   end
+  
+  def test_reads_compressed
+    assert eat('http://www.sears.com/shc/s/p_10153_12605_07692286000P?prdNo=8&blockNo=8&blockType=G8').include?('New Balance')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eat
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-30 00:00:00.000000000Z
+date: 2011-12-05 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &2172837000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2172837000
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2164548520 !ruby/object:Gem::Requirement
+  requirement: &2172836540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2172836540
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2172836120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164548520
+  version_requirements: *2172836120
 description: A (better?) replacement for open-uri. Gets the contents of local and
   remote files as a String, no questions asked.
 email:
@@ -60,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: eat
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ! 'Defines an #eat method that takes local and remote paths and returns the