mechanize 2.7.5 → 2.7.6

data/test/test_mechanize_cookie_jar.rb

@@ -6,6 +6,30 @@ class TestMechanizeCookieJar < Mechanize::TestCase
     super
 
     @jar = Mechanize::CookieJar.new
+
+    @jar.extend Minitest::Assertions
+
+    def @jar.add(*args)
+      capture_io { super }
+    end
+
+    def @jar.jar(*args)
+      result = nil
+      capture_io { result = super }
+      result
+    end
+
+    def @jar.save_as(*args)
+      result = nil
+      capture_io { result = super }
+      result
+    end
+
+    def @jar.clear!(*args)
+      result = nil
+      capture_io { result = super }
+      result
+    end
   end
 
   def cookie_values(options = {})
@@ -270,8 +294,7 @@ class TestMechanizeCookieJar < Mechanize::TestCase
     # Add one cookie with an expiration date in the future
     cookie = Mechanize::Cookie.new(cookie_values)
     s_cookie = Mechanize::Cookie.new(cookie_values(:name => 'Bar',
-                                              :expires => nil,
-                                              :session => true))
+                                              :expires => nil))
 
     @jar.add(url, cookie)
     @jar.add(url, s_cookie)
@@ -297,8 +320,7 @@ class TestMechanizeCookieJar < Mechanize::TestCase
     # Add one cookie with an expiration date in the future
     cookie = Mechanize::Cookie.new(cookie_values)
     s_cookie = Mechanize::Cookie.new(cookie_values(:name => 'Bar',
-                                              :expires => nil,
-                                              :session => true))
+                                              :expires => nil))
 
     @jar.add(url, cookie)
     @jar.add(url, s_cookie)
@@ -324,8 +346,7 @@ class TestMechanizeCookieJar < Mechanize::TestCase
     # Add one cookie with an expiration date in the future
     cookie = Mechanize::Cookie.new(cookie_values)
     s_cookie = Mechanize::Cookie.new(cookie_values(:name => 'Bar',
-                                              :expires => nil,
-                                              :session => true))
+                                              :expires => nil))
 
     @jar.add(url, cookie)
     @jar.add(url, s_cookie)

data/test/test_mechanize_file_response.rb

@@ -5,7 +5,7 @@ class TestMechanizeFileResponse < Mechanize::TestCase
   def test_content_type
     Tempfile.open %w[pi .nothtml] do |tempfile|
       res = Mechanize::FileResponse.new tempfile.path
-      assert_equal nil, res['content-type']
+      assert_nil res['content-type']
     end
 
     Tempfile.open %w[pi .xhtml] do |tempfile|

data/test/test_mechanize_form.rb

@@ -214,7 +214,7 @@ class TestMechanizeForm < Mechanize::TestCase
 
     @form['name'] = 'Aaron'
 
-    assert @form.has_field?('name')
+    assert_equal true, @form.has_field?('name')
   end
 
   def test_has_value_eh
@@ -222,7 +222,7 @@ class TestMechanizeForm < Mechanize::TestCase
 
     @form['name'] = 'Aaron'
 
-    assert @form.has_value?('Aaron')
+    assert_equal true, @form.has_value?('Aaron')
   end
 
   def test_keys
@@ -863,15 +863,19 @@ class TestMechanizeForm < Mechanize::TestCase
   def test_form_and_fields_dom_id
     # blatant copypasta of test above
     page = @mech.get("http://localhost/form_test.html")
-    form = page.form_with(:dom_id => 'generic_form')
-    form_by_id = page.form_with(:id => 'generic_form')
+    form = page.form_with(dom_id: 'generic_form')
 
-    assert_equal(1, form.fields_with(:dom_id => 'name_first').length)
-    assert_equal('first_name', form.field_with(:dom_id => 'name_first').name)
+    assert_equal(1, form.fields_with(dom_id: 'name_first').length)
+    assert_equal('first_name', form.field_with(dom_id: 'name_first').name)
 
