mechanize 0.4.3 → 0.4.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.4.4
+
+* Fixed error in method signature, basic_authetication is now basic_auth
+* Fixed bug with encoding names in file uploads (Big thanks to Alex Young)
+* Added options to the select list
+
 == 0.4.3
 
 * Added syntactic sugar for finding things

data/NOTES

@@ -1,5 +1,14 @@
 = Mechanize Release Notes
 
+== 0.4.4
+
+This release of mechanize comes with a new "Option" object that can be
+accessed from select fields on forms.  That means that you can figure out
+what option to set based on the text in the select field.  For example:
+
+selectlist = form.fields.name('selectlist').first
+selectlist.value = selectlist.options.find { |o| o.text == 'foo'}.value
+
 == 0.4.3
 
 The new syntax for finding things like forms, fields, frames, etcetera looks

data/README

@@ -24,6 +24,9 @@ Copyright (c) 2005 by Michael Neumann (mneumann@ntecs.de)
 New Code:
 Copyright (c) 2006 by Aaron Patterson (aaronp@rubyforge.org) 
 
+This library comes with a shameless plug for employing me (Aaron) programming
+Ruby, my favorite language!
+
 == License
 
 This library is distributed under the GPL.  Please see the LICENSE file.

data/lib/mechanize.rb

@@ -102,11 +102,13 @@ class Mechanize
     cookies
   end
 
-  def basic_authetication(user, password)
+  def basic_auth(user, password)
     @user = user
     @password = password
   end
 
+  alias :basic_authetication :basic_auth
+
   def get(url)
     cur_page = current_page() || Page.new
 

data/lib/mechanize/form.rb

@@ -148,16 +148,20 @@ module WWW
       string
     end
   
+    def mime_value_quote(str)
+      str.gsub(/(["\r\\])/){|s| '\\' + s}
+    end
+
     def param_to_multipart(name, value)
       return "Content-Disposition: form-data; name=\"" +
-              "#{WEBrick::HTTPUtils.escape_form(name)}\"\r\n" +
+              "#{mime_value_quote(name)}\"\r\n" +
               "\r\n#{value}\r\n"
     end
   
     def file_to_multipart(file)
       body =  "Content-Disposition: form-data; name=\"" +
-              "#{WEBrick::HTTPUtils.escape_form(file.name)}\"; " +
-              "filename=\"#{file.file_name}\"\r\n" +
+              "#{mime_value_quote(file.name)}\"; " +
+              "filename=\"#{mime_value_quote(file.file_name)}\"\r\n" +
               "Content-Transfer-Encoding: binary\r\n"
       if file.mime_type != nil
         body << "Content-Type: #{file.mime_type}\r\n"

data/lib/mechanize/form_elements.rb

@@ -96,12 +96,24 @@ module WWW
       # parse
       node.each_recursive {|n|
         if n.name.downcase == 'option'
-          value = n.attributes['value']
-          @options << value 
-          @value = value if n.attributes['selected']
+          option = Option.new(n)
+          @options << option
+          @value = option.value if option.selected
         end
       }
-      @value = @options.first if @value == nil
+      @value = @options.first.value if @value == nil
+    end
+  end
+
+  class Option
+    attr_reader :value, :selected, :text
+
+    alias :to_s :value
+
+    def initialize(node)
+      @text     = node.all_text
+      @value    = node.attributes['value']
+      @selected = node.attributes['selected'] ? true : false
     end
   end
 end

data/lib/mechanize/mech_version.rb

@@ -1,5 +1,5 @@
 # DO NOT EDIT
 # This file is auto-generated by build scripts
 module WWW
-  MechVersion = '0.4.3'
+  MechVersion = '0.4.4'
 end

data/test/data/htpasswd

@@ -0,0 +1 @@
+mech:44E/qORekFV0E

data/test/htdocs/file_upload.html

@@ -7,6 +7,12 @@
     <form enctype="multipart/form-data" action="/file_upload" method="post">
       Your name: <input type="text" name="name" /><br />
       File to process: <input name="userfile1" type="file" /><br />
+      <input type="text" name="foo[aaron]" value="test" />
+      <input type="submit" value="Send File" />
+    </form>
+    <form enctype="multipart/form-data" action="/file_upload" method="post">
+      Your name: <input type="text" name="name" /><br />
+      File to process: <input name="green[eggs]" type="file" /><br />
       <input type="submit" value="Send File" />
     </form>
   </body>

data/test/htdocs/form_test.html

@@ -19,6 +19,10 @@
           <td>Check this if you are cool:</td>
           <td><input type="checkbox" name="cool person" /></td>
         </tr>
+        <tr>
+          <td>Check this if you like green eggs:</td>
+          <td><input type="checkbox" name="green[eggs]" /></td>
+        </tr>
         <tr>
           <td>Check this if you like ham:</td>
           <td><input type="checkbox" name="likes ham" /></td>
@@ -48,6 +52,10 @@
           <td>Check this if you are cool:</td>
           <td><input type="checkbox" name="cool person" /></td>
         </tr>
+        <tr>
+          <td>Check this if you like green eggs:</td>
+          <td><input type="checkbox" name="green[eggs]" /></td>
+        </tr>
         <tr>
           <td>Check this if you like ham:</td>
           <td><input type="checkbox" name="likes ham" /></td>

data/test/server.rb

@@ -2,9 +2,11 @@ require 'webrick'
 require 'servlets'
 require 'logger'
 
+base_dir = FileTest.exists?(Dir::pwd + '/test') ? Dir::pwd + '/test' : Dir::pwd
+
 s = WEBrick::HTTPServer.new(
   :Port           => 2000,
-  :DocumentRoot   => Dir::pwd + "/htdocs",
+  :DocumentRoot   => base_dir + "/htdocs",
   :Logger         => Logger.new(nil),
   :AccessLog      => Logger.new(nil)
 )
@@ -17,6 +19,18 @@ s.mount("/form post", FormTest)
 s.mount("/response_code", ResponseCodeTest)
 s.mount("/file_upload", FileUploadTest)
 
+htpasswd = WEBrick::HTTPAuth::Htpasswd.new(base_dir + '/data/htpasswd')
+auth = WEBrick::HTTPAuth::BasicAuth.new(
+  :UserDB => htpasswd,
+  :Realm  => 'mechanize',
+  :Logger         => Logger.new(nil),
+  :AccessLog      => Logger.new(nil)
+)
+s.mount_proc('/htpasswd_auth') { |req, res|
+  auth.authenticate(req, res)
+  res.body = "You are authenticated"
+}
+
 trap("INT") { s.stop }
 
 s.start

data/test/tc_authenticate.rb

@@ -0,0 +1,27 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'test/unit'
+require 'rubygems'
+require 'mechanize'
+require 'test_includes'
+
+class BasicAuthTest < Test::Unit::TestCase
+  include TestMethods
+
+  def test_auth_success
+    agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    agent.basic_auth('mech', 'password')
+    page = agent.get("http://localhost:#{@port}/htpasswd_auth")
+    assert_equal('You are authenticated', page.body)
+  end
+
+  def test_auth_failure
+    agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    begin
+      page = agent.get("http://localhost:#{@port}/htpasswd_auth")
+    rescue WWW::ResponseCodeError => e
+      assert_equal("401", e.response_code)
+    end
+  end
+
+end

data/test/tc_forms.rb

@@ -21,7 +21,7 @@ class FormsMechTest < Test::Unit::TestCase
 
     assert_equal(1, post_form.buttons.size)
     assert_equal(2, post_form.radiobuttons.size)
-    assert_equal(2, post_form.checkboxes.size)
+    assert_equal(3, post_form.checkboxes.size)
     assert_not_nil(post_form.fields.find { |f| f.name == "first_name" },
       "First name field was nil"
     )
@@ -42,11 +42,17 @@ class FormsMechTest < Test::Unit::TestCase
       "couldn't find cool person checkbox")
     assert_not_nil(post_form.checkboxes.find { |f| f.name == "likes ham" },
       "couldn't find likes ham checkbox")
+    assert_not_nil(post_form.checkboxes.find { |f| f.name == "green[eggs]" },
+      "couldn't find green[eggs] checkbox")
 
     # Find the select list
     s = post_form.fields.find { |f| f.name == "country" }
     assert_equal(2, s.options.length)
     assert_equal("USA", s.value)
+    assert_equal("USA", s.options.first.value)
+    assert_equal("USA", s.options.first.text)
+    assert_equal("CANADA", s.options[1].value)
+    assert_equal("CANADA", s.options[1].text)
 
     # Now set all the fields
     post_form.fields.find { |f| f.name == "first_name" }.value = "Aaron"
@@ -54,14 +60,19 @@ class FormsMechTest < Test::Unit::TestCase
       f.name == "gender" && f.value == "male" 
     }.checked = true
     post_form.checkboxes.find { |f| f.name == "likes ham" }.checked = true
+    post_form.checkboxes.find { |f| f.name == "green[eggs]" }.checked = true
     page = agent.submit(post_form, post_form.buttons.first)
 
     # Check that the submitted fields exist
-    assert_equal(4, page.links.size, "Not enough links")
+    assert_equal(5, page.links.size, "Not enough links")
     assert_not_nil(
       page.links.find { |l| l.text == "likes ham:on" },
       "likes ham check box missing"
     )
+    assert_not_nil(
+      page.links.find { |l| l.text == "green[eggs]:on" },
+      "green[eggs] check box missing"
+    )
     assert_not_nil(
       page.links.find { |l| l.text == "first_name:Aaron" },
       "first_name field missing"
@@ -86,7 +97,7 @@ class FormsMechTest < Test::Unit::TestCase
     assert_equal(1, get_form.fields.size)
     assert_equal(2, get_form.buttons.size)
     assert_equal(2, get_form.radiobuttons.size)
-    assert_equal(2, get_form.checkboxes.size)
+    assert_equal(3, get_form.checkboxes.size)
     assert_not_nil(get_form.fields.find { |f| f.name == "first_name" },
       "First name field was nil"
     )
@@ -104,6 +115,8 @@ class FormsMechTest < Test::Unit::TestCase
       "couldn't find cool person checkbox")
     assert_not_nil(get_form.checkboxes.find { |f| f.name == "likes ham" },
       "couldn't find likes ham checkbox")
+    assert_not_nil(get_form.checkboxes.find { |f| f.name == "green[eggs]" },
+      "couldn't find green[eggs] checkbox")
 
     # Set up the image button
     img = get_form.buttons.find { |f| f.name == "button" }
@@ -115,14 +128,19 @@ class FormsMechTest < Test::Unit::TestCase
       f.name == "gender" && f.value == "male" 
     }.checked = true
     get_form.checkboxes.find { |f| f.name == "likes ham" }.checked = true
