mechanize 2.6.0 → 2.7.0

data/lib/mechanize/download.rb

@@ -54,7 +54,17 @@ class Mechanize::Download
 
   def save filename = nil
     filename = find_free_name filename
+    save! filename
+  end
+
+  alias save_as save
 
+  ##
+  # Use this method to save the content of body_io to +filename+.
+  # This method will overwrite any existing filename that exists with the
+  # same name.
+
+  def save! filename = nil
     dirname = File.dirname filename
     FileUtils.mkdir_p dirname
 
@@ -65,7 +75,5 @@ class Mechanize::Download
     end
   end
 
-  alias save_as save
-
 end
 

data/lib/mechanize/file.rb

@@ -57,13 +57,7 @@ class Mechanize::File
 
   def save filename = nil
     filename = find_free_name filename
-
-		dirname = File.dirname filename
-		FileUtils.mkdir_p dirname
-
-    open filename, 'wb' do |f|
-      f.write body
-    end
+    save! filename
   end
 
   alias save_as save

data/lib/mechanize/form.rb

@@ -252,6 +252,8 @@ class Mechanize::Form
     query = []
     @mech.log.info("form encoding: #{encoding}") if @mech && @mech.log
 
+    save_hash_field_order
+
     successful_controls = []
 
     (fields + checkboxes).reject do |f|
@@ -301,6 +303,19 @@ class Mechanize::Form
     query
   end
 
+  # This method adds an index to all fields that have Hash nodes. This
+  # enables field sorting to maintain order.
+  def save_hash_field_order
+    index = 0
+
+    fields.each do |field|
+      if Hash === field.node
+        field.index = index
+        index += 1
+      end
+    end
+  end
+
   # This method adds a button to the query.  If the form needs to be
   # submitted with multiple buttons, pass each button to this method.
   def add_button_to_query(button)

data/lib/mechanize/form/field.rb

@@ -19,6 +19,9 @@ class Mechanize::Form::Field
   # This fields value before it's sent through Util.html_unescape.
   attr_reader :raw_value
 
+  # index is used to maintain order for fields with Hash nodes
+  attr_accessor :index
+
   def initialize node, value = node['value']
     @node = node
     @name = Mechanize::Util.html_unescape(node['name'])
@@ -38,8 +41,17 @@ class Mechanize::Form::Field
 
   def <=> other
     return 0 if self == other
+
+    # If both are hashes, sort by index
+    if Hash === node && Hash === other.node && index
+      return index <=> other.index
+    end
+
+    # Otherwise put Hash based fields at the end
     return 1 if Hash === node
     return -1 if Hash === other.node
+
+    # Finally let nokogiri determine sort order
     node <=> other.node
   end
 

data/lib/mechanize/http/agent.rb

@@ -660,7 +660,16 @@ class Mechanize::HTTP::Agent
         base = nil
       end
 
-      uri = referer_uri + (base ? base.uri : referer_uri) + uri
+      base = referer_uri + (base ? base.uri : referer_uri)
+
+      # Workaround for URI's bug in that it squashes consecutive
+      # slashes.  See #304.
+      if uri.path.match(%r{\A(.*?/)(?!/\.\.?(?!/))(/.*)\z}i)
+        uri = URI((base + $1).to_s + $2)
+      else
+        uri = base + uri
+      end
+
       # Strip initial "/.." bits from the path
       uri.path.sub!(/^(\/\.\.)+(?=\/)/, '')
     end
@@ -793,7 +802,7 @@ class Mechanize::HTTP::Agent
     return body_io if length.zero?
 
     out_io = case response['Content-Encoding']
-             when nil, 'none', '7bit' then
+             when nil, 'none', '7bit', "" then
                body_io
              when 'deflate' then
                content_encoding_inflate body_io
@@ -840,14 +849,15 @@ class Mechanize::HTTP::Agent
   end
 
   def save_cookies(uri, set_cookie)
-    log = log()	 # reduce method calls
-    Mechanize::Cookie.parse(uri, set_cookie, log) { |c|
-      if @cookie_jar.add(uri, c)
-        log.debug("saved cookie: #{c}") if log
-      else
-        log.debug("rejected cookie: #{c}") if log
-      end
-    }
+    return [] if set_cookie.nil?
+    if log = log()	 # reduce method calls
+      @cookie_jar.parse(set_cookie, uri, :logger => log) { |c|
+        log.debug("saved cookie: #{c}")
+        true
+      }
+    else
+      @cookie_jar.parse(set_cookie, uri)
+    end
   end
 
   def response_follow_meta_refresh response, uri, page, redirects
@@ -913,7 +923,7 @@ class Mechanize::HTTP::Agent
       body_io.rewind
       raise Mechanize::ChunkedTerminationError.new(e, response, body_io, uri,
                                                    @context)
-    rescue Net::HTTP::Persistent::Error => e
+    rescue Net::HTTP::Persistent::Error, Errno::ECONNRESET => e
       body_io.rewind
       raise Mechanize::ResponseReadError.new(e, response, body_io, uri,
                                              @context)
@@ -928,9 +938,12 @@ class Mechanize::HTTP::Agent
     content_length = response.content_length
 
     unless Net::HTTP::Head === request or Net::HTTPRedirection === response then
-      raise EOFError, "Content-Length (#{content_length}) does not match " \
-                      "response body length (#{body_io.length})" if
-        content_length and content_length != body_io.length
+      if content_length and content_length != body_io.length
+        err = EOFError.new("Content-Length (#{content_length}) does not " \
+                      "match response body length (#{body_io.length})")
+        raise Mechanize::ResponseReadError.new(err, response, body_io, uri,
+                                                @context)
+      end
     end
 
     body_io
@@ -1217,7 +1230,7 @@ class Mechanize::HTTP::Agent
   end
 
   def reset
-    @cookie_jar.clear!
+    @cookie_jar.clear
     @history.clear
   end
 

data/lib/mechanize/page/image.rb

@@ -160,12 +160,12 @@ class Mechanize::Page::Image
   def url
     if relative? then
       if page.bases[0] then
-         page.bases[0].href + src
+        page.bases[0].href + src
       else
-        page.uri + src
+        page.uri + Mechanize::Util.uri_escape(src)
       end
     else
-      URI src
+      URI Mechanize::Util.uri_escape(src)
     end
   end
 

data/lib/mechanize/prependable.rb

@@ -0,0 +1,89 @@
+# Fake implementation of prepend(), which does not support overriding
+# inherited methods nor methods that are formerly overridden by
+# another invocation of prepend().
+#
+# Here's what <Original>.prepend(<Wrapper>) does:
+#
+# - Create an anonymous stub module (hereinafter <Stub>) and define
+#   <Stub>#<method> that calls #<method>_without_<Wrapper> for each
+#   instance method of <Wrapper>.
+#
+# - Rename <Original>#<method> to #<method>_without_<Wrapper> for each
+#   instance method of <Wrapper>.
+#
+# - Include <Wrapper> and <Stub> into <Original> in that order.
+#
+# This way, a call of <Original>#<method> is dispatched to
+# <Wrapper><method>, which may call super which is dispatched to
+# <Stub>#<method>, which finally calls
+# <Original>#<method>_without_<Wrapper> which is used to be called
+# <Original>#<method>.
+#
+# Usage:
+#
+#     class Mechanize
+#       # module with methods that overrides those of X
+#       module Y
+#       end
+#
+#       unless X.respond_to?(:prepend, true)
+#         require 'mechanize/prependable'
+#         X.extend(Prependable)
+#       end
+#
+#       class X
+#         prepend Y
+#       end
+#     end
+module Mechanize::Prependable
+  def prepend(mod)
+    stub = Module.new
+
+    mod_id = (mod.name || 'Module__%d' % mod.object_id).gsub(/::/, '__')
+
+    mod.instance_methods.each { |name|
+      method_defined?(name) or next
+
+      original = instance_method(name)
+      if original.owner != self
+        warn "%s cannot override an inherited method: %s(%s)#%s" % [
+          __method__, self, original.owner, name
+        ]
+        next
+      end
+
+      name = name.to_s
+      name_without = name.sub(/(?=[?!=]?\z)/) { '_without_%s' % mod_id }
+
+      arity = original.arity
+      arglist = (
+        if arity >= 0
+          (1..arity).map { |i| 'x%d' % i }
+        else
+          (1..(-arity - 1)).map { |i| 'x%d' % i } << '*a'
+        end << '&b'
+      ).join(', ')
+
+      if name.end_with?('=')
+        stub.module_eval %{
+          def #{name}(#{arglist})
+            __send__(:#{name_without}, #{arglist})
+          end
+        }
+      else
+        stub.module_eval %{
+          def #{name}(#{arglist})
+            #{name_without}(#{arglist})
+          end
+        }
+      end
+      module_eval {
+        alias_method name_without, name
+        remove_method name
+      }
+    }
+
+    include(mod, stub)
+  end
+  private :prepend
+end

data/lib/mechanize/test_case.rb

@@ -29,7 +29,7 @@ require 'minitest/autorun'
 #
 # Which will launch a test server at http://localhost:8000
 
-class Mechanize::TestCase < MiniTest::Unit::TestCase
+class Mechanize::TestCase < Minitest::Test
 
   TEST_DIR = File.expand_path '../../../test', __FILE__
   REQUESTS = []
@@ -84,9 +84,7 @@ class Mechanize::TestCase < MiniTest::Unit::TestCase
   def cookie_jar str, uri = URI('http://example')
     jar = Mechanize::CookieJar.new
 
-    Mechanize::Cookie.parse uri, str do |cookie|
-      jar.add uri, cookie
-    end
+    jar.parse str, uri
 
     jar
   end
@@ -170,7 +168,7 @@ UQIBATANBgkqhkiG9w0BAQUFAANBAAAB////////////////////////////////
   # Creates a Tempfile with +content+ that is immediately unlinked
 
   def tempfile content
-    body_io = Tempfile.new @__name__
+    body_io = Tempfile.new @NAME
     body_io.unlink
     body_io.write content
     body_io.flush

data/test/test_mechanize.rb

@@ -263,10 +263,8 @@ but not <a href="/" rel="me nofollow">this</a>!
 
   def test_cookies
     uri = URI 'http://example'
-    jar = Mechanize::CookieJar.new
-    Mechanize::Cookie.parse uri, 'a=b' do |cookie|
-      jar.add uri, cookie
-    end
+    jar = HTTP::CookieJar.new
+    jar.parse 'a=b', uri
 
     @mech.cookie_jar = jar
 
@@ -276,7 +274,7 @@ but not <a href="/" rel="me nofollow">this</a>!
   def test_cookie_jar
     assert_kind_of Mechanize::CookieJar, @mech.cookie_jar
 
-    jar = Mechanize::CookieJar.new
+    jar = HTTP::CookieJar.new
 
     @mech.cookie_jar = jar
 
@@ -1031,10 +1029,8 @@ but not <a href="/" rel="me nofollow">this</a>!
 
   def test_shutdown
     uri = URI 'http://localhost'
-    jar = Mechanize::CookieJar.new
-    Mechanize::Cookie.parse uri, 'a=b' do |cookie|
-      jar.add uri, cookie
-    end
+    jar = HTTP::CookieJar.new
+    jar.parse 'a=b', uri
 
     @mech.cookie_jar = jar
 

data/test/test_mechanize_cookie.rb

@@ -36,7 +36,7 @@ class TestMechanizeCookie < Mechanize::TestCase
               "Fri, 17 Mar 89 4:01:33",
               "Fri, 17 Mar 89 4:01 GMT",
               "Mon Jan 16 16:12 PDT 1989",
-              "Mon Jan 16 16:12 +0130 1989",
+              #"Mon Jan 16 16:12 +0130 1989",
               "6 May 1992 16:41-JST (Wednesday)",
               #"22-AUG-1993 10:59:12.82",
               "22-AUG-1993 10:59pm",
@@ -45,7 +45,7 @@ class TestMechanizeCookie < Mechanize::TestCase
               #"Friday, August 04, 1995 3:54 PM",
               #"06/21/95 04:24:34 PM",
               #"20/06/95 21:07",
-              "95-06-08 19:32:48 EDT",
+              #"95-06-08 19:32:48 EDT",
     ]
 
     dates.each do |date|
@@ -91,7 +91,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     Mechanize::Cookie.parse uri, cookie_str do |cookie|
       assert_equal 'quoted', cookie.name
-      assert_equal '"value"', cookie.value
+      assert_equal 'value', cookie.value
     end
   end
 
@@ -222,7 +222,7 @@ class TestMechanizeCookie < Mechanize::TestCase
   end
 
   def test_parse_many
-    url = URI 'http://example/'
+    url = URI 'http://localhost/'
     cookie_str =
       "name=Aaron; Domain=localhost; Expires=Sun, 06 Nov 2011 00:29:51 GMT; Path=/, " \
       "name=Aaron; Domain=localhost; Expires=Sun, 06 Nov 2011 00:29:51 GMT; Path=/, " \

data/test/test_mechanize_cookie_jar.rb

@@ -123,8 +123,9 @@ class TestMechanizeCookieJar < Mechanize::TestCase
 
     tld_cookie = Mechanize::Cookie.new(cookie_values(:domain => '.org'))
     @jar.add(url, tld_cookie)
-    single_dot_cookie = Mechanize::Cookie.new(cookie_values(:domain => '.'))
-    @jar.add(url, single_dot_cookie)
+    # single dot domain is now treated as no domain
+    # single_dot_cookie = Mechanize::Cookie.new(cookie_values(:domain => '.'))
+    # @jar.add(url, single_dot_cookie)
 
     assert_equal(0, @jar.cookies(url).length)
   end
@@ -463,8 +464,7 @@ class TestMechanizeCookieJar < Mechanize::TestCase
       @jar.load("cookies.txt", :cookiestxt)
     end
 
-    assert_equal(1, @jar.cookies(url).length)
-    assert_nil @jar.cookies(url).first.expires
+    assert_equal(0, @jar.cookies(url).length)
   end
 
   def test_save_and_read_expired_cookies
@@ -536,7 +536,7 @@ class TestMechanizeCookieJar < Mechanize::TestCase
       #
       # * Cookies that only match exactly the domain specified must not have a
       #   leading dot, and must have FALSE as the second field.
-      # * Cookies that match subdomains must have a leading dot, and must have
+      # * Cookies that match subdomains may have a leading dot, and must have
       #   TRUE as the second field.
       cookies_txt = File.readlines("cookies.txt")
       assert_equal(1, cookies_txt.grep( /^rubyforge\.org\tFALSE/ ).length)

data/test/test_mechanize_download.rb

@@ -33,7 +33,7 @@ class TestMechanizeDownload < Mechanize::TestCase
 
   def test_save_tempfile
     uri = URI.parse 'http://example/foo.html'
-    Tempfile.open __name__ do |body_io|
+    Tempfile.open @NAME do |body_io|
       body_io.unlink
       body_io.write '0123456789'
 

data/test/test_mechanize_form.rb

@@ -8,7 +8,7 @@ class TestMechanizeForm < Mechanize::TestCase
     @uri = URI 'http://example'
     @page = page @uri
 
-    @form = Mechanize::Form.new node('form', 'name' => __name__), @mech, @page
+    @form = Mechanize::Form.new node('form', 'name' => @NAME), @mech, @page
   end
 
   def test_action
@@ -25,7 +25,7 @@ class TestMechanizeForm < Mechanize::TestCase
     end
 
     assert_equal "#{button.inspect} does not belong to the same page " \
-                 "as the form \"#{@__name__}\" in #{@uri}",
+                 "as the form \"#{@NAME}\" in #{@uri}",
                  e.message
   end
 
@@ -312,7 +312,7 @@ class TestMechanizeForm < Mechanize::TestCase
     page = html_page '<form><input name="a" value="b"><input name="a"></form>'
     form = page.forms.first
 
-    form.set_fields :a => ['c', 1] 
+    form.set_fields :a => ['c', 1]
 
     assert_equal 'b', form.fields.first.value
     assert_equal 'c', form.fields.last.value
@@ -935,4 +935,32 @@ class TestMechanizeForm < Mechanize::TestCase
     assert_empty page.links
   end
 
+  def test_form_built_from_array_post
+    submitted = @mech.post(
+      'http://example/form_post',
+      [
+        %w[order_matters 0],
+        %w[order_matters 1],
+        %w[order_matters 2],
+        %w[mess_it_up asdf]
+      ]
+    )
+
+    assert_equal 'order_matters=0&order_matters=1&order_matters=2&mess_it_up=asdf', submitted.parser.at('#query').text
+  end
+
+  def test_form_built_from_hashes_submit
+    uri = URI 'http://example/form_post'
+    page = page uri
+    form = Mechanize::Form.new node('form', 'name' => @NAME, 'method' => 'POST'), @mech, page
+    form.fields << Mechanize::Form::Field.new({'name' => 'order_matters'}, '0')
+    form.fields << Mechanize::Form::Field.new({'name' => 'order_matters'}, '1')
+    form.fields << Mechanize::Form::Field.new({'name' => 'order_matters'}, '2')
+    form.fields << Mechanize::Form::Field.new({'name' => 'mess_it_up'}, 'asdf')
+
+    submitted = @mech.submit form
+
+    assert_equal 'order_matters=0&order_matters=1&order_matters=2&mess_it_up=asdf', submitted.parser.at('#query').text
+  end
+
 end