-    #  *_with(:id => blah) should work exactly like (:dom_id => blah)
-    assert_equal(form, form_by_id)
-    assert_equal(form.fields_with(:dom_id => 'name_first'), form.fields_with(:id => 'name_first'))
+    assert_equal(form, page.form_with(id: 'generic_form'))
+    assert_equal(form, page.form_with(css: '#generic_form'))
+
+    fields_by_dom_id = form.fields_with(dom_id: 'name_first')
+    assert_equal(fields_by_dom_id, form.fields_with(id: 'name_first'))
+    assert_equal(fields_by_dom_id, form.fields_with(css: '#name_first'))
+    assert_equal(fields_by_dom_id, form.fields_with(xpath: '//*[@id="name_first"]'))
+    assert_equal(fields_by_dom_id, form.fields_with(search: '//*[@id="name_first"]'))
   end
 
   def test_form_and_fields_dom_class
@@ -914,9 +918,9 @@ class TestMechanizeForm < Mechanize::TestCase
     page = @mech.get("http://localhost/form_multival.html")
     form = page.form_with(:name => 'post_form')
 
-    assert(!form.has_field?('intarweb'))
+    assert_equal false, form.has_field?('intarweb')
     assert form.add_field!('intarweb')
-    assert(form.has_field?('intarweb'))
+    assert_equal true, form.has_field?('intarweb')
   end
 
   def test_fill_unexisting_form

data/test/test_mechanize_form_check_box.rb

@@ -8,6 +8,16 @@ class TestMechanizeFormCheckBox < Mechanize::TestCase
     @page = @mech.get('http://localhost/tc_checkboxes.html')
   end
 
+  def test_search
+    form = @page.forms.first
+
+    checkbox = form.checkbox_with(name: 'green')
+    assert_equal('green', checkbox.name)
+
+    assert_equal(checkbox, form.checkbox_with('green'))
+    assert_equal(checkbox, form.checkbox_with(search: 'input[@type=checkbox][@name=green]'))
+  end
+
   def test_check
     form = @page.forms.first
 

data/test/test_mechanize_form_encoding.rb

@@ -67,7 +67,7 @@ class TestMechanizeFormEncoding < Mechanize::TestCase
     node['enctype'] = 'application/x-www-form-urlencoded'
     form = Mechanize::Form.new(node)
 
-    assert_equal nil, form.encoding
+    assert_nil form.encoding
   end
 
   def test_post_form_with_form_encoding

data/test/test_mechanize_form_multi_select_list.rb

@@ -32,9 +32,13 @@ class TestMechanizeFormMultiSelectList < Mechanize::TestCase
   end
 
   def test_option_with
-    option = @select.option_with :value => '1'
+    option = @select.option_with value: '1'
 
     assert_equal '1', option.value
+
+    option = @select.option_with search: 'option[@selected]'
+
+    assert_equal '2', option.value
   end
 
   def test_options_with

data/test/test_mechanize_http_agent.rb

@@ -682,6 +682,14 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'absolute URL needed (not google)', e.message
   end
 
+  def test_resolve_uri_without_path
+    e = assert_raises ArgumentError do
+      @agent.resolve 'http:%5C%5Cfoo'
+    end
+
+    assert_equal 'hierarchical URL needed (not http:%5C%5Cfoo)', e.message
+  end
+
   def test_resolve_utf8
     uri = 'http://example?q=ü'
 
@@ -1057,6 +1065,14 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'part', body.read
   end
 
+  def test_response_content_encoding_identity
+    @res.instance_variable_set :@header, 'content-encoding' => %w[identity]
+
+    body = @agent.response_content_encoding @res, StringIO.new('part')
+
+    assert_equal 'part', body.read
+  end
+
   def test_response_content_encoding_tempfile_7_bit
     body_io = tempfile 'part'
 
@@ -1650,6 +1666,42 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     assert_equal 'invalid value for port: "nonexistent service"', e.message
   end
 
