mechanize 2.7.5 → 2.7.6

data/lib/mechanize/http/content_disposition_parser.rb

@@ -141,7 +141,10 @@ class Mechanize::HTTP::ContentDispositionParser
           text << " "
         end
       else
-        if '"' == @scanner.peek(1) then
+        if '\\"' == @scanner.peek(2) then
+          @scanner.skip(/\\/)
+          text << @scanner.get_byte
+        elsif '"' == @scanner.peek(1) then
           @scanner.get_byte
           break
         else

data/lib/mechanize/http/www_authenticate_parser.rb

@@ -34,7 +34,7 @@ class Mechanize::HTTP::WWWAuthenticateParser
         scan_comma_spaces
       end
 
-      next unless scheme
+      break unless scheme
       challenge.scheme = scheme
 
       space = spaces

data/lib/mechanize/page.rb

@@ -58,7 +58,7 @@ class Mechanize::Page < Mechanize::File
   def title
     @title ||=
       if doc = parser
-        title = doc.search('title').inner_text
+        title = doc.xpath('string(((/html/head | /html | /head | /)/title)[1])').to_s
         title.empty? ? nil : title
       end
   end
@@ -282,7 +282,9 @@ class Mechanize::Page < Mechanize::File
   # value.
   #
   # :class, :dom_class: selects forms with a #dom_class value that
-  # matches this value.
+  # matches this value.  Note that class attribute values are compared
+  # literally as string, so forms_with(class: "a") does not match a
+  # form with class="a b".  Use forms_with(css: "form.a") instead.
   #
   # :search: only selects forms matching this selector expression.
   #

data/lib/mechanize/page/frame.rb

@@ -11,6 +11,8 @@ class Mechanize::Page::Frame < Mechanize::Page::Link
   attr_reader :text
   alias :name :text
 
+  attr_reader :node
+
   def initialize(node, mech, referer)
     super(node, mech, referer)
     @node = node

data/lib/mechanize/parser.rb

@@ -118,13 +118,13 @@ module Mechanize::Parser
     end
 
     # Set the filename
-    if disposition = @response['content-disposition'] then
+    if (disposition = @response['content-disposition'])
       content_disposition =
         Mechanize::HTTP::ContentDispositionParser.parse disposition
 
-      if content_disposition && content_disposition.filename && content_disposition.filename != '' then
+      if content_disposition && content_disposition.filename && content_disposition.filename != ''
         filename = content_disposition.filename
-        filename = filename.split(/[\\\/]/).last
+        filename = filename.rpartition(/[\\\/]/).last
         handled = true
       end
     end

data/lib/mechanize/test_case/http_refresh_servlet.rb

@@ -3,7 +3,6 @@ class HttpRefreshServlet < WEBrick::HTTPServlet::AbstractServlet
     res['Content-Type'] = req.query['ct'] || "text/html"
     refresh_time = req.query['refresh_time'] || 0
     refresh_url = req.query['refresh_url'] || '/'
-    res['Refresh'] = " #{refresh_time};url=#{refresh_url}\r\n";
+    res['Refresh'] = " #{refresh_time};url=#{refresh_url}";
   end
 end
-

data/lib/mechanize/test_case/infinite_refresh_servlet.rb

@@ -4,7 +4,6 @@ class InfiniteRefreshServlet < WEBrick::HTTPServlet::AbstractServlet
     res['Content-Type'] = req.query['ct'] || "text/html"
     res.status = req.query['code'] ? req.query['code'].to_i : '302'
     number = req.query['q'] ? req.query['q'].to_i : 0
-    res['Refresh'] = "0;url=http://#{address}/infinite_refresh?q=#{number + 1}\r\n";
+    res['Refresh'] = "0;url=http://#{address}/infinite_refresh?q=#{number + 1}";
   end
 end
-

data/lib/mechanize/version.rb

@@ -1,3 +1,3 @@
 class Mechanize
-  VERSION = "2.7.5"
+  VERSION = "2.7.6"
 end

