mechanize 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,5 +1,10 @@
 = Mechanize CHANGELOG
 
+== 0.5.1
+
+* Fixed bug with file uploads
+* Added performance tweaks to the cookie class
+
 == 0.5.0
 
 * Added pluggable parsers. (Thanks to Eric Kolve for the idea)

data/NOTES

@@ -1,5 +1,11 @@
 = Mechanize Release Notes
 
+== 0.5.1
+
+This release is a small bugfix release.  The main bug fixed in this release is
+a problem with file uploading.  I have also made some performance improvements
+to cookie parsing.
+
 == 0.5.0
 
 Good News first:

data/lib/mechanize/cookie.rb

@@ -13,76 +13,61 @@ module WWW
         @domain   = cookie[:domain]
         @expires  = cookie[:expires]
         @secure   = cookie[:secure]
-        @string   = "#{cookie[:name]}=#{cookie[:value]}"
       end
     
       def Cookie::parse(uri, raw_cookie, &block)
         esc = raw_cookie.gsub(/(expires=[^,]*),([^;]*(;|$))/i) { "#{$1}#{$2}" }
         esc.split(/,/).each do |cookie_text|
-          cookie_values = Hash.new
           cookie = Hash.new
+          valid_cookie = true
           cookie_text.split(/; ?/).each do |data|
             name, value = data.split('=', 2)
             next unless name
-            cookie[name.strip] = value
-          end
-    
-          cookie_values[:path] = cookie.delete(
-            cookie.keys.find { |k| k.downcase  == "path" } ) || uri.path
 
-          expires_key = cookie.keys.find { |k| k.downcase == "expires" }
-          if expires_key
-            time = nil
-            expires_val = cookie.delete(expires_key)
+            name.strip!
+    
+            # Set the cookie to invalid if the domain is incorrect
+            case name.downcase
+            when 'path'
+              cookie[:path] = value
+            when 'expires'
+              cookie[:expires] = begin
+                Time::parse(value)
+              rescue
+                Time.now
+              end
+            when 'secure'
+              cookie[:secure] = true
+            when 'domain' # Reject the cookie if it isn't for this domain
+              cookie[:domain] = value.sub(/^\./, '')
 
-            # If we can't parse the time, set it to the current time
-            begin
-              time = Time::parse(expires_val)
-            rescue
-              time = Time.now
+              # Reject cookies not for this domain
+              # TODO Move the logic to reject based on host to the jar
+              unless uri.host =~ /#{cookie[:domain]}$/
+                valid_cookie = false
+              end
+            when 'httponly'
+              # do nothing
+          # http://msdn.microsoft.com/workshop/author/dhtml/httponly_cookies.asp
+            else
+              cookie[:name]  = name
+              cookie[:value] = value
             end
-
-            # If we couldn't parse it, set it to the current time
-            time = Time.now if time == nil
-            cookie_values[:expires] = time
-          end
-
-          secure_key = cookie.keys.find { |k| k.downcase == "secure" }
-          if secure_key
-            cookie_values[:secure] = true
-            cookie.delete(secure_key)
-          else
-            cookie_values[:secure] = false
           end
-    
-          # Set the domain name of the cookie
-          domain_key = cookie.keys.find { |k| k.downcase == "domain" }
-          if domain_key
-            domain = cookie.delete(domain_key)
-            domain.sub!(/^\./, '')
 
-            # Reject cookies not for this domain
-            next unless uri.host =~ /#{domain}$/
-            cookie_values[:domain] = domain
-          else
-            cookie_values[:domain] = uri.host
-          end
+          # Don't yield this cookie if it is invalid
+          next unless valid_cookie
 
-          # Delete the http only option
-          # http://msdn.microsoft.com/workshop/author/dhtml/httponly_cookies.asp
-          http_only = cookie.keys.find { |k| k.downcase == 'httponly' }
-          cookie.delete(http_only) if http_only
+          cookie[:path]    ||= uri.path
+          cookie[:secure]  ||= false
+          cookie[:domain]  ||= uri.host
 
-          cookie.each { |k,v|
-            cookie_values[:name] = k.strip
-            cookie_values[:value] = v.strip
-          }
-          yield Cookie.new(cookie_values)
+          yield Cookie.new(cookie)
         end
       end
     
       def to_s
-        @string
+        "#{@name}=#{@value}"
       end
     end
 

data/lib/mechanize/form.rb

@@ -110,7 +110,7 @@ module WWW
         case @enctype.downcase
         when 'multipart/form-data'
           boundary = rand_string(20)
-          @enctype << ", boundary=#{boundary}"
+          @enctype << "; boundary=#{boundary}"
           params = []
           query_params.each { |k,v| params << param_to_multipart(k, v) }
           @file_uploads.each { |f| params << file_to_multipart(f) }
@@ -119,7 +119,7 @@ module WWW
         else
           query = WWW::Mechanize.build_query_string(query_params)
         end
-    
+
         query
       end
     
@@ -180,7 +180,7 @@ module WWW
       def file_to_multipart(file)
         body =  "Content-Disposition: form-data; name=\"" +
                 "#{mime_value_quote(file.name)}\"; " +
-                "filename=\"#{mime_value_quote(file.file_name)}\"\r\n" +
+                "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

@@ -98,7 +98,7 @@ module WWW
         if n.name.downcase == 'option'
           option = Option.new(n)
           @options << option
-          value = option.value if option.selected
+          value = option.value if option.selected && value.nil?
         end
       }
       value = @options.first.value if (value == nil && @options.first)

data/lib/mechanize/mech_version.rb

@@ -2,6 +2,6 @@
 # This file is auto-generated by build scripts
 module WWW
   class Mechanize
-    Version = '0.5.0'
+    Version = '0.5.1'
   end
 end

data/test/tc_upload.rb

@@ -52,4 +52,16 @@ class UploadMechTest < Test::Unit::TestCase
       page.body
     )
   end
+
+  def test_submit_no_file
+    page = @agent.get("http://localhost:#{PORT}/file_upload.html")
+    form = page.forms.first
+    form.fields.name('name').value = 'Aaron'
+    page = @agent.submit(form)
+    assert_match('Aaron', page.body)
+    assert_match(
+      "Content-Disposition: form-data; name=\"userfile1\"; filename=\"\"",
+      page.body
+    )
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: mechanize
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2006-07-05 00:00:00 -07:00
+  version: 0.5.1
+date: 2006-07-21 00:00:00 -07:00
 summary: Mechanize provides automated web-browsing
 require_paths: 
   - lib
@@ -81,7 +81,6 @@ files:
   - lib/mechanize
   - lib/mechanize.rb
   - lib/mechanize/cookie.rb
-  - lib/mechanize/cookie.rb.rej
   - lib/mechanize/errors.rb
   - lib/mechanize/form.rb
   - lib/mechanize/form_elements.rb

data/lib/mechanize/cookie.rb.rej

@@ -1,16 +0,0 @@
-***************
-*** 140,145 ****
-      def cookies(url)
-        cleanup
-        cookies = []
-        @jar.each_key do |domain|
-          if url.host =~ /#{domain}$/
-            @jar[domain].each_key do |name|
---- 140,146 ----
-      def cookies(url)
-        cleanup
-        cookies = []
-+       url.path = '/' if url.path.empty?
-        @jar.each_key do |domain|
-          if url.host =~ /#{domain}$/
-            @jar[domain].each_key do |name|