RubyGems - mechanize - Versions diffs - 0.4.6 → 0.4.7 - Mend

mechanize 0.4.6 → 0.4.7

Potentially problematic release.

This version of mechanize might be problematic. Click here for more details.

Files changed (13) hide show

data/CHANGELOG +9 -0
data/NOTES +9 -0
data/lib/mechanize.rb +7 -1
data/lib/mechanize/cookie.rb +17 -0
data/lib/mechanize/form.rb +5 -0
data/lib/mechanize/mech_version.rb +1 -1
data/lib/mechanize/page.rb +5 -1
data/test/htdocs/form_no_action.html +18 -0
data/test/tc_cookie_class.rb +40 -0
data/test/tc_cookies.rb +4 -10
data/test/tc_forms.rb +17 -2
data/test/tc_mech.rb +8 -0
metadata +3 -2

data/CHANGELOG CHANGED

@@ -1,3 +1,12 @@
+== 0.4.7
+* Fixed bug with no action in forms.  Thanks to Adam Wiggins
+* Setting a default user-agent string
+* Added house cleaning to the cookie jar so expired cookies don't stick around.
+* Added new method WWW::Form#field to find the first field with a given name.
+  (thanks to Gregory Brown)
+* Added WWW::Mechanize#get_file for fetching non text/html files
 == 0.4.6
 * Added support for proxies

data/NOTES CHANGED

@@ -1,5 +1,14 @@
 = Mechanize Release Notes
+== 0.4.7
+This release of mechanize comes with a few bug fixes including fixing a
+bug when there is no action specified in a form.
+In this version, a default user agent string is now set for mechanize.  Also
+a convenience method WWW::Mechanize#get_file has been added for fetching
+non text/html files.
 == 0.4.6
 The 0.4.6 release comes with proxy support which can be enabled by calling

data/lib/mechanize.rb CHANGED

@@ -66,6 +66,7 @@ class Mechanize
     'Mac Mozilla' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.4a) Gecko/20030401',
     'Linux Mozilla' => 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624',
     'Linux Konqueror' => 'Mozilla/5.0 (compatible; Konqueror/3; Linux)',
+    'Mechanize' => "WWW-Mechanize/#{WWW::MechVersion} (http://rubyforge.org/projects/mechanize/)"
   }
   attr_accessor :log
@@ -80,7 +81,7 @@ class Mechanize
   def initialize
     @history        = []
-    @user_agent     = nil
+    @user_agent     = AGENT_ALIASES['Mechanize']
     @user           = nil
     @open_timeout   = nil
     @read_timeout   = nil
@@ -139,6 +140,11 @@ class Mechanize
     page
   end
+  # Fetch a file and return the contents
+  def get_file(url)
+    get(url).body
+  end
   # Posts to the given URL wht the query parameters passed in.
   def post(url, query={})
     cur_page = current_page() || Page.new

data/lib/mechanize/cookie.rb CHANGED

@@ -132,10 +132,13 @@ module WWW
       end
       @jar[cookie.domain][cookie.name] = cookie
+      cleanup()
+      cookie
     end
     # Fetch the cookies that should be used for the URI object passed in.
     def cookies(url)
+      cleanup
       cookies = []
       @jar.each_key do |domain|
         if url.host =~ /#{domain}$/
@@ -157,5 +160,19 @@ module WWW
     def empty?(url)
       cookies(url).length > 0 ? false : true
     end
+    private
+    # Remove expired cookies
+    def cleanup
+      @jar.each_key do |domain|
+        @jar[domain].each_key do |name|
+          if ! @jar[domain][name].expires.nil? &&
+            DateTime.now > @jar[domain][name].expires
+              @jar[domain].delete(name)
+          end
+        end
+      end
+    end
   end
 end

data/lib/mechanize/form.rb CHANGED

@@ -194,5 +194,10 @@ module WWW
       @node = node
       super(@node, @node)
     end
+    # Fetch the first field whose name is equal to field_name
+    def field(field_name)
+      fields.find { |f| f.name.eql? field_name }
+    end
   end
 end

data/lib/mechanize/mech_version.rb CHANGED

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

data/lib/mechanize/page.rb CHANGED

@@ -24,6 +24,8 @@ module WWW
     attr_finder :frames, :iframes, :links, :forms, :meta, :watches
     attr_reader :body_filter
+    alias :content :body
     # Alias our finders so that we can lazily parse the html
     alias :find_frames   :frames
     alias :find_iframes  :iframes
@@ -159,7 +161,9 @@ module WWW
         case name
         when 'form'
-          @forms << Form.new(node)
+          form = Form.new(node)
+          form.action ||= @uri
+          @forms << form
         when 'a'
           @links << Link.new(node)
         when 'meta'

data/test/htdocs/form_no_action.html ADDED

@@ -0,0 +1,18 @@
+<html>
+  <head><title>Page Title</title></head>
+  <body>
+    <form name="get_form" method="get">
+      <table>
+        <tr>
+          <td>First Name</td>
+          <td><input name="first" type="text" /></td>
+        </tr>
+        <tr>
+          <td><input type="submit" value="Submit" /></td>
+          <td></td>
+        </tr>
+      </table>
+    </form>
+  </body>
+</html>

data/test/tc_cookie_class.rb CHANGED

@@ -129,6 +129,46 @@ class CookieClassTest < Test::Unit::TestCase
     end
   end
+  # Test using secure cookies
+  def test_cookie_with_secure
+    url = URI.parse('http://rubyforge.org/')
+    cookie_params = {}
+    cookie_params['expires']   = 'expires=Sun, 27-Sep-2037 00:00:00 GMT'
+    cookie_params['path']      = 'path=/'
+    cookie_params['domain']    = 'domain=.rubyforge.org'
+    cookie_params['secure']    = 'secure'
+    cookie_value = '12345%7D=ASDFWEE345%3DASda'
+    expires = DateTime.strptime('Sun, 27-Sep-2037 00:00:00 GMT',
+              '%a, %d-%b-%Y %T %Z')
+    cookie_params.keys.combine.each do |c|
+      next unless c.find { |k| k == 'secure' }
+      cookie_text = "#{cookie_value}; "
+      c.each_with_index do |key, idx|
+        if idx == (c.length - 1)
+          cookie_text << "#{cookie_params[key]}"
+        else
+          cookie_text << "#{cookie_params[key]}; "
+        end
+      end
+      cookie = nil
+      WWW::Cookie.parse(url, cookie_text) { |p_cookie| cookie = p_cookie }
+      assert_not_nil(cookie)
+      assert_equal('12345%7D=ASDFWEE345%3DASda', cookie.to_s)
+      assert_equal('rubyforge.org', cookie.domain)
+      assert_equal('/', cookie.path)
+      assert_equal(true, cookie.secure)
+      # if expires was set, make sure we parsed it
+      if c.find { |k| k == 'expires' }
+        assert_equal(expires, cookie.expires)
+      else
+        assert_nil(cookie.expires)
+      end
+    end
+  end
   # If no domain was given, we must use the one from the URL
   def test_cookie_with_url_domain
     url = URI.parse('http://login.rubyforge.org/')

data/test/tc_cookies.rb CHANGED

@@ -33,7 +33,7 @@ class CookiesMechTest < Test::Unit::TestCase
   def test_many_cookies_as_string
     agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
     page = agent.get("http://localhost:#{@port}/many_cookies_as_string")
-    assert_equal(5, agent.cookies.length)
+    assert_equal(4, agent.cookies.length)
     name_cookie = agent.cookies.find { |k| k.name == "name" }
     assert_not_nil(name_cookie, "Name cookie was nil")
@@ -42,10 +42,7 @@ class CookiesMechTest < Test::Unit::TestCase
     assert_equal(true, DateTime.now < name_cookie.expires)
     expired_cookie = agent.cookies.find { |k| k.name == "expired" }
-    assert_not_nil(expired_cookie, "Expired cookie was nil")
-    assert_equal("doh", expired_cookie.value)
-    assert_equal("/", expired_cookie.path)
-    assert_equal(true, DateTime.now > expired_cookie.expires)
+    assert_nil(expired_cookie, "Expired cookie was not nil")
     no_exp_cookie = agent.cookies.find { |k| k.name == "no_expires" }
     assert_not_nil(no_exp_cookie, "No expires cookie is nil")
@@ -68,7 +65,7 @@ class CookiesMechTest < Test::Unit::TestCase
   def test_many_cookies
     agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
     page = agent.get("http://localhost:#{@port}/many_cookies")
-    assert_equal(5, agent.cookies.length)
+    assert_equal(4, agent.cookies.length)
     name_cookie = agent.cookies.find { |k| k.name == "name" }
     assert_not_nil(name_cookie, "Name cookie was nil")
@@ -77,10 +74,7 @@ class CookiesMechTest < Test::Unit::TestCase
     assert_equal(true, DateTime.now < name_cookie.expires)
     expired_cookie = agent.cookies.find { |k| k.name == "expired" }
-    assert_not_nil(expired_cookie, "Expired cookie was nil")
-    assert_equal("doh", expired_cookie.value)
-    assert_equal("/", expired_cookie.path)
-    assert_equal(true, DateTime.now > expired_cookie.expires)
+    assert_nil(expired_cookie, "Expired cookie was not nil")
     no_exp_cookie = agent.cookies.find { |k| k.name == "no_expires" }
     assert_not_nil(no_exp_cookie, "No expires cookie is nil")

data/test/tc_forms.rb CHANGED

@@ -9,6 +9,13 @@ require 'test_includes'
 class FormsMechTest < Test::Unit::TestCase
   include TestMethods
+  def test_no_form_action
+    mech = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    page = mech.get('http://localhost:2000/form_no_action.html')
+    page.forms.first.fields.first.value = 'Aaron'
+    page = mech.submit(page.forms.first)
+    assert_match('/form_no_action.html?first=Aaron', page.uri.to_s)
+  end
   # Test submitting form with two fields of the same name
   def test_post_multival
     agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
@@ -367,13 +374,13 @@ class FormsMechTest < Test::Unit::TestCase
       "Gender female button was nil"
     )
-    assert_not_nil(post_form.checkboxes.find { |f| f.name == "cool person" },
+    assert_not_nil(post_form.checkboxes.name("cool person").first,
       "couldn't find cool person checkbox")
     assert_not_nil(post_form.checkboxes.find { |f| f.name == "likes ham" },
       "couldn't find likes ham checkbox")
     # Now set all the fields
-    post_form.fields.find { |f| f.name == "first_name" }.value = "Aaron"
+    post_form.fields.name('first_name').value = "Aaron"
     post_form.radiobuttons.find { |f|
       f.name == "gender" && f.value == "male"
     }.checked = true
@@ -456,4 +463,12 @@ class FormsMechTest < Test::Unit::TestCase
       "one field missing"
     )
   end
+  def test_field_addition
+    agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    page = agent.get("http://localhost:#{@port}/form_test.html")
+    get_form = page.forms.find { |f| f.name == "get_form1" }
+    get_form.field("first_name").value = "Gregory"
+    assert_equal( "Gregory", get_form.field("first_name").value )
+  end
 end

data/test/tc_mech.rb CHANGED

@@ -100,4 +100,12 @@ class MechMethodsTest < Test::Unit::TestCase
       assert_equal(a, d)
     }
   end
+  def test_get_file
+    agent = WWW::Mechanize.new { |a| a.log = Logger.new(nil) }
+    page = agent.get("http://localhost:#{@port}/frame_test.html")
+    content_length = page.header['Content-Length']
+    page_as_string = agent.get_file("http://localhost:#{@port}/frame_test.html")
+    assert_equal(content_length.to_i, page_as_string.length.to_i)
+  end
 end

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11.13
 specification_version: 1
 name: mechanize
 version: !ruby/object:Gem::Version
-  version: 0.4.6
-date: 2006-06-02 00:00:00 -07:00
+  version: 0.4.7
+date: 2006-06-19 00:00:00 -07:00
 summary: Mechanize provides automated web-browsing
 require_paths:
 - lib
@@ -60,6 +60,7 @@ files:
 - test/htdocs/find_link.html
 - test/htdocs/index.html
 - test/htdocs/google.html
+- test/htdocs/form_no_action.html
 - test/htdocs/file_upload.html
 - test/htdocs/iframe_test.html
 - test/data/htpasswd