mechanize 0.8.4 → 0.8.5

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

@@ -17,7 +17,7 @@ module WWW
           @options = WWW::Mechanize::List.new
       
           # parse
-          node.search('//option').each do |n|
+          node.search('option').each do |n|
             option = Option.new(n, self)
             @options << option
           end
@@ -47,7 +47,7 @@ module WWW
 
         def value=(values)
           select_none
-          values.each do |value|
+          [values].flatten.each do |value|
             option = options.find { |o| o.value == value }
             if option.nil?
               @value.push(value)

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

@@ -27,7 +27,7 @@ module WWW
 
         private
         def uncheck_peers
-          @form.radiobuttons.name(name).each do |b|
+          @form.radiobuttons_with(:name => name).each do |b|
             next if b.value == value
             b.uncheck
           end

data/lib/www/mechanize/list.rb

@@ -1,53 +1,26 @@
 module WWW
   class Mechanize
-    # = Synopsis
-    # This class provides syntax sugar to help find things within Mechanize.
-    # Most calls in Mechanize that return arrays, like the 'links' method
-    # WWW::Mechanize::Page return a Mechanize::List.  This class lets you
-    # find things with a particular attribute on the found class.
-    #
-    # If you have an array with objects that response to the method "name",
-    # and you want to find all objects where name equals 'foo', your code
-    # would look like this:
-    #
-    #  list.name('foo') # => Mechanize::List
-    #
-    # == A bit more information
-    # Mechanize::List will iterate through all of the objects it contains,
-    # testing to see if the object will respond to the "name" method.  If it
-    # does, it will test to see if calling the name method returns a value
-    # equal to the value passed in.
-    #
-    # Finding the list will return another list, so it is possible to chain
-    # calls with Mechanize::List.  For example:
-    #
-    #  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')
+    # This class is deprecated and will be removed in Mechanize version 0.9.0
     class List < Array
+      @@notified = false
+
       # This method provides syntax sugar so that you can write expressions
       # like this:
       #  form.fields.with.name('foo').and.href('bar.html')
       #
       def with
+        if !@@notified
+          $stderr.puts("This method is deprecated and will be removed in version 0.9.0.  Please use: *_with(:#{meth_sym} => #{args.first ? args.first.inspect : 'nil'})")
+          @@notified = true
+        end
         self
       end
 
-      # This method will allow the you to set the value of the first element
-      # in the list.  For example, finding an input field with name 'foo'
-      # and setting the value to 'bar'.
-      #
-      #  form.fields.name('foo').value = 'bar'
-      #
       def value=(arg)
+        if !@@notified
+          $stderr.puts("This method is deprecated and will be removed in version 0.9.0.  Please use: *_with(:#{meth_sym} => #{args.first ? args.first.inspect : 'nil'})")
+          @@notified = true
+        end
         first().value=(arg)
       end
 
@@ -58,6 +31,10 @@ module WWW
       end
 
       def method_missing(meth_sym, *args)
+        if !@@notified
+          $stderr.puts("This method is deprecated and will be removed in version 0.9.0.  Please use: *_with(:#{meth_sym} => #{args.first ? args.first.inspect : 'nil'})")
+          @@notified = true
+        end
         if length > 0
           return first.send(meth_sym) if args.empty?
           arg = args.first

data/lib/www/mechanize/page.rb

@@ -33,13 +33,20 @@ module WWW
       end
 
       def title
-        @title ||= if parser && search('//title').inner_text.length > 0
-          search('//title').inner_text
+        @title ||= if parser && search('title').inner_text.length > 0
+          search('title').inner_text
         end
       end
 
       def parser
-        @parser ||= body && response ? Mechanize.html_parser.parse(body) : nil
+        return @parser if @parser
+
+        if body && response
+          html_body = body.length > 0 ? body : '<html></html>'
+          @parser = Mechanize.html_parser.parse(html_body)
+        end
+
+        @parser
       end
       alias :root :parser
 
@@ -55,7 +62,7 @@ module WWW
 
       # Find a form matching +criteria+.
       # Example:
-      #   page.form(:action => '/post/login.php') do |f|
+      #   page.form_with(:action => '/post/login.php') do |f|
       #     ...
       #   end
       [:form, :link, :base, :frame, :iframe].each do |type|
@@ -80,7 +87,7 @@ module WWW
     
       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
@@ -90,7 +97,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.to_s
             form
@@ -100,7 +107,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'
@@ -115,19 +122,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.search('//img').length > 0
+          if (@text.nil? || @text.length == 0) && node.search('img').length > 0
             @text = ''
-            node.search('//img').each do |e|
+            node.search('img').each do |e|
               @text << ( e['alt'] || '')
             end
           end

