mechanize 2.7.4 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74b81c4883e990cd6360ee0294a3ff1ae1c8d59
-  data.tar.gz: 872ab6eeda86c290a94105a730bfec64ee819493
+  metadata.gz: f42c3bb7351deeb2a1a68c33b118e666925ed20a
+  data.tar.gz: 751d2ffcf39675f4668a7d069a707a3782cafcfe
 SHA512:
-  metadata.gz: 96dc6beaa52babf27369eb8548733298782a2409f7a2bb43c9a5e9241445d96e117c54ad5b8c3e445b6b4c4ea1edb37f8b223b0513916f8be7b591fa3e29c598
-  data.tar.gz: 95e653b7705518a33aa5bbb765be7ddc4603756e0ee24bd5ab6c2979d039ea5b29e94ae9a2b8e478ceaa993b165d83a65d695212fa271ab59889fe7c811c876d
+  metadata.gz: c1b85a0469fbdd35bb9ce230cf5752d4cef8f9416eab11f72ca00bc25f0f3b40065a94e31ef63944ecf8ef270a3388bbbab310b190ffbf4582f0305da3d24259
+  data.tar.gz: 4e94e81383dccbf49bec0312e1ffe0183eaf7668679f7a77d4d5b42c2ece81337797cc16b8d61fef02dfac9077aa46ece2acce0b2418204f231ef476416b8df8

data/.travis.yml

@@ -6,20 +6,26 @@ notifications:
   - ljjarvis@gmail.com
   - knu@idaemons.org
 sudo: false
+# bundler is missing for jruby-head in travis-ci
+# https://github.com/travis-ci/travis-ci/issues/5861
+before_install: gem query -i -n ^bundler$ >/dev/null || gem install bundler
 rvm:
 - 1.9.3
 - 2.0.0
 - 2.1
 - 2.2
-- 2.3
+- 2.3.1
 - ruby-head
-- jruby-19mode
+- jruby-1.7.25
+- jruby-9.1.2.0
 - jruby-head
 - rbx-19mode
 script: rake test
 matrix:
   allow_failures:
+    - rvm: 2.3
     - rvm: ruby-head
-    - rvm: jruby-19mode
+    - rvm: jruby-1.7.25
+    - rvm: jruby-9.1.2.0
     - rvm: jruby-head
     - rvm: rbx-19mode

data/CHANGELOG.rdoc

@@ -1,5 +1,16 @@
 = Mechanize CHANGELOG
 
+=== 2.7.5
+
+* New Features
+  * All 4xx responses and RedirectLimitReachedError when fetching robots.txt are treated as full allow just like Googlebot does.
+  * Enable support for mime-types > 3.
+
+* Bug fix
+  * Don't cause infinite loop when `GET /robots.txt` redirects. (#457)
+  * Fix basic authentication for a realm that contains uppercase characters. (#458, #459)
+  * Fix encoding error when uploading a file which name is non-ASCII. (#333)
+
 === 2.7.4
 
 * New Features
@@ -10,7 +21,7 @@
     Rawlins.
   * Capture link when scheme is unsupported. #362 by Jon Rowe.
   * Pre-defined User-Agent stings are updated to those of more recent versions, and new aliases for IE 10/11 and Edge are added.
-  * Support for mime-types 1.x is restored while keeping compatible with mime-types 2.x and adding support for 3.0.
+  * Support for mime-types 1.x is restored while keeping compatible with mime-types 2.x.
   * Mechanize::Page now responds to #xpath, #css, #at_xpath, #at_css, and #%.
   * element(s)_with methods now accept :xpath and :css options for doing xpath/css
     selector searching.

data/Rakefile

@@ -25,7 +25,7 @@ end
 RDoc::Task.new do |rdoc|
   rdoc.main = "README.rdoc"
   rdoc.rdoc_dir = 'doc'
-  rdoc.rdoc_files.include( "CHANGELOG.rdoc", "EXAMPLES.rdoc", "GUIDE.rdoc", "LICENSE.rdoc", "Manifest.txt", "README.rdoc", "lib/**/*.rb")
+  rdoc.rdoc_files.include( "CHANGELOG.rdoc", "EXAMPLES.rdoc", "GUIDE.rdoc", "LICENSE.rdoc", "README.rdoc", "lib/**/*.rb")
 end
 
 desc "Run tests"

data/lib/mechanize/form.rb

@@ -67,12 +67,12 @@ class Mechanize::Form
 
   # Returns all field names (keys) for this form
   def keys
-    fields.map { |f| f.name }
+    fields.map(&:name)
   end
 
   # Returns all field values for this form
   def values
-    fields.map { |f| f.value }
+    fields.map(&:value)
   end
 
   # Returns all buttons of type Submit
@@ -278,10 +278,10 @@ class Mechanize::Form
 
     # take one radio button from each group
     radio_groups.each_value do |g|
-      checked = g.select {|f| f.checked}
+      checked = g.select(&:checked)
 
       if checked.uniq.size > 1 then
-        values = checked.map { |button| button.value }.join(', ').inspect
+        values = checked.map(&:value).join(', ').inspect
         name = checked.first.name.inspect
         raise Mechanize::Error,
               "radiobuttons #{values} are checked in the #{name} group, " \
@@ -337,6 +337,8 @@ class Mechanize::Form
     @clicked_buttons = []
   end
 
+  CRLF = "\r\n".freeze
+
   # This method calculates the request data to be sent back to the server
   # for this form, depending on if this is a regular post, get, or a
   # multi-part post,
@@ -348,16 +350,23 @@ class Mechanize::Form
       boundary = rand_string(20)
       @enctype = "multipart/form-data; boundary=#{boundary}"
 
-      params = query_params.map do |k,v|
-        param_to_multipart(k, v) if k
-      end.compact
+      delimiter = "--#{boundary}\r\n"
+
+      data = ::String.new
 
-      params.concat @file_uploads.map { |f| file_to_multipart(f) }
+      query_params.each do |k,v|
+        if k
+          data << delimiter
+          param_to_multipart(k, v, data)
+        end
+      end
 
-      params.map do |part|
-        "--#{boundary}\r\n#{part.force_encoding(Encoding::ASCII_8BIT)}"
-      end.join('') +
-        "--#{boundary}--\r\n"
+      @file_uploads.each do |f|
+        data << delimiter
+        file_to_multipart(f, data)
+      end
+
+      data << "--#{boundary}--\r\n"
     else
       Mechanize::Util.build_query_string(query_params)
     end
@@ -586,49 +595,67 @@ class Mechanize::Form
     end
   end
 
+  unless ::String.method_defined?(:b)
+    # Define String#b for Ruby < 2.0
+    class ::String
+      def b
+        dup.force_encoding(Encoding::ASCII_8BIT)
+      end
+    end
+  end
+
   def rand_string(len = 10)
     chars = ("a".."z").to_a + ("A".."Z").to_a
-    string = ""
+    string = ::String.new
     1.upto(len) { |i| string << chars[rand(chars.size-1)] }
     string
   end
 
   def mime_value_quote(str)
-    str.gsub(/(["\r\\])/){|s| '\\' + s}
+    str.b.gsub(/(["\r\\])/, '\\\\\1')
   end
 
-  def param_to_multipart(name, value)
-    return "Content-Disposition: form-data; name=\"" +
-      "#{mime_value_quote(name)}\"\r\n" +
-      "\r\n#{value}\r\n"
+  def param_to_multipart(name, value, buf = ::String.new)
+    buf <<
+      "Content-Disposition: form-data; name=\"".freeze <<
+      mime_value_quote(name) <<
+      "\"\r\n\r\n".freeze <<
+      value.b <<
+      CRLF
   end
 
-  def file_to_multipart(file)
+  def file_to_multipart(file, buf = ::String.new)
     file_name = file.file_name ? ::File.basename(file.file_name) : ''
-    body =  "Content-Disposition: form-data; name=\"" +
-      "#{mime_value_quote(file.name)}\"; " +
-      "filename=\"#{mime_value_quote(file_name)}\"\r\n" +
-      "Content-Transfer-Encoding: binary\r\n"
+
+    body = buf <<
+           "Content-Disposition: form-data; name=\"".freeze <<
+           mime_value_quote(file.name) <<
+           "\"; filename=\"".freeze <<
+           mime_value_quote(file_name) <<
+           "\"\r\nContent-Transfer-Encoding: binary\r\n".freeze
 
     if file.file_data.nil? and file.file_name
-      file.file_data = open(file.file_name, "rb") { |f| f.read }
+      file.file_data = File.binread(file.file_name)
       file.mime_type =
         WEBrick::HTTPUtils.mime_type(file.file_name,
                                      WEBrick::HTTPUtils::DefaultMimeTypes)
     end
 
     if file.mime_type
-      body << "Content-Type: #{file.mime_type}\r\n"
+      body << "Content-Type: ".freeze << file.mime_type << CRLF
     end
 
-    body <<
-      if file.file_data.respond_to? :read
-        "\r\n#{file.file_data.read}\r\n"
+    body << CRLF
+
+    if file_data = file.file_data
+      if file_data.respond_to? :read
+        body << file_data.read.force_encoding(Encoding::ASCII_8BIT)
       else
-        "\r\n#{file.file_data}\r\n"
+        body << file_data.b
       end
+    end
 
-    body
+    body << CRLF
   end
 end
 

data/lib/mechanize/form/multi_select_list.rb

@@ -64,18 +64,18 @@ class Mechanize::Form::MultiSelectList < Mechanize::Form::Field
   # Select no options
   def select_none
     @value = []
-    options.each { |o| o.untick }
+    options.each(&:untick)
   end
 
   # Select all options
   def select_all
     @value = []
-    options.each { |o| o.tick }
+    options.each(&:tick)
   end
 
   # Get a list of all selected options
   def selected_options
-    @options.find_all { |o| o.selected? }
+    @options.find_all(&:selected?)
   end
 
   def value=(values)
@@ -91,10 +91,7 @@ class Mechanize::Form::MultiSelectList < Mechanize::Form::Field
   end
 
   def value
-    value = []
-    value.concat @value
-    value.concat selected_options.map { |o| o.value }
-    value
+    @value + selected_options.map(&:value)
   end
 
 end

data/lib/mechanize/history.rb

@@ -16,7 +16,7 @@ class Mechanize::History < Array
   end
 
   def inspect # :nodoc:
-    uris = map { |page| page.uri }.join ', '
+    uris = map(&:uri).join ', '
 
     "[#{uris}]"
   end

data/lib/mechanize/http/agent.rb

@@ -71,7 +71,10 @@ class Mechanize::HTTP::Agent
 
   # :section: Allowed error codes
 
-  # List of error codes to handle without raising an exception.
+  # List of error codes (in String or Integer) to handle without
+  # raising Mechanize::ResponseCodeError, defaulted to an empty array.
+  # Note that 2xx, 3xx and 401 status codes will be handled without
+  # checking this list.
 
   attr_accessor :allowed_error_codes
 
@@ -80,6 +83,9 @@ class Mechanize::HTTP::Agent
   # When true, this agent will consult the site's robots.txt for each access.
   attr_reader :robots
 
+  # Mutex used when fetching robots.txt
+  attr_reader :robots_mutex
+
   # :section: SSL
 
   # OpenSSL key password
@@ -148,6 +154,7 @@ class Mechanize::HTTP::Agent
     @redirection_limit        = 20
     @request_headers          = {}
     @robots                   = false
+    @robots_mutex             = Mutex.new
     @user_agent               = nil
     @webrobots                = nil
 
@@ -988,11 +995,26 @@ class Mechanize::HTTP::Agent
 
   # :section: Robots
 
+  RobotsKey = :__mechanize_get_robots__
+
   def get_robots(uri) # :nodoc:
-    fetch(uri).body
-  rescue Mechanize::ResponseCodeError => e
-    return '' if e.response_code == '404'
-    raise e
+    robots_mutex.synchronize do
+      Thread.current[RobotsKey] = true
+      begin
+        fetch(uri).body
+      rescue Mechanize::ResponseCodeError => e
+        case e.response_code
+        when /\A4\d\d\z/
+          ''
+        else
+          raise e
+        end
+      rescue Mechanize::RedirectLimitReachedError
+        ''
+      ensure
+        Thread.current[RobotsKey] = false
+      end
+    end
   end
 
   def robots= value
@@ -1006,7 +1028,7 @@ class Mechanize::HTTP::Agent
   # robots.txt.
 
   def robots_allowed? uri
-    return true if uri.request_uri == '/robots.txt'
+    return true if Thread.current[RobotsKey]
 
     webrobots.allowed? uri
   end

data/lib/mechanize/http/auth_realm.rb

@@ -7,7 +7,7 @@ class Mechanize::HTTP::AuthRealm
   def initialize scheme, uri, realm
     @scheme = scheme
     @uri    = uri
-    @realm  = realm.downcase if realm
+    @realm  = realm if realm
   end
 
   def == other

data/lib/mechanize/page/frame.rb

@@ -1,4 +1,4 @@
-# A Frame object wrapse a frame HTML element.  Frame objects can be treated
+# A Frame object wraps a frame HTML element.  Frame objects can be treated
 # just like Link objects.  They contain #src, the #link they refer to and a
 # #name, the name of the frame they refer to.  #src and #name are aliased to
 # #href and #text respectively so that a Frame object can be treated just like

data/lib/mechanize/test_case/robots_txt_servlet.rb

@@ -0,0 +1,14 @@
+class RobotsTxtServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    if /301/ === req['Host'] && req.path == '/robots.txt'
+      res['Location'] = 'http://301/robots_txt'
+      res.code = 301
+    else
+      res['Content-Type'] = 'text/plain'
+      res.body = <<-'EOF'
+User-Agent: *
+Disallow: /norobots
+      EOF
+    end
+  end
+end

data/lib/mechanize/test_case/servlets.rb

@@ -21,6 +21,7 @@ require 'mechanize/test_case/referer_servlet'
 require 'mechanize/test_case/refresh_with_empty_url'
 require 'mechanize/test_case/refresh_without_url'
 require 'mechanize/test_case/response_code_servlet'
+require 'mechanize/test_case/robots_txt_servlet'
 require 'mechanize/test_case/send_cookies_servlet'
 require 'mechanize/test_case/verb_servlet'
 
@@ -49,6 +50,8 @@ MECHANIZE_TEST_CASE_SERVLETS = {
   '/refresh_with_empty_url' => RefreshWithEmptyUrl,
   '/refresh_without_url'    => RefreshWithoutUrl,
   '/response_code'          => ResponseCodeServlet,
+  '/robots.txt'             => RobotsTxtServlet,
+  '/robots_txt'             => RobotsTxtServlet,
   '/send_cookies'           => SendCookiesServlet,
   '/verb'                   => VerbServlet,
 }

data/lib/mechanize/unauthorized_error.rb

@@ -11,7 +11,7 @@ class Mechanize::UnauthorizedError < Mechanize::ResponseCodeError
     out = super
 
     if @challenges then
-      realms = @challenges.map { |challenge| challenge.realm_name }.join ', '
+      realms = @challenges.map(&:realm_name).join ', '
       out << " -- available realms: #{realms}"
     end
 

data/lib/mechanize/util.rb

@@ -102,10 +102,11 @@ class Mechanize::Util
   case NKF::BINARY
   when Encoding
     def self.guess_encoding(src)
-      NKF.guess(src)
+      # NKF.guess of JRuby may return nil
+      NKF.guess(src) || Encoding::US_ASCII
     end
   else
-    # Old NKF from 1.8, still bundled with JRuby and Rubinius
+    # Old NKF from 1.8, still bundled with Rubinius
     NKF_ENCODING_MAP = {
       NKF::UNKNOWN => Encoding::US_ASCII,
       NKF::BINARY  => Encoding::ASCII_8BIT,

data/lib/mechanize/version.rb

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

data/mechanize.gemspec

@@ -47,7 +47,11 @@ Gem::Specification.new do |spec|
 
   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" ]
-  spec.add_runtime_dependency "mime-types",           [ ">= 1.17.2", "< 3" ]
+  if RUBY_VERSION >= "2.0"
+    spec.add_runtime_dependency "mime-types", [ ">= 1.17.2" ]
+  else
+    spec.add_runtime_dependency "mime-types", [ ">= 1.17.2", "< 3" ]
+  end
   spec.add_runtime_dependency "http-cookie",          [ "~> 1.0" ]
   spec.add_runtime_dependency "nokogiri",             [ "~> 1.6" ]
   spec.add_runtime_dependency "ntlm-http",            [ ">= 0.1.1", "~> 0.1"   ]

data/test/test_mechanize.rb

@@ -92,7 +92,7 @@ class TestMechanize < Mechanize::TestCase
 
     assert_equal("http://localhost/form_test.html",
                  @mech.history.last.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 
   def test_click_bogus_link_with_cookies
     @mech.cookie_jar = cookie_jar("a=b")
@@ -149,7 +149,7 @@ class TestMechanize < Mechanize::TestCase
 
     assert_equal("http://localhost/form_test.html",
                  @mech.history.last.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 
   def test_click_link
     link = node 'a', 'href' => '/index.html'
@@ -374,6 +374,14 @@ but not <a href="/" rel="me nofollow">this</a>!
     end
   end
 
+  def test_get_auth
+    @mech.add_auth @uri, 'user', 'pass'
+
+    page = @mech.get @uri + '/basic_auth'
+
+    assert_equal 'You are authenticated', page.body
+  end
+
   def test_get_auth_bad
     @mech.add_auth(@uri, 'aaron', 'aaron')
 
@@ -392,6 +400,14 @@ but not <a href="/" rel="me nofollow">this</a>!
     assert_equal("401", e.response_code)
   end
 
+  def test_get_auth_realm
+    @mech.add_auth @uri, 'user', 'pass', 'Blah'
+
+    page = @mech.get @uri + '/basic_auth'
+
+    assert_equal 'You are authenticated', page.body
+  end
+
   def test_get_conditional
     assert_empty @mech.history
 
@@ -927,7 +943,26 @@ but not <a href="/" rel="me nofollow">this</a>!
       "Content-Disposition: form-data; name=\"userfile1\"; filename=\"#{name}\"",
       page.body
     )
-    assert page.body.length > File.read(__FILE__).length
+    assert_send [page.body.bytesize, :>, File.size(__FILE__)]
+  end
+
+  def test_post_file_upload_nonascii
+    name = 'ユーザファイル1'
+    file_upload = Mechanize::Form::FileUpload.new({'name' => 'userfile1'}, name)
+    file_upload.file_data = File.read(__FILE__)
+    file_upload.mime_type = 'application/zip'
+
+    page = @mech.post('http://localhost/file_upload', {
+      :name       => 'Some file',
+      :userfile1  => file_upload
+    })
+
+    assert_match(
+      "Content-Disposition: form-data; name=\"userfile1\"; filename=\"#{name}\"".force_encoding(Encoding::ASCII_8BIT),
+      page.body
+    )
+    assert_match("Content-Type: application/zip", page.body)
+    assert_send [page.body.bytesize, :>, File.size(__FILE__)]
   end
 
   def test_post_file_upload
@@ -946,7 +981,7 @@ but not <a href="/" rel="me nofollow">this</a>!
       page.body
     )
     assert_match("Content-Type: application/zip", page.body)
-    assert page.body.length > File.read(__FILE__).length
+    assert_send [page.body.bytesize, :>, File.size(__FILE__)]
   end
 
   def test_post_redirect
@@ -1140,7 +1175,7 @@ but not <a href="/" rel="me nofollow">this</a>!
 
     page = @mech.submit(form)
 
-    contents = File.read __FILE__
+    contents = File.binread __FILE__
     basename = File.basename __FILE__
 
     assert_match(
@@ -1160,7 +1195,7 @@ but not <a href="/" rel="me nofollow">this</a>!
 
     page = @mech.submit(form)
 
-    contents = File.read __FILE__
+    contents = File.binread __FILE__
     basename = File.basename __FILE__
     assert_match(
       "Content-Disposition: form-data; name=\"green[eggs]\"; filename=\"#{basename}\"",

data/test/test_mechanize_http_agent.rb

@@ -1604,6 +1604,17 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
     end
   end
 
+  def test_robots_infinite_loop
+    @agent.robots = true
+    @agent.redirect_ok = true
+
+    assert_raises Mechanize::RobotsDisallowedError do
+      @agent.fetch URI('http://301/norobots.html')
+    end
+
+    @agent.fetch URI('http://301/robots.html')
+  end
+
   def test_set_proxy
     @agent.set_proxy 'www.example.com', 9001, 'joe', 'lol'
 

data/test/test_mechanize_http_auth_challenge.rb

@@ -25,6 +25,14 @@ class TestMechanizeHttpAuthChallenge < Mechanize::TestCase
     assert_equal expected, @challenge.realm(@uri + '/foo')
   end
 
+  def test_realm_digest_case
+    challenge = @AC.new 'Digest', { 'realm' => 'R' }, 'Digest realm=R'
+
+    expected = @AR.new 'Digest', @uri, 'R'
+
+    assert_equal expected, challenge.realm(@uri + '/foo')
+  end
+
   def test_realm_unknown
     @challenge.scheme = 'Unknown'
 
@@ -39,6 +47,12 @@ class TestMechanizeHttpAuthChallenge < Mechanize::TestCase
     assert_equal 'r', @challenge.realm_name
   end
 
+  def test_realm_name_case
+    challenge = @AC.new 'Digest', { 'realm' => 'R' }, 'Digest realm=R'
+
+    assert_equal 'R', challenge.realm_name
+  end
+
   def test_realm_name_ntlm
     challenge = @AC.new 'Negotiate, NTLM'
 

data/test/test_mechanize_http_auth_realm.rb

@@ -14,7 +14,10 @@ class TestMechanizeHttpAuthRealm < Mechanize::TestCase
     assert_equal 'r', @realm.realm
 
     realm = @AR.new 'Digest', @uri, 'R'
-    assert_equal 'r', realm.realm
+    refute_equal 'r', realm.realm
+
+    realm = @AR.new 'Digest', @uri, 'R'
+    assert_equal 'R', realm.realm
 
     realm = @AR.new 'Digest', @uri, nil
     assert_nil realm.realm
@@ -30,6 +33,9 @@ class TestMechanizeHttpAuthRealm < Mechanize::TestCase
     other = @AR.new 'Digest', URI('http://other.example/'), 'r'
     refute_equal @realm, other
 
+    other = @AR.new 'Digest', @uri, 'R'
+    refute_equal @realm, other
+
     other = @AR.new 'Digest', @uri, 's'
     refute_equal @realm, other
   end

data/test/test_mechanize_http_auth_store.rb

@@ -57,6 +57,20 @@ class TestMechanizeHttpAuthStore < Mechanize::TestCase
     assert_equal expected, @store.auth_accounts
   end
 
+  def test_add_auth_realm_case
+    @store.add_auth @uri, 'user1', 'pass', 'realm'
+    @store.add_auth @uri, 'user2', 'pass', 'Realm'
+
+    expected = {
+      @uri => {
+        'realm' => ['user1', 'pass', nil],
+        'Realm' => ['user2', 'pass', nil],
+      }
+    }
+
+    assert_equal expected, @store.auth_accounts
+  end
+
   def test_add_auth_string
     @store.add_auth "#{@uri}/path", 'user', 'pass'
 
@@ -143,6 +157,14 @@ class TestMechanizeHttpAuthStore < Mechanize::TestCase
     assert_equal ['user1', 'pass', nil], @store.credentials_for(@uri, 'other')
   end
 
+  def test_credentials_for_realm_case
+    @store.add_auth @uri, 'user1', 'pass', 'realm'
+    @store.add_auth @uri, 'user2', 'pass', 'Realm'
+
+    assert_equal ['user1', 'pass', nil], @store.credentials_for(@uri, 'realm')
+    assert_equal ['user2', 'pass', nil], @store.credentials_for(@uri, 'Realm')
+  end
+
   def test_credentials_for_path
     @store.add_auth @uri, 'user', 'pass', 'realm'
 
@@ -183,6 +205,21 @@ class TestMechanizeHttpAuthStore < Mechanize::TestCase
     assert_equal expected, @store.auth_accounts
   end
 
+  def test_remove_auth_realm_case
+    @store.add_auth @uri, 'user1', 'pass', 'realm'
+    @store.add_auth @uri, 'user2', 'pass', 'Realm'
+
+    @store.remove_auth @uri, 'Realm'
+
+    expected = {
+      @uri => {
+        'realm' => ['user1', 'pass', nil]
+      }
+    }
+
+    assert_equal expected, @store.auth_accounts
+  end
+
   def test_remove_auth_string
     @store.add_auth @uri, 'user1', 'pass'
 

data/test/test_mechanize_http_www_authenticate_parser.rb

@@ -109,6 +109,14 @@ class TestMechanizeHttpWwwAuthenticateParser < Mechanize::TestCase
     assert_equal expected, @parser.parse('Basic ReAlM=foo')
   end
 
+  def test_parse_realm_value_case
+    expected = [
+      challenge('Basic', { 'realm' => 'Foo' }, 'Basic realm=Foo'),
+    ]
+
+    assert_equal expected, @parser.parse('Basic realm=Foo')
+  end
+
   def test_parse_scheme_uppercase
     expected = [
       challenge('Basic', { 'realm' => 'foo' }, 'BaSiC realm=foo'),

data/test/test_mechanize_link.rb

@@ -10,7 +10,7 @@ class TestMechanizeLink < Mechanize::TestCase
     page = link.click
     assert_equal("http://localhost/form_test.html",
       @mech.history.last.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 
   def test_click_bang
     page = @mech.get("http://localhost/frame_test.html")
@@ -20,7 +20,7 @@ class TestMechanizeLink < Mechanize::TestCase
     page = link.click
     assert_equal("http://localhost/form_test.html",
       @mech.history.last.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 
   def test_click_base
     page = @mech.get("http://google.com/tc_base_link.html")
@@ -103,7 +103,7 @@ class TestMechanizeLink < Mechanize::TestCase
     page = page.link_with(:text => 'just the query string').click
     assert_equal('http://localhost/relative/tc_relative_links.html?a=b',
                  page.uri.to_s)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse IFRAME
 
   def test_uri_weird
     doc = Nokogiri::HTML::Document.new
@@ -122,6 +122,6 @@ class TestMechanizeLink < Mechanize::TestCase
 
     assert_equal "/form_test.html", link.uri.to_s
     assert_equal "http://localhost/form_test.html", link.resolved_uri.to_s
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse body of NOFRAMES
 end
 

data/test/test_mechanize_page.rb

@@ -123,7 +123,7 @@ class TestMechanizePage < Mechanize::TestCase
     assert_equal "frame4",            page.iframes.first.name
     assert_equal "/file_upload.html", page.iframes.first.src
     assert_equal "File Upload Form",  page.iframes.first.content.title
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse IFRAME
 
   def test_image_with
     page = html_page <<-BODY

data/test/test_mechanize_page_link.rb

@@ -290,7 +290,7 @@ class TestMechanizePageLink < Mechanize::TestCase
   def test_links
     page = @mech.get("http://localhost/find_link.html")
     assert_equal(18, page.links.length)
-  end
+  end unless RUBY_ENGINE == 'jruby'  # NekoHTML does not parse FRAME outside of FRAMESET
 
   def test_links_with_bold
     page = @mech.get("http://localhost/tc_links.html")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mechanize
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Eric Hodel
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
@@ -61,9 +61,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,9 +68,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +241,6 @@ files:
 - GUIDE.rdoc
 - Gemfile
 - LICENSE.rdoc
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - examples/flickr_upload.rb
@@ -336,6 +329,7 @@ files:
 - lib/mechanize/test_case/refresh_with_empty_url.rb
 - lib/mechanize/test_case/refresh_without_url.rb
 - lib/mechanize/test_case/response_code_servlet.rb
+- lib/mechanize/test_case/robots_txt_servlet.rb
 - lib/mechanize/test_case/send_cookies_servlet.rb
 - lib/mechanize/test_case/server.rb
 - lib/mechanize/test_case/servlets.rb
@@ -378,7 +372,6 @@ files:
 - test/htdocs/rails_3_encoding_hack_form_test.html
 - test/htdocs/relative/tc_relative_links.html
 - test/htdocs/robots.html
-- test/htdocs/robots.txt
 - test/htdocs/tc_bad_charset.html
 - test/htdocs/tc_bad_links.html
 - test/htdocs/tc_base_link.html
@@ -469,7 +462,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Mechanize library is used for automating interaction with websites
@@ -506,7 +499,6 @@ test_files:
 - test/htdocs/rails_3_encoding_hack_form_test.html
 - test/htdocs/relative/tc_relative_links.html
 - test/htdocs/robots.html
-- test/htdocs/robots.txt
 - test/htdocs/tc_bad_charset.html
 - test/htdocs/tc_bad_links.html
 - test/htdocs/tc_base_link.html
@@ -575,4 +567,3 @@ test_files:
 - test/test_mechanize_util.rb
 - test/test_mechanize_xml_file.rb
 - test/test_multi_select.rb
-has_rdoc: 

data/Manifest.txt

@@ -1,204 +0,0 @@
-.autotest
-.travis.yml
-CHANGELOG.rdoc
-EXAMPLES.rdoc
-GUIDE.rdoc
-LICENSE.rdoc
-Manifest.txt
-README.rdoc
-Rakefile
-examples/flickr_upload.rb
-examples/mech-dump.rb
-examples/proxy_req.rb
-examples/rubyforge.rb
-examples/spider.rb
-examples/wikipedia_links_to_philosophy.rb
-lib/mechanize.rb
-lib/mechanize/chunked_termination_error.rb
-lib/mechanize/content_type_error.rb
-lib/mechanize/cookie.rb
-lib/mechanize/cookie_jar.rb
-lib/mechanize/directory_saver.rb
-lib/mechanize/download.rb
-lib/mechanize/element_matcher.rb
-lib/mechanize/element_not_found_error.rb
-lib/mechanize/file.rb
-lib/mechanize/file_connection.rb
-lib/mechanize/file_request.rb
-lib/mechanize/file_response.rb
-lib/mechanize/file_saver.rb
-lib/mechanize/form.rb
-lib/mechanize/form/button.rb
-lib/mechanize/form/check_box.rb
-lib/mechanize/form/field.rb
-lib/mechanize/form/file_upload.rb
-lib/mechanize/form/hidden.rb
-lib/mechanize/form/image_button.rb
-lib/mechanize/form/keygen.rb
-lib/mechanize/form/multi_select_list.rb
-lib/mechanize/form/option.rb
-lib/mechanize/form/radio_button.rb
-lib/mechanize/form/reset.rb
-lib/mechanize/form/select_list.rb
-lib/mechanize/form/submit.rb
-lib/mechanize/form/text.rb
-lib/mechanize/form/textarea.rb
-lib/mechanize/headers.rb
-lib/mechanize/history.rb
-lib/mechanize/http.rb
-lib/mechanize/http/agent.rb
-lib/mechanize/http/auth_challenge.rb
-lib/mechanize/http/auth_realm.rb
-lib/mechanize/http/auth_store.rb
-lib/mechanize/http/content_disposition_parser.rb
-lib/mechanize/http/www_authenticate_parser.rb
-lib/mechanize/image.rb
-lib/mechanize/page.rb
-lib/mechanize/page/base.rb
-lib/mechanize/page/frame.rb
-lib/mechanize/page/image.rb
-lib/mechanize/page/label.rb
-lib/mechanize/page/link.rb
-lib/mechanize/page/meta_refresh.rb
-lib/mechanize/parser.rb
-lib/mechanize/pluggable_parsers.rb
-lib/mechanize/prependable.rb
-lib/mechanize/redirect_limit_reached_error.rb
-lib/mechanize/redirect_not_get_or_head_error.rb
-lib/mechanize/response_code_error.rb
-lib/mechanize/response_read_error.rb
-lib/mechanize/robots_disallowed_error.rb
-lib/mechanize/test_case.rb
-lib/mechanize/test_case/.document
-lib/mechanize/test_case/bad_chunking_servlet.rb
-lib/mechanize/test_case/basic_auth_servlet.rb
-lib/mechanize/test_case/content_type_servlet.rb
-lib/mechanize/test_case/digest_auth_servlet.rb
-lib/mechanize/test_case/file_upload_servlet.rb
-lib/mechanize/test_case/form_servlet.rb
-lib/mechanize/test_case/gzip_servlet.rb
-lib/mechanize/test_case/header_servlet.rb
-lib/mechanize/test_case/http_refresh_servlet.rb
-lib/mechanize/test_case/infinite_redirect_servlet.rb
-lib/mechanize/test_case/infinite_refresh_servlet.rb
-lib/mechanize/test_case/many_cookies_as_string_servlet.rb
-lib/mechanize/test_case/many_cookies_servlet.rb
-lib/mechanize/test_case/modified_since_servlet.rb
-lib/mechanize/test_case/ntlm_servlet.rb
-lib/mechanize/test_case/one_cookie_no_spaces_servlet.rb
-lib/mechanize/test_case/one_cookie_servlet.rb
-lib/mechanize/test_case/quoted_value_cookie_servlet.rb
-lib/mechanize/test_case/redirect_servlet.rb
-lib/mechanize/test_case/referer_servlet.rb
-lib/mechanize/test_case/refresh_with_empty_url.rb
-lib/mechanize/test_case/refresh_without_url.rb
-lib/mechanize/test_case/response_code_servlet.rb
-lib/mechanize/test_case/send_cookies_servlet.rb
-lib/mechanize/test_case/server.rb
-lib/mechanize/test_case/servlets.rb
-lib/mechanize/test_case/verb_servlet.rb
-lib/mechanize/unauthorized_error.rb
-lib/mechanize/unsupported_scheme_error.rb
-lib/mechanize/util.rb
-lib/mechanize/xml_file.rb
-test/data/htpasswd
-test/data/server.crt
-test/data/server.csr
-test/data/server.key
-test/data/server.pem
-test/htdocs/alt_text.html
-test/htdocs/bad_form_test.html
-test/htdocs/button.jpg
-test/htdocs/canonical_uri.html
-test/htdocs/dir with spaces/foo.html
-test/htdocs/empty_form.html
-test/htdocs/file_upload.html
-test/htdocs/find_link.html
-test/htdocs/form_multi_select.html
-test/htdocs/form_multival.html
-test/htdocs/form_no_action.html
-test/htdocs/form_no_input_name.html
-test/htdocs/form_order_test.html
-test/htdocs/form_select.html
-test/htdocs/form_set_fields.html
-test/htdocs/form_test.html
-test/htdocs/frame_referer_test.html
-test/htdocs/frame_test.html
-test/htdocs/google.html
-test/htdocs/index.html
-test/htdocs/link with space.html
-test/htdocs/meta_cookie.html
-test/htdocs/no_title_test.html
-test/htdocs/noindex.html
-test/htdocs/rails_3_encoding_hack_form_test.html
-test/htdocs/relative/tc_relative_links.html
-test/htdocs/robots.html
-test/htdocs/robots.txt
-test/htdocs/tc_bad_charset.html
-test/htdocs/tc_bad_links.html
-test/htdocs/tc_base_link.html
-test/htdocs/tc_blank_form.html
-test/htdocs/tc_charset.html
-test/htdocs/tc_checkboxes.html
-test/htdocs/tc_encoded_links.html
-test/htdocs/tc_field_precedence.html
-test/htdocs/tc_follow_meta.html
-test/htdocs/tc_follow_meta_loop_1.html
-test/htdocs/tc_follow_meta_loop_2.html
-test/htdocs/tc_form_action.html
-test/htdocs/tc_links.html
-test/htdocs/tc_meta_in_body.html
-test/htdocs/tc_pretty_print.html
-test/htdocs/tc_referer.html
-test/htdocs/tc_relative_links.html
-test/htdocs/tc_textarea.html
-test/htdocs/test_click.html
-test/htdocs/unusual______.html
-test/test_mechanize.rb
-test/test_mechanize_cookie.rb
-test/test_mechanize_cookie_jar.rb
-test/test_mechanize_directory_saver.rb
-test/test_mechanize_download.rb
-test/test_mechanize_element_not_found_error.rb
-test/test_mechanize_file.rb
-test/test_mechanize_file_connection.rb
-test/test_mechanize_file_request.rb
-test/test_mechanize_file_response.rb
-test/test_mechanize_file_saver.rb
-test/test_mechanize_form.rb
-test/test_mechanize_form_check_box.rb
-test/test_mechanize_form_encoding.rb
-test/test_mechanize_form_field.rb
-test/test_mechanize_form_file_upload.rb
-test/test_mechanize_form_image_button.rb
-test/test_mechanize_form_keygen.rb
-test/test_mechanize_form_multi_select_list.rb
-test/test_mechanize_form_option.rb
-test/test_mechanize_form_radio_button.rb
-test/test_mechanize_form_select_list.rb
-test/test_mechanize_form_textarea.rb
-test/test_mechanize_headers.rb
-test/test_mechanize_history.rb
-test/test_mechanize_http_agent.rb
-test/test_mechanize_http_auth_challenge.rb
-test/test_mechanize_http_auth_realm.rb
-test/test_mechanize_http_auth_store.rb
-test/test_mechanize_http_content_disposition_parser.rb
-test/test_mechanize_http_www_authenticate_parser.rb
-test/test_mechanize_image.rb
-test/test_mechanize_link.rb
-test/test_mechanize_page.rb
-test/test_mechanize_page_encoding.rb
-test/test_mechanize_page_frame.rb
-test/test_mechanize_page_image.rb
-test/test_mechanize_page_link.rb
-test/test_mechanize_page_meta_refresh.rb
-test/test_mechanize_parser.rb
-test/test_mechanize_pluggable_parser.rb
-test/test_mechanize_redirect_limit_reached_error.rb
-test/test_mechanize_redirect_not_get_or_head_error.rb
-test/test_mechanize_response_read_error.rb
-test/test_mechanize_subclass.rb
-test/test_mechanize_util.rb
-test/test_mechanize_xml_file.rb
-test/test_multi_select.rb

data/test/htdocs/robots.txt

@@ -1,2 +0,0 @@
-User-Agent: *
-Disallow: /norobots