+  def test_set_proxy_with_scheme
+    @agent.set_proxy 'http://www.example.com', 9001, 'joe', 'lol'
+
+    assert_equal @agent.proxy_uri.host,     'www.example.com'
+    assert_equal @agent.proxy_uri.port,     9001
+    assert_equal @agent.proxy_uri.user,     'joe'
+    assert_equal @agent.proxy_uri.password, 'lol'
+  end
+
+  def test_set_proxy_url
+    @agent.set_proxy 'http://joe:lol@www.example.com:9001'
+
+    assert_equal @agent.proxy_uri.host,     'www.example.com'
+    assert_equal @agent.proxy_uri.port,     9001
+    assert_equal @agent.proxy_uri.user,     'joe'
+    assert_equal @agent.proxy_uri.password, 'lol'
+  end
+
+  def test_set_proxy_uri
+    @agent.set_proxy URI('http://joe:lol@www.example.com:9001')
+
+    assert_equal @agent.proxy_uri.host,     'www.example.com'
+    assert_equal @agent.proxy_uri.port,     9001
+    assert_equal @agent.proxy_uri.user,     'joe'
+    assert_equal @agent.proxy_uri.password, 'lol'
+  end
+
+  def test_set_proxy_url_and_credentials
+    @agent.set_proxy 'http://www.example.com:9001', nil, 'joe', 'lol'
+
+    assert_equal @agent.proxy_uri.host,     'www.example.com'
+    assert_equal @agent.proxy_uri.port,     9001
+    assert_equal @agent.proxy_uri.user,     'joe'
+    assert_equal @agent.proxy_uri.password, 'lol'
+  end
+
   def test_setting_agent_name
     mech = Mechanize.new 'user-set-name'
     assert_equal 'user-set-name', mech.agent.http.name

data/test/test_mechanize_http_content_disposition_parser.rb

@@ -119,7 +119,7 @@ class TestMechanizeHttpContentDispositionParser < Mechanize::TestCase
 
     assert_equal 'end "', string
   end
-  
+
   def test_parse_uppercase
     content_disposition = @parser.parse \
       'content-disposition: attachment; Filename=value', true
@@ -128,5 +128,12 @@ class TestMechanizeHttpContentDispositionParser < Mechanize::TestCase
     assert_equal 'value',      content_disposition.filename
   end
 
+  def test_parse_filename_starting_with_escaped_quote
+    content_disposition = @parser.parse \
+      'content-disposition: attachment; Filename="\"value\""', true
+
+    assert_equal '"value"', content_disposition.filename
+  end
+
 end
 

data/test/test_mechanize_http_www_authenticate_parser.rb

@@ -133,6 +133,14 @@ class TestMechanizeHttpWwwAuthenticateParser < Mechanize::TestCase
     assert_equal expected, @parser.parse('Basic realm = "foo"')
   end
 
+  def test_parse_bad_single_quote
+    expected = [
+      challenge('Basic', { 'realm' => "'foo" }, "Basic realm='foo"),
+    ]
+
+    assert_equal expected, @parser.parse("Basic realm='foo bar', qop='baz'")
+  end
+
   def test_quoted_string
     @parser.scanner = StringScanner.new '"text"'
 

data/test/test_mechanize_link.rb

@@ -2,6 +2,25 @@ require 'mechanize/test_case'
 
 class TestMechanizeLink < Mechanize::TestCase
 
+  def test_search
+    page = @mech.get("http://localhost/find_link.html")
+    link = page.link_with(text: "Form Test")
+
+    assert_equal('Form Test', link.text)
+
+    link_with_search = page.link_with(search: "//*[text()='Form Test']")
+    assert_equal(link, link_with_search)
+
+    link_with_xpath = page.link_with(xpath: "//*[text()='Form Test']")
+    assert_equal(link, link_with_xpath)
+
+    link_with_css = page.link_with(css: ".formtest")
+    assert_equal(link, link_with_css)
+
+    link_with_class = page.link_with(class: "formtest")
+    assert_equal(link, link_with_class)
+  end
+
   def test_click
     page = @mech.get("http://localhost/frame_test.html")
     link = page.link_with(:text => "Form Test")

data/test/test_mechanize_page.rb

@@ -108,6 +108,8 @@ class TestMechanizePage < Mechanize::TestCase
     assert_equal "frame3",            page.frames[2].name
     assert_equal "/file_upload.html", page.frames[2].src
     assert_equal "File Upload Form",  page.frames[2].content.title
+
+    assert_equal %w[/google.html /file_upload.html], page.frames_with(search: '*[name=frame1], *[name=frame3]').map(&:src)
   end
 
   def test_iframes
@@ -248,5 +250,31 @@ class TestMechanizePage < Mechanize::TestCase
     assert_empty page.links_with(:search => '//img')
   end
 
+	def test_multiple_titles
+		page = html_page <<-BODY
+<!doctype html>
+<html>
+	<head>
+		<title>HTML&gt;TITLE</title>
+	</head>
+	<body>
+		<svg>
+			<title>SVGTITLE</title>
+			<metadata id="metadata5">
+				<rdf:RDF>
+					<cc:Work>
+						<dc:title>RDFDCTITLE</dc:title>
+					</cc:Work>
+				</rdf:RDF>
+			</metadata>
+			<g></g>
+		</svg>
+	</body>
+</html>
+		BODY
+
+		assert_equal page.title, "HTML>TITLE"
+	end
+
 end
 

data/test/test_mechanize_page_image.rb

@@ -147,7 +147,7 @@ class TestMechanizePageImage < Mechanize::TestCase
 
     assert_equal 'https', page.uri.scheme
     assert_equal false, page.images.first.relative?
-    assert_equal nil, requests.first['Referer']
+    assert_nil requests.first['Referer']
   end
 
   def test_image_referer_http_page_abs_src

data/test/test_mechanize_page_link.rb

@@ -72,7 +72,7 @@ class TestMechanizePageLink < Mechanize::TestCase
     assert_equal(URI("http://localhost/canonical_uri"), page.canonical_uri)
 
     page = @mech.get("http://localhost/file_upload.html")
-    assert_equal(nil, page.canonical_uri)
+    assert_nil page.canonical_uri
   end
 
   def test_canonical_uri_unescaped
@@ -339,7 +339,7 @@ class TestMechanizePageLink < Mechanize::TestCase
   def test_title_none
     page = util_page '' # invalid HTML
 
-    assert_equal(nil, page.title)
+    assert_nil(page.title)
   end
 
   def test_page_decoded_with_charset

data/test/test_mechanize_page_meta_refresh.rb

@@ -112,7 +112,7 @@ class TestMechanizePageMetaRefresh < Mechanize::TestCase
     page = util_page 5, nil
     link = util_meta_refresh page
     assert_equal 5, link.delay
-    assert_equal nil, link.href
+    assert_nil link.href
 
     page = util_page 5, @uri
     link = util_meta_refresh page

data/test/test_mechanize_parser.rb

@@ -99,10 +99,10 @@ class TestMechanizeParser < Mechanize::TestCase
     @parser.uri = URI 'http://example'
 
     @parser.response = {
-      'content-disposition' => 'attachment; filename="some \"file\""'
+      'content-disposition' => 'attachment; filename="\"some \"file\""'
     }
 
-    assert_equal 'some__file_', @parser.extract_filename
+    assert_equal '_some__file_', @parser.extract_filename
   end
 
   def test_extract_filename_content_disposition_special
@@ -162,6 +162,16 @@ class TestMechanizeParser < Mechanize::TestCase
     end
   end
 
+  def test_extract_filename_content_disposition_empty
+    @parser.uri = URI 'http://example'
+
+    @parser.response = {
+      'content-disposition' => 'inline; filename="/"'
+    }
+
+    assert_equal '', @parser.extract_filename
+  end
+
   def test_extract_filename_host
     @parser.response = {}
     @parser.uri = URI 'http://example'

data/test/test_mechanize_util.rb

@@ -27,7 +27,7 @@ class TestMechanizeUtil < Mechanize::TestCase
 
   def test_from_native_charset_returns_nil_when_no_string
     @result = @MU.from_native_charset(nil, CONTENT_ENCODING)
-    assert_equal nil, @result
+    assert_nil @result
   end
 
   def test_from_native_charset_doesnot_convert_when_no_encoding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mechanize
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Eric Hodel
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
@@ -35,39 +35,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.2
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 1.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.2
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
@@ -227,8 +221,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.rdoc
 - EXAMPLES.rdoc
+- CHANGELOG.rdoc
 - GUIDE.rdoc
 - LICENSE.rdoc
 - README.rdoc
@@ -462,7 +456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: The Mechanize library is used for automating interaction with websites