mechanize 0.5.2 → 0.5.3

data/CHANGELOG

@@ -1,5 +1,23 @@
 = Mechanize CHANGELOG
 
+== 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.
+  That means the syntax for clicking links is shortened and still supports
+  selecting a link.  The following are equivalent:
+   agent.click page.links.first
+   agent.click page.links
+* Fixed a bug with spaces in href's and get's
+* Added a tick, untick, and click method to radio buttons so that
+  radiobuttons can be "clicked"
+* Added a tick, untick, and click method to check boxes so that
+  checkboxes can be "clicked"
+* Options on Select lists can now be "tick"ed, and "untick"ed.
+* Fixed a potential bug conflicting with rails.  Thanks Eric Kolve
+* Updated log4r support for a speed increase.  Thanks Yinon Bentor
+* Added inspect methods and pretty printing
+
 == 0.5.2
 
 * Fixed a bug with input names that are nil

data/EXAMPLES

@@ -17,7 +17,7 @@
   
   agent = WWW::Mechanize.new
   page = agent.get('http://rubyforge.org/')
-  link = page.links.text(/Log In/).first
+  link = page.links.text(/Log In/)
   page = agent.click(link)
   form = page.forms[1]
   form.form_loginname = ARGV[0]
@@ -38,10 +38,10 @@ This example uploads one image as two different images to flickr.
   form.email = ARGV[0]
   form.password = ARGV[1]
   page = agent.submit(form)
-  page = agent.click page.links.text('Upload').first
+  page = agent.click page.links.text('Upload')
   form = page.forms.first