data/lib/www/mechanize/redirect_not_get_or_head_error.rb

@@ -0,0 +1,20 @@
+module WWW
+  class Mechanize
+    # Thrown when a POST, PUT, or DELETE request results in a redirect
+    # see RFC 2616 10.3.2, 10.3.3 http://www.ietf.org/rfc/rfc2616.txt
+    class RedirectNotGetOrHeadError < RuntimeError
+      attr_reader :page, :response_code, :verb, :uri
+      def initialize(page, verb)
+        @page           = page
+        @verb           = verb
+        @uri            = page.uri
+        @response_code  = page.code
+      end
+
+      def to_s
+        "#{@response_code} redirect received after a #{@verb} request"
+      end
+      alias :inspect :to_s
+    end
+  end
+end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__),'..','lib')))
 require 'rubygems'
 require 'mechanize'
 require 'webrick/httputils'
@@ -32,6 +33,7 @@ class Net::HTTP
     '/basic_auth'             => BasicAuthServlet,
     '/form post'              => FormTest,
     '/response_code'          => ResponseCodeTest,
+    '/http_refresh'           => HttpRefreshTest,
     '/bad_content_type'       => BadContentTypeTest,
     '/content_type_test'      => ContentTypeTest,
     '/referer'                => RefererServlet,
@@ -44,6 +46,8 @@ class Net::HTTP
     '/if_modified_since'      => ModifiedSinceServlet,
     '/http_headers'           => HeaderServlet,
     '/infinite_redirect'      => InfiniteRedirectTest,
+    '/infinite_refresh'       => InfiniteRefreshTest,
+    '/redirect'               => RedirectTest,
     '/digest_auth'            => DigestAuthServlet,
     '/verb'                   => VerbServlet,
   }

data/test/htdocs/relative/tc_relative_links.html

@@ -13,6 +13,7 @@
   [Your user agent does not support frames or is currently configured
   not to display frames. However, you may visit
   <A href="foo.html">the related document.</A>]
+  <a href="?a=b">just the query string</A>
   </IFRAME>
   </FRAMESET>
 </FRAMESET>

data/test/servlets.rb

@@ -6,14 +6,12 @@ require 'stringio'
 require 'base64'
 
 class VerbServlet < WEBrick::HTTPServlet::AbstractServlet
-  def do_HEAD(req, res)
-    res.body = "method: HEAD"
-  end
-
-  def method_missing(method, *args, &block)
-    super unless method.to_s =~ /^do_([A-Z]*)$/
-    res = args[1]
-    res.body = "method: #{$1}"
+  %w(HEAD GET POST PUT DELETE).each do |verb|
+    eval(<<-eomethod)
+      def do_#{verb}(req, res)
+        res.body = "method: #{verb}"
+      end
+    eomethod
   end
 end
 
@@ -157,6 +155,15 @@ class FileUploadTest < WEBrick::HTTPServlet::AbstractServlet
   end
 end
 
+class InfiniteRefreshTest < 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['Refresh'] = " 0;url=http://localhost/infinite_refresh?q=#{number + 1}\r\n";
+  end
+end
+
 class InfiniteRedirectTest < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res['Content-Type'] = req.query['ct'] || "text/html"
@@ -167,6 +174,19 @@ class InfiniteRedirectTest < WEBrick::HTTPServlet::AbstractServlet
   alias :do_POST :do_GET
 end
 
+class RedirectTest < 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'
+    res['Location'] = "/verb"
+  end
+
+  alias :do_POST :do_GET
+  alias :do_HEAD :do_GET
+  alias :do_PUT :do_GET
+  alias :do_DELETE :do_GET
+end
+
 class ResponseCodeTest < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res['Content-Type'] = req.query['ct'] || "text/html"
@@ -181,6 +201,16 @@ class ResponseCodeTest < WEBrick::HTTPServlet::AbstractServlet
     end
   end
 end
+
+class HttpRefreshTest < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res['Content-Type'] = req.query['ct'] || "text/html"
+    refresh_time = req.query['refresh_time'] || 0
+    refresh_url = req.query['refresh_url'] || '/index.html'
+    res['Refresh'] = " #{refresh_time};url=#{refresh_url}\r\n";
+  end
+end
+
 class FormTest < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.body = "<HTML><body>"

data/test/test_checkboxes.rb

@@ -8,12 +8,11 @@ class TestCheckBoxes < Test::Unit::TestCase
 
   def test_select_one
     form = @page.forms.first
-    form.checkboxes.name('green').check
-    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)
+    form.checkbox_with(:name => 'green').check
+    assert(form.checkbox_with(:name => 'green').checked)
+    %w{ red blue yellow brown }.each do |color|
+      assert_equal(false, form.checkbox_with(:name => color).checked)
+    end
   end
 
   def test_select_all
@@ -38,10 +37,10 @@ class TestCheckBoxes < Test::Unit::TestCase
 
   def test_check_one
     form = @page.forms.first
-    assert_equal(2, form.checkboxes.name('green').length)
-    form.checkboxes.name('green')[1].check
-    assert_equal(false,  form.checkboxes.name('green')[0].checked)
-    assert_equal(true,  form.checkboxes.name('green')[1].checked)
+    assert_equal(2, form.checkboxes_with(:name => 'green').length)
+    form.checkboxes_with(:name => 'green')[1].check
+    assert_equal(false,  form.checkboxes_with(:name => 'green')[0].checked)
+    assert_equal(true,  form.checkboxes_with(:name => 'green')[1].checked)
     page = @agent.submit(form)
     assert_equal(1, page.links.length)
     assert_equal('green:on', page.links.first.text)
@@ -49,11 +48,11 @@ class TestCheckBoxes < Test::Unit::TestCase
 
   def test_check_two
     form = @page.forms.first
-    assert_equal(2, form.checkboxes.name('green').length)
-    form.checkboxes.name('green')[0].check
-    form.checkboxes.name('green')[1].check
-    assert_equal(true,  form.checkboxes.name('green')[0].checked)
-    assert_equal(true,  form.checkboxes.name('green')[1].checked)
+    assert_equal(2, form.checkboxes_with(:name => 'green').length)
+    form.checkboxes_with(:name => 'green')[0].check
+    form.checkboxes_with(:name => 'green')[1].check
+    assert_equal(true,  form.checkboxes_with(:name => 'green')[0].checked)
+    assert_equal(true,  form.checkboxes_with(:name => 'green')[1].checked)
     page = @agent.submit(form)
     assert_equal(2, page.links.length)
     assert_equal('green:on', page.links.first.text)

data/test/test_cookie_class.rb

@@ -51,8 +51,9 @@ class CookieClassTest < Test::Unit::TestCase
     dates.each do |date|
       cookie = "PREF=1; expires=#{date}"
       silently do
-        WWW::Mechanize::Cookie.parse(url, cookie) { |cookie|
-          assert_equal(true, cookie.expires < yesterday)
+        WWW::Mechanize::Cookie.parse(url, cookie) { |c|
+          assert c.expires, "Tried parsing: #{date}"
+          assert_equal(true, c.expires < yesterday)
         }
       end
     end
@@ -93,8 +94,8 @@ class CookieClassTest < Test::Unit::TestCase
     silently do
       dates.each do |date|
         cookie = "PREF=1; expires=#{date}"
-        WWW::Mechanize::Cookie.parse(url, cookie) { |cookie|
-          assert_equal(true, cookie.expires.nil?)
+        WWW::Mechanize::Cookie.parse(url, cookie) { |c|
+          assert_equal(true, c.expires.nil?)
         }
       end
     end

data/test/test_cookie_jar.rb

@@ -311,4 +311,33 @@ class CookieJarTest < Test::Unit::TestCase
 
     FileUtils.rm("cookies.txt")
   end
+
+  def test_ssl_cookies
+    # thanks to michal "ocher" ochman for reporting the bug responsible for this test.
+    values = {  :name     => 'Foo',
+      :value    => 'Bar',
+      :path     => '/login',
+      :expires  => nil,
+      :domain   => 'rubyforge.org'
+    }
+    values_ssl = {  :name     => 'Foo',
+      :value    => 'Bar',
+      :path     => '/login',
+      :expires  => nil,
+      :domain   => 'rubyforge.org:443'
+    }
+    url = URI.parse('https://rubyforge.org/login')
+
+    jar = WWW::Mechanize::CookieJar.new
+    assert_equal(0, jar.cookies(url).length)
+
+    cookie = cookie_from_hash(values)
+    jar.add(url, cookie)
+    assert_equal(1, jar.cookies(url).length, "did not handle SSL cookie")
+
+    cookie = cookie_from_hash(values_ssl)
+    jar.add(url, cookie)
+    assert_equal(2, jar.cookies(url).length, "did not handle SSL cookie with :443")
+  end
+
 end

data/test/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/test_errors.rb

@@ -22,7 +22,7 @@ class MechErrorsTest < Test::Unit::TestCase
 
   def test_too_many_radio
     page = @agent.get("http://localhost/form_test.html")
-    form = page.forms.name('post_form1').first
+    form = page.form_with(:name => 'post_form1')
     form.radiobuttons.each { |r| r.checked = true }
     assert_raise(RuntimeError) {
       @agent.submit(form)