mechanize 0.8.4 → 0.8.5

data/test/test_pluggable_parser.rb

@@ -57,8 +57,8 @@ class PluggableParserTest < Test::Unit::TestCase
     page = @agent.get("http://localhost/find_link.html")
     assert_kind_of(Filter, page)
     assert_equal(19, page.links.length)
-    assert_not_nil(page.links.text('Net::DAAP::Client').first)
-    assert_equal(1, page.links.text('Net::DAAP::Client').length)
+    assert_not_nil(page.link_with(:text => 'Net::DAAP::Client'))
+    assert_equal(1, page.links_with(:text => 'Net::DAAP::Client').length)
   end
 
   def test_filter_hash
@@ -68,8 +68,8 @@ class PluggableParserTest < Test::Unit::TestCase
     assert_equal(Filter, @agent.pluggable_parser['text/html'])
     assert_kind_of(Filter, page)
     assert_equal(19, page.links.length)
-    assert_not_nil(page.links.text('Net::DAAP::Client').first)
-    assert_equal(1, page.links.text('Net::DAAP::Client').length)
+    assert_not_nil(page.link_with(:text => 'Net::DAAP::Client'))
+    assert_equal(1, page.links_with(:text => 'Net::DAAP::Client').length)
   end
 
   def test_file_saver

data/test/test_radiobutton.rb

@@ -6,65 +6,58 @@ class TestRadioButtons < Test::Unit::TestCase
     @page  = @agent.get("http://localhost/tc_radiobuttons.html")
   end
 
-  def test_select_one
-    form = @page.forms.first
-    button = form.radiobuttons.name('color')
-    form.radiobuttons.name('color').value('green').check
-    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|
+    form.radiobuttons_with(:name => 'color').each do |b|
       b.check
     end
-    form.radiobuttons.name('color').value('green').check
-    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)
+    form.radiobutton_with(:name => 'color', :value => 'green').check
+
+    assert_equal(true, form.radiobutton_with( :name => 'color',
+                                              :value => 'green').checked)
+
+    %w{ red blue yellow brown }.each do |button_value|
+      assert_equal(false, form.radiobutton_with(  :name => 'color',
+                                                  :value => button_value
+                                               ).checked)
+    end
   end
 
   def test_unselect_all
     form = @page.forms.first
-    button = form.radiobuttons.name('color')
-    form.radiobuttons.name('color').each do |b|
+    form.radiobuttons_with(:name => 'color').each do |b|
       b.uncheck
     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)
+    %w{ green red blue yellow brown }.each do |button_value|
+      assert_equal(false, form.radiobutton_with(  :name => 'color',
+                                                  :value => button_value
+                                               ).checked)
+    end
   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)
+    form.radiobutton_with(:name => 'color', :value => 'green').click
+
+    assert form.radiobutton_with(:name => 'color', :value => 'green').checked
+
+    %w{ red blue yellow brown }.each do |button_value|
+      assert_equal(false, form.radiobutton_with(  :name => 'color',
+                                                  :value => button_value
+                                               ).checked)
+    end
   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)
+    form.radiobutton_with(:name => 'color', :value => 'green').click
+    assert form.radiobutton_with(:name => 'color', :value => 'green').checked
+
+    form.radiobutton_with(:name => 'color', :value => 'green').click
+    %w{ green red blue yellow brown }.each do |button_value|
+      assert_equal(false, form.radiobutton_with(  :name => 'color',
+                                                  :value => button_value
+                                               ).checked)
+    end
   end
 end

