tenderlove-mechanize 0.9.3.20090617085936 → 0.9.3.20090623142847

data/CHANGELOG.rdoc

@@ -2,9 +2,17 @@
 
 === HEAD
 
+* Bug Fixes:
+
+  * Rescue errors from bogus encodings
+
+=== 0.9.3
+
 * Bug Fixes:
 
   * Do not apply encoding if encoding equals 'none' Thanks Akinori MUSHA!
+  * Fixed Page#encoding= when changing the value from or to nil.  Made
+    it return the assigned value while at it. (Akinori MUSHA)
   * Custom request headers may be supplied WWW::Mechanize#request_headers
     RF #24516
   * HTML Parser may be set on a per instance level WWW::Mechanize#html_parser

data/lib/www/mechanize/form.rb

@@ -24,15 +24,15 @@ module WWW
     #  puts form['name']
     class Form
       attr_accessor :method, :action, :name
-    
+
       attr_reader :fields, :buttons, :file_uploads, :radiobuttons, :checkboxes
       attr_accessor :enctype
 
       alias :elements :fields
-    
+
       attr_reader :form_node
       attr_reader :page
-    
+
       def initialize(node, mech=nil, page=nil)
         @enctype = node['enctype'] || 'application/x-www-form-urlencoded'
         @form_node        = node
@@ -137,10 +137,10 @@ module WWW
       end
 
       # This method is sub-method of build_query.
-      # It converts charset of query value of fields into excepted one.
+      # It converts charset of query value of fields into expected one.
       def proc_query(field)
         return unless field.query_value
-        field.query_value.map{|(name, val)| 
+        field.query_value.map{|(name, val)|
           [from_native_charset(name), from_native_charset(val.to_s)]
         }
       end
@@ -149,7 +149,7 @@ module WWW
       def from_native_charset(str, enc=nil)
         if page
           enc ||= page.encoding
-          Util.from_native_charset(str,enc)
+          Util.from_native_charset(str,enc) rescue str
         else
           str
         end
@@ -161,36 +161,36 @@ module WWW
       # be used to create a query string for this form.
       def build_query(buttons = [])
         query = []
-    
+
         fields().each do |f|
           qval = proc_query(f)
           query.push(*qval)
         end
-    
+
         checkboxes().each do |f|
           if f.checked
             qval = proc_query(f)
             query.push(*qval)
           end
         end
-    
+
         radio_groups = {}
         radiobuttons().each do |f|
           fname = from_native_charset(f.name)
           radio_groups[fname] ||= []
-          radio_groups[fname] << f 
+          radio_groups[fname] << 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
             qval = proc_query(f)
             query.push(*qval)
-          elsif checked.size > 1 
-            raise "multiple radiobuttons are checked in the same group!" 
+          elsif checked.size > 1
+            raise "multiple radiobuttons are checked in the same group!"
           end
         end
 
@@ -206,7 +206,7 @@ module WWW
       def add_button_to_query(button)
         @clicked_buttons << button
       end
-    
+
       # This method calculates the request data to be sent back to the server
       # for this form, depending on if this is a regular post, get, or a
       # multi-part post,
@@ -225,8 +225,8 @@ module WWW
           WWW::Mechanize::Util.build_query_string(query_params)
         end
       end
-    
-      # Removes all fields with name +field_name+. 
+
+      # Removes all fields with name +field_name+.
       def delete_field!(field_name)
         @fields.delete_if{ |f| f.name == field_name}
       end
@@ -255,7 +255,7 @@ module WWW
           alias :#{singular} :#{singular}_with
         eomethod
       end
- 
+
       private
       def parse
         @fields       = []
@@ -263,7 +263,7 @@ module WWW
         @file_uploads = []
         @radiobuttons = []
         @checkboxes   = []
-    
+
         # Find all input tags
         form_node.search('input').each do |node|
           type = (node['type'] || 'text').downcase
@@ -275,7 +275,7 @@ module WWW
           when 'checkbox'
             @checkboxes << CheckBox.new(node['name'], node['value'], !!node['checked'], self)
           when 'file'
-            @file_uploads << FileUpload.new(node['name'], nil) 
+            @file_uploads << FileUpload.new(node['name'], nil)
           when 'submit'
             @buttons << Button.new(node['name'], node['value'])
           when 'button'
@@ -283,7 +283,7 @@ module WWW
           when 'image'
             @buttons << ImageButton.new(node['name'], node['value'])
           else
-            @fields << Field.new(node['name'], node['value'] || '') 
+            @fields << Field.new(node['name'], node['value'] || '')
           end
         end
 
@@ -318,7 +318,7 @@ module WWW
         1.upto(len) { |i| string << chars[rand(chars.size-1)] }
         string
       end
-    
+
       def mime_value_quote(str)
         str.gsub(/(["\r\\])/){|s| '\\' + s}
       end
@@ -328,7 +328,7 @@ module WWW
                 "#{mime_value_quote(name)}\"\r\n" +
                 "\r\n#{value}\r\n"
       end
-    
+
       def file_to_multipart(file)
         file_name = file.file_name ? ::File.basename(file.file_name) : ''
         body =  "Content-Disposition: form-data; name=\"" +
@@ -345,7 +345,7 @@ module WWW
         if file.mime_type != nil
           body << "Content-Type: #{file.mime_type}\r\n"
         end
-    
+
         body <<
           if file.file_data.respond_to? :read
             "\r\n#{file.file_data.read}\r\n"

data/lib/www/mechanize/page.rb

@@ -57,10 +57,15 @@ module WWW
       def encoding=(encoding)
         @encoding = encoding
 
-        if @parser && @parser.encoding.downcase != encoding.downcase
-          # lazy reinitialize the parser with the new encoding
-          @parser = nil
+        if @parser
+          parser_encoding = @parser.encoding
+          if (parser_encoding && parser_encoding.downcase) != (encoding && encoding.downcase)
+            # lazy reinitialize the parser with the new encoding
+            @parser = nil
+          end
         end
+
+        encoding
       end
 
       def encoding

data/lib/www/mechanize.rb

@@ -479,7 +479,7 @@ module WWW
           @keep_alive_time,
           @cookie_jar,
           @user_agent,
-          {}
+          @request_headers
         ),
         Chain::CustomHeaders.new,
         @pre_connect_hook,

data/mechanize.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mechanize}
-  s.version = "0.9.3.20090617085936"
+  s.version = "0.9.3.20090623142847"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Mike Dalessio"]
-  s.date = %q{2009-06-17}
+  s.date = %q{2009-06-23}
   s.description = %q{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
@@ -29,13 +29,13 @@ a history.}
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.2.1"])
-      s.add_development_dependency(%q<hoe>, [">= 2.1.0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.2.0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.2.1"])
-      s.add_dependency(%q<hoe>, [">= 2.1.0"])
+      s.add_dependency(%q<hoe>, [">= 2.2.0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.2.1"])
-    s.add_dependency(%q<hoe>, [">= 2.1.0"])
+    s.add_dependency(%q<hoe>, [">= 2.2.0"])
   end
 end

data/test/test_form_action.rb

@@ -6,6 +6,14 @@ class TestFormAction < Test::Unit::TestCase
     @page  = @agent.get("http://localhost/tc_form_action.html")
   end
 
+  def test_post_with_bad_encoding_does_not_raise_exception
+    @page  = @agent.get("http://localhost/test_bad_encoding.html")
+    form = @page.form(:name => 'post_form1') { |f|
+      f.first_name = "Aaron"
+    }
+    form.submit
+  end
+
   def test_post_encoded_action
     form = @page.form(:name => 'post_form1') { |f|
       f.first_name = "Aaron"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tenderlove-mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.9.3.20090617085936
+  version: 0.9.3.20090623142847
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.2.0
     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: