mechanize 0.7.6 → 0.7.7

data/lib/www/mechanize/cookie.rb

@@ -7,7 +7,7 @@ module WWW
     class Cookie < WEBrick::Cookie
       def self.parse(uri, str, log = nil)
         return str.split(/,(?=[^;,]*=)|,$/).collect { |c|
-          cookie_elem = c.split(/;/)
+          cookie_elem = c.split(/;+/)
           first_elem = cookie_elem.shift
           first_elem.strip!
           key, value = first_elem.split(/=/, 2)

data/lib/www/mechanize/form.rb

@@ -74,20 +74,27 @@ module WWW
       # This method sets multiple fields on the form.  It takes a list of field
       # name, value pairs.  If there is more than one field found with the
       # same name, this method will set the first one found.  If you want to
-      # set the value of a duplicate field, use a value which is an Array with
-      # the second value of the array as the index in to the form.  The index
+      # set the value of a duplicate field, use a value which is a Hash with
+      # the key as the index in to the form.  The index
       # is zero based.  For example, to set the second field named 'foo', you
       # could do the following:
-      #  form.set_fields( :foo => ['bar', 1] )
+      #  form.set_fields( :foo => { 1 => 'bar' } )
       def set_fields(fields = {})
         fields.each do |k,v|
-          value = nil
-          index = 0
-          v.each do |val|
-            index = val.to_i unless value.nil?
-            value = val if value.nil?
+          case v
+          when Hash
+            v.each do |index, value|
+              self.fields.name(k.to_s).[](index).value = value
+            end
+          else
+            value = nil
+            index = 0
+            v.each do |val|
+              index = val.to_i unless value.nil?
+              value = val if value.nil?
+            end
+            self.fields.name(k.to_s).[](index).value = value
           end
-          self.fields.name(k.to_s).[](index).value = value
         end
       end
 
@@ -128,6 +135,12 @@ module WWW
         @mech.submit(self, button)
       end
 
+      # Submit form using +button+. Defaults
+      # to the first button.
+      def click_button(button = buttons.first)
+        submit(button)
+      end
+
       # This method builds an array of arrays that represent the query
       # parameters to be used with this form.  The return value can then
       # be used to create a query string for this form.
@@ -179,9 +192,9 @@ module WWW
       def request_data
         query_params = build_query()
         case @enctype.downcase
-        when 'multipart/form-data'
+        when /^multipart\/form-data/
           boundary = rand_string(20)
-          @enctype << "; boundary=#{boundary}"
+          @enctype = "multipart/form-data; boundary=#{boundary}"
           params = []
           query_params.each { |k,v| params << param_to_multipart(k, v) }
           @file_uploads.each { |f| params << file_to_multipart(f) }
@@ -206,7 +219,7 @@ module WWW
         @checkboxes   = WWW::Mechanize::List.new
     
         # Find all input tags
-        (form_node/'input').each do |node|
+        form_node.search('//input').each do |node|
           type = (node['type'] || 'text').downcase
           name = node['name']
           next if name.nil? && !(type == 'submit' || type =='button')
@@ -229,13 +242,13 @@ module WWW
         end
 
         # Find all textarea tags
-        (form_node/'textarea').each do |node|
+        form_node.search('//textarea').each do |node|
           next if node['name'].nil?
           @fields << Field.new(node['name'], node.inner_text)
         end
 
         # Find all select tags
-        (form_node/'select').each do |node|
+        form_node.search('//select').each do |node|
           next if node['name'].nil?
           if node.has_attribute? 'multiple'
             @fields << MultiSelectList.new(node['name'], node)

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

@@ -17,7 +17,7 @@ module WWW
           @options = WWW::Mechanize::List.new
       
           # parse
-          (node/'option').each do |n|
+          node.search('//option').each do |n|
             option = Option.new(n, self)
             @options << option
           end

data/lib/www/mechanize/monkey_patch.rb

@@ -23,6 +23,9 @@ end
 else
 module WWW
   class Mechanize
+    class Form
+      alias :inspect  :pretty_inspect
+    end
     class Page
       alias :inspect  :pretty_inspect
       class Link

data/lib/www/mechanize/page.rb

@@ -1,7 +1,3 @@
-require 'fileutils'
-require 'hpricot'
-require 'forwardable'
-
 require 'www/mechanize/page/link'
 require 'www/mechanize/page/meta'
 require 'www/mechanize/page/base'
@@ -37,13 +33,13 @@ module WWW
       end
 
       def title
-        @title ||= if parser && search('title').text.length > 0
-          search('title').text
+        @title ||= if parser && search('//title').inner_text.length > 0
+          search('//title').inner_text
         end
       end
 
       def parser
-        @parser ||= body && response ? Hpricot.parse(body) : nil
+        @parser ||= body && response ? Mechanize.html_parser.parse(body) : nil
       end
       alias :root :parser
 
@@ -57,16 +53,24 @@ module WWW
       def_delegator :parser, :/, :/
       def_delegator :parser, :at, :at
 
-      # Find a form with +name+.  Form will be yielded if a block is given.
-      def form(name)
-        f = forms.name(name).first
+      # Find a form matching +criteria+.
+      # Example:
+      #   page.form(:action => '/post/login.php') do |f|
+      #     ...
+      #   end
+      def form_with(criteria)
+        criteria = {:name => criteria} if String === criteria
+        f = forms.find do |form|
+          criteria.all? { |k,v| form.send(k) == v }
+        end
         yield f if block_given?
         f
       end
+      alias :form :form_with
     
       def links
         @links ||= WWW::Mechanize::List.new(
-          %w{ a area }.map do |tag|
+          %w{ //a //area }.map do |tag|
             search(tag).map do |node|
               Link.new(node, @mech, self)
             end
@@ -76,7 +80,7 @@ module WWW
 
       def forms
         @forms ||= WWW::Mechanize::List.new(
-          search('form').map do |html_form|
+          search('//form').map do |html_form|
             form = Form.new(html_form, @mech, self)
             form.action ||= @uri
             form
@@ -86,7 +90,7 @@ module WWW
 
       def meta
         @meta ||= WWW::Mechanize::List.new(
-          search('meta').map do |node|
+          search('//meta').map do |node|
             next unless node['http-equiv'] && node['content']
             (equiv, content) = node['http-equiv'], node['content']
             if equiv && equiv.downcase == 'refresh'
@@ -101,19 +105,19 @@ module WWW
 
       def bases
         @bases ||= WWW::Mechanize::List.new(
-          search('base').map { |node| Base.new(node, @mech, self) }
+          search('//base').map { |node| Base.new(node, @mech, self) }
         )
       end
 
       def frames
         @frames ||= WWW::Mechanize::List.new(
-          search('frame').map { |node| Frame.new(node, @mech, self) }
+          search('//frame').map { |node| Frame.new(node, @mech, self) }
         )
       end
 
       def iframes
         @iframes ||= WWW::Mechanize::List.new(
-          search('iframe').map { |node| Frame.new(node, @mech, self) }
+          search('//iframe').map { |node| Frame.new(node, @mech, self) }
         )
       end
     end

data/lib/www/mechanize/page/link.rb

@@ -27,9 +27,9 @@ module WWW
           @attributes = node
 
           # If there is no text, try to find an image and use it's alt text
-          if (@text.nil? || @text.length == 0) && (node/'img').length > 0
+          if (@text.nil? || @text.length == 0) && node.search('//img').length > 0
             @text = ''
-            (node/'img').each do |e|
+            node.search('//img').each do |e|
               @text << ( e['alt'] || '')
             end
           end

data/lib/www/mechanize/redirect_limit_reached_error.rb

@@ -0,0 +1,18 @@
+module WWW
+  class Mechanize
+    # Thrown when too many redirects are sent
+    class RedirectLimitReachedError < RuntimeError
+      attr_reader :page, :response_code, :redirects
+      def initialize(page, redirects)
+        @page           = page
+        @redirects      = redirects
+        @response_code  = page.code
+      end
+
+      def to_s
+        "Maximum redirect limit (#{redirects}) reached"
+      end
+      alias :inspect :to_s
+    end
+  end
+end

data/test/helper.rb

@@ -6,6 +6,19 @@ require 'servlets'
 
 BASE_DIR = File.dirname(__FILE__)
 
+# Move this to a test base class
+module MechTestHelper
+  def self.fake_page(agent)
+    html = <<-END
+    <html><body>
+    <form><input type="submit" value="submit" /></form>
+    </body></html>
+    END
+    html_response = { 'content-type' => 'text/html' }
+    page = WWW::Mechanize::Page.new(  nil, html_response, html, 200, agent )
+  end
+end
+
 class Net::HTTP
   alias :old_do_start :do_start
 
@@ -30,6 +43,7 @@ class Net::HTTP
     '/send_cookies'           => SendCookiesTest,
     '/if_modified_since'      => ModifiedSinceServlet,
     '/http_headers'           => HeaderServlet,
+    '/infinite_redirect'      => InfiniteRedirectTest,
   }
 
   PAGE_CACHE = {}

data/test/htdocs/meta_cookie.html

@@ -0,0 +1,11 @@
+<html>
+  <meta http-equiv="Set-Cookie" content="tender=live;expires=Sun, 27-Sep-2037 00:00:00 GMT; path=/">
+  <body>
+    <a href="alt_text.html"><img alt="alt text" src="hello"></a>
+    <a href="no_alt_text.html"><img src="hello"></a>
+    <a href="nil_alt_text.html"><img alt src="hello"></a>
+    <a href="no_image.html">no image</a>
+    <a href="no_text.html"></a>
+  </body>
+</html>
+

data/test/servlets.rb

@@ -114,6 +114,16 @@ class FileUploadTest < WEBrick::HTTPServlet::AbstractServlet
   end
 end
 
+class InfiniteRedirectTest < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res['Content-Type'] = req.query['ct'] || "text/html"
+    res.status = req.query['code'] ? req.query['code'].to_i : '302'
+    number = req.query['q'] ? req.query['q'].to_i : 0
+    res['Location'] = "/infinite_redirect?q=#{number + 1}"
+  end
+  alias :do_POST :do_GET
+end
+
 class ResponseCodeTest < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res['Content-Type'] = req.query['ct'] || "text/html"

data/test/{tc_cookie_class.rb → test_cookie_class.rb}

@@ -58,6 +58,15 @@ class CookieClassTest < Test::Unit::TestCase
     end
   end
 
+  def test_double_semicolon
+    double_semi = 'WSIDC=WEST;; domain=.williams-sonoma.com; path=/'
+    url = URI.parse('http://williams-sonoma.com/')
+    WWW::Mechanize::Cookie.parse(url, double_semi) { |cookie|
+      assert_equal('WSIDC', cookie.name)
+      assert_equal('WEST', cookie.value)
+    }
+  end
+
   def test_parse_bad_version
     bad_cookie = 'PRETANET=TGIAqbFXtt; Name=/PRETANET; Path=/; Version=1.2; Content-type=text/html; Domain=192.168.6.196; expires=Friday, 13-November-2026  23:01:46 GMT;'
     url = URI.parse('http://localhost/')

data/test/{tc_cookies.rb → test_cookies.rb}

@@ -5,6 +5,12 @@ class CookiesMechTest < Test::Unit::TestCase
     @agent = WWW::Mechanize.new
   end
 
+  def test_meta_tag_cookies
+    cookies = @agent.cookies.length
+    page = @agent.get("http://localhost/meta_cookie.html")
+    assert_equal(cookies + 1, @agent.cookies.length)
+  end
+
   def test_send_cookies
     page = @agent.get("http://localhost/many_cookies")
     page = @agent.get("http://localhost/send_cookies")

data/test/{tc_encoded_links.rb → test_encoded_links.rb}

@@ -14,7 +14,7 @@ class TestEncodedLinks < Test::Unit::TestCase
   end
 
   def test_hpricot_link
-    page = @agent.click(@page.search('a').first)
+    page = @agent.click(@page.search('//a').first)
     assert_equal("http://localhost/form_post?a=b&b=c", page.uri.to_s)
   end
 end

data/test/{tc_form_action.rb → test_form_action.rb}

@@ -7,7 +7,7 @@ class TestFormAction < Test::Unit::TestCase
   end
 
   def test_post_encoded_action
-    form = @page.form('post_form1') { |f|
+    form = @page.form(:name => 'post_form1') { |f|
       f.first_name = "Aaron"
     }
     assert_equal('/form_post?a=b&b=c', form.action)

data/test/test_get_headers.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + "/helper"
+
+class TestGetHeaders < Test::Unit::TestCase
+  def setup
+    @agent = WWW::Mechanize.new
+  end
+
+  def test_bad_header_symbol
+    assert_raises(ArgumentError) do
+      @agent.get(:url => "http://localhost/file_upload.html", :headers => { :foobar => "is fubar"})
+    end
+  end
+
+  def test_host_header
+    page = @agent.get(:url => 'http://localhost/http_headers', :headers => { :etag => '160604-24bc-9fe2c40'})
+    assert_header(page, 'host' => 'localhost')
+  end
+
+  def test_etag_header
+    page = @agent.get(:url => 'http://localhost/http_headers', :headers => { :etag => '160604-24bc-9fe2c40'})
+    assert_header(page, 'etag' => '160604-24bc-9fe2c40')
+  end
+
+  def test_if_modified_since_header
+    value = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+    page = @agent.get(:url => 'http://localhost/http_headers', :headers => { :if_modified_since => value})
+    assert_header(page, 'if-modified-since' => value)
+  end
+
+  def test_string_header
+    page = @agent.get(:url => 'http://localhost/http_headers', :headers => { "X-BS-French-Header" => 'Ou est la bibliotheque?'})
+    assert_header(page, 'x-bs-french-header' => 'Ou est la bibliotheque?')
+  end
+
+  def assert_header(page, header)
+    headers = {}
+    page.body.split(/[\r\n]+/).each do |page_header|
+      headers.[]=(*page_header.chomp.split(/\|/))
+    end
+    header.each do |key, value|
+      assert(headers.has_key?(key))
+      assert_equal(value, headers[key])
+    end
+  end
+end

data/test/test_hash_api.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + "/helper"
+
+class TestHashApi < Test::Unit::TestCase
+  def setup
+    @agent = WWW::Mechanize.new
+  end
+
+  def test_title
+    page = @agent.get(:url => "http://localhost/file_upload.html")
+    assert_equal('File Upload Form', page.title)
+  end
+
+  def test_page_gets_yielded
+    pages = nil
+    @agent.get(:url => "http://localhost/file_upload.html") { |page|
+      pages = page
+    }
+    assert pages
+    assert_equal('File Upload Form', pages.title)
+  end
+
+  def test_get_with_params
+    page = @agent.get(:url => 'http://localhost/', :params => { :q => 'hello' })
+    assert_equal('http://localhost/?q=hello', page.uri.to_s)
+  end
+
+  def test_get_with_referer
+    class << @agent
+      attr_reader :request
+      alias :old_set_headers :set_headers
+      def set_headers(u, request, cur_page)
+        old_set_headers(u, request, cur_page)
+        @request = request
+      end
+    end
+    @agent.get(:url => 'http://localhost/', :referer => URI.parse('http://google.com/'))
+    assert_equal 'http://google.com/', @agent.request['Referer']
+
+    @agent.get(:url => 'http://localhost/', :params => [], :referer => 'http://tenderlovemaking.com/')
+    assert_equal 'http://tenderlovemaking.com/', @agent.request['Referer']
+  end
+end