mechanize 0.7.5 → 0.7.6

data/{CHANGELOG.txt → History.txt}

@@ -1,31 +1,54 @@
 = Mechanize CHANGELOG
 
-== 0.7.5
+=== 0.7.6
+
+* New Features:
+  * Added support for reading Mozilla cookie jars.  Thanks Chris Riddoch!
+  * Moving text, password, hidden, int to default.  Thanks Tim Harper!
+  * Mechanize#history_added callback for page loads. Thanks Tobi Reif!
+  * Mechanize#scheme_handlers callbacks for handling unsupported schemes on
+    links.
+
+* Bug Fixes:
+  * Ignoring scheme case
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=470642
+  * Not encoding tildes in uris. Thanks Bruno.  [#19380]
+  * Resetting request bodys when retrying form posts.  Thanks Bruno. [#19379]
+  * Throwing away keep alive connections on EPIPE and ECONNRESET.
+  * Duplicating request headers when retrying a 401. Thanks Hiroshi Ichikawa.
+  * Simulating an EOF error when a response length is bad.  Thanks Tobias Gruetzmacher.
+    http://rubyforge.org/tracker/index.php?func=detail&aid=19178&group_id=1453&atid=5711
+  * Defaulting option tags to the inner text.
+    http://rubyforge.org/tracker/index.php?func=detail&aid=19976&group_id=1453&atid=5709
+  * Supporting blank strings for option values.
+    http://rubyforge.org/tracker/index.php?func=detail&aid=19975&group_id=1453&atid=5709
+
+=== 0.7.5
 
 * Fixed a bug when fetching files and not pages.  Thanks Mat Schaffer!
 
-== 0.7.4
+=== 0.7.4
 
 * doh!
 
-== 0.7.3
+=== 0.7.3
 
 * Pages are now yielded to a blocks given to WWW::Mechanize#get
 * WWW::Mechanize#get now takes hash arguments for uri parameters.
 * WWW::Mechanize#post takes an IO object as a parameter and posts correctly.
 * Fixing a strange zlib inflate problem on windows
 
-== 0.7.2
+=== 0.7.2
 
 * Handling gzipped responses with no Content-Length header
 
-== 0.7.1
+=== 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
+=== 0.7.0
 
 * Removed Ruby 1.8.2 support
 * Changed parser to lazily parse links
@@ -33,7 +56,7 @@
 * Adding verify_callback for SSL requests.  Thanks Mike Dalessio!
 * Fixed a bug with Accept-Language header.  Thanks Bill Siggelkow.
 
-== 0.6.11
+=== 0.6.11
 
 * Detecting single quotes in meta redirects.
 * Adding pretty inspect for ruby versions > 1.8.4 (Thanks Joel Kociolek)
@@ -44,7 +67,7 @@
 * Added a FAQ
   http://rubyforge.org/tracker/?func=detail&aid=15772&group_id=1453&atid=5709
 
-== 0.6.10
+=== 0.6.10
 
 * Made digest authentication work with POSTs.
 * Made sure page was HTML before following meta refreshes.
@@ -63,7 +86,7 @@
 * Aliasing inspect to pretty_inspect.  Thanks Eric Promislow.
   http://rubyforge.org/pipermail/mechanize-users/2007-July/000157.html
 
-== 0.6.9
+=== 0.6.9
 
 * Updating UTF-8 support for urls
 * Adding AREA tags to the links list.
@@ -75,7 +98,7 @@
 * Added Digest Authentication support.  Thanks to Ryan Davis and Eric Hodel,
   you get a gold star!
 
-== 0.6.8
+=== 0.6.8
 
 * Keep alive can be shut off now with WWW::Mechanize#keep_alive
 * Conditional requests can be shut off with WWW::Mechanize#conditional_requests
@@ -86,12 +109,12 @@
 * Updating compatability with hpricot
 * Added more unit tests
 
-== 0.6.7
+=== 0.6.7
 
 * Fixed a bug with keep-alive requests
 * [#9549] fixed problem with cookie paths
 
-== 0.6.6
+=== 0.6.6
 
 * Removing hpricot overrides
 * Fixed a bug where alt text can be nil.  Thanks Yannick!
@@ -101,7 +124,7 @@
 * [#9434] Fixed bug where html entities weren't decoded
 * [#9150] Updated mechanize history to deal with redirects
 
-== 0.6.5
+=== 0.6.5
 
 * Copying headers to a hash to prevent memory leaks
 * Speeding up page parsing
@@ -116,7 +139,7 @@
   http://rubyforge.org/tracker/?func=detail&aid=7563&group_id=1453&atid=5709
 * Added MSIE 7.0 user agent string
 
-== 0.6.4
+=== 0.6.4
 
 * Adding the "redirect_ok" method to Mechanize to stop mechanize from
   following redirects.
@@ -133,7 +156,7 @@
 * Fixed bug [#6548].  Input type of 'button' was not being added as a button.
 * Fixed bug [#7139]. REXML parser calls hpricot parser by accident
 
-== 0.6.3
+=== 0.6.3
 
 * Added keys and values methods to Form
 * Added has_value? to Form
@@ -148,7 +171,7 @@
 * Fixed a bug where '#' symbols are encoded
   http://rubyforge.org/forum/message.php?msg_id=14747
 
-== 0.6.2
+=== 0.6.2
 
 * Added a yield to Page#form so that dealing with forms can be more DSL like.
 * Added the parsed page to the ResponseCodeError so that the parsed results
@@ -156,7 +179,7 @@
   http://rubyforge.org/pipermail/mechanize-users/2006-September/000007.html
 * Updated documentation (Thanks to Paul Smith)
 
-== 0.6.1
+=== 0.6.1
 
 * Added a method to Form called "submit".  Now forms can be submitted by
   calling a method on the form.
@@ -174,7 +197,7 @@
 * Fixed a bug with loading text in to links.
   http://rubyforge.org/pipermail/mechanize-users/2006-September/000000.html
 
-== 0.6.0
+=== 0.6.0
 
 * Changed main parser to use hpricot
 * Made WWW::Mechanize::Page class searchable like hpricot
@@ -186,7 +209,7 @@
 * Removed REXML helper methods since the main parser is now hpricot
 * Overhauled cookie parser to use WEBrick::Cookie
 
-== 0.5.4
+=== 0.5.4
 
 * Added WWW::Mechanize#trasact for saving history state between in a
   transaction.  See the EXAMPLES file.  Thanks Johan Kiviniemi.
@@ -201,7 +224,7 @@
 * Fixed a bug with saving files on windows
 * Fixed a bug with the filename being set in forms
 
-== 0.5.3
+=== 0.5.3
 
 * Mechanize#click will now act on the first element of an array.  So if an
   array of links is passed to WWW::Mechanize#click, the first link is clicked.
@@ -219,7 +242,7 @@
 * Updated log4r support for a speed increase.  Thanks Yinon Bentor
 * Added inspect methods and pretty printing
 
-== 0.5.2
+=== 0.5.2
 
 * Fixed a bug with input names that are nil
 * Added a warning when using attr_finder because attr_finder will be deprecated
@@ -236,12 +259,12 @@
   WWW::Mechanize::Form#set_fields.  Which can be used like so:
    form.set_fields( :foo => 'bar', :name => 'Aaron' )
 
-== 0.5.1
+=== 0.5.1
 
 * Fixed bug with file uploads
 * Added performance tweaks to the cookie class
 
-== 0.5.0
+=== 0.5.0
 
 * Added pluggable parsers. (Thanks to Eric Kolve for the idea)
 * Changed namespace so all classes are under WWW::Mechanize.
@@ -256,7 +279,7 @@
 * Removed support for body filters in favor of pluggable parsers.
 * Fixed cookie bug adding a '/' when the url is missing one (Thanks Nick Dainty)
 
-== 0.4.7
+=== 0.4.7
 
 * Fixed bug with no action in forms.  Thanks to Adam Wiggins
 * Setting a default user-agent string
@@ -265,7 +288,7 @@
   (thanks to Gregory Brown)
 * Added WWW::Mechanize#get_file for fetching non text/html files
 
-== 0.4.6
+=== 0.4.6
 
 * Added support for proxies
 * Added a uri field to WWW::Link
@@ -276,7 +299,7 @@
   allows syntax as such:    form.fields.name('q').value = 'xyz'
   Before it was like this:  form.fields.name('q').first.value = 'xyz'
 
-== 0.4.5
+=== 0.4.5
 
 * Added support for multiple values of the same name
 * Updated build_query_string to take an array of arrays (Thanks Michal Janeczek)
@@ -286,13 +309,13 @@
 * Fixed a bug with empty select lists
 * Fixing a problem with cookies not handling no spaces after semicolons
 
-== 0.4.4
+=== 0.4.4
 
 * Fixed error in method signature, basic_authetication is now basic_auth
 * Fixed bug with encoding names in file uploads (Big thanks to Alex Young)
 * Added options to the select list
 
-== 0.4.3
+=== 0.4.3
 
 * Added syntactic sugar for finding things
 * Fixed bug with HttpOnly option in cookies
@@ -300,21 +323,21 @@
 * Defaulted dropdown lists to the first element
 * Added unit tests
 
-== 0.4.2
+=== 0.4.2
 
 * Added support for iframes
 * Made mechanize dependant on ruby-web rather than narf
 * Added unit tests
 * Fixed a bunch of warnings
 
-== 0.4.1
+=== 0.4.1
 
 * Added support for file uploading
 * Added support for frames (Thanks Gabriel[mailto:leerbag@googlemail.com])
 * Added more unit tests
 * Fixed some bugs
 
-== 0.4.0
+=== 0.4.0
 
 * Added more unit tests
 * Added a cookie jar with better cookie support, included expiration of cookies

data/Manifest.txt

@@ -1,7 +1,7 @@
-CHANGELOG.txt
 EXAMPLES.txt
 FAQ.txt
 GUIDE.txt
+History.txt
 LICENSE.txt
 Manifest.txt
 NOTES.txt
@@ -41,6 +41,7 @@ lib/www/mechanize/page/link.rb
 lib/www/mechanize/page/meta.rb
 lib/www/mechanize/pluggable_parsers.rb
 lib/www/mechanize/response_code_error.rb
+lib/www/mechanize/unsupported_scheme_error.rb
 test/data/htpasswd
 test/data/server.crt
 test/data/server.csr
@@ -105,6 +106,7 @@ test/tc_forms.rb
 test/tc_frames.rb
 test/tc_gzipping.rb
 test/tc_history.rb
+test/tc_history_added.rb
 test/tc_html_unscape_forms.rb
 test/tc_if_modified_since.rb
 test/tc_keep_alive.rb
@@ -113,6 +115,7 @@ test/tc_mech.rb
 test/tc_mechanize_file.rb
 test/tc_multi_select.rb
 test/tc_no_attributes.rb
+test/tc_option.rb
 test/tc_page.rb
 test/tc_pluggable_parser.rb
 test/tc_post_form.rb

data/Rakefile

@@ -7,31 +7,6 @@ require 'mechanize'
 class MechHoe < Hoe
   def define_tasks
     super
-
-    desc "Tag code"
-    task :tag do |p|
-      abort "Must supply VERSION=x.y.z" unless ENV['VERSION']
-      v = ENV['VERSION'].gsub(/\./, '_')
-
-      rf = RubyForge.new
-      user = rf.userconfig['username']
-
-      baseurl = "svn+ssh://#{user}@rubyforge.org//var/svn/#{name}"
-      sh "svn cp -m 'tagged REL-#{v}' . #{ baseurl }/tags/REL-#{ v }"
-    end
-
-    desc "Branch code"
-    Rake::Task.define_task("branch") do |p|
-      abort "Must supply VERSION=x.y.z" unless ENV['VERSION']
-      v = ENV['VERSION'].split(/\./)[0..1].join('_')
-
-      rf = RubyForge.new
-      user = rf.userconfig['username']
-
-      baseurl = "svn+ssh://#{user}@rubyforge.org/var/svn/#{name}"
-      sh "svn cp -m'branched #{v}' #{baseurl}/trunk #{baseurl}/branches/RB-#{v}"
-    end
-    
     desc "Update SSL Certificate"
     Rake::Task.define_task('ssl_cert') do |p|
       sh "openssl genrsa -des3 -out server.key 1024"
@@ -51,10 +26,6 @@ MechHoe.new('mechanize', WWW::Mechanize::VERSION) do |p|
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'
   p.summary         = "Mechanize provides automated web-browsing"
-  p.description     = p.paragraphs_of('README.txt', 3).join("\n\n")
-  p.url             = p.paragraphs_of('README.txt', 1).first.strip
-  p.changes         = p.paragraphs_of('CHANGELOG.txt', 0..2).join("\n\n")
   p.extra_deps      = [['hpricot', '>= 0.5.0']]
 end
 
-

data/lib/www/mechanize.rb

@@ -8,6 +8,7 @@ require 'digest/md5'
 
 require 'www/mechanize/content_type_error'
 require 'www/mechanize/response_code_error'
+require 'www/mechanize/unsupported_scheme_error'
 require 'www/mechanize/cookie'
 require 'www/mechanize/cookie_jar'
 require 'www/mechanize/history'
@@ -38,7 +39,7 @@ module WWW
   class Mechanize
     ##
     # The version of Mechanize you are using.
-    VERSION = '0.7.5'
+    VERSION = '0.7.6'
   
     ##
     # User Agent aliases
@@ -70,6 +71,8 @@ module WWW
     attr_accessor :conditional_requests
     attr_accessor :follow_meta_refresh
     attr_accessor :verify_callback
+    attr_accessor :history_added
+    attr_accessor :scheme_handlers
   
     attr_reader :history
     attr_reader :pluggable_parser
@@ -87,6 +90,7 @@ module WWW
       @read_timeout   = nil
       @user_agent     = AGENT_ALIASES['Mechanize']
       @watch_for_set  = nil
+      @history_added  = nil
       @ca_file        = nil # OpenSSL server certificate file
 
       # callback for OpenSSL errors while verifying the server certificate
@@ -123,10 +127,19 @@ module WWW
       @connection_cache = {}
       @keep_alive_time  = 300
       @keep_alive       = true
+
+      @scheme_handlers  = Hash.new { |h,k|
+        h[k] = lambda { |link, page|
+          raise UnsupportedSchemeError.new(k)
+        }
+      }
+      @scheme_handlers['http']      = lambda { |link, page| link }
+      @scheme_handlers['https']     = @scheme_handlers['http']
+      @scheme_handlers['relative']  = @scheme_handlers['http']
   
       yield self if block_given?
     end
-  
+
     def max_history=(length); @history.max_size = length; end
     def max_history; @history.max_size; end
   
@@ -403,7 +416,7 @@ module WWW
   
     def to_absolute_uri(url, cur_page=current_page())
       unless url.is_a? URI
-        url = url.to_s.strip.gsub(/[^#{0.chr}-#{125.chr}]/) { |match|
+        url = url.to_s.strip.gsub(/[^#{0.chr}-#{126.chr}]/) { |match|
           sprintf('%%%X', match.unpack($KCODE == 'UTF8' ? 'U' : 'c')[0])
         }
   
@@ -418,6 +431,7 @@ module WWW
               )
       end
   
+      url = @scheme_handlers[url.relative? ? 'relative' : url.scheme.downcase].call(url, cur_page)
       url.path = '/' if url.path.length == 0
   
       # construct an absolute uri
@@ -456,7 +470,7 @@ module WWW
   
     # Creates a new request object based on the scheme and type
     def fetch_request(uri, type = :get)
-      raise "unsupported scheme" unless ['http', 'https'].include?(uri.scheme)
+      raise "unsupported scheme: #{uri.scheme}" unless ['http', 'https'].include?(uri.scheme.downcase)
       if type == :get
         Net::HTTP::Get.new(uri.request_uri)
       else
@@ -466,7 +480,7 @@ module WWW
   
     # uri is an absolute URI
     def fetch_page(uri, request, cur_page=current_page(), request_data=[])
-      raise "unsupported scheme" unless ['http', 'https'].include?(uri.scheme)
+      raise "unsupported scheme: #{uri.scheme}" unless ['http', 'https'].include?(uri.scheme.downcase)
   
       log.info("#{ request.class }: #{ request.path }") if log
   
@@ -546,6 +560,8 @@ module WWW
             body.write(part)
             log.debug("Read #{total} bytes") if log
           }
+          # Net::HTTP ignores EOFError if Content-length is given, so we emulate it here.
+          raise EOFError if response.content_length() && response.content_length() != total
           body.rewind
   
           response.each_header { |k,v|
@@ -598,9 +614,10 @@ module WWW
           }
   
         }
-      rescue EOFError
+      rescue EOFError, Errno::ECONNRESET, Errno::EPIPE
         log.error("Rescuing EOF error") if log
         http_obj.finish
+        request.body = nil
         http_obj.start
         retry
       end
@@ -652,30 +669,28 @@ module WWW
         else
           @auth_hash[uri.host] = :basic
         end
-        return fetch_page(  uri,
-                            fetch_request(uri, request.method.downcase.to_sym),
-                            cur_page,
-                            request_data
-                         )
+        # Copy the request headers for the second attempt
+        req = fetch_request(uri, request.method.downcase.to_sym)
+        request.each_header do |k,v|
+          req[k] = v
+        end
+        return fetch_page(uri, req, cur_page, request_data)
       end
   
       raise ResponseCodeError.new(page), "Unhandled response", caller
     end
   
     def self.build_query_string(parameters)
-      vals = [] 
-      parameters.each { |k,v|
-        next if k.nil?
-        vals <<
-        [WEBrick::HTTPUtils.escape_form(k.to_s),
-         WEBrick::HTTPUtils.escape_form(v.to_s)].join("=")
-      }
-  
-      vals.join("&")
+      parameters.map { |k,v|
+        k &&
+          [WEBrick::HTTPUtils.escape_form(k.to_s),
+            WEBrick::HTTPUtils.escape_form(v.to_s)].join("=")
+      }.compact.join('&')
     end
   
     def add_to_history(page)
       @history.push(page, to_absolute_uri(page.uri))
+      history_added.call(page) if history_added
     end
   end
 end

data/lib/www/mechanize/cookie_jar.rb

@@ -60,16 +60,40 @@ module WWW
         cookies
       end
 
-      # Save the cookie jar to a file as YAML
-      def save_as(file)
+      # Save the cookie jar to a file in the format specified.
+      #
+      # Available formats:
+      # :yaml  <- YAML structure
+      # :cookiestxt  <- Mozilla's cookies.txt format
+      def save_as(file, format = :yaml)
         ::File.open(file, "w") { |f|
-          YAML::dump(@jar, f)
+          case format
+          when :yaml:
+            YAML::dump(@jar, f)
+          when :cookiestxt:
+            dump_cookiestxt(f)
+          else
+            raise "Unknown cookie jar file format"
+          end
         }
       end
 
-      # Load cookie jar from a file stored as YAML
-      def load(file)
-        @jar = ::File.open(file) { |yf| YAML::load( yf ) }
+      # Load cookie jar from a file in the format specified.
+      #
+      # Available formats:
+      # :yaml  <- YAML structure.
+      # :cookiestxt  <- Mozilla's cookies.txt format
+      def load(file, format = :yaml)
+        @jar = ::File.open(file) { |f|
+          case format
+          when :yaml:
+            YAML::load(f)
+          when :cookiestxt:
+            load_cookiestxt(f)
+          else
+            raise "Unknown cookie jar file format"
+          end
+        }
       end
 
       # Clear the cookie jar
@@ -77,6 +101,73 @@ module WWW
         @jar = {}
       end
 
+
+      # Read cookies from Mozilla cookies.txt-style IO stream
+      def load_cookiestxt(io)
+        now = Time.now
+        fakeuri = Struct.new(:host)    # add_cookie wants something resembling a URI.
+        
+        io.each_line do |line|
+          line.chomp!
+          line.gsub!(/#.+/, '')
+          fields = line.split("\t")
+          
+          next if fields.length != 7
+          
+          expires_seconds = fields[4].to_i
+          begin
+            expires = Time.at(expires_seconds)
+          rescue
+            next
+            # Just in case we ever decide to support DateTime...
+            # expires = DateTime.new(1970,1,1) + ((expires_seconds + 1) / (60*60*24.0))
+          end
+          next if expires < now
+          
+          c = WWW::Mechanize::Cookie.new(fields[5], fields[6])
+          c.domain = fields[0]
+          # Field 1 indicates whether the cookie can be read by other machines at the same domain.
+          # This is computed by the cookie implementation, based on the domain value.
+          c.path = fields[2]               # Path for which the cookie is relevant
+          c.secure = (fields[3] == "TRUE") # Requires a secure connection
+          c.expires = expires             # Time the cookie expires.
+          c.version = 0                   # Conforms to Netscape cookie spec.
+          
+          add(fakeuri.new(c.domain), c)
+        end
+        @jar
+      end
+      
+      # Write cookies to Mozilla cookies.txt-style IO stream
+      def dump_cookiestxt(io)
+        @jar.each_pair do |domain, cookies|
+          cookies.each_pair do |name, cookie|
+            fields = []
+            fields[0] = cookie.domain
+            
+            if cookie.domain =~ /^\./
+              fields[1] = "TRUE"
+            else
+              fields[1] = "FALSE"
+            end
+            
+            fields[2] = cookie.path
+            
+            if cookie.secure == true
+              fields[3] = "TRUE"
+            else
+              fields[3] = "FALSE"
+            end
+            
+            fields[4] = cookie.expires.to_i.to_s
+            
+            fields[5] = cookie.name
+            fields[6] = cookie.value
+            io.puts(fields.join("\t"))
+          end 
+        end
+      end
+
       private
       # Remove expired cookies
       def cleanup

data/lib/www/mechanize/form.rb

@@ -211,8 +211,6 @@ module WWW
           name = node['name']
           next if name.nil? && !(type == 'submit' || type =='button')
           case type
-          when 'text', 'password', 'hidden', 'int'
-            @fields << Field.new(node['name'], node['value'] || '') 
           when 'radio'
             @radiobuttons << RadioButton.new(node['name'], node['value'], node.has_attribute?('checked'), self)
           when 'checkbox'
@@ -225,6 +223,8 @@ module WWW
             @buttons << Button.new(node['name'], node['value'])
           when 'image'
             @buttons << ImageButton.new(node['name'], node['value'])
+          else
+            @fields << Field.new(node['name'], node['value'] || '') 
           end
         end
 

data/lib/www/mechanize/form/option.rb

@@ -14,7 +14,7 @@ module WWW
 
         def initialize(node, select_list)
           @text     = node.inner_text
-          @value    = Mechanize.html_unescape(node['value'])
+          @value    = Mechanize.html_unescape(node['value'] || node.inner_text)
           @selected = node.has_attribute? 'selected'
           @select_list = select_list # The select list this option belongs to
         end

data/lib/www/mechanize/form/select_list.rb

@@ -35,6 +35,10 @@ module WWW
             super([new.to_s])
           end
         end
+
+        def query_value
+          value ? [[name, value]] : ''
+        end
       end
     end
   end

data/lib/www/mechanize/unsupported_scheme_error.rb

@@ -0,0 +1,10 @@
+module WWW
+  class Mechanize
+    class UnsupportedSchemeError < RuntimeError
+      attr_accessor :scheme
+      def initialize(scheme)
+        @scheme = scheme
+      end
+    end
+  end
+end

data/test/htdocs/tc_links.html

@@ -12,5 +12,7 @@
     <a href="link with space.html">not encoded space</a>
     <!-- End escaped bug -->
     <a href="unusual&&%3F%3F%23%23.html">unusual characters</a>
+
+    <a href="javascript:new_page('1')">javascript link</a>
   </body>
 </html>

data/test/servlets.rb

@@ -23,6 +23,7 @@ class BasicAuthServlet < WEBrick::HTTPServlet::AbstractServlet
     end
     FileUtils.rm('dot.htpasswd')
   end
+  alias :do_POST :do_GET
 end
 
 class HeaderServlet < WEBrick::HTTPServlet::AbstractServlet

data/test/tc_authenticate.rb

@@ -11,6 +11,31 @@ class BasicAuthTest < Test::Unit::TestCase
     assert_equal('You are authenticated', page.body)
   end
 
+  def test_post_auth_success
+    class << @agent
+      alias :old_fetch_request :fetch_request
+      attr_accessor :requests
+      def fetch_request(*args)
+        @requests ||= []
+        @requests << old_fetch_request(*args)
+        @requests.last
+      end
+    end
+    @agent.basic_auth('user', 'pass')
+    page = @agent.post("http://localhost/basic_auth")
+    assert_equal('You are authenticated', page.body)
+    assert_equal(2, @agent.requests.length)
+    r1 = @agent.requests[0]
+    r2 = @agent.requests[1]
+    assert r1['Content-Type']
+    assert r2['Content-Type']
+    assert_equal(r1['Content-Type'], r2['Content-Type'])
+
+    assert r1['Content-Length']
+    assert r2['Content-Length']
+    assert_equal(r1['Content-Length'], r2['Content-Length'])
+  end
+
   def test_auth_bad_user_pass
     @agent.basic_auth('aaron', 'aaron')
     begin

data/test/tc_cookie_jar.rb

@@ -282,4 +282,33 @@ class CookieJarTest < Test::Unit::TestCase
                                           :expires => Time.now - (10 * 86400))))
     assert_equal(0, jar.cookies(url).length)
   end
+  
+  
+  def test_save_and_read_cookiestxt
+    values = {  :name     => 'Foo',
+                :value    => 'Bar',
+                :path     => '/',
+                :expires  => Time.now + (10 * 86400),
+                :domain   => 'rubyforge.org'
+             }
+    url = URI.parse('http://rubyforge.org/')
+
+    jar = WWW::Mechanize::CookieJar.new
+    assert_equal(0, jar.cookies(url).length)
+
+    # Add one cookie with an expiration date in the future
+    cookie = cookie_from_hash(values)
+    jar.add(url, cookie)
+    jar.add(url, cookie_from_hash(values.merge( :name => 'Baz' )))
+    assert_equal(2, jar.cookies(url).length)
+    
+    jar.save_as("cookies.txt", :cookiestxt)
+    jar.clear!
+    assert_equal(0, jar.cookies(url).length)
+
+    jar.load("cookies.txt", :cookiestxt)
+    assert_equal(2, jar.cookies(url).length)
+
+    FileUtils.rm("cookies.txt")
+  end
 end

data/test/tc_errors.rb

@@ -42,7 +42,7 @@ class MechErrorsTest < Test::Unit::TestCase
   end
 
   def test_unsupported_scheme
-    assert_raise(RuntimeError) {
+    assert_raise(WWW::Mechanize::UnsupportedSchemeError) {
       @agent.get('ftp://server.com/foo.html')
     }
   end

data/test/tc_history_added.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + "/helper"
+
+class HistoryAddedTest < Test::Unit::TestCase
+  def setup
+    @agent = WWW::Mechanize.new
+  end
+
+  def test_history_added_gets_called
+    onload = 0
+    @agent.history_added = lambda { |page|
+      onload += 1
+    }
+    page = @agent.get('http://localhost/tc_blank_form.html')
+    assert_equal(1, onload)
+  end
+end

data/test/tc_links.rb

@@ -5,6 +5,21 @@ class LinksMechTest < Test::Unit::TestCase
     @agent = WWW::Mechanize.new
   end
 
+  def test_unsupported_link_types
+    page = @agent.get("http://google.com/tc_links.html")
+    link = page.links.text('javascript link').first
+    assert_raise(WWW::Mechanize::UnsupportedSchemeError) {
+      link.click
+    }
+
+    @agent.scheme_handlers['javascript'] = lambda { |link, page|
+      URI.parse('http://localhost/tc_links.html')
+    }
+    assert_nothing_raised {
+      link.click
+    }
+  end
+
   def test_base
     page = @agent.get("http://google.com/tc_base_link.html")
     page = page.links.first.click

data/test/tc_mech.rb

@@ -5,11 +5,21 @@ class TestMechMethods < Test::Unit::TestCase
     @agent = WWW::Mechanize.new
   end
 
+  def test_get_with_tilde
+    page = @agent.get('http://localhost/?foo=~2')
+    assert_equal('http://localhost/?foo=~2', page.uri.to_s)
+  end
+
   def test_get_with_params
     page = @agent.get('http://localhost/', { :q => 'hello' })
     assert_equal('http://localhost/?q=hello', page.uri.to_s)
   end
 
+  def test_get_with_upper_http
+    page = @agent.get('HTTP://localhost/', { :q => 'hello' })
+    assert_equal('HTTP://localhost/?q=hello', page.uri.to_s)
+  end
+
   def test_get_with_referer
     class << @agent
       attr_reader :request

data/test/tc_option.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + "/helper"
+
+class OptionTest < Test::Unit::TestCase
+  class FakeAttribute < Hash
+    attr_reader :inner_text
+    def initialize(inner_text)
+      @inner_text = inner_text
+    end
+    alias :has_attribute? :has_key?
+  end
+
+  def test_option_missing_value
+    attribute = FakeAttribute.new('blah')
+    option = WWW::Mechanize::Form::Option.new(attribute, nil)
+    assert_equal('blah', option.value)
+  end
+end

data/test/tc_select.rb

@@ -73,6 +73,15 @@ class SelectTest < Test::Unit::TestCase
     assert_equal(1, page.links.text('list:1').length)
   end
 
+  def test_select_with_empty_value
+    list = @form.fields.name('list').first
+    list.options.last.instance_variable_set(:@value, '')
+    list.options.last.tick
+    page = @agent.submit(@form)
+    assert_equal(1, page.links.length)
+    assert_equal(1, page.links.text('list:').length)
+  end
+
   def test_select_with_click
     @form.list = ['1', 'Aaron']
     @form.fields.name('list').first.options[3].tick

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-15 00:00:00 -07:00
+date: 2008-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,19 +37,19 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG.txt
 - EXAMPLES.txt
 - FAQ.txt
 - GUIDE.txt
+- History.txt
 - LICENSE.txt
 - Manifest.txt
 - NOTES.txt
 - README.txt
 files: 
-- CHANGELOG.txt
 - EXAMPLES.txt
 - FAQ.txt
 - GUIDE.txt
+- History.txt
 - LICENSE.txt
 - Manifest.txt
 - NOTES.txt
@@ -89,6 +89,7 @@ files:
 - lib/www/mechanize/page/meta.rb
 - lib/www/mechanize/pluggable_parsers.rb
 - lib/www/mechanize/response_code_error.rb
+- lib/www/mechanize/unsupported_scheme_error.rb
 - test/data/htpasswd
 - test/data/server.crt
 - test/data/server.csr
@@ -153,6 +154,7 @@ files:
 - test/tc_frames.rb
 - test/tc_gzipping.rb
 - test/tc_history.rb
+- test/tc_history_added.rb
 - test/tc_html_unscape_forms.rb
 - test/tc_if_modified_since.rb
 - test/tc_keep_alive.rb
@@ -161,6 +163,7 @@ files:
 - test/tc_mechanize_file.rb
 - test/tc_multi_select.rb
 - test/tc_no_attributes.rb
+- test/tc_option.rb
 - test/tc_page.rb
 - test/tc_pluggable_parser.rb
 - test/tc_post_form.rb
@@ -181,7 +184,7 @@ files:
 - test/tc_upload.rb
 - test/test_all.rb
 has_rdoc: true
-homepage: http://mechanize.rubyforge.org/
+homepage: "  http://mechanize.rubyforge.org/"
 post_install_message: 
 rdoc_options: 
 - --main
@@ -203,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mechanize
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: Mechanize provides automated web-browsing