mechanize 0.7.0 → 0.7.1

data/CHANGELOG.txt

@@ -1,5 +1,11 @@
 = Mechanize CHANGELOG
 
+== 0.7.1
+
+* Added iPhone to the user agent aliases. [#17572]
+* Fixed a bug with EOF errors in net/http.  [#17570]
+* Handling 0 length gzipped responses. [#17471]
+
 == 0.7.0
 
 * Removed Ruby 1.8.2 support

data/README.txt

@@ -12,7 +12,7 @@ a history.
 
 == Dependencies
 
-* ruby 1.8.2
+* ruby 1.8.4
 * hpricot[http://code.whytheluckystiff.net/hpricot/]
 
 Note that the files in the net-overrides/ directory are taken from Ruby 1.9.0.

data/lib/www/mechanize.rb

@@ -38,7 +38,7 @@ module WWW
   class Mechanize
     ##
     # The version of Mechanize you are using.
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   
     ##
     # User Agent aliases
@@ -51,6 +51,7 @@ module WWW
       'Mac Mozilla' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.4a) Gecko/20030401',
       'Linux Mozilla' => 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624',
       'Linux Konqueror' => 'Mozilla/5.0 (compatible; Konqueror/3; Linux)',
+      'iPhone' => 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3',
       'Mechanize' => "WWW-Mechanize/#{VERSION} (http://rubyforge.org/projects/mechanize/)"
     }
   
@@ -508,56 +509,67 @@ module WWW
       cache_obj[:last_request_time] = Time.now.to_i
   
       # Send the request
-      response = http_obj.request(request, *request_data) {|response|
-  
-        body = StringIO.new
-        total = 0
-        response.read_body { |part|
-          total += part.length
-          body.write(part)
-          log.debug("Read #{total} bytes") if log
-        }
-        body.rewind
-  
-        response.each_header { |k,v|
-          log.debug("response-header: #{ k } => #{ v }")
-        } if log
-  
-        content_type = nil
-        unless response['Content-Type'].nil?
-          data = response['Content-Type'].match(/^([^;]*)/)
-          content_type = data[1].downcase unless data.nil?
-        end
+      begin
+        response = http_obj.request(request, *request_data) {|response|
+  
+          body = StringIO.new
+          total = 0
+          response.read_body { |part|
+            total += part.length
+            body.write(part)
+            log.debug("Read #{total} bytes") if log
+          }
+          body.rewind
+  
+          response.each_header { |k,v|
+            log.debug("response-header: #{ k } => #{ v }")
+          } if log
+  
+          content_type = nil
+          unless response['Content-Type'].nil?
+            data = response['Content-Type'].match(/^([^;]*)/)
+            content_type = data[1].downcase unless data.nil?
+          end
   
-        response_body = 
-        if encoding = response['Content-Encoding']
-          case encoding.downcase
-          when 'gzip'
-            log.debug('gunzip body') if log
-            Zlib::GzipReader.new(body).read
-          when 'x-gzip'
-            body.read
+          response_body = 
+          if encoding = response['Content-Encoding']
+            case encoding.downcase
+            when 'gzip'
+              log.debug('gunzip body') if log
+              if response['Content-Length'].to_i > 0
+                Zlib::GzipReader.new(body).read
+              else
+                ''
+              end
+            when 'x-gzip'
+              body.read
+            else
+              raise 'Unsupported content encoding'
+            end
           else
-            raise 'Unsupported content encoding'
+            body.read
           end
-        else
-          body.read
-        end
   
-        # Find our pluggable parser
-        page = @pluggable_parser.parser(content_type).new(
-          uri,
-          response,
-          response_body,
-          response.code
-        ) { |parser|
-          parser.mech = self if parser.respond_to? :mech=
-          if parser.respond_to?(:watch_for_set=) && @watch_for_set
-            parser.watch_for_set = @watch_for_set
-          end
-        }
+          # Find our pluggable parser
+          page = @pluggable_parser.parser(content_type).new(
+            uri,
+            response,
+            response_body,
+            response.code
+          ) { |parser|
+            parser.mech = self if parser.respond_to? :mech=
+            if parser.respond_to?(:watch_for_set=) && @watch_for_set
+              parser.watch_for_set = @watch_for_set
+            end
+          }
   
-      }
+        }
+      rescue EOFError
+        log.error("Rescuing EOF error") if log
+        http_obj.finish
+        http_obj.start
+        retry
+      end
   
       # If the server sends back keep alive options, save them
       if keep_alive_info = response['keep-alive']

data/test/servlets.rb

@@ -72,16 +72,20 @@ end
 class GzipServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     if req['Accept-Encoding'] =~ /gzip/
-      File.open("#{BASE_DIR}/htdocs/#{req.query['file']}", 'r') do |file|
-        string = ""
-        zipped = StringIO.new string, 'w'
-        gz = Zlib::GzipWriter.new(zipped)
-        gz.write file.read
-        gz.close
-        res['Content-Encoding'] = 'gzip'
-        res['Content-Type'] = "text/html"
-        res.body = string
+      if req.query['file']
+        File.open("#{BASE_DIR}/htdocs/#{req.query['file']}", 'r') do |file|
+          string = ""
+          zipped = StringIO.new string, 'w'
+          gz = Zlib::GzipWriter.new(zipped)
+          gz.write file.read
+          gz.close
+          res.body = string
+        end
+      else
+        res.body = ''
       end
+      res['Content-Encoding'] = 'gzip'
+      res['Content-Type'] = "text/html"
     else
       raise 'no gzip'
     end

data/test/tc_gzipping.rb

@@ -5,6 +5,12 @@ class TestGzip < Test::Unit::TestCase
     @agent = WWW::Mechanize.new
   end
 
+  def test_request_empty_gzip
+    assert_nothing_raised do
+      page = @agent.get("http://localhost/gzip")
+    end
+  end
+
   def test_request_gzip
     page = nil
     assert_nothing_raised do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 -08:00
+date: 2008-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.1
     version: 
 description: The Mechanize library is used for automating interaction with websites.  Mechanize automatically stores and sends cookies, follows redirects, can follow links, and submit forms.  Form fields can be populated and submitted.  Mechanize also keeps track of the sites that you have visited as a history.
 email: aaronp@rubyforge.org