data/mechanize.gemspec

@@ -46,11 +46,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 1.9.2"
 
   spec.add_runtime_dependency "net-http-digest_auth", [ ">= 1.1.1", "~> 1.1" ]
-  spec.add_runtime_dependency "net-http-persistent",  [ ">= 2.5.2", "~> 2.5" ]
   if RUBY_VERSION >= "2.0"
     spec.add_runtime_dependency "mime-types", [ ">= 1.17.2" ]
+    spec.add_runtime_dependency "net-http-persistent", [ ">= 2.5.2"]
   else
     spec.add_runtime_dependency "mime-types", [ ">= 1.17.2", "< 3" ]
+    spec.add_runtime_dependency "net-http-persistent", [ ">= 2.5.2", "~> 2.5" ]
   end
   spec.add_runtime_dependency "http-cookie",          [ "~> 1.0" ]
   spec.add_runtime_dependency "nokogiri",             [ "~> 1.6" ]

data/test/htdocs/find_link.html

@@ -11,13 +11,10 @@
         <A HREF="http://blargle.com/">blargle</A>
         <A HREF="http://a.cpan.org/">CPAN A</A>
         <A HREF="http://b.cpan.org/">CPAN B</A>
-        <FRAME SRC="foo.html">
-        <FRAME SRC="bar.html">
         <A HREF="http://c.cpan.org/" NAME="bongo">CPAN C</A>
         <A HREF="http://d.cpan.org/">CPAN D</A>
 
         <A HREF="http://www.msnbc.com/">MSNBC</A>
-        <FRAME SRC="http://www.oreilly.com/" NAME="wongo">
         <A HREF="http://www.cnn.com/">CNN</A>
         <A HREF="http://www.bbc.co.uk/" NAME="Wilma">BBC</A>
         <A HREF="http://www.msnbc.com/">News</A>
@@ -35,7 +32,7 @@
         <!-- new stuff -->
         <A HREF="http://nowhere.org/" Name="Here">NoWhere</A>
         <A HREF="http://nowhere.org/padded" Name=" Here "> NoWhere </A>
-        <A HREF="blongo.html">Blongo!</A>
+        <A HREF="form_test.html" class="formtest">Form Test</A>
     </body>
 </html>
 

data/test/test_mechanize.rb

@@ -943,7 +943,7 @@ but not <a href="/" rel="me nofollow">this</a>!
       "Content-Disposition: form-data; name=\"userfile1\"; filename=\"#{name}\"",
       page.body
     )
-    assert_send [page.body.bytesize, :>, File.size(__FILE__)]
+    assert_operator page.body.bytesize, :>, File.size(__FILE__)
   end
 
   def test_post_file_upload_nonascii
@@ -962,7 +962,7 @@ but not <a href="/" rel="me nofollow">this</a>!
       page.body
     )
     assert_match("Content-Type: application/zip", page.body)
-    assert_send [page.body.bytesize, :>, File.size(__FILE__)]
+    assert_operator page.body.bytesize, :>, File.size(__FILE__)
   end
 
   def test_post_file_upload
@@ -981,7 +981,7 @@ but not <a href="/" rel="me nofollow">this</a>!
       page.body
     )
     assert_match("Content-Type: application/zip", page.body)
-    assert_send [page.body.bytesize, :>, File.size(__FILE__)]
+    assert_operator page.body.bytesize, :>, File.size(__FILE__)
   end
 
   def test_post_redirect
@@ -1087,25 +1087,21 @@ but not <a href="/" rel="me nofollow">this</a>!
 
     assert_match(/Hello World/, @mech.current_page.body)
     refute_empty @mech.cookies
-    refute_empty Thread.current[@mech.agent.http.request_key]
 
     @mech.shutdown
 
-    assert_nil Thread.current[@mech.agent.http.request_key]
     assert_empty @mech.history
     assert_empty @mech.cookies
   end
 
   def test_start
-    body, id = nil
+    body = nil
 
     Mechanize.start do |m|
       body = m.get("http://localhost/").body
-      id = m.agent.http.request_key
     end
 
     assert_match(/Hello World/, body)
-    assert_nil Thread.current[id]
   end
 
   def test_submit_bad_form_method
@@ -1363,4 +1359,3 @@ but not <a href="/" rel="me nofollow">this</a>!
     end
   end
 end
-

data/test/test_mechanize_cookie.rb

@@ -18,14 +18,21 @@ module Enumerable
 end
 
 class TestMechanizeCookie < Mechanize::TestCase
-  def silently
-    warn_level = $VERBOSE
-    $VERBOSE = false
-    res = yield
-    $VERBOSE = warn_level
-    res
+  def assert_cookie_parse url, cookie_text, &block
+    cookie = nil
+
+    block ||= proc { |p_cookie| cookie = p_cookie }
+
+    exp_re = /The call of Mechanize::Cookie.parse/
+    assert_output "", exp_re do
+      Mechanize::Cookie.parse(url, cookie_text, &block)
+    end
+
+    cookie
   end
 
+  alias silently capture_io
+
   def test_parse_dates
     url = URI.parse('http://localhost/')
 
@@ -64,7 +71,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     uri = URI.parse 'http://example'
 
-    Mechanize::Cookie.parse uri, cookie_str do |cookie|
+    assert_cookie_parse uri, cookie_str do |cookie|
       assert_equal 'a', cookie.name
       assert_equal 'b', cookie.value
     end
@@ -75,7 +82,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     uri = URI.parse 'http://example'
 
-    Mechanize::Cookie.parse uri, cookie_str do |cookie|
+    assert_cookie_parse uri, cookie_str do |cookie|
       assert_equal 'foo',               cookie.name
       assert_equal 'bar',               cookie.value
       assert_equal '/',                 cookie.path
@@ -89,7 +96,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     uri = URI.parse 'http://example'
 
-    Mechanize::Cookie.parse uri, cookie_str do |cookie|
+    assert_cookie_parse uri, cookie_str do |cookie|
       assert_equal 'quoted', cookie.name
       assert_equal 'value', cookie.value
     end
@@ -98,35 +105,37 @@ class TestMechanizeCookie < Mechanize::TestCase
   def test_parse_weird_cookie
     cookie = 'n/a, ASPSESSIONIDCSRRQDQR=FBLDGHPBNDJCPCGNCPAENELB; path=/'
     url = URI.parse('http://www.searchinnovation.com/')
-    Mechanize::Cookie.parse(url, cookie) { |c|
+    assert_cookie_parse url, cookie do |c|
       assert_equal('ASPSESSIONIDCSRRQDQR', c.name)
       assert_equal('FBLDGHPBNDJCPCGNCPAENELB', c.value)
-    }
+    end
   end
 
   def test_double_semicolon
     double_semi = 'WSIDC=WEST;; domain=.williams-sonoma.com; path=/'
     url = URI.parse('http://williams-sonoma.com/')
-    Mechanize::Cookie.parse(url, double_semi) { |cookie|
+    assert_cookie_parse url, double_semi do |cookie|
       assert_equal('WSIDC', cookie.name)
       assert_equal('WEST', cookie.value)
-    }
+    end
   end
 
   def test_parse_bad_version
     bad_cookie = 'PRETANET=TGIAqbFXtt; Name=/PRETANET; Path=/; Version=1.2; Content-type=text/html; Domain=192.168.6.196; expires=Friday, 13-November-2026  23:01:46 GMT;'
     url = URI.parse('http://localhost/')
-    Mechanize::Cookie.parse(url, bad_cookie) { |cookie|
+
+    assert_cookie_parse url, bad_cookie do |cookie|
       assert_nil(cookie.version)
-    }
+    end
   end
 
   def test_parse_bad_max_age
     bad_cookie = 'PRETANET=TGIAqbFXtt; Name=/PRETANET; Path=/; Max-Age=1.2; Content-type=text/html; Domain=192.168.6.196; expires=Friday, 13-November-2026  23:01:46 GMT;'
     url = URI.parse('http://localhost/')
-    Mechanize::Cookie.parse(url, bad_cookie) { |cookie|
+
+    assert_cookie_parse url, bad_cookie do |cookie|
       assert_nil(cookie.max_age)
-    }
+    end
   end
 
   def test_parse_date_fail
@@ -151,7 +160,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     cookie_str = 'a=b; domain=.example.com'
 
-    cookie = Mechanize::Cookie.parse(url, cookie_str).first
+    cookie = assert_cookie_parse url, cookie_str
 
     assert_equal 'example.com', cookie.domain
     assert cookie.for_domain?
@@ -162,7 +171,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     cookie_str = 'a=b; domain=example.com'
 
-    cookie = Mechanize::Cookie.parse(url, cookie_str).first
+    cookie = assert_cookie_parse url, cookie_str
 
     assert_equal 'example.com', cookie.domain
     assert cookie.for_domain?
@@ -173,7 +182,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     cookie_str = 'a=b;'
 
-    cookie = Mechanize::Cookie.parse(url, cookie_str).first
+    cookie = assert_cookie_parse url, cookie_str
 
     assert_equal 'example.com', cookie.domain
     assert !cookie.for_domain?
@@ -184,17 +193,23 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     date = 'Mon, 19 Feb 2012 19:26:04 GMT'
 
-    cookie = Mechanize::Cookie.parse(url, "name=Akinori; expires=#{date}").first
+    cookie_text = "name=Akinori; expires=#{date}"
+    cookie = assert_cookie_parse url, cookie_text
     assert_equal Time.at(1329679564), cookie.expires
 
-    cookie = Mechanize::Cookie.parse(url, 'name=Akinori; max-age=3600').first
+    cookie_text = 'name=Akinori; max-age=3600'
+    cookie = assert_cookie_parse url, cookie_text
     assert_in_delta Time.now + 3600, cookie.expires, 1
 
     # Max-Age has precedence over Expires
-    cookie = Mechanize::Cookie.parse(url, "name=Akinori; max-age=3600; expires=#{date}").first
+    cookie_text = "name=Akinori; max-age=3600; expires=#{date}"
+    cookie = assert_cookie_parse url, cookie_text
+
     assert_in_delta Time.now + 3600, cookie.expires, 1
 
-    cookie = Mechanize::Cookie.parse(url, "name=Akinori; expires=#{date}; max-age=3600").first
+    cookie_text = "name=Akinori; expires=#{date}; max-age=3600"
+    cookie = assert_cookie_parse url, cookie_text
+
     assert_in_delta Time.now + 3600, cookie.expires, 1
   end
 
@@ -208,7 +223,7 @@ class TestMechanizeCookie < Mechanize::TestCase
       'name=Akinori; expires=',
       'name=Akinori; max-age=',
     ].each { |str|
-      cookie = Mechanize::Cookie.parse(url, str).first
+      cookie = assert_cookie_parse url, str
       assert cookie.session, str
     }
 
@@ -216,7 +231,7 @@ class TestMechanizeCookie < Mechanize::TestCase
       'name=Akinori; expires=Mon, 19 Feb 2012 19:26:04 GMT',
       'name=Akinori; max-age=3600',
     ].each { |str|
-      cookie = Mechanize::Cookie.parse(url, str).first
+      cookie = assert_cookie_parse url, str
       assert !cookie.session, str
     }
   end
@@ -237,7 +252,8 @@ class TestMechanizeCookie < Mechanize::TestCase
       "no_domain2=no_domain; Expires=Sun, 06 Nov 2011 00:29:53 GMT; no_expires=nope; Domain, " \
       "no_domain3=no_domain; Expires=Sun, 06 Nov 2011 00:29:53 GMT; no_expires=nope; Domain="
 
-    cookies = Mechanize::Cookie.parse url, cookie_str
+    cookies = nil
+    silently { cookies = Mechanize::Cookie.parse url, cookie_str }
     assert_equal 13, cookies.length
 
     name = cookies.find { |c| c.name == 'name' }
@@ -293,8 +309,8 @@ class TestMechanizeCookie < Mechanize::TestCase
           cookie_text << "#{cookie_params[key]}; "
         end
       end
-      cookie = nil
-      Mechanize::Cookie.parse(url, cookie_text) { |p_cookie| cookie = p_cookie }
+
+      cookie = assert_cookie_parse url, cookie_text
 
       assert_equal('12345%7D=ASDFWEE345%3DASda', cookie.to_s)
       assert_equal('/', cookie.path)
@@ -328,8 +344,7 @@ class TestMechanizeCookie < Mechanize::TestCase
           cookie_text << "#{cookie_params[key]}; "
         end
       end
-      cookie = nil
-      Mechanize::Cookie.parse(url, cookie_text) { |p_cookie| cookie = p_cookie }
+      cookie = assert_cookie_parse url, cookie_text
 
       assert_equal('12345%7D=', cookie.to_s)
       assert_equal('', cookie.value)
@@ -366,8 +381,8 @@ class TestMechanizeCookie < Mechanize::TestCase
           cookie_text << "#{cookie_params[key]}; "
         end
       end
-      cookie = nil
-      Mechanize::Cookie.parse(url, cookie_text) { |p_cookie| cookie = p_cookie }
+
+      cookie = assert_cookie_parse url, cookie_text
 
       assert_equal('12345%7D=ASDFWEE345%3DASda', cookie.to_s)
       assert_equal('/', cookie.path)
@@ -403,8 +418,8 @@ class TestMechanizeCookie < Mechanize::TestCase
           cookie_text << "#{cookie_params[key]}; "
         end
       end
-      cookie = nil
-      Mechanize::Cookie.parse(url, cookie_text) { |p_cookie| cookie = p_cookie }
+
+      cookie = assert_cookie_parse url, cookie_text
 
       assert_equal('12345%7D=ASDFWEE345%3DASda', cookie.to_s)
       assert_equal('/', cookie.path)
@@ -439,8 +454,8 @@ class TestMechanizeCookie < Mechanize::TestCase
           cookie_text << "#{cookie_params[key]};"
         end
       end
-      cookie = nil
-      Mechanize::Cookie.parse(url, cookie_text) { |p_cookie| cookie = p_cookie }
+
+      cookie = assert_cookie_parse url, cookie_text
 
       assert_equal('12345%7D=ASDFWEE345%3DASda', cookie.to_s)
       assert_equal('/', cookie.path)
@@ -458,7 +473,7 @@ class TestMechanizeCookie < Mechanize::TestCase
     cookie = Mechanize::Cookie.new('key', 'value')
     assert_equal 'key', cookie.name
     assert_equal 'value', cookie.value
-    assert_equal nil, cookie.expires
+    assert_nil cookie.expires
 
     # Minimum unit for the expires attribute is second
     expires = Time.at((Time.now + 3600).to_i)
@@ -478,7 +493,7 @@ class TestMechanizeCookie < Mechanize::TestCase
     url = URI.parse('http://host.dom.example.com:8080/')
 
     cookie_str = 'a=b; domain=Example.Com'
-    cookie = Mechanize::Cookie.parse(url, cookie_str).first
+    cookie = assert_cookie_parse url, cookie_str
     assert 'example.com', cookie.domain
 
     cookie.domain = DomainName(url.host)
@@ -512,8 +527,8 @@ class TestMechanizeCookie < Mechanize::TestCase
           cookie_text << "#{cookie_params[key]}; "
         end
       end
-      cookie = nil
-      Mechanize::Cookie.parse(url, cookie_text) { |p_cookie| cookie = p_cookie; }
+
+      cookie = assert_cookie_parse url, cookie_text
 
       assert_equal(true, cookie.httponly)