mechanize 2.7.3 → 2.8.0

data/lib/mechanize/page/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A base element on an HTML page.  Mechanize treats base tags just like 'a'
 # tags.  Base objects will contain links, but most likely will have no text.

data/lib/mechanize/page/frame.rb

@@ -1,4 +1,5 @@
-# A Frame object wrapse a frame HTML element.  Frame objects can be treated
+# frozen_string_literal: true
+# 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
@@ -11,6 +12,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/page/image.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # An image element on an HTML page
 
@@ -169,6 +170,8 @@ class Mechanize::Page::Image
     end
   end
 
+  alias uri url
+
   ##
   # The width attribute of the image
 

data/lib/mechanize/page/label.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A form label on an HTML page
 

data/lib/mechanize/page/link.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class encapsulates links.  It contains the text and the URI for
 # 'a' tags parsed out of an HTML page.  If the link contains an image,
@@ -8,6 +9,8 @@
 #   <a href="http://example">Hello World</a>
 #   <a href="http://example"><img src="test.jpg" alt="Hello World"></a>
 
+require 'addressable/uri'
+
 class Mechanize::Page::Link
   attr_reader :node
   attr_reader :href
@@ -94,10 +97,19 @@ class Mechanize::Page::Link
                begin
                  URI.parse @href
                rescue URI::InvalidURIError
-                 URI.parse WEBrick::HTTPUtils.escape @href
+                 begin
+                   URI.parse(Addressable::URI.escape(@href))
+                 rescue Addressable::URI::InvalidURIError
+                   raise URI::InvalidURIError
+                 end
                end
              end
   end
 
+  # A fully resolved URI for the #href for this link.
+  def resolved_uri
+    @mech.resolve uri
+  end
+
 end
 

data/lib/mechanize/page/meta_refresh.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class encapsulates a meta element with a refresh http-equiv.  Mechanize
 # treats meta refresh elements just like 'a' tags.  MetaRefresh objects will

data/lib/mechanize/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The parser module provides standard methods for accessing the headers and
 # content of a response that are shared across pluggable parsers.
@@ -118,13 +119,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/pluggable_parsers.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 require 'mechanize/file'
 require 'mechanize/file_saver'
 require 'mechanize/page'
 require 'mechanize/xml_file'
+require 'mime/types'
 
 ##
 # Mechanize allows different parsers for different content types.  Mechanize
@@ -68,6 +70,15 @@ class Mechanize::PluggableParser
     :xml   => ['text/xml', 'application/xml'],
   }
 
+  InvalidContentTypeError =
+    if defined?(MIME::Type::InvalidContentType)
+      # For mime-types >=2.1
+      MIME::Type::InvalidContentType
+    else
+      # For mime-types <2.1
+      MIME::InvalidContentType
+    end
+
   attr_accessor :default
 
   def initialize
@@ -97,9 +108,11 @@ class Mechanize::PluggableParser
 
     parser = @parsers[mime_type.to_s] ||
              @parsers[mime_type.simplified] ||
+             # Starting from mime-types 3.0 x-prefix is deprecated as per IANA
+             (@parsers[MIME::Type.simplified(mime_type.to_s, remove_x_prefix: true)] rescue nil) ||
              @parsers[mime_type.media_type] ||
              default
-  rescue MIME::Type::InvalidContentType
+  rescue InvalidContentTypeError
     default
   end
 

data/lib/mechanize/prependable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Fake implementation of prepend(), which does not support overriding
 # inherited methods nor methods that are formerly overridden by
 # another invocation of prepend().

data/lib/mechanize/redirect_limit_reached_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Raised when too many redirects are sent
 

data/lib/mechanize/redirect_not_get_or_head_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Raised when a POST, PUT, or DELETE request results in a redirect
 # see RFC 2616 10.3.2, 10.3.3 http://www.ietf.org/rfc/rfc2616.txt

data/lib/mechanize/response_code_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This error is raised when Mechanize encounters a response code it does not
 # know how to handle.  Currently, this exception will be thrown if Mechanize
 # encounters response codes other than 200, 301, or 302.  Any other response
@@ -16,7 +17,7 @@ class Mechanize::ResponseCodeError < Mechanize::Error
 
   def to_s
     response_class = Net::HTTPResponse::CODE_TO_OBJ[@response_code]
-    out = "#{@response_code} => #{response_class} "
+    out = String.new("#{@response_code} => #{response_class} ")
     out << "for #{@page.uri} " if @page.respond_to? :uri # may be HTTPResponse
     out << "-- #{super}"
   end

data/lib/mechanize/response_read_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Raised when Mechanize encounters an error while reading the response body
 # from the server.  Contains the response headers and the response body up to

data/lib/mechanize/robots_disallowed_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Exception that is raised when an access to a resource is disallowed by
 # robots.txt or by HTML document itself.
 

data/lib/mechanize/test_case.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mechanize'
 require 'logger'
 require 'tempfile'
@@ -14,6 +15,11 @@ end
 
 require 'minitest/autorun'
 
+begin
+  require 'minitest/pride'
+rescue LoadError
+end
+
 ##
 # A generic test case for testing mechanize.  Using a subclass of
 # Mechanize::TestCase for your tests will create an isolated mechanize
@@ -52,12 +58,12 @@ class Mechanize::TestCase < Minitest::Test
 
   def fake_page agent = @mech
     uri = URI 'http://fake.example/'
-    html = <<-END
-<html>
-<body>
-<form><input type="submit" value="submit" /></form>
-</body>
-</html>
+    html = String.new(<<~END)
+      <html>
+      <body>
+      <form><input type="submit" value="submit" /></form>
+      </body>
+      </html>
     END
 
     Mechanize::Page.new uri, nil, html, 200, agent
@@ -82,11 +88,9 @@ class Mechanize::TestCase < Minitest::Test
   # Creates a Mechanize::CookieJar by parsing the given +str+
 
   def cookie_jar str, uri = URI('http://example')
-    jar = Mechanize::CookieJar.new
-
-    jar.parse str, uri
-
-    jar
+    Mechanize::CookieJar.new.tap do |jar|
+      jar.parse str, uri
+    end
   end
 
   ##
@@ -104,22 +108,18 @@ class Mechanize::TestCase < Minitest::Test
   # Creates a Nokogiri Node +element+ with the given +attributes+
 
   def node element, attributes = {}
-    doc = Nokogiri::HTML::Document.new
-
-    node = Nokogiri::XML::Node.new element, doc
-
-    attributes.each do |name, value|
-      node[name] = value
+    Nokogiri::XML::Node.new(element, Nokogiri::HTML::Document.new).tap do |node|
+      attributes.each do |name, value|
+        node[name] = value
+      end
     end
-
-    node
   end
 
   ##
   # Creates a Mechanize::Page for the given +uri+ with the given
   # +content_type+, response +body+ and HTTP status +code+
 
-  def page uri, content_type = 'text/html', body = '', code = 200
+  def page uri, content_type = 'text/html', body = String.new, code = 200
     uri = URI uri unless URI::Generic === uri
 
     Mechanize::Page.new(uri, { 'content-type' => content_type }, body, code,
@@ -168,15 +168,25 @@ UQIBATANBgkqhkiG9w0BAQUFAANBAAAB////////////////////////////////
   # Creates a Tempfile with +content+ that is immediately unlinked
 
   def tempfile content
-    body_io = Tempfile.new @NAME
-    body_io.unlink
-    body_io.write content
-    body_io.flush
-    body_io.rewind
+    Tempfile.new(@NAME).tap do |body_io|
+      body_io.unlink
+      body_io.write content
+      body_io.flush
+      body_io.rewind
+    end
+  end
 
-    body_io
+  ##
+  # Returns true if the current platform is a Windows platform
+  def windows?
+    ::RUBY_PLATFORM =~ /mingw|mswin/
   end
 
+  ##
+  # Return the contents of the file without Windows carriage returns
+  def file_contents_without_cr(path)
+    File.read(path).gsub(/\r\n/, "\n")
+  end
 end
 
 require 'mechanize/test_case/servlets'
@@ -225,9 +235,9 @@ class Net::HTTP # :nodoc:
     else
       filename = "htdocs#{path.gsub(/[^\/\\.\w\s]/, '_')}"
       unless PAGE_CACHE[filename]
-        open("#{Mechanize::TestCase::TEST_DIR}/#{filename}", 'rb') { |io|
+        ::File.open("#{Mechanize::TestCase::TEST_DIR}/#{filename}", 'rb') do |io|
           PAGE_CACHE[filename] = io.read
-        }
+        end
       end
 
       res.body = PAGE_CACHE[filename]
@@ -307,7 +317,7 @@ class Response # :nodoc:
 
     def initialize
       @header = {}
-      @body = ''
+      @body = String.new
       @code = nil
       @query = nil
       @cookies = []

data/lib/mechanize/test_case/bad_chunking_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class BadChunkingServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET req, res
     res.keep_alive = false if res.respond_to? :keep_alive=

data/lib/mechanize/test_case/basic_auth_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class BasicAuthServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req,res)
     htpd = nil

data/lib/mechanize/test_case/content_type_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ContentTypeServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     ct = req.query['ct'] || "text/html; charset=utf-8"

data/lib/mechanize/test_case/digest_auth_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'logger'
 
 class DigestAuthServlet < WEBrick::HTTPServlet::AbstractServlet

data/lib/mechanize/test_case/file_upload_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class FileUploadServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_POST req, res
     res.body = req.body

data/lib/mechanize/test_case/form_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class FormServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.content_type = 'text/html'

data/lib/mechanize/test_case/gzip_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'stringio'
 require 'zlib'
 
@@ -13,8 +14,8 @@ class GzipServlet < WEBrick::HTTPServlet::AbstractServlet
     end
 
     if name = req.query['file'] then
-      open "#{TEST_DIR}/htdocs/#{name}" do |io|
-        string = ""
+      ::File.open("#{TEST_DIR}/htdocs/#{name}") do |io|
+        string = String.new
         zipped = StringIO.new string, 'w'
         Zlib::GzipWriter.wrap zipped do |gz|
           gz.write io.read
@@ -22,7 +23,7 @@ class GzipServlet < WEBrick::HTTPServlet::AbstractServlet
         res.body = string
       end
     else
-      res.body = ''
+      res.body = String.new
     end
 
     res['Content-Encoding'] = req['X-ResponseContentEncoding'] || 'gzip'

data/lib/mechanize/test_case/header_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class HeaderServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.content_type = "text/plain"

data/lib/mechanize/test_case/http_refresh_servlet.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
 class HttpRefreshServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     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_redirect_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class InfiniteRedirectServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res['Content-Type'] = req.query['ct'] || "text/html"

data/lib/mechanize/test_case/infinite_refresh_servlet.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 class InfiniteRefreshServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     address = "#{req.host}:#{req.port}"
     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/test_case/many_cookies_as_string_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ManyCookiesAsStringServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     cookies = []

data/lib/mechanize/test_case/many_cookies_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ManyCookiesServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     name_cookie = WEBrick::Cookie.new("name", "Aaron")

data/lib/mechanize/test_case/modified_since_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ModifiedSinceServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     s_time = 'Fri, 04 May 2001 00:00:38 GMT'

data/lib/mechanize/test_case/ntlm_servlet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class NTLMServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def do_GET(req, res)