+    get_form.checkboxes.find { |f| f.name == "green[eggs]" }.checked = true
     page = agent.submit(get_form, get_form.buttons.first)
 
     # Check that the submitted fields exist
-    assert_equal(6, page.links.size, "Not enough links")
+    assert_equal(7, page.links.size, "Not enough links")
     assert_not_nil(
       page.links.find { |l| l.text == "likes ham:on" },
       "likes ham check box missing"
     )
+    assert_not_nil(
+      page.links.find { |l| l.text == "green[eggs]:on" },
+      "green[eggs] check box missing"
+    )
     assert_not_nil(
       page.links.find { |l| l.text == "first_name:Aaron" },
       "first_name field missing"

data/test/tc_upload.rb

@@ -30,5 +30,24 @@ class UploadMechTest < Test::Unit::TestCase
     )
     assert_match('Content-Type: text/plain', page.body)
     assert_match('Hello World', page.body)
+    assert_match('foo[aaron]', page.body)
+  end
+
+  def test_form_multipart
+    agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    page = agent.get("http://localhost:#{@port}/file_upload.html")
+    assert_equal('multipart/form-data', page.forms[1].enctype)
+
+    form = page.forms[1]
+    form.file_uploads.first.file_name = "README"
+    form.file_uploads.first.mime_type = "text/plain"
+    form.file_uploads.first.file_data = "Hello World\n\n"
+
+    page = agent.submit(form)
+
+    assert_match(
+      "Content-Disposition: form-data; name=\"green[eggs]\"; filename=\"README\"",
+      page.body
+    )
   end
 end

data/test/ts_mech.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "test")
 
 Thread.new {
 require 'server'
@@ -14,4 +15,5 @@ require 'tc_upload'
 require 'tc_forms'
 require 'tc_watches'
 require 'tc_parsing'
+require 'tc_authenticate'
 

metadata

@@ -3,99 +3,104 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2006-04-26 00:00:00 -07:00
+  version: 0.4.4
+date: 2006-05-11 00:00:00 -07:00
 summary: Mechanize provides automated web-browsing
 require_paths: 
-  - lib
+- lib
 email: aaronp@rubyforge.org
 homepage: mechanize.rubyforge.org
 rubyforge_project: mechanize
 description: 
-autorequire: mechanize
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Aaron Patterson
+- Aaron Patterson
 files: 
-  - test/htdocs
-  - test/README
-  - test/server.rb
-  - test/servlets.rb
-  - test/tc_cookies.rb
-  - test/tc_forms.rb
-  - test/tc_frames.rb
-  - test/tc_links.rb
-  - test/tc_mech.rb
-  - test/tc_parsing.rb
-  - test/tc_response_code.rb
-  - test/tc_upload.rb
-  - test/tc_watches.rb
-  - test/test_includes.rb
-  - test/test_mech.rb
-  - test/ts_mech.rb
-  - test/htdocs/button.jpg
-  - test/htdocs/file_upload.html
-  - test/htdocs/find_link.html
-  - test/htdocs/form_test.html
-  - test/htdocs/frame_test.html
-  - test/htdocs/google.html
-  - test/htdocs/iframe_test.html
-  - test/htdocs/index.html
-  - lib/mechanize
-  - lib/mechanize.rb
-  - lib/mechanize/cookie.rb
-  - lib/mechanize/form.rb
-  - lib/mechanize/form_elements.rb
-  - lib/mechanize/mech_version.rb
-  - lib/mechanize/module.rb
-  - lib/mechanize/net-overrides
-  - lib/mechanize/page.rb
-  - lib/mechanize/page_elements.rb
-  - lib/mechanize/parsing.rb
-  - lib/mechanize/net-overrides/net
-  - lib/mechanize/net-overrides/net/http.rb
-  - lib/mechanize/net-overrides/net/https.rb
-  - lib/mechanize/net-overrides/net/protocol.rb
-  - README
-  - EXAMPLES
-  - CHANGELOG
-  - LICENSE
-  - NOTES
+- test/tc_watches.rb
+- test/servlets.rb
+- test/tc_upload.rb
+- test/htdocs
+- test/tc_response_code.rb
+- test/tc_links.rb
+- test/tc_forms.rb
+- test/server.rb
+- test/test_mech.rb
+- test/tc_frames.rb
+- test/test_includes.rb
+- test/tc_cookies.rb
+- test/tc_authenticate.rb
+- test/tc_mech.rb
+- test/README
+- test/data
+- test/tc_parsing.rb
+- test/ts_mech.rb
+- test/htdocs/find_link.html
+- test/htdocs/frame_test.html
+- test/htdocs/iframe_test.html
+- test/htdocs/google.html
+- test/htdocs/form_test.html
+- test/htdocs/index.html
+- test/htdocs/button.jpg
+- test/htdocs/file_upload.html
+- test/data/htpasswd
+- lib/mechanize
+- lib/mechanize.rb
+- lib/mechanize/cookie.rb
+- lib/mechanize/page.rb
+- lib/mechanize/form.rb
+- lib/mechanize/parsing.rb
+- lib/mechanize/net-overrides
+- lib/mechanize/page_elements.rb
+- lib/mechanize/form_elements.rb
+- lib/mechanize/mech_version.rb
+- lib/mechanize/module.rb
+- lib/mechanize/net-overrides/net
+- lib/mechanize/net-overrides/net/http.rb
+- lib/mechanize/net-overrides/net/protocol.rb
+- lib/mechanize/net-overrides/net/https.rb
+- README
+- EXAMPLES
+- CHANGELOG
+- LICENSE
+- NOTES
 test_files: []
+
 rdoc_options: 
-  - "--main"
-  - README
-  - "--title"
-  - "'WWW::Mechanize RDoc'"
+- --main
+- README
+- --title
+- "'WWW::Mechanize RDoc'"
 extra_rdoc_files: 
-  - README
-  - EXAMPLES
-  - CHANGELOG
-  - LICENSE
-  - NOTES
+- README
+- EXAMPLES
+- CHANGELOG
+- LICENSE
+- NOTES
 executables: []
+
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: ruby-web
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.1.0
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-web
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+    version: