mechanize 2.0 → 2.0.1

data/.autotest

@@ -0,0 +1,6 @@
+require 'autotest/restart'
+
+Autotest.add_hook :initialize do |at|
+  at.testlib = 'minitest/autorun'
+end
+

data/CHANGELOG.rdoc

@@ -1,6 +1,17 @@
 = Mechanize CHANGELOG
 
-=== 2.0.pre.2 / 2011-04-17
+=== 2.0.1 / 2011-06-28
+
+Mechanize now uses minitest to avoid 1.9 vs 1.8 assertion availability in
+test/unit
+
+* Bug Fixes
+  * Restored Mechanize#set_proxy.  Issue #117, #118, #119
+  * Mechanize::CookieJar#load now lazy-loads YAML.  Issue #118
+  * Mechanize#keep_alive_time no longer crashes but does nothing as
+    net-http-persistent does not support HTTP/1.0 keep-alive extensions.
+
+=== 2.0 / 2011-06-27
 
 Mechanize is now under the MIT license
 

data/Manifest.txt

@@ -1,3 +1,4 @@
+.autotest
 CHANGELOG.rdoc
 EXAMPLES.rdoc
 FAQ.rdoc

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'hoe'
-Hoe.plugin :bundler
-Hoe.plugin :gemspec
+
 Hoe.plugin :git
+Hoe.plugin :minitest
 
 Hoe.spec 'mechanize' do
   developer 'Eric Hodel',      'drbrain@segment7.net'
@@ -13,6 +13,8 @@ Hoe.spec 'mechanize' do
   self.history_file     = 'CHANGELOG.rdoc'
   self.extra_rdoc_files += Dir['*.rdoc']
 
+  rdoc_locations << 'drbrain@rubyforge.org:/var/www/gforge-projects/mechanize/'
+
   self.extra_deps << ['nokogiri',             '~> 1.4']
   self.extra_deps << ['net-http-persistent',  '~> 1.8']
   self.extra_deps << ['net-http-digest_auth', '~> 1.1', '>= 1.1.1']

data/lib/mechanize.rb

@@ -33,7 +33,7 @@ class Mechanize
 
   ##
   # The version of Mechanize you are using.
-  VERSION = '2.0'
+  VERSION = '2.0.1'
 
   class Error < RuntimeError
   end
@@ -44,6 +44,14 @@ class Mechanize
                    "#{RUBY_VERSION}dev#{RUBY_REVISION}"
                  end
 
+  # HTTP/1.1 keep-alives are always active.  This does nothing.
+  attr_accessor :keep_alive
+
+  # HTTP/1.0 keep-alive time.  This is no longer supported by mechanize as it
+  # now uses net-http-persistent which only supports HTTP/1.1 persistent
+  # connections
+  attr_accessor :keep_alive_time
+
   ##
   # User Agent aliases
 
@@ -162,18 +170,6 @@ class Mechanize
     @agent.gzip_enabled = enabled
   end
 
-  # HTTP/1.0 keep-alive time
-  def keep_alive_time
-    @agent.keep_alive_time
-  end
-
-  def keep_alive_time= keep_alive_time
-    @agent.keep_alive_time = keep_alive_time
-  end
-
-  # HTTP/1.1 keep-alives are always active.  This does nothing.
-  attr_accessor :keep_alive
-
   def conditional_requests
     @agent.conditional_requests
   end
@@ -300,6 +296,7 @@ class Mechanize
     @pluggable_parser = PluggableParser.new
 
     @keep_alive       = true
+    @keep_alive_time  = 0
 
     # Proxy
     @proxy_addr = nil
@@ -578,6 +575,19 @@ class Mechanize
     end
   end
 
+  ##
+  # Sets the proxy +address+ at +port+ with an optional +user+ and +password+
+
+  def set_proxy address, port, user = nil, password = nil
+    @proxy_addr = address
+    @proxy_port = port
+    @proxy_user = user
+    @proxy_pass = password
+
+    @agent.set_proxy address, port, user, password
+    @agent.set_http
+  end
+
   # Runs given block, then resets the page history as it was before. self is
   # given as a parameter to the block. Returns the value of the block.
   def transact

data/lib/mechanize/cookie_jar.rb

@@ -83,12 +83,7 @@ class Mechanize::CookieJar
     open(file, 'w') { |f|
       case format
       when :yaml then
-        begin
-          require 'psych'
-        rescue LoadError
-        end
-
-        require 'yaml'
+        load_yaml
 
         YAML.dump(jar.jar, f)
       when :cookiestxt then
@@ -110,7 +105,9 @@ class Mechanize::CookieJar
     @jar = open(file) { |f|
       case format
       when :yaml then
-        YAML::load(f)
+        load_yaml
+
+        YAML.load(f)
       when :cookiestxt then
         load_cookiestxt(f)
       else
@@ -123,6 +120,15 @@ class Mechanize::CookieJar
     self
   end
 
+  def load_yaml # :nodoc:
+    begin
+      require 'psych'
+    rescue LoadError
+    end
+
+    require 'yaml'
+  end
+
   # Clear the cookie jar
   def clear!
     @jar = {}

data/test/helper.rb

@@ -1,5 +1,5 @@
-require 'test/unit'
 require 'rubygems'
+require 'minitest/autorun'
 require 'mechanize'
 require 'webrick/httputils'
 require 'servlets'

data/test/test_cookies.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class CookiesMechTest < Test::Unit::TestCase
+class CookiesMechTest < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end
@@ -21,15 +21,15 @@ class CookiesMechTest < Test::Unit::TestCase
     page = @agent.get("http://localhost/many_cookies")
     page = @agent.get("http://localhost/send_cookies")
     assert_equal(3, page.links.length)
-    assert_not_nil(page.links.find { |l| l.text == "name:Aaron" })
-    assert_not_nil(page.links.find { |l| l.text == "no_expires:nope" })
+    assert(page.links.find { |l| l.text == "name:Aaron" })
+    assert(page.links.find { |l| l.text == "no_expires:nope" })
   end
 
   def test_no_space_cookies
     @agent.get("http://localhost/one_cookie_no_space")
     assert_equal(1, @agent.cookies.length)
     foo_cookie = @agent.cookies.find { |k| k.name == 'foo' }
-    assert_not_nil(foo_cookie, 'Foo cookie was nil')
+    assert(foo_cookie, 'Foo cookie was nil')
     assert_equal('bar', foo_cookie.value)
     assert_equal('/', foo_cookie.path)
     assert_equal(true, Time.now < foo_cookie.expires)
@@ -40,7 +40,7 @@ class CookiesMechTest < Test::Unit::TestCase
     assert_equal(4, @agent.cookies.length)
 
     name_cookie = @agent.cookies.find { |k| k.name == "name" }
-    assert_not_nil(name_cookie, "Name cookie was nil")
+
     assert_equal("Aaron", name_cookie.value)
     assert_equal("/", name_cookie.path)
     assert_equal(true, Time.now < name_cookie.expires)
@@ -49,18 +49,18 @@ class CookiesMechTest < Test::Unit::TestCase
     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")
+
     assert_equal("nope", no_exp_cookie.value)
     assert_equal("/", no_exp_cookie.path)
     assert_nil(no_exp_cookie.expires)
 
     path_cookie = @agent.cookies.find { |k| k.name == "a_path" }
-    assert_not_nil(path_cookie, "Path cookie is nil")
+
     assert_equal("some_path", path_cookie.value)
     assert_equal(true, Time.now < path_cookie.expires)
 
     no_path_cookie = @agent.cookies.find { |k| k.name == "no_path" }
-    assert_not_nil(no_path_cookie, "No path cookie is nil")
+
     assert_equal("no_path", no_path_cookie.value)
     assert_equal("/", no_path_cookie.path)
     assert_equal(true, Time.now < no_path_cookie.expires)
@@ -71,7 +71,7 @@ class CookiesMechTest < Test::Unit::TestCase
     assert_equal(4, @agent.cookies.length)
 
     name_cookie = @agent.cookies.find { |k| k.name == "name" }
-    assert_not_nil(name_cookie, "Name cookie was nil")
+    assert(name_cookie, "Name cookie was nil")
     assert_equal("Aaron", name_cookie.value)
     assert_equal("/", name_cookie.path)
     assert_equal(true, Time.now < name_cookie.expires)
@@ -80,18 +80,18 @@ class CookiesMechTest < Test::Unit::TestCase
     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")
+    assert(no_exp_cookie, "No expires cookie is nil")
     assert_equal("nope", no_exp_cookie.value)
     assert_equal("/", no_exp_cookie.path)
     assert_nil(no_exp_cookie.expires)
 
     path_cookie = @agent.cookies.find { |k| k.name == "a_path" }
-    assert_not_nil(path_cookie, "Path cookie is nil")
+    assert(path_cookie, "Path cookie is nil")
     assert_equal("some_path", path_cookie.value)
     assert_equal(true, Time.now < path_cookie.expires)
 
     no_path_cookie = @agent.cookies.find { |k| k.name == "no_path" }
-    assert_not_nil(no_path_cookie, "No path cookie is nil")
+    assert(no_path_cookie, "No path cookie is nil")
     assert_equal("no_path", no_path_cookie.value)
     assert_equal("/", no_path_cookie.path)
     assert_equal(true, Time.now < no_path_cookie.expires)

data/test/test_form_action.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestFormAction < Test::Unit::TestCase
+class TestFormAction < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
     @page  = @agent.get("http://localhost/tc_form_action.html")

data/test/test_form_as_hash.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestFormHash < Test::Unit::TestCase
+class TestFormHash < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
     @page  = @agent.get('http://localhost/form_multival.html')
@@ -9,31 +9,28 @@ class TestFormHash < Test::Unit::TestCase
   def test_form_hash
     form = @page.form_with(:name => 'post_form')
 
-    assert_not_nil(form)
     field_length = form.fields.length
     assert_nil(form['intarweb'])
     form['intarweb'] = 'Aaron'
 
-    assert_not_nil(form['intarweb'])
+    assert form['intarweb']
     assert_equal(field_length + 1, form.fields.length)
   end
 
   def test_add_field_via_hash
     form = @page.form_with(:name => 'post_form')
 
-    assert_not_nil(form)
     field_length = form.fields.length
     assert_nil(form['intarweb'])
     form['intarweb'] = 'Aaron'
 
-    assert_not_nil(form['intarweb'])
+    assert form['intarweb']
     assert_equal(field_length + 1, form.fields.length)
   end
 
   def test_fields_as_hash
     form = @page.form_with(:name => 'post_form')
 
-    assert_not_nil(form)
     assert_equal(2, form.fields_with(:name => 'first').length)
 
     form['first'] = 'Aaron'
@@ -45,12 +42,13 @@ class TestFormHash < Test::Unit::TestCase
     @page = @agent.get('http://localhost/empty_form.html')
     form = @page.forms.first
 
-    assert_not_nil(form)
     assert(!form.has_field?('name'))
     assert(!form.has_value?('Aaron'))
     assert_equal(0, form.keys.length)
     assert_equal(0, form.values.length)
+
     form['name'] = 'Aaron'
+
     assert(form.has_field?('name'))
     assert(form.has_value?('Aaron'))
     assert_equal(1, form.keys.length)

data/test/test_form_button.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestFormButtons < Test::Unit::TestCase
+class TestFormButtons < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end

data/test/test_frames.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class FramesMechTest < Test::Unit::TestCase
+class FramesMechTest < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end

data/test/test_headers.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestHeaders < Test::Unit::TestCase
+class TestHeaders < MiniTest::Unit::TestCase
   def setup
     @headers = Mechanize::Headers.new
     @headers['content-type'] = 'text/html'

data/test/test_history.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestHistory < Test::Unit::TestCase
+class TestHistory < MiniTest::Unit::TestCase
 
   Node = Struct.new :href, :inner_text
 

data/test/test_history_added.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class HistoryAddedTest < Test::Unit::TestCase
+class HistoryAddedTest < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end

data/test/test_html_unscape_forms.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestCheckBoxes < Test::Unit::TestCase
+class TestCheckBoxes < MiniTest::Unit::TestCase
   def test_field
     f = Mechanize::Form::Field.new({'name' => 'a&amp;b'}, 'a&amp;b')
     assert_equal('a&b', f.name)

data/test/test_if_modified_since.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestIfModifiedSince < Test::Unit::TestCase
+class TestIfModifiedSince < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end

data/test/test_images.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class ImagesMechTest < Test::Unit::TestCase
+class ImagesMechTest < MiniTest::Unit::TestCase
   def setup
     @agent = Mechanize.new
   end

data/test/test_mechanize.rb

@@ -2,7 +2,7 @@
 
 require 'helper'
 
-class TestMechanize < Test::Unit::TestCase
+class TestMechanize < MiniTest::Unit::TestCase
 
   KEY = OpenSSL::PKey::RSA.new 512
   name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
@@ -91,32 +91,31 @@ class TestMechanize < Test::Unit::TestCase
     @mech.user_agent_alias = 'Mac Safari'
     page = @mech.get("http://localhost/frame_test.html")
     link = page.link_with(:text => "Form Test")
-    assert_not_nil(link)
+
     page = @mech.click(link)
+
     assert_equal("http://localhost/form_test.html",
-      @mech.history.last.uri.to_s)
+                 @mech.history.last.uri.to_s)
   end
 
   def test_click_frame_hpricot_style
     page = @mech.get("http://localhost/frame_test.html")
-
     link = (page/"//frame[@name='frame2']").first
-    assert_not_nil(link)
+
     page = @mech.click(link)
+
     assert_equal("http://localhost/form_test.html",
-      @mech.history.last.uri.to_s)
+                 @mech.history.last.uri.to_s)
   end
 
   def test_click_hpricot_style # HACK move to test_divide in Page
     page = @mech.get("http://localhost/frame_test.html")
-
     link = (page/"//a[@class='bar']").first
-    assert_not_nil(link)
 
     page = @mech.click(link)
 
     assert_equal("http://localhost/form_test.html",
-      @mech.history.last.uri.to_s)
+                 @mech.history.last.uri.to_s)
   end
 
   def test_click_link
@@ -216,8 +215,8 @@ class TestMechanize < Test::Unit::TestCase
   end
 
   def test_get_bad_url
-    assert_raise ArgumentError do
-      @mech.get('/foo.html')
+    assert_raises ArgumentError do
+      @mech.get '/foo.html'
     end
   end
 
@@ -383,8 +382,9 @@ class TestMechanize < Test::Unit::TestCase
   def test_get_kcode
     $KCODE = 'u'
     page = @mech.get("http://localhost/?a=#{[0xd6].pack('U')}")
-    assert_not_nil(page)
+
     assert_equal('http://localhost/?a=%D6', page.uri.to_s)
+
     $KCODE = 'NONE'
   end unless RUBY_VERSION >= '1.9.0'
 
@@ -426,9 +426,10 @@ class TestMechanize < Test::Unit::TestCase
   end
 
   def test_get_referer_file
-    assert_nothing_raised do
-      @mech.get('http://localhost', [], Mechanize::File.new(URI.parse('http://tenderlovemaking.com/crossdomain.xml')))
-    end
+    uri = URI.parse 'http://tenderlovemaking.com/crossdomain.xml'
+    file = Mechanize::File.new uri
+
+    @mech.get('http://localhost', [], file)
 
     # HACK no assertion of behavior
   end
@@ -448,9 +449,9 @@ class TestMechanize < Test::Unit::TestCase
   end
 
   def test_get_scheme_unsupported
-    assert_raise(Mechanize::UnsupportedSchemeError) {
+    assert_raises Mechanize::UnsupportedSchemeError do
       @mech.get('ftp://server.com/foo.html')
-    }
+    end
   end
 
   def test_get_space
@@ -470,15 +471,11 @@ class TestMechanize < Test::Unit::TestCase
   end
 
   def test_get_weird
-    assert_nothing_raised {
-      @mech.get('http://localhost/?action=bing&bang=boom=1|a=|b=|c=')
-    }
-    assert_nothing_raised {
-      @mech.get('http://localhost/?a=b&#038;b=c&#038;c=d')
-    }
-    assert_nothing_raised {
-      @mech.get("http://localhost/?a=#{[0xd6].pack('U')}")
-    }
+    @mech.get('http://localhost/?action=bing&bang=boom=1|a=|b=|c=')
+    @mech.get('http://localhost/?a=b&#038;b=c&#038;c=d')
+    @mech.get("http://localhost/?a=#{[0xd6].pack('U')}")
+
+    # HACK no assertion of behavior
   end
 
   def test_get_yield
@@ -550,6 +547,14 @@ class TestMechanize < Test::Unit::TestCase
     }
   end
 
+  def test_keep_alive_time
+    assert_equal 0, @mech.keep_alive_time
+
+    @mech.keep_alive_time = 1
+
+    assert_equal 1, @mech.keep_alive_time
+  end
+
   def test_max_history_equals
     @mech.max_history = 10
     0.upto(10) do |i|
@@ -627,9 +632,22 @@ class TestMechanize < Test::Unit::TestCase
     assert_equal 5, @mech.read_timeout
   end
 
+  def test_set_proxy
+    http = @mech.agent.http
+
+    @mech.set_proxy 'localhost', 8080, 'user', 'pass'
+
+    assert_equal 'localhost', @mech.proxy_addr
+    assert_equal 8080,        @mech.proxy_port
+    assert_equal 'user',      @mech.proxy_user
+    assert_equal 'pass',      @mech.proxy_pass
+
+    refute_same http, @mech.agent.http
+  end
+
   def test_submit_bad_form_method
     page = @mech.get("http://localhost/bad_form_test.html")
-    assert_raise ArgumentError do
+    assert_raises ArgumentError do
       @mech.submit(page.forms.first)
     end
   end