-  img1 = form.file_uploads.name('file1').first
-  img2 = form.file_uploads.name('file2').first
+  img1 = form.file_uploads.name('file1')
+  img2 = form.file_uploads.name('file2')
   
   img1.file_name = img2.file_name = ARGV[2]
   File.open(ARGV[2], "r") { |f|

data/NOTES

@@ -1,5 +1,37 @@
 = Mechanize Release Notes
 
+== 0.5.3 (Twan)
+
+Here it is.  Mechanize 0.5.3 also named the "Twan" release.  There are a few
+new features, a few fixed bugs, and some other stuff too!
+
+First, new features.  WWW::Mechanize#click has been updated to operate on the
+first link if an array is passed in.  How is this helpful?  It allows
+syntax like this:
+  agent.click page.links.first
+to be like this:
+  agent.click page.links
+This trick was actually implemented in WWW::Mechanize::List.  If you send a
+method to WWW::Mechanize::List, and it doesn't know how to respond, it will
+try calling that method on the first element of the list.  But it only does
+that for methods with no arguments.
+
+Radio buttons, check boxes, and select lists can now be ticked, unticked, and
+clicked.  Now to select the second radio button from a list, you can do this:
+  form.radiobuttons.name('color')[1].click
+Mechanize will handle unchecking all of the other radio buttons with the same
+name.
+
+Pretty printing has been added so that inspecting mechanize objects is very
+pretty.  Go ahead and try it out!
+  pp page
+Or even
+  pp page.forms.first
+
+Now, bugfixes.  A bug was fixed when spaces are passed in as part of the URL
+to WWW::Mechanize#get.  Thanks to Eric Kolve, a bug was fixed with methods
+that conflict with rails.  Thanks to Yinon Bentor for sending in a patch to
+improve Log4r support and a slight speed increase.
 == 0.5.2
 
 This release comes with a few cool new features.  First, support for select

data/lib/mechanize.rb

@@ -29,6 +29,7 @@ require 'mechanize/list'
 require 'mechanize/page'
 require 'mechanize/page_elements'
 require 'mechanize/parsing'
+require 'mechanize/inspect'
 
 module WWW
 
@@ -78,7 +79,7 @@ class Mechanize
   def initialize
     # attr_accessors
     @cookie_jar = CookieJar.new
-    @log = Logger.new(nil)
+    @log            = nil
     @max_history    = nil
     @open_timeout   = nil
     @read_timeout   = nil
@@ -224,13 +225,13 @@ class Mechanize
     if url.is_a?(URI)
       uri = url
     else
-      uri = URI.parse(url.gsub(/\s/, '%20'))
+      uri = URI.parse(url.strip.gsub(/\s/, '%20'))
     end
 
     # construct an absolute uri
     if uri.relative?
       if cur_page.uri
-        uri = cur_page.uri + (url.is_a?(URI) ? url : URI::escape(url))
+        uri = cur_page.uri + (url.is_a?(URI) ? url : URI::escape(url.strip))
       else
         raise 'no history. please specify an absolute URL'
       end
@@ -246,7 +247,7 @@ class Mechanize
 
     # this is called before the request is sent
     pre_request_hook = proc {|request|
-      log.debug("query: #{ request_data.inspect }")
+      log.debug("query: #{ request_data.inspect }") if log
       request.add_field('Content-Type', form.enctype)
       request.add_field('Content-Length', request_data[0].size.to_s)
     }
@@ -261,7 +262,7 @@ class Mechanize
   def fetch_page(uri, method=:get, cur_page=current_page(), pre_request_hook=nil, request_data=[])
     raise "unsupported scheme" unless ['http', 'https'].include?(uri.scheme)
 
-    log.info("#{ method.to_s.upcase }: #{ uri.to_s }")
+    log.info("#{ method.to_s.upcase }: #{ uri.to_s }") if log
 
     page = Page.new(uri)
 
@@ -301,7 +302,11 @@ class Mechanize
       unless @cookie_jar.empty?(uri)
         cookies = @cookie_jar.cookies(uri)
         cookie = cookies.length > 0 ? cookies.join("; ") : nil
-        log.debug("use cookie: #{ cookie }")
+        if log
+          cookies.each do |c|
+            log.debug("using cookie: #{c}")
+          end
+        end
         request.add_field('Cookie', cookie)
       end
 
@@ -322,9 +327,10 @@ class Mechanize
       pre_request_hook.call(request) if pre_request_hook
 
       # Log specified headers for the request
-
-      request.each_header do |k, v|
-        log.debug("request-header: #{ k } => #{ v }")
+      if log
+        request.each_header do |k, v|
+          log.debug("request-header: #{ k } => #{ v }")
+        end
       end
 
       # Specify timeouts if given
@@ -336,14 +342,18 @@ class Mechanize
 
       http.request(request, *request_data) {|response|
 
-        (response.get_fields('Set-Cookie')||[]).each do |cookie|
-          log.debug("cookie received: #{ cookie }") 
-          Cookie::parse(uri, cookie) { |c| @cookie_jar.add(c) }
+        if log
+          response.each_header {|k,v|
+            log.debug("response-header: #{ k } => #{ v }")
+          }
         end
 
-        response.each_header {|k,v|
-          log.debug("header: #{ k } : #{ v }")
-        }
+        (response.get_fields('Set-Cookie')||[]).each do |cookie|
+          Cookie::parse(uri, cookie) { |c|
+            log.debug("saved cookie: #{c}") if log
+            @cookie_jar.add(c)
+          }
+        end
 
         response.read_body
 
@@ -362,7 +372,7 @@ class Mechanize
           response.code
         )
 
-        log.info("status: #{ page.code }")
+        log.info("status: #{ page.code }") if log
 
         if page.respond_to? :watch_for_set
           page.watch_for_set = @watch_for_set
@@ -372,7 +382,7 @@ class Mechanize
         when "200"
           return page
         when "301", "302"
-          log.info("follow redirect to: #{ response['Location'] }")
+          log.info("follow redirect to: #{ response['Location'] }") if log
           return fetch_page(to_absolute_uri(URI.parse(response['Location'].gsub(/ /, '%20')), page), :get, page)
         else
           raise ResponseCodeError.new(page.code), "Unhandled response", caller

data/lib/mechanize/form.rb

@@ -123,10 +123,6 @@ module WWW
         query
       end
     
-      def inspect
-        "Form: ['#{@name}' #{@method} #{@action}]"
-      end
-
       private
       def parse
         @fields       = WWW::Mechanize::List.new
@@ -147,9 +143,9 @@ module WWW
             when 'text', 'password', 'hidden', 'int'
               @fields << Field.new(node.attributes['name'], node.attributes['value'] || '') 
             when 'radio'
-              @radiobuttons << RadioButton.new(node.attributes['name'], node.attributes['value'], node.attributes.has_key?('checked'))
+              @radiobuttons << RadioButton.new(node.attributes['name'], node.attributes['value'], node.attributes.has_key?('checked'), self)
             when 'checkbox'
-              @checkboxes << CheckBox.new(node.attributes['name'], node.attributes['value'], node.attributes.has_key?('checked'))
+              @checkboxes << CheckBox.new(node.attributes['name'], node.attributes['value'], node.attributes.has_key?('checked'), self)
             when 'file'
               @file_uploads << FileUpload.new(node.attributes['name'], node.attributes['value']) 
             when 'submit'

data/lib/mechanize/form_elements.rb

@@ -13,10 +13,6 @@ module WWW
       @name, @value = name, value
     end
   
-    def inspect
-      "#{name} = #{@value}"
-    end
-
     def query_value
       [[@name, @value || '']]
     end
@@ -69,10 +65,32 @@ module WWW
   class RadioButton < Field
     attr_accessor :checked
   
-    def initialize(name, value, checked)
+    def initialize(name, value, checked, form)
       @checked = checked
+      @form    = form
       super(name, value)
     end
+
+    def tick
+      uncheck_peers
+      @checked = true
+    end
+
+    def untick
+      @checked = false
+    end
+
+    def click
+      @checked = !@checked
+    end
+
+    private
+    def uncheck_peers
+      @form.radiobuttons.name(name).each do |b|
+        next if b.value == value
+        b.untick
+      end
+    end
   end
   
   # This class represents a check box found in a Form.  To activate the
@@ -115,13 +133,13 @@ module WWW
     # Select no options
     def select_none
       @value = []
-      options.each { |o| o.unselect }
+      options.each { |o| o.untick }
     end
 
     # Select all options
     def select_all
       @value = []
-      options.each { |o| o.select }
+      options.each { |o| o.tick }
     end
 
     # Get a list of all selected options
@@ -177,7 +195,7 @@ module WWW
     end
 
     def value=(new)
-      if new.respond_to? :first
+      if new != new.to_s and new.respond_to? :first
         super([new.first])
       else
         super([new.to_s])
@@ -187,9 +205,9 @@ module WWW
 
   # This class contains option an option found within SelectList.  A
   # SelectList can have many Option classes associated with it.  An option
-  # can be selected by calling Option#select, or Option#click.  For example,
+  # can be selected by calling Option#tick, or Option#click.  For example,
   # select the first option in a list:
-  #  select_list.first.select
+  #  select_list.first.tick
   class Option
     attr_reader :value, :selected, :text, :select_list
 
@@ -214,6 +232,9 @@ module WWW
       @selected = false
     end
 
+    alias :tick   :select
+    alias :untick :unselect
+
     # Toggle the selection value of this option
     def click
       unselect_peers

data/lib/mechanize/inspect.rb

@@ -0,0 +1,95 @@
+require 'pp'
+
+module WWW
+  # :stopdoc:
+  class Mechanize
+    def pretty_print(q)
+      q.object_group(self) {
+        q.breakable
+        q.pp cookie_jar
+        q.breakable
+        q.pp current_page
+      }
+    end
+    alias :inspect :pretty_print_inspect
+
+    class Page
+      def pretty_print(q)
+        parse_html
+        q.object_group(self) {
+          q.breakable
+          q.group(1, '{url', '}') {q.breakable; q.pp uri }
+          q.breakable
+          q.group(1, '{meta', '}') {
+            @meta.each { |link| q.breakable; q.pp link }
+          }
+          q.breakable
+          q.group(1, '{title', '}') { q.breakable; q.pp title }
+          q.breakable
+          q.group(1, '{iframes', '}') {
+            @iframes.each { |link| q.breakable; q.pp link }
+          }
+          q.breakable
+          q.group(1, '{frames', '}') {
+            @frames.each { |link| q.breakable; q.pp link }
+          }
+          q.breakable
+          q.group(1, '{links', '}') {
+            @links.each { |link| q.breakable; q.pp link }
+          }
+          q.breakable
+          q.group(1, '{forms', '}') {
+            @forms.each { |form| q.breakable; q.pp form }
+          }
+        }
+      end
+      alias :inspect :pretty_print_inspect
+    end
+
+    class Link
+      def pretty_print(q)
+        q.object_group(self) {
+          q.breakable; q.pp text
+          q.breakable; q.pp href
+        }
+      end
+      alias :inspect :pretty_print_inspect
+    end
+
+    class Form
+      def pretty_print(q)
+        q.object_group(self) {
+          q.breakable; q.group(1, '{name', '}') { q.breakable; q.pp name }
+          q.breakable; q.group(1, '{method', '}') { q.breakable; q.pp method }
+          q.breakable; q.group(1, '{action', '}') { q.breakable; q.pp action }
+          q.breakable; q.group(1, '{fields', '}') {
+            @fields.each do |field|
+              q.breakable
+              q.pp field
+            end
+          }
+          q.breakable; q.group(1, '{radiobuttons', '}') {
+            @radiobuttons.each { |b| q.breakable; q.pp b }
+          }
+          q.breakable; q.group(1, '{checkboxes', '}') {
+            @checkboxes.each { |b| q.breakable; q.pp b }
+          }
+          q.breakable; q.group(1, '{file_uploads', '}') {
+            @file_uploads.each { |b| q.breakable; q.pp b }
+          }
+          q.breakable; q.group(1, '{buttons', '}') {
+            @buttons.each { |b| q.breakable; q.pp b }
+          }
+        }
+      end
+      alias :inspect :pretty_print_inspect
+    end
+
+    class RadioButton
+      def pretty_print_instance_variables
+        [:@checked, :@name, :@value]
+      end
+    end
+  end
+  # :startdoc:
+end

data/lib/mechanize/list.rb

@@ -24,6 +24,14 @@ module WWW
     #  list.name('foo').href('bar.html')
     #
     # This code will find all elements with name 'foo' and href 'bar.html'.
+    # If you call a method with no arguments that List does not know how to
+    # respond to, it will try that method on the first element of the array.
+    # This lets you treat the array like the type of object it contains.
+    # For example, you can click the first element in the array just by
+    # saying:
+    #  agent.click page.links
+    # Or click the first link with the text "foo"
+    #  agent.click page.links.text('foo')
     class List < Array
       # This method provides syntax sugar so that you can write expressions
       # like this:
@@ -45,7 +53,9 @@ module WWW
 
       alias :and :with
 
-      def method_missing(meth_sym, arg)
+      def method_missing(meth_sym, *args)
+        return first.send(meth_sym) if args.empty?
+        arg = args.first
         if arg.class == Regexp
           WWW::Mechanize::List.new(find_all { |e| e.send(meth_sym) =~ arg })
         else

data/lib/mechanize/mech_version.rb

@@ -2,6 +2,6 @@
 # This file is auto-generated by build scripts
 module WWW
   class Mechanize
-    Version = '0.5.2'
+    Version = '0.5.3'
   end
 end

data/lib/mechanize/page.rb

@@ -97,10 +97,6 @@ module WWW
         @title
       end
     
-      def inspect
-        "Page: [#{title} '#{uri.to_s}']"
-      end
-
       private
     
       def parse_html

data/lib/mechanize/page_elements.rb

@@ -33,10 +33,6 @@ module WWW
       def uri
         URI.parse(@href)
       end
-
-      def inspect
-        "'#{@text}' -> #{@href}"
-      end
     end
     
     # This class encapsulates a Meta tag.  Mechanize treats meta tags just

data/test/htdocs/tc_bad_links.html

@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <a href="/alt_text.html ">Alt Text</a>
+  </body>
+</html>

data/test/htdocs/tc_checkboxes.html

@@ -0,0 +1,19 @@
+<html>
+  <head><title>tc_checkboxbuttons.html</title></head>
+  <body>
+    <form name="form1" method="post" action="/form_post">
+      Gender:<br />
+      M: <input type="checkbox" name="male" /><br />
+      F: <input type="checkbox" name="female" /><br />
+      Your one favorite color:<br />
+      Green: <input type="checkbox" name="green" /><br />
+      Green: <input type="checkbox" name="green" /><br />
+      Red: <input type="checkbox" name="red" /><br />
+      Blue: <input type="checkbox" name="blue" /><br />
+      Yellow: <input type="checkbox" name="yellow" /><br />
+      Brown: <input type="checkbox" name="brown" /><br />
+      Purple: <input type="checkbox" name="purple" /><br />
+      <input type="submit" value="Submit" />
+    </form>
+  </body>
+</html>

data/test/htdocs/tc_pretty_print.html

@@ -0,0 +1,17 @@
+<html>
+  <head><title>tc_pretty_print.html</title></head>
+  <body>
+    <a href="http://google.com/">Google</a><br />
+    <form method="post" action="/form_post" name="form1">
+      <input type="text" name="first_name"/><br />
+      <input type="password" name="password" /><br />
+      <input type="hidden" name="secret" value="hey" />
+      <input type="checkbox" name="checkme" />
+      <input type="radio" name="r" value="one" /><br />
+      <input type="radio" name="r" value="two" /><br />
+      <input type="submit" value="Submit" />
+    </form>
+    <frame src="http://memepool.com/" />
+    <iframe src="http://memepool.com/" />
+  </body>
+</html>

data/test/htdocs/tc_radiobuttons.html

@@ -0,0 +1,17 @@
+<html>
+  <head><title>tc_radiobuttons.html</title></head>
+  <body>
+    <form name="form1" method="post" action="/form_post">
+      Gender:<br />
+      M: <input type="radio" name="gender" value="male" /><br />
+      F: <input type="radio" name="gender" value="female" /><br />
+      Your one favorite color:<br />
+      Green: <input type="radio" name="color" value="green" /><br />
+      Red: <input type="radio" name="color" value="red" /><br />
+      Blue: <input type="radio" name="color" value="blue" /><br />
+      Yellow: <input type="radio" name="color" value="yellow" /><br />
+      Brown: <input type="radio" name="color" value="brown" /><br />
+      <input type="submit" value="Submit" />
+    </form>
+  </body>
+</html>

data/test/htdocs/tc_textarea.html

@@ -0,0 +1,23 @@
+<html>
+  <head><title>tc_textarea.html</title></head>
+  <body>
+    <form name="form1" method="post" action="/form_post">
+      <textarea name="text1"></textarea>
+      <br />
+      <input type="submit" value="Submit" />
+    </form>
+    <br />
+    <form name="form2" method="post" action="/form_post">
+      <textarea name="text1">sample text</textarea>
+      <br />
+      <input type="submit" value="Submit" />
+    </form>
+    <br />
+    <form name="form3" method="post" action="/form_post">
+      <textarea name="text1"></textarea>
+      <textarea name="text1">sample text</textarea>
+      <br />
+      <input type="submit" value="Submit" />
+    </form>
+  </body>
+</html>

data/test/tc_authenticate.rb

@@ -9,7 +9,7 @@ class BasicAuthTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_auth_success

data/test/tc_bad_links.rb

@@ -0,0 +1,32 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test/unit'
+require 'rubygems'
+require 'mechanize'
+require 'test_includes'
+
+class TestBadLinks < Test::Unit::TestCase
+  include TestMethods
+
+  def setup
+    @agent = WWW::Mechanize.new
+    @page = @agent.get("http://localhost:#{PORT}/tc_bad_links.html")
+  end
+
+  def test_space_in_link
+    assert_nothing_raised do
+      @agent.click @page.links.first
+    end
+    assert_match(/alt_text.html$/, @agent.history.last.uri.to_s)
+    assert_equal(2, @agent.history.length)
+  end
+
+  def test_space_in_url
+    page = nil
+    assert_nothing_raised do
+      page = @agent.get("http://localhost:#{PORT}/tc_bad_links.html ")
+    end
+    assert_match(/tc_bad_links.html$/, @agent.history.last.uri.to_s)
+    assert_equal(2, @agent.history.length)
+  end
+end

data/test/tc_checkboxes.rb

@@ -0,0 +1,69 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test/unit'
+require 'rubygems'
+require 'mechanize'
+require 'test_includes'
+
+class TestCheckBoxes < Test::Unit::TestCase
+  include TestMethods
+
+  def setup
+    @agent = WWW::Mechanize.new
+    @page  = @agent.get("http://localhost:#{PORT}/tc_checkboxes.html")
+  end
+
+  def test_select_one
+    form = @page.forms.first
+    form.checkboxes.name('green').tick
+    assert_equal(true,  form.checkboxes.name('green').checked)
+    assert_equal(false, form.checkboxes.name('red').checked)
+    assert_equal(false, form.checkboxes.name('blue').checked)
+    assert_equal(false, form.checkboxes.name('yellow').checked)
+    assert_equal(false, form.checkboxes.name('brown').checked)
+  end
+
+  def test_select_all
+    form = @page.forms.first
+    form.checkboxes.each do |b|
+      b.tick
+    end
+    form.checkboxes.each do |b|
+      assert_equal(true, b.checked)
+    end
+  end
+
+  def test_select_none
+    form = @page.forms.first
+    form.checkboxes.each do |b|
+      b.untick
+    end
+    form.checkboxes.each do |b|
+      assert_equal(false, b.checked)
+    end
+  end
+
+  def test_tick_one
+    form = @page.forms.first
+    assert_equal(2, form.checkboxes.name('green').length)
+    form.checkboxes.name('green')[1].tick
+    assert_equal(false,  form.checkboxes.name('green')[0].checked)
+    assert_equal(true,  form.checkboxes.name('green')[1].checked)
+    page = @agent.submit(form)
+    assert_equal(1, page.links.length)
+    assert_equal('green:on', page.links.first.text)
+  end
+
+  def test_tick_two
+    form = @page.forms.first
+    assert_equal(2, form.checkboxes.name('green').length)
+    form.checkboxes.name('green')[0].tick
+    form.checkboxes.name('green')[1].tick
+    assert_equal(true,  form.checkboxes.name('green')[0].checked)
+    assert_equal(true,  form.checkboxes.name('green')[1].checked)
+    page = @agent.submit(form)
+    assert_equal(2, page.links.length)
+    assert_equal('green:on', page.links.first.text)
+    assert_equal('green:on', page.links[1].text)
+  end
+end

data/test/tc_cookies.rb

@@ -9,7 +9,7 @@ class CookiesMechTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_send_cookies

data/test/tc_errors.rb

@@ -9,7 +9,7 @@ class MechErrorsTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_bad_form_method

data/test/tc_forms.rb

@@ -10,7 +10,7 @@ class FormsMechTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_no_form_action

data/test/tc_frames.rb

@@ -9,7 +9,7 @@ class FramesMechTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_frames

data/test/tc_links.rb

@@ -9,7 +9,7 @@ class LinksMechTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_find_meta
@@ -35,4 +35,15 @@ class LinksMechTest < Test::Unit::TestCase
     assert_equal('no image', page.links.href('no_image.html').first.text)
     assert_equal('', page.links.href('no_text.html').first.text)
   end
+
+  def test_click_link
+    @agent.user_agent_alias = 'Mac Safari'
+    page = @agent.get("http://localhost:#{PORT}/frame_test.html")
+    link = page.links.text("Form Test")
+    assert_not_nil(link)
+    assert_equal('Form Test', link.text)
+    page = @agent.click(link)
+    assert_equal("http://localhost:#{PORT}/form_test.html",
+      @agent.history.last.uri.to_s)
+  end
 end

data/test/tc_mech.rb

@@ -10,7 +10,7 @@ class MechMethodsTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_history

data/test/tc_multi_select.rb

@@ -102,7 +102,7 @@ class MultiSelectTest < Test::Unit::TestCase
     page = @agent.get("http://localhost:#{PORT}/form_multi_select.html")
     form = page.forms.first
     form.list = ['1', 'Aaron']
-    form.fields.name('list').first.options[3].select
+    form.fields.name('list').first.options[3].tick
     assert_equal(['1', 'Aaron', '4'].sort, form.list.sort)
     page = @agent.submit(form)
     assert_equal(3, page.links.length)

data/test/tc_page.rb

@@ -9,7 +9,7 @@ class PageTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_title

data/test/tc_pluggable_parser.rb

@@ -9,7 +9,7 @@ class PluggableParserTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_content_type_error

data/test/tc_post_form.rb

@@ -9,7 +9,7 @@ class PostForm < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_post_form

data/test/tc_pretty_print.rb

@@ -0,0 +1,29 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test/unit'
+require 'rubygems'
+require 'mechanize'
+require 'test_includes'
+
+class TestPrettyPrint < Test::Unit::TestCase
+  include TestMethods
+
+  def setup
+    @agent = WWW::Mechanize.new
+  end
+  
+  def test_pretty_print
+    @agent.get("http://localhost:#{PORT}/tc_pretty_print.html")
+    pretty_string = @agent.inspect
+    assert_match("{title \"tc_pretty_print.html\"}", pretty_string)
+    assert_match(/\{frames[^"]*"http:\/\/meme/, pretty_string)
+    assert_match(/\{iframes[^"]*"http:\/\/meme/, pretty_string)
+    assert_match(
+     "{links #<WWW::Mechanize::Link \"Google\" \"http://google.com/\">}",
+     pretty_string
+                )
+    assert_match("form1", pretty_string)
+    assert_match("POST", pretty_string)
+    assert_match("{file_uploads}", pretty_string)
+  end
+end

data/test/tc_radiobutton.rb

@@ -0,0 +1,77 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test/unit'
+require 'rubygems'
+require 'mechanize'
+require 'test_includes'
+
+class TestRadioButtons < Test::Unit::TestCase
+  include TestMethods
+
+  def setup
+    @agent = WWW::Mechanize.new
+    @page  = @agent.get("http://localhost:#{PORT}/tc_radiobuttons.html")
+  end
+
+  def test_select_one
+    form = @page.forms.first
+    button = form.radiobuttons.name('color')
+    form.radiobuttons.name('color').value('green').tick
+    assert_equal(true, button.value('green').checked)
+    assert_equal(false, button.value('red').checked)
+    assert_equal(false, button.value('blue').checked)
+    assert_equal(false, button.value('yellow').checked)
+    assert_equal(false, button.value('brown').checked)
+  end
+
+  def test_select_all
+    form = @page.forms.first
+    button = form.radiobuttons.name('color')
+    form.radiobuttons.name('color').each do |b|
+      b.tick
+    end
+    form.radiobuttons.name('color').value('green').tick
+    assert_equal(true, button.value('green').checked)
+    assert_equal(false, button.value('red').checked)
+    assert_equal(false, button.value('blue').checked)
+    assert_equal(false, button.value('yellow').checked)
+    assert_equal(false, button.value('brown').checked)
+  end
+
+  def test_unselect_all
+    form = @page.forms.first
+    button = form.radiobuttons.name('color')
+    form.radiobuttons.name('color').each do |b|
+      b.untick
+    end
+    assert_equal(false, button.value('green').checked)
+    assert_equal(false, button.value('red').checked)
+    assert_equal(false, button.value('blue').checked)
+    assert_equal(false, button.value('yellow').checked)
+    assert_equal(false, button.value('brown').checked)
+  end
+
+  def test_click_one
+    form = @page.forms.first
+    button = form.radiobuttons.name('color')
+    form.radiobuttons.name('color').value('green').click
+    assert_equal(true, button.value('green').checked)
+    assert_equal(false, button.value('red').checked)
+    assert_equal(false, button.value('blue').checked)
+    assert_equal(false, button.value('yellow').checked)
+    assert_equal(false, button.value('brown').checked)
+  end
+
+  def test_click_twice
+    form = @page.forms.first
+    button = form.radiobuttons.name('color')
+    form.radiobuttons.name('color').value('green').click
+    assert_equal(true, button.value('green').checked)
+    form.radiobuttons.name('color').value('green').click
+    assert_equal(false, button.value('green').checked)
+    assert_equal(false, button.value('red').checked)
+    assert_equal(false, button.value('blue').checked)
+    assert_equal(false, button.value('yellow').checked)
+    assert_equal(false, button.value('brown').checked)
+  end
+end

data/test/tc_response_code.rb

@@ -9,7 +9,7 @@ class ResponseCodeMechTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_redirect
@@ -23,7 +23,7 @@ class ResponseCodeMechTest < Test::Unit::TestCase
   end
 
   def test_error
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
     begin
       @agent.get("http://localhost:#{PORT}/response_code?code=500")
     rescue WWW::Mechanize::ResponseCodeError => err

data/test/tc_save_file.rb

@@ -10,7 +10,7 @@ class TestSaveFile < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_save_file

data/test/tc_select.rb

@@ -82,7 +82,7 @@ class SelectTest < Test::Unit::TestCase
 
   def test_select_with_click
     @form.list = ['1', 'Aaron']
-    @form.fields.name('list').first.options[3].select
+    @form.fields.name('list').first.options[3].tick
     assert_equal('4', @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)

data/test/tc_textarea.rb

@@ -0,0 +1,52 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test/unit'
+require 'rubygems'
+require 'mechanize'
+require 'test_includes'
+
+class TestTextArea < Test::Unit::TestCase
+  include TestMethods
+
+  def setup
+    @agent = WWW::Mechanize.new
+    @page  = @agent.get("http://localhost:#{PORT}/tc_textarea.html")
+  end
+
+  def test_empty_text_area
+    form = @page.forms.name('form1').first
+    assert_equal('', form.fields.name('text1').value)
+    form.text1 = 'Hello World'
+    assert_equal('Hello World', form.fields.name('text1').value)
+    page = @agent.submit(form)
+    assert_equal(1, page.links.length)
+    assert_equal('text1:Hello World', page.links[0].text)
+  end
+
+  def test_non_empty_textfield
+    form = @page.forms.name('form2').first
+    assert_equal('sample text', form.fields.name('text1').value)
+    page = @agent.submit(form)
+    assert_equal(1, page.links.length)
+    assert_equal('text1:sample text', page.links[0].text)
+  end
+
+  def test_multi_textfield
+    form = @page.forms.name('form3').first
+    assert_equal(2, form.fields.name('text1').length)
+    assert_equal('', form.fields.name('text1')[0].value)
+    assert_equal('sample text', form.fields.name('text1')[1].value)
+    form.text1 = 'Hello World'
+    assert_equal('Hello World', form.fields.name('text1')[0].value)
+    assert_equal('sample text', form.fields.name('text1')[1].value)
+    page = @agent.submit(form)
+    assert_equal(2, page.links.length)
+    link = page.links.text('text1:sample text')
+    assert_not_nil(link)
+    assert_equal(1, link.length)
+
+    link = page.links.text('text1:Hello World')
+    assert_not_nil(link)
+    assert_equal(1, link.length)
+  end
+end

data/test/tc_upload.rb

@@ -9,7 +9,7 @@ class UploadMechTest < Test::Unit::TestCase
   include TestMethods
 
   def setup
-    @agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    @agent = WWW::Mechanize.new
   end
 
   def test_form_enctype

data/test/ts_mech.rb

@@ -34,6 +34,11 @@ require 'tc_select_none'
 require 'tc_select'
 require 'tc_select_noopts'
 require 'tc_set_fields'
+require 'tc_bad_links'
+require 'tc_radiobutton'
+require 'tc_checkboxes'
+require 'tc_pretty_print'
+require 'tc_textarea'
 #require 'tc_proxy'
 #require 'tc_ssl_server'
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2006-08-07 00:00:00 -07:00
+  version: 0.5.3
+date: 2006-08-18 00:00:00 -07:00
 summary: Mechanize provides automated web-browsing
 require_paths: 
 - lib
@@ -35,6 +35,7 @@ files:
 - test/tc_select_all.rb
 - test/tc_page.rb
 - test/test_includes.rb
+- test/tc_checkboxes.rb
 - test/tc_watches.rb
 - test/tc_cookies.rb
 - test/proxy.rb
@@ -47,12 +48,14 @@ files:
 - test/tc_select_noopts.rb
 - test/ssl_server.rb
 - test/parse.rb
+- test/tc_pretty_print.rb
 - test/tc_post_form.rb
 - test/tc_parsing.rb
 - test/test_mech.rb
 - test/tc_errors.rb
 - test/tc_authenticate.rb
 - test/README
+- test/tc_radiobutton.rb
 - test/tc_form_no_inputname.rb
 - test/tc_upload.rb
 - test/tc_cookie_class.rb
@@ -61,8 +64,10 @@ files:
 - test/server.rb
 - test/htdocs
 - test/tc_ssl_server.rb
+- test/tc_textarea.rb
 - test/tc_proxy.rb
 - test/tc_frames.rb
+- test/tc_bad_links.rb
 - test/tc_response_code.rb
 - test/servlets.rb
 - test/tc_save_file.rb
@@ -79,6 +84,7 @@ files:
 - test/htdocs/bad_form_test.html
 - test/htdocs/alt_text.html
 - test/htdocs/frame_test.html
+- test/htdocs/tc_radiobuttons.html
 - test/htdocs/form_multi_select.html
 - test/htdocs/form_set_fields.html
 - test/htdocs/index.html
@@ -87,10 +93,14 @@ files:
 - test/htdocs/no_title_test.html
 - test/htdocs/button.jpg
 - test/htdocs/form_multival.html
+- test/htdocs/tc_bad_links.html
+- test/htdocs/tc_checkboxes.html
+- test/htdocs/tc_textarea.html
 - test/htdocs/form_select_none.html
 - test/htdocs/form_select_noopts.html
 - test/htdocs/form_select.html
 - test/htdocs/form_no_input_name.html
+- test/htdocs/tc_pretty_print.html
 - lib/mechanize.rb
 - lib/mechanize
 - lib/mechanize/errors.rb
@@ -99,6 +109,7 @@ files:
 - lib/mechanize/form_elements.rb
 - lib/mechanize/net-overrides
 - lib/mechanize/cookie.rb
+- lib/mechanize/inspect.rb
 - lib/mechanize/mech_version.rb
 - lib/mechanize/list.rb
 - lib/mechanize/module.rb