mechanize 2.9.2 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 657e0dcff19a6db26a52cf94584a987b9cd231bee579fc10662b0ef677716a68
-  data.tar.gz: 2f706289ddcdf0090303f0bdcf9771ea3d4547b4d31f1c0ab31ac930bc25485c
+  metadata.gz: d5d4ec84463a2df7945cede673dde4ea74d9f03270c923cd7f11d2fbc56aadcd
+  data.tar.gz: c5803f307bc7924da28191b6cfee4a9ce2ed4e9f5daeeee3e3cc9e38bd405cfc
 SHA512:
-  metadata.gz: 901b1386243cd9755b9fd47d4365f3ceace2c62b8f1d344b4eb01bfa0930bcc0812a18b5f87aba95494b7341e402441915d0682dc06fd04360ea3320950a9e86
-  data.tar.gz: 1491b3ca0b17590cfd1bfc01af9a9782d77728ccf54deab4f7f583d3d3bf7831df824cef18af6f98734bcdffddfc5e2dd03d1fe86acf877efe500d051c90f731
+  metadata.gz: 87f463a89c2158edfce7b556e3b824a6215646c6581947c434df8e7289f2e150a986db1750d5336b9266b7aee768f4000903271472575edcb90008862071818b
+  data.tar.gz: 5787421c7c331be9f0adc25ae01587a88ae8c78786420113aa813a9bbddc4ea755655501add2a7afc0400c03d5f9bdfb041958c5ebc61815981c0dac084296fb

data/.github/workflows/{ci-test.yml → ci.yml}

@@ -20,10 +20,10 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.2"
+        ruby-version: "3.3"
         bundler-cache: true
     - run: bundle exec rake rubocop
 
@@ -32,31 +32,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "head", "jruby-9.4", "truffleruby-head"]
-
+        ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "jruby-9.4", "truffleruby"]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby-version}}
         bundler-cache: true
-        bundler: 2.3.26 # https://github.com/rubygems/rubygems/issues/6435
-    - run: bundle exec rake test
-
-  test-platform:
-    needs: ["rubocop"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: ["windows-latest", "macos-latest"]
-
-    runs-on: ${{matrix.platform}}
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "3.2"
-        bundler-cache: true
-        bundler: latest
     - run: bundle exec rake test

data/.github/workflows/upstream.yml

@@ -0,0 +1,51 @@
+name: "upstream"
+
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 8 * * 5" # At 08:00 on Friday # https://crontab.guru/#0_8_*_*_5
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - main
+    paths:
+      - .github/workflows/upstream.yml # this file
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ["head", "jruby-head", "truffleruby-head"]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby-version}}
+          bundler-cache: true
+      - run: bundle exec rake test
+
+  upstream:
+    name: "upstream (${{matrix.name}})"
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { name: "nokogiri", git: "https://github.com/sparklemotion/nokogiri" }
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with: { ruby-version: "3.3" }
+      - run: |
+          bundle add ${{matrix.name}} --git="${{matrix.git}}"
+          bundle show
+      - run: bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Mechanize CHANGELOG
 
+## 2.10.1 / 2024-06-12
+
+* Improve page encoding error recovery on pages with broken encoding when used with libxml2 >= 2.12.0. (#644) @flavorjones
+
+
+## 2.10.0 / 2024-01-22
+
+* Add `nkf` and `base64` as explicit dependencies, since they are being unbundled in Ruby 3.4. (#634) @flavorjones
+
+
 ## 2.9.2 / 2024-01-15
 
 * Correct spelling errors in documentation. (#631) @p-linnane

data/README.md

@@ -3,7 +3,7 @@
 * https://www.rubydoc.info/gems/mechanize/
 * https://github.com/sparklemotion/mechanize
 
-[![Test suite](https://github.com/sparklemotion/mechanize/actions/workflows/ci-test.yml/badge.svg)](https://github.com/sparklemotion/mechanize/actions/workflows/ci-test.yml)
+[![Test suite](https://github.com/sparklemotion/mechanize/actions/workflows/ci.yml/badge.svg)](https://github.com/sparklemotion/mechanize/actions/workflows/ci.yml)
 
 
 ## Description

data/Rakefile

@@ -49,7 +49,7 @@ namespace "rubocop" do
 
   desc "Run rubocop string literals check"
   task :frozen_string_literals do
-    sh "rubocop lib --auto-correct-all --only Style/FrozenStringLiteralComment"
+    sh "rubocop lib test --auto-correct-all --only Style/FrozenStringLiteralComment"
   end
 end
 

data/lib/mechanize/cookie.rb

@@ -7,7 +7,7 @@ class Mechanize
   module CookieDeprecated
     def __deprecated__(to = nil)
       $VERBOSE or return
-      method = caller[0][/([^`]+)(?='$)/]
+      method = caller_locations(1,1).first.base_label
       to ||= method
       case self
       when Class
@@ -21,7 +21,7 @@ class Mechanize
         this = '%s#%s' % [klass, method]
         that = 'HTTP::%s#%s' % [lname, to]
       end
-      warn '%s: The call of %s needs to be fixed to follow the new API (%s).' % [caller[1], this, that]
+      warn '%s: The call of %s needs to be fixed to follow the new API (%s).' % [caller_locations(2,1).first, this, that]
     end
     private :__deprecated__
   end

data/lib/mechanize/page.rb

@@ -101,6 +101,7 @@ class Mechanize::Page < Mechanize::File
     return false if parser.errors.empty?
     parser.errors.any? do |error|
       error.message.scrub =~ /(indicate\ encoding)|
+                              (Invalid\ bytes)|
                               (Invalid\ char)|
                               (input\ conversion\ failed)/x
     end

data/lib/mechanize/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class Mechanize
-  VERSION = "2.9.2"
+  VERSION = "2.10.1"
 end

data/lib/mechanize.rb

@@ -717,10 +717,10 @@ class Mechanize
   # authentication.
 
   def auth user, password, domain = nil
-    caller.first =~ /(.*?):(\d+).*?$/
+    c = caller_locations(1,1).first
 
     warn <<-WARNING
-At #{$1} line #{$2}
+At #{c.absolute_path} line #{c.lineno}
 
 Use of #auth and #basic_auth are deprecated due to a security vulnerability.
 

data/mechanize.gemspec

@@ -65,10 +65,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("net-http-persistent", ">= 2.5.2", "< 5.0.dev")
 
   spec.add_runtime_dependency("nokogiri", ">= 1.11.2", "~> 1.11")
-  spec.add_runtime_dependency("rubyntlm", ">= 0.6.3", "~> 0.6")
   spec.add_runtime_dependency("webrick", "~> 1.7")
   spec.add_runtime_dependency("webrobots", "~> 0.1.2")
 
+  spec.add_runtime_dependency("rubyntlm", ">= 0.6.3", "~> 0.6")
+  spec.add_runtime_dependency("base64") # removed from bundled gems in 3.4, and needed by rubyntlm (which doesn't declare this dependency)
+  spec.add_runtime_dependency("nkf") # removed from bundled gems in 3.4
+
   spec.add_development_dependency("minitest", "~> 5.14")
   spec.add_development_dependency("rake", "~> 13.0")
   spec.add_development_dependency("rdoc", "~> 6.3")

data/test/test_mechanize.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'mechanize/test_case'
 
@@ -965,7 +966,7 @@ but not <a href="/" rel="me nofollow">this</a>!
     })
 
     assert_match(
-      "Content-Disposition: form-data; name=\"userfile1\"; filename=\"#{name}\"".force_encoding(Encoding::ASCII_8BIT),
+      "Content-Disposition: form-data; name=\"userfile1\"; filename=\"#{name}\"".dup.force_encoding(Encoding::ASCII_8BIT),
       page.body
     )
     assert_match("Content-Type: application/zip", page.body)

data/test/test_mechanize_cookie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 module Enumerable
@@ -301,7 +302,7 @@ class TestMechanizeCookie < Mechanize::TestCase
     expires = Time.parse('Sun, 27-Sep-2037 00:00:00 GMT')
 
     cookie_params.keys.combine.each do |c|
-      cookie_text = "#{cookie_value}; "
+      cookie_text = +"#{cookie_value}; "
       c.each_with_index do |key, idx|
         if idx == (c.length - 1)
           cookie_text << "#{cookie_params[key]}"
@@ -336,7 +337,7 @@ class TestMechanizeCookie < Mechanize::TestCase
     expires = Time.parse('Sun, 27-Sep-2037 00:00:00 GMT')
 
     cookie_params.keys.combine.each do |c|
-      cookie_text = "#{cookie_value}; "
+      cookie_text = +"#{cookie_value}; "
       c.each_with_index do |key, idx|
         if idx == (c.length - 1)
           cookie_text << "#{cookie_params[key]}"
@@ -373,7 +374,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     cookie_params.keys.combine.each do |c|
       next if c.find { |k| k == 'path' }
-      cookie_text = "#{cookie_value}; "
+      cookie_text = +"#{cookie_value}; "
       c.each_with_index do |key, idx|
         if idx == (c.length - 1)
           cookie_text << "#{cookie_params[key]}"
@@ -410,7 +411,7 @@ class TestMechanizeCookie < Mechanize::TestCase
 
     cookie_params.keys.combine.each do |c|
       next unless c.find { |k| k == 'secure' }
-      cookie_text = "#{cookie_value}; "
+      cookie_text = +"#{cookie_value}; "
       c.each_with_index do |key, idx|
         if idx == (c.length - 1)
           cookie_text << "#{cookie_params[key]}"
@@ -446,7 +447,7 @@ class TestMechanizeCookie < Mechanize::TestCase
     expires = Time.parse('Sun, 27-Sep-2037 00:00:00 GMT')
 
     cookie_params.keys.combine.each do |c|
-      cookie_text = "#{cookie_value};"
+      cookie_text = +"#{cookie_value};"
       c.each_with_index do |key, idx|
         if idx == (c.length - 1)
           cookie_text << "#{cookie_params[key]}"
@@ -502,12 +503,23 @@ class TestMechanizeCookie < Mechanize::TestCase
     cookie.domain = 'Dom.example.com'
     assert 'dom.example.com', cookie.domain
 
-    cookie.domain = Object.new.tap { |o|
+    new_domain = Object.new.tap { |o|
       def o.to_str
         'Example.com'
       end
     }
+    cookie.domain = new_domain
     assert 'example.com', cookie.domain
+
+    new_domain = Object.new.tap { |o|
+      def o.to_str
+        'Example2.com'
+      end
+    }
+    assert_output nil, /The call of Mechanize::Cookie#set_domain/ do
+      cookie.set_domain(new_domain)
+    end
+    assert 'example2.com', cookie.domain
   end
 
   def test_cookie_httponly
@@ -519,7 +531,7 @@ class TestMechanizeCookie < Mechanize::TestCase
     expires = Time.parse('Sun, 27-Sep-2037 00:00:00 GMT')
 
     cookie_params.keys.combine.each do |c|
-      cookie_text = "#{cookie_value}; "
+      cookie_text = +"#{cookie_value}; "
       c.each_with_index do |key, idx|
         if idx == (c.length - 1)
           cookie_text << "#{cookie_params[key]}"

data/test/test_mechanize_cookie_jar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 require 'fileutils'
 

data/test/test_mechanize_directory_saver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeDirectorySaver < Mechanize::TestCase

data/test/test_mechanize_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeDownload < Mechanize::TestCase

data/test/test_mechanize_element_not_found_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeRedirectLimitReachedError < Mechanize::TestCase

data/test/test_mechanize_file.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFile < Mechanize::TestCase

data/test/test_mechanize_file_connection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFileConnection < Mechanize::TestCase
@@ -7,7 +8,7 @@ class TestMechanizeFileConnection < Mechanize::TestCase
     uri = URI.parse "file://#{file_path}"
     conn = Mechanize::FileConnection.new
 
-    body = ''
+    body = +''
 
     conn.request uri, nil do |response|
       assert_equal(file_path, response.file_path)

data/test/test_mechanize_file_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFileRequest < Mechanize::TestCase

data/test/test_mechanize_file_response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFileResponse < Mechanize::TestCase

data/test/test_mechanize_file_saver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFileSaver < Mechanize::TestCase

data/test/test_mechanize_form.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeForm < Mechanize::TestCase

data/test/test_mechanize_form_check_box.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormCheckBox < Mechanize::TestCase

data/test/test_mechanize_form_encoding.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormEncoding < Mechanize::TestCase
@@ -8,7 +9,7 @@ class TestMechanizeFormEncoding < Mechanize::TestCase
 
   INPUTTED_VALUE = "テスト" # "test" in Japanese UTF-8 encoding
   CONTENT_ENCODING = 'Shift_JIS' # one of Japanese encoding
-  encoded_value = "\x83\x65\x83\x58\x83\x67".force_encoding(::Encoding::SHIFT_JIS) # "test" in Japanese Shift_JIS encoding
+  encoded_value = "\x83\x65\x83\x58\x83\x67".dup.force_encoding(::Encoding::SHIFT_JIS) # "test" in Japanese Shift_JIS encoding
   EXPECTED_QUERY = "first_name=#{CGI.escape(encoded_value)}&first_name=&gender=&green%5Beggs%5D="
 
   ENCODING_ERRORS = [EncodingError, Encoding::ConverterNotFoundError] # and so on

data/test/test_mechanize_form_field.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormField < Mechanize::TestCase

data/test/test_mechanize_form_file_upload.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormFileUpload < Mechanize::TestCase

data/test/test_mechanize_form_image_button.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormImageButton < Mechanize::TestCase

data/test/test_mechanize_form_keygen.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormKeygen < Mechanize::TestCase

data/test/test_mechanize_form_multi_select_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormMultiSelectList < Mechanize::TestCase

data/test/test_mechanize_form_option.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormOption < Mechanize::TestCase

data/test/test_mechanize_form_radio_button.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormRadioButton < Mechanize::TestCase

data/test/test_mechanize_form_select_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormSelectList < Mechanize::TestCase

data/test/test_mechanize_form_textarea.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeFormTextarea < Mechanize::TestCase

data/test/test_mechanize_headers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeHeaders < Mechanize::TestCase

data/test/test_mechanize_history.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeHistory < Mechanize::TestCase

data/test/test_mechanize_http_agent.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'mechanize/test_case'
 
@@ -29,7 +30,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
 
   def skip_if_jruby_zlib
     if RUBY_ENGINE == 'jruby'
-      meth = caller[0][/`(\w+)/, 1]
+      meth = caller_locations(1,1).first.base_label
       skip "#{meth}: skipped because how Zlib handles error is different in JRuby"
     end
   end
@@ -1027,7 +1028,7 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
 
     body = @agent.response_content_encoding @res, body_io
 
-    expected = "test\xB2"
+    expected = +"test\xB2"
     expected.force_encoding Encoding::BINARY if have_encoding?
 
     content = body.read
@@ -1432,11 +1433,11 @@ class TestMechanizeHttpAgent < Mechanize::TestCase
 
       io = @agent.response_read res, req, uri
 
-      expected = "π\n".force_encoding(Encoding::BINARY)
+      expected = "π\n".dup.force_encoding(Encoding::BINARY)
 
       # Ruby 1.8.7 doesn't let us set the write mode of the tempfile to binary,
       # so we should expect an inserted carriage return on some platforms
-      expected_with_carriage_return = "π\r\n".force_encoding(Encoding::BINARY)
+      expected_with_carriage_return = "π\r\n".dup.force_encoding(Encoding::BINARY)
 
       body = io.read
       assert_match(/^(#{expected}|#{expected_with_carriage_return})$/m, body)

data/test/test_mechanize_http_auth_challenge.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeHttpAuthChallenge < Mechanize::TestCase

data/test/test_mechanize_http_auth_realm.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeHttpAuthRealm < Mechanize::TestCase

data/test/test_mechanize_http_auth_store.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'mechanize/test_case'
 

data/test/test_mechanize_http_content_disposition_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeHttpContentDispositionParser < Mechanize::TestCase

data/test/test_mechanize_http_www_authenticate_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeHttpWwwAuthenticateParser < Mechanize::TestCase

data/test/test_mechanize_image.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeImage < Mechanize::TestCase

data/test/test_mechanize_link.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeLink < Mechanize::TestCase

data/test/test_mechanize_page.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizePage < Mechanize::TestCase

data/test/test_mechanize_page_encoding.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 # tests for Page encoding and charset and parsing
@@ -12,7 +13,7 @@ class TestMechanizePageEncoding < Mechanize::TestCase
 
     @uri = URI('http://localhost/')
     @response_headers = { 'content-type' => 'text/html' }
-    @body = '<title>hi</title>'
+    @body = +'<title>hi</title>'
   end
 
   def util_page body = @body, headers = @response_headers
@@ -118,7 +119,7 @@ class TestMechanizePageEncoding < Mechanize::TestCase
   end
 
   def test_meta_charset
-    body = '<meta http-equiv="content-type" content="text/html;charset=META">'
+    body = +'<meta http-equiv="content-type" content="text/html;charset=META">'
     page = util_page body
 
     assert_equal ['META'], page.meta_charset
@@ -132,7 +133,7 @@ class TestMechanizePageEncoding < Mechanize::TestCase
 
   def test_encodings
     response = {'content-type' => 'text/html;charset=HEADER'}
-    body = '<meta http-equiv="content-type" content="text/html;charset=META">'
+    body = +'<meta http-equiv="content-type" content="text/html;charset=META">'
     @mech.default_encoding = 'DEFAULT'
     page = util_page body, response
 
@@ -175,7 +176,7 @@ class TestMechanizePageEncoding < Mechanize::TestCase
   def test_parser_encoding_when_searching_elements
     skip "Encoding not implemented" unless have_encoding?
 
-    body = '<span id="latin1">hi</span>'
+    body = +'<span id="latin1">hi</span>'
     page = util_page body, 'content-type' => 'text/html,charset=ISO-8859-1'
 
     result = page.search('#latin1')
@@ -187,7 +188,7 @@ class TestMechanizePageEncoding < Mechanize::TestCase
     skip if RUBY_ENGINE == 'jruby' # this is a libxml2-specific condition
 
     # https://github.com/sparklemotion/mechanize/issues/553
-    body = <<~EOF
+    body = +<<~EOF
       <html>
       <body>
       <!--

data/test/test_mechanize_page_frame.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizePageFrame < Mechanize::TestCase

data/test/test_mechanize_page_image.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizePageImage < Mechanize::TestCase

data/test/test_mechanize_page_link.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'mechanize/test_case'
 
@@ -11,7 +12,7 @@ class TestMechanizePageLink < Mechanize::TestCase
 <title>hi</title>
   HTML
 
-  BAD = <<-HTML
+  BAD = <<-HTML.dup
 <meta http-equiv="content-type" content="text/html; charset=windows-1255">
 <title>Bia\xB3ystok</title>
   HTML
@@ -19,18 +20,16 @@ class TestMechanizePageLink < Mechanize::TestCase
 
   SJIS_TITLE = "\x83\x65\x83\x58\x83\x67"
 
-  SJIS_AFTER_TITLE = <<-HTML
+  SJIS_AFTER_TITLE = <<-HTML.dup
 <title>#{SJIS_TITLE}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
   HTML
-
   SJIS_AFTER_TITLE.force_encoding Encoding::BINARY if defined? Encoding
 
-  SJIS_BAD_AFTER_TITLE = <<-HTML
+  SJIS_BAD_AFTER_TITLE = <<-HTML.dup
 <title>#{SJIS_TITLE}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   HTML
-
   SJIS_BAD_AFTER_TITLE.force_encoding Encoding::BINARY if defined? Encoding
 
   UTF8_TITLE = 'テスト'
@@ -46,7 +45,7 @@ class TestMechanizePageLink < Mechanize::TestCase
 
     @uri = URI('http://example')
     @res = { 'content-type' => 'text/html' }
-    @body = '<title>hi</title>'
+    @body = +'<title>hi</title>'
   end
 
   def util_page body = @body, res = @res
@@ -55,7 +54,7 @@ class TestMechanizePageLink < Mechanize::TestCase
 
   def skip_if_nkf_dependency
     if RUBY_ENGINE == 'jruby'
-      meth = caller[0][/`(\w+)/, 1]
+      meth = caller_locations(1,1).first.base_label
       skip "#{meth}: skipped because this feature currently depends on NKF"
     end
   end
@@ -75,7 +74,7 @@ class TestMechanizePageLink < Mechanize::TestCase
   end
 
   def test_canonical_uri_unescaped
-    page = util_page <<-BODY
+    page = util_page(+<<-BODY)
 <head>
   <link rel="canonical" href="http://example/white space"/>
 </head>
@@ -97,7 +96,7 @@ class TestMechanizePageLink < Mechanize::TestCase
   end
 
   def test_encoding
-    page = util_page WINDOWS_1255
+    page = util_page WINDOWS_1255.dup
 
     assert_equal 'windows-1255', page.encoding
   end
@@ -115,13 +114,12 @@ class TestMechanizePageLink < Mechanize::TestCase
 
     # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
     skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"])
-    expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
 
-    page = util_page UTF8
+    page = util_page UTF8.dup
 
     assert_equal false, page.encoding_error?
 
-    assert_equal expected_encoding, page.encoding
+    assert_equal "UTF-8", page.encoding
   end
 
   def test_encoding_charset_after_title_double_bad
@@ -139,9 +137,8 @@ class TestMechanizePageLink < Mechanize::TestCase
 
     # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
     skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"])
-    expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
 
-    page = util_page "<title>#{UTF8_TITLE}</title>"
+    page = util_page(+"<title>#{UTF8_TITLE}</title>")
     page.encodings.replace %w[
       UTF-8
       Shift_JIS
@@ -149,11 +146,11 @@ class TestMechanizePageLink < Mechanize::TestCase
 
     assert_equal false, page.encoding_error?
 
-    assert_equal expected_encoding, page.encoding
+    assert_equal 'UTF-8', page.encoding
   end
 
   def test_encoding_meta_charset
-    page = util_page "<meta charset='UTF-8'>"
+    page = util_page(+"<meta charset='UTF-8'>")
 
     assert_equal 'UTF-8', page.encoding
   end
@@ -344,7 +341,7 @@ class TestMechanizePageLink < Mechanize::TestCase
   end
 
   def test_title_none
-    page = util_page '' # invalid HTML
+    page = util_page(+'') # invalid HTML
 
     assert_nil(page.title)
   end

data/test/test_mechanize_page_meta_refresh.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizePageMetaRefresh < Mechanize::TestCase

data/test/test_mechanize_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeParser < Mechanize::TestCase

data/test/test_mechanize_pluggable_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizePluggableParser < Mechanize::TestCase

data/test/test_mechanize_redirect_limit_reached_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeRedirectLimitReachedError < Mechanize::TestCase

data/test/test_mechanize_redirect_not_get_or_head_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeRedirectNotGetOrHead < Mechanize::TestCase

data/test/test_mechanize_response_read_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeResponseReadError < Mechanize::TestCase

data/test/test_mechanize_subclass.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeSubclass < Mechanize::TestCase

data/test/test_mechanize_util.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'mechanize/test_case'
 
@@ -6,7 +7,7 @@ class TestMechanizeUtil < Mechanize::TestCase
 
   INPUTTED_VALUE = "テスト" # "test" in Japanese UTF-8 encoding
   CONTENT_ENCODING = 'Shift_JIS' # one of Japanese encoding
-  ENCODED_VALUE = "\x83\x65\x83\x58\x83\x67".force_encoding(::Encoding::SHIFT_JIS) # "test" in Japanese Shift_JIS encoding
+  ENCODED_VALUE = "\x83\x65\x83\x58\x83\x67".dup.force_encoding(::Encoding::SHIFT_JIS) # "test" in Japanese Shift_JIS encoding
 
   ENCODING_ERRORS = [EncodingError, Encoding::ConverterNotFoundError] # and so on
   ERROR_LOG_MESSAGE = /from_native_charset: Encoding::ConverterNotFoundError: form encoding: "UTF-eight"/
@@ -67,7 +68,7 @@ class TestMechanizeUtil < Mechanize::TestCase
   end
 
   def test_from_native_charset_logs_form_when_encoding_error_raised
-    sio = StringIO.new("")
+    sio = StringIO.new
     log = Logger.new(sio)
     log.level = Logger::DEBUG
 
@@ -79,7 +80,7 @@ class TestMechanizeUtil < Mechanize::TestCase
   end
 
   def test_from_native_charset_logs_form_when_encoding_error_is_ignored
-    sio = StringIO.new("")
+    sio = StringIO.new
     log = Logger.new(sio)
     log.level = Logger::DEBUG
 

data/test/test_mechanize_xml_file.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class TestMechanizeXmlFile < Mechanize::TestCase

data/test/test_multi_select.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize/test_case'
 
 class MultiSelectTest < Mechanize::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mechanize
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.1
 platform: ruby
 authors:
 - Eric Hodel
@@ -9,10 +9,10 @@ authors:
 - Mike Dalessio
 - Akinori MUSHA
 - Lee Jarvis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -142,6 +142,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: webrobots
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
@@ -163,33 +191,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webrobots
+  name: nkf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +296,8 @@ extra_rdoc_files:
 files:
 - ".autotest"
 - ".github/dependabot.yml"
-- ".github/workflows/ci-test.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/upstream.yml"
 - ".gitignore"
 - ".yardopts"
 - CHANGELOG.md
@@ -486,7 +515,7 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/mechanize
   homepage_uri: https://github.com/sparklemotion/mechanize
   source_code_uri: https://github.com/sparklemotion/mechanize
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -503,8 +532,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: The Mechanize library is used for automating interaction with websites
 test_files: