mechanize 0.2.1 → 0.2.2

data/lib/mechanize.rb

@@ -6,7 +6,7 @@
 # set cookies (I might be wrong), does not automatically redirect and has
 # problems with some html documents.
 
-Version = "0.2.1"
+Version = "0.2.2"
 
 # required due to the missing get_fields method in Ruby 1.8.2
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "mechanize", "net-overrides")
@@ -26,14 +26,16 @@ class Field
 
   def initialize(name, value)
     @name, @value = name, value
+    @user, @password = nil
   end
 
   # Returns an array of Field objects
   def self.extract_all_from(root_node)
     fields = []
     root_node.each_recursive {|node|
-      if node.name.downcase == 'input' and 
-         ['text', 'password', 'hidden', 'checkbox', 'radio'].include?(node.attributes['type'].downcase)
+      if (node.name.downcase == 'input' and 
+         %w(text password hidden checkbox radio int).include?(node.attributes['type'].downcase)) or
+         %w(textarea option).include?(node.name.downcase)
         fields << Field.new(node.attributes['name'], node.attributes['value']) 
       end
     }
@@ -131,13 +133,15 @@ class GlobalForm
       case node.name.downcase
       when 'input'
         case (node.attributes['type'] || '').downcase
-        when 'text', 'password', 'hidden', 'checkbox', 'radio'
+        when 'text', 'password', 'hidden', 'checkbox', 'radio', 'int'
           @fields << Field.new(node.attributes['name'], node.attributes['value']) 
         when 'file'
           @file_uploads << FileUpload.new(node.attributes['name'], node.attributes['value']) 
         when 'submit'
           @buttons << Button.new(node.attributes['name'], node.attributes['value'])
         end
+      when 'textarea', 'select'
+        @fields << Field.new(node.attributes['name'], node.attributes['value'])
       when 'select'
         @fields << SelectList.new(node.attributes['name'], node)
       end
@@ -277,6 +281,11 @@ class Mechanize
     self.user_agent = AGENT_ALIASES[al] || raise("unknown agent alias")
   end
 
+  def basic_authetication(user, password)
+    @user = user
+    @password = password
+  end
+
   def get(url)
     cur_page = current_page() || Page.new
 
@@ -314,7 +323,7 @@ class Mechanize
     form.fields.each do |f|
       query[f.name] = f.value || ""
     end
-    query[button.name] = button.value || "" if button
+    query[button.name] = button.value || "" if button and button.name
 
     uri = to_absolute_uri(form.action)
     case form.method.upcase
@@ -391,6 +400,8 @@ class Mechanize
 
       request.add_header('User-Agent', @user_agent) if @user_agent 
 
+      request.basic_auth(@user, @password) if @user
+
       # Invoke pre-request-hook (use it to add custom headers or content)
 
       pre_request_hook.call(request) if pre_request_hook

data/lib/mechanize/parsing.rb

@@ -54,7 +54,7 @@ module REXML::Node
   #   node == node.parent.elements[node.index_in_parent]
 
   def index_in_parent
-    parent.index(self)+1
+    parent.elements.index(self)
   end
 
   # Recursivly collects all text strings starting into an array.

data/test/test_parsing.rb

@@ -9,6 +9,44 @@ class TestParsing < Test::Unit::TestCase
     assert_equal ["asdf", ["abc"], "def"], root_for("<i>asdf<b>abc</b>def</i>").collect_text_recursively
   end
 
+  def test_index_in_parent
+    table = root_for %(<table><tr><td>A</td><td>B</td></tr><tr><td colspan="2">C</td></tr></table>)
+    node = table.find_first_recursive {|n| n.name == 'tr'}
+    assert_equal node, node.parent.elements[node.index_in_parent]
+  end
+
+  def test_table_to_matrix
+    table = root_for %(<table><tr><td>A</td><td>B</td></tr><tr><td colspan="2">C</td></tr></table>)
+    matrix = table_to_matrix(table)
+    assert_equal "A", matrix[0][0].all_text
+    assert_equal "B", matrix[0][1].all_text
+    assert_equal "C", matrix[1][0].all_text
+    assert_equal nil, matrix[1][1]
+  end
+
+  def test_extract_from_table
+    table = root_for %(
+      <table>
+        <tr>
+          <td>A</td>
+          <td>B</td>
+          <td>C</td>
+        </tr>
+        <tr>
+          <td>A.1</td>
+          <td>B.1</td>
+          <td>C.1</td>
+        </tr>
+        <tr>
+          <td>A.2</td>
+          <td>B.2</td>
+          <td>C.2</td>
+        </tr>
+      </table>)
+
+    assert_equal [ ["A.1", "C.1"], ["A.2", "C.2"] ], extract_from_table(table, ["A", "C"])
+  end
+
   private
 
   def root_for(str)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.4
 specification_version: 1
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2005-04-06
+  version: 0.2.2
+date: 2005-04-17
 summary: Automated web-browsing.
 require_paths: 
   - lib