data/test/test_redirect_verb_handling.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+
+class TestRedirectNotGetOrHead < Test::Unit::TestCase
+  include WWW
+
+  def setup
+    @agent = WWW::Mechanize.new
+  end
+
+  def test_to_s
+    page = MechTestHelper.fake_page(@agent)
+    error = Mechanize::RedirectNotGetOrHeadError.new(page, :put)
+    assert_match(/put/, error.to_s)
+  end
+
+  def test_head_redirect_results_in_head_request
+    page = @agent.head('http://localhost/redirect')
+    assert_equal(page.uri.to_s, 'http://localhost/verb')
+    assert_equal(page.body, "method: HEAD")
+  end
+
+  def test_get_redirect_results_in_get_request
+    page = @agent.get('http://localhost/redirect')
+    assert_equal(page.uri.to_s, 'http://localhost/verb')
+    assert_equal(page.body, "method: GET")
+  end
+
+  def test_post_redirect_results_in_get_request
+    page = @agent.post('http://localhost/redirect')
+    assert_equal(page.uri.to_s, 'http://localhost/verb')
+    assert_equal(page.body, "method: GET")
+  end
+
+  def test_put_redirect_results_in_get_request
+    page = @agent.put('http://localhost/redirect')
+    assert_equal(page.uri.to_s, 'http://localhost/verb')
+    assert_equal(page.body, "method: GET")
+  end
+
+  def test_delete_redirect_results_in_get_request
+    page = @agent.delete('http://localhost/redirect')
+    assert_equal(page.uri.to_s, 'http://localhost/verb')
+    assert_equal(page.body, "method: GET")
+  end
+end

data/test/test_referer.rb

@@ -26,7 +26,7 @@ class RefererTest < Test::Unit::TestCase
   def test_fetch_two_first
     page1 = @agent.get("http://localhost/tc_referer.html")
     page2 = @agent.get("http://localhost/tc_pretty_print.html")
-    page = @agent.click page1.links
+    page = @agent.click page1.links.first
     assert_equal("http://localhost/tc_referer.html", page.body)
   end
 

data/test/test_relative_links.rb

@@ -13,7 +13,7 @@ class TestRelativeLinks < Test::Unit::TestCase
 
   def test_too_many_dots
     @page = @agent.get("http://localhost/relative/tc_relative_links.html")
-    page = @page.links.text('too many dots').click
+    page = @page.link_with(:text => 'too many dots').click
     assert_not_nil(page)
     assert_equal('http://localhost/tc_relative_links.html', page.uri.to_s)
   end
@@ -26,15 +26,15 @@ class TestRelativeLinks < Test::Unit::TestCase
 
   def test_frame_dot_dot_slash
     @page = @agent.get("http://localhost/relative/tc_relative_links.html")
-    page = @agent.click(@page.frames.text('frame1'))
+    page = @agent.click(@page.frame_with(:text => 'frame1'))
     assert_equal('http://localhost/tc_relative_links.html', @agent.current_page.uri.to_s)
   end
 
   def test_frame_forward_back_forward
     @page = @agent.get("http://localhost/tc_relative_links.html")
-    page1 = @agent.click @page.frames.name('frame1')
+    page1 = @agent.click @page.frame_with(:name => 'frame1')
     assert_equal('http://localhost/relative/tc_relative_links.html', @agent.current_page.uri.to_s)
-    page2 = @agent.click @page.frames.name('frame2')
+    page2 = @agent.click @page.frame_with(:name => 'frame2')
     assert_equal('http://localhost/relative/tc_relative_links.html', @agent.current_page.uri.to_s)
   end
 end

data/test/test_scheme.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 class SchemeTest < Test::Unit::TestCase
   def setup
     @agent = WWW::Mechanize.new
+    @agent.log = Class.new(Object) do
+      def method_missing(*args)
+      end
+    end.new
   end
 
   def test_file_scheme

data/test/test_select.rb

@@ -8,36 +8,36 @@ class SelectTest < Test::Unit::TestCase
   end
 
   def test_select_none
-    @form.fields.name('list').first.select_none
+    @form.fields_with(:name => 'list').first.select_none
     assert_equal('1', @form.list)
   end
 
   def test_select_all
-    @form.fields.name('list').first.select_all
+    @form.fields_with(:name => 'list').first.select_all
     assert_equal('6', @form.list)
   end
 
   def test_correct_class
     assert_instance_of(WWW::Mechanize::Form::SelectList,
-      @form.fields.name('list').first)
+      @form.field_with(:name => 'list'))
   end
 
   def test_click_all
