mechanize 0.2.2 → 0.2.3

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.2"
+Version = "0.2.3"
 
 # 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,10 +26,10 @@ class Field
 
   def initialize(name, value)
     @name, @value = name, value
-    @user, @password = nil
   end
 
   # Returns an array of Field objects
+  # TODO: is this correct?
   def self.extract_all_from(root_node)
     fields = []
     root_node.each_recursive {|node|
@@ -75,6 +75,22 @@ class Button
   end
 end 
 
+class RadioButton
+  attr_accessor :name, :value, :checked
+
+  def initialize(name, value, checked)
+    @name, @value, @checked = name, value, checked
+  end
+end
+
+class CheckBox
+  attr_accessor :name, :value, :checked
+
+  def initialize(name, value, checked)
+    @name, @value, @checked = name, value, checked
+  end
+end
+
 class SelectList
   attr_accessor :name, :value, :options
 
@@ -113,7 +129,7 @@ class GlobalForm
   attr_reader :form_node, :elements_node
   attr_accessor :method, :action, :name
 
-  attr_reader :fields, :buttons, :file_uploads
+  attr_reader :fields, :buttons, :file_uploads, :radiobuttons, :checkboxes
 
   def initialize(form_node, elements_node)
     @form_node, @elements_node = form_node, elements_node
@@ -125,23 +141,62 @@ class GlobalForm
     parse
   end
 
+  def build_query
+    query = {}
+
+    fields().each do |f|
+      query[f.name] = f.value || ""
+    end
+
+    checkboxes().each do |f|
+      query[f.name] = f.value || "on" if f.checked
+    end
+
+    radio_groups = {}
+    radiobuttons().each do |f|
+      radio_groups[f.name] ||= []
+      radio_groups[f.name] << f 
+    end
+
+    # take one radio button from each group
+    radio_groups.each_value do |g|
+      checked = g.select {|f| f.checked}
+
+      if checked.size == 1
+        f = checked.first
+        query[f.name] = f.value || ""
+      elsif checked.size > 1 
+        raise "multiple radiobuttons are checked in the same group!" 
+      end
+    end
+
+    query
+  end
+
   def parse
     @fields = []
     @buttons = []
     @file_uploads = []
+    @radiobuttons = []
+    @checkboxes = []
+
     @elements_node.each_recursive {|node|
       case node.name.downcase
       when 'input'
         case (node.attributes['type'] || '').downcase
-        when 'text', 'password', 'hidden', 'checkbox', 'radio', 'int'
+        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'))
+        when 'checkbox'
+          @checkboxes << CheckBox.new(node.attributes['name'], node.attributes['value'], node.attributes.has_key?('checked'))
         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 'textarea'
+        @fields << Field.new(node.attributes['name'], node.all_text)
       when 'select'
         @fields << SelectList.new(node.attributes['name'], node)
       end
@@ -319,10 +374,8 @@ class Mechanize
   end
 
   def submit(form, button=nil)
-    query = {}
-    form.fields.each do |f|
-      query[f.name] = f.value || ""
-    end
+    query = form.build_query
+
     query[button.name] = button.value || "" if button and button.name
 
     uri = to_absolute_uri(form.action)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2005-04-17
+  version: 0.2.3
+date: 2005-06-20
 summary: Automated web-browsing.
 require_paths: 
   - lib