-    @form.fields.name('list').first.options.each { |o| o.click }
-    option_list = @form.fields.name('list').first.options
+    @form.field_with(:name => 'list').options.each { |o| o.click }
+    option_list = @form.field_with(:name => 'list').options
     assert_not_nil(option_list)
     assert_equal(6, option_list.length)
     assert_equal(option_list.last.value, @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text("list:#{option_list.last}").length)
+    assert_equal(1, page.links_with(:text => "list:#{option_list.last}").length)
   end
 
   def test_select_default
     assert_equal("2", @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:2').length)
+    assert_equal(1, page.links_with(:text => 'list:2').length)
   end
 
   def test_select_one
@@ -53,7 +53,7 @@ class SelectTest < Test::Unit::TestCase
     assert_equal('1', @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
   end
 
   def test_select_three
@@ -61,7 +61,7 @@ class SelectTest < Test::Unit::TestCase
     assert_equal('1', @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
   end
 
   def test_select_three_twice
@@ -70,29 +70,29 @@ class SelectTest < Test::Unit::TestCase
     assert_equal('1', @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
   end
 
   def test_select_with_empty_value
-    list = @form.fields.name('list').first
+    list = @form.field_with(:name => 'list')
     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)
+    assert_equal(1, page.links_with(:text => 'list:').length)
   end
 
   def test_select_with_click
     @form.list = ['1', 'Aaron']
-    @form.fields.name('list').first.options[3].tick
+    @form.field_with(:name => 'list').options[3].tick
     assert_equal('4', @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:4').length)
+    assert_equal(1, page.links_with(:text => 'list:4').length)
   end
 
   def test_click_twice
-    list = @form.fields.name('list').first
+    list = @form.field_with(:name => 'list')
     list.options[0].click
     assert_equal('1', @form.list)
     list.options[1].click

data/test/test_select_all.rb

@@ -10,6 +10,6 @@ class SelectAllTest < Test::Unit::TestCase
     assert_equal("6", @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:6').length)
+    assert_equal(1, page.links_with(:text => 'list:6').length)
   end
 end

data/test/test_select_none.rb

@@ -10,6 +10,6 @@ class SelectNoneTest < Test::Unit::TestCase
     assert_equal("1", @form.list)
     page = @agent.submit(@form)
     assert_equal(1, page.links.length)
-    assert_equal(1, page.links.text('list:1').length)
+    assert_equal(1, page.links_with(:text => 'list:1').length)
   end
 end

data/test/test_select_noopts.rb

@@ -8,7 +8,7 @@ class SelectNoOptionsTest < Test::Unit::TestCase
   end
 
   def test_select_default
-    assert_not_nil(@form.fields.name('list').first)
+    assert_not_nil(@form.field('list'))
     assert_nil(@form.list)
     page = @agent.submit(@form)
     assert_equal(0, page.links.length)

data/test/test_set_fields.rb

@@ -26,19 +26,19 @@ class TestSetFields < Test::Unit::TestCase
                     )
     assert_equal('male', @form.gender)
     assert_equal('Aaron', @form.first_name)
-    assert_equal('Ham', @form.fields.name('green[eggs]').first.value)
+    assert_equal('Ham', @form.fields_with(:name => 'green[eggs]').first.value)
   end
 
   def test_set_multiple_duplicate_fields
     page = @agent.get("http://localhost/form_multival.html")
     form = page.form('post_form')
     form.set_fields( :first => { 0 => 'a', 1 => 'b' } )
-    assert_equal('a', form.fields.name('first')[0].value)
-    assert_equal('b', form.fields.name('first')[1].value)
+    assert_equal('a', form.fields_with(:name => 'first')[0].value)
+    assert_equal('b', form.fields_with(:name => 'first')[1].value)
   end
 
   def test_set_second_field
     @form.set_fields( :first_name => ['Aaron', 1] )
-    assert_equal('Aaron', @form.fields.name('first_name')[1].value)
+    assert_equal('Aaron', @form.fields_with(:name => 'first_name')[1].value)
   end
 end

data/test/test_textarea.rb

@@ -7,38 +7,38 @@ class TestTextArea < Test::Unit::TestCase
   end
 
   def test_empty_text_area
-    form = @page.forms.name('form1').first
-    assert_equal('', form.fields.name('text1').value)
+    form = @page.forms_with(:name => 'form1').first
+    assert_equal('', form.field_with(:name => 'text1').value)
     form.text1 = 'Hello World'
-    assert_equal('Hello World', form.fields.name('text1').value)
+    assert_equal('Hello World', form.field_with(: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)
+    form = @page.forms_with(:name => 'form2').first
+    assert_equal('sample text', form.field_with(: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 = @page.form_with(:name => 'form3')
+    assert_equal(2, form.fields_with(:name => 'text1').length)
+    assert_equal('', form.fields_with(:name => 'text1')[0].value)
+    assert_equal('sample text', form.fields_with(: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)
+    assert_equal('Hello World', form.fields_with(:name => 'text1')[0].value)
+    assert_equal('sample text', form.fields_with(:name => 'text1')[1].value)
     page = @agent.submit(form)
     assert_equal(2, page.links.length)
-    link = page.links.text('text1:sample text')
+    link = page.links_with(:text => 'text1:sample text')
     assert_not_nil(link)
     assert_equal(1, link.length)
 
-    link = page.links.text('text1:Hello World')
+    link = page.links_with(:text => 'text1:Hello World')
     assert_not_nil(link)
     assert_equal(1, link.length)
   end

data/test/test_upload.rb

@@ -92,7 +92,7 @@ class UploadMechTest < Test::Unit::TestCase
 
   def test_submit_no_file
     form = @page.forms.first
-    form.fields.name('name').value = 'Aaron'
+    form.field_with(:name => 'name').value = 'Aaron'
     @page = @agent.submit(form)
     assert_match('Aaron', @page.body)
     assert_match(

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Aaron Patterson
+- Mike Dalessio
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-02 00:00:00 -07:00
+date: 2008-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +31,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: The Mechanize library is used for automating interaction with websites.  Mechanize automatically stores and sends cookies, follows redirects, can follow links, and submit forms.  Form fields can be populated and submitted.  Mechanize also keeps track of the sites that you have visited as a history.
-email: aaronp@rubyforge.org
+email: 
+- aaronp@rubyforge.org
+- mike.dalessio@gmail.com
 executables: []
 
 extensions: []
@@ -45,7 +48,6 @@ extra_rdoc_files:
 - History.txt
 - LICENSE.txt
 - Manifest.txt
-- NOTES.txt
 - README.txt
 files: 
 - EXAMPLES.txt
@@ -54,7 +56,6 @@ files:
 - History.txt
 - LICENSE.txt
 - Manifest.txt
-- NOTES.txt
 - README.txt
 - Rakefile
 - examples/flickr_upload.rb
@@ -108,6 +109,7 @@ files:
 - lib/www/mechanize/page/meta.rb
 - lib/www/mechanize/pluggable_parsers.rb
 - lib/www/mechanize/redirect_limit_reached_error.rb
+- lib/www/mechanize/redirect_not_get_or_head_error.rb
 - lib/www/mechanize/response_code_error.rb
 - lib/www/mechanize/unsupported_scheme_error.rb
 - lib/www/mechanize/util.rb
@@ -201,6 +203,7 @@ files:
 - test/test_pretty_print.rb
 - test/test_radiobutton.rb
 - test/test_redirect_limit_reached.rb
+- test/test_redirect_verb_handling.rb
 - test/test_referer.rb
 - test/test_relative_links.rb
 - test/test_response_code.rb
@@ -286,6 +289,7 @@ test_files:
 - test/test_pretty_print.rb
 - test/test_radiobutton.rb
 - test/test_redirect_limit_reached.rb
+- test/test_redirect_verb_handling.rb
 - test/test_referer.rb
 - test/test_relative_links.rb
 - test/test_response_code.rb