mechanize 2.7.3 → 2.8.0

data/lib/mechanize/http/auth_challenge.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::HTTP
 
   AuthChallenge = Struct.new :scheme, :params, :raw

data/lib/mechanize/http/auth_realm.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::HTTP::AuthRealm
 
   attr_reader :scheme
@@ -7,7 +8,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/http/auth_store.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A credential store for HTTP authentication.
 #
@@ -93,6 +94,8 @@ only to a particular server you specify.
     uri = URI uri unless URI === uri
 
     uri += '/'
+    uri.user = nil
+    uri.password = nil
 
     realms = @auth_accounts[uri]
 

data/lib/mechanize/http/content_disposition_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: BINARY
 
 require 'strscan'
@@ -16,6 +17,7 @@ end
 # * Missing disposition-type
 # * Multiple semicolons
 # * Whitespace around semicolons
+# * Dates in ISO 8601 format
 
 class Mechanize::HTTP::ContentDispositionParser
 
@@ -93,7 +95,17 @@ class Mechanize::HTTP::ContentDispositionParser
               when /^filename$/ then
                 rfc_2045_value
               when /^(creation|modification|read)-date$/ then
-                Time.rfc822 rfc_2045_quoted_string
+                date = rfc_2045_quoted_string
+
+                begin
+                  Time.rfc822 date
+                rescue ArgumentError
+                  begin
+                    Time.iso8601 date
+                  rescue ArgumentError
+                    nil
+                  end
+                end
               when /^size$/ then
                 rfc_2045_value.to_i(10)
               else
@@ -125,7 +137,7 @@ class Mechanize::HTTP::ContentDispositionParser
   def rfc_2045_quoted_string
     return nil unless @scanner.scan(/"/)
 
-    text = ''
+    text = String.new
 
     while true do
       chunk = @scanner.scan(/[\000-\014\016-\041\043-\133\135-\177]+/) # not \r "
@@ -141,7 +153,10 @@ class Mechanize::HTTP::ContentDispositionParser
           text << " "
         end
       else
-        if '"' == @scanner.peek(1) then
+        if '\\"' == @scanner.peek(2) then
+          @scanner.skip(/\\/)
+          text << @scanner.get_byte
+        elsif '"' == @scanner.peek(1) then
           @scanner.get_byte
           break
         else

data/lib/mechanize/http/www_authenticate_parser.rb

@@ -1,4 +1,4 @@
-# coding: BINARY
+# frozen_string_literal: true
 
 require 'strscan'
 
@@ -34,7 +34,7 @@ class Mechanize::HTTP::WWWAuthenticateParser
         scan_comma_spaces
       end
 
-      next unless scheme
+      break unless scheme
       challenge.scheme = scheme
 
       space = spaces
@@ -128,7 +128,7 @@ class Mechanize::HTTP::WWWAuthenticateParser
 
   def auth_param
     return nil unless name = token
-    return nil unless @scanner.scan(/=/)
+    return nil unless @scanner.scan(/ *= */)
 
     value = if @scanner.peek(1) == '"' then
               quoted_string
@@ -151,10 +151,10 @@ class Mechanize::HTTP::WWWAuthenticateParser
   def quoted_string
     return nil unless @scanner.scan(/"/)
 
-    text = ''
+    text = String.new
 
     while true do
-      chunk = @scanner.scan(/[\r\n \t\041\043-\176\200-\377]+/) # not "
+      chunk = @scanner.scan(/[\r\n \t\x21\x23-\x7e\u0080-\u00ff]+/) # not " which is \x22
 
       if chunk then
         text << chunk

data/lib/mechanize/image.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # An Image holds downloaded data for an image/* response.
 

data/lib/mechanize/page.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class encapsulates an HTML page.  If Mechanize finds a content
 # type of 'text/html', this class will be instantiated and returned.
@@ -42,7 +43,7 @@ class Mechanize::Page < Mechanize::File
     if body
       # Force the encoding to be 8BIT so we can perform regular expressions.
       # We'll set it to the detected encoding later
-      body.force_encoding 'ASCII-8BIT' if body.respond_to? :force_encoding
+      body.force_encoding(Encoding::ASCII_8BIT)
 
       @encodings.concat self.class.meta_charset body
 
@@ -58,7 +59,7 @@ class Mechanize::Page < Mechanize::File
   def title
     @title ||=
       if doc = parser
-        title = doc.search('title').inner_text
+        title = doc.xpath('string(((/html/head | /html | /head | /)/title)[1])').to_s
         title.empty? ? nil : title
       end
   end
@@ -92,7 +93,9 @@ class Mechanize::Page < Mechanize::File
   end
 
   def encoding
-    parser.respond_to?(:encoding) ? parser.encoding : nil
+    parser.encoding
+  rescue NoMethodError
+    nil
   end
 
   # Return whether parser result has errors related to encoding or not.
@@ -109,15 +112,17 @@ class Mechanize::Page < Mechanize::File
 
   def parser
     return @parser if @parser
-    return nil unless @body
+    return unless @body
+
+    url = @uri && @uri.to_s
 
-    if @encoding then
-      @parser = @mech.html_parser.parse html_body, nil, @encoding
-    elsif mech.force_default_encoding then
-      @parser = @mech.html_parser.parse html_body, nil, @mech.default_encoding
+    if @encoding
+      @parser = mech.html_parser.parse html_body, url, @encoding
+    elsif mech.force_default_encoding
+      @parser = mech.html_parser.parse html_body, url, @mech.default_encoding
     else
       @encodings.reverse_each do |encoding|
-        @parser = @mech.html_parser.parse html_body, nil, encoding
+        @parser = mech.html_parser.parse html_body, url, encoding
 
         break unless encoding_error? @parser
       end
@@ -192,39 +197,71 @@ class Mechanize::Page < Mechanize::File
   ##
   # :method: search
   #
-  # Search for +paths+ in the page using Nokogiri's #search.  The +paths+ can
-  # be XPath or CSS and an optional Hash of namespaces may be appended.
+  # Shorthand for +parser.search+.
   #
-  # See Nokogiri::XML::Node#search for further details.
+  # See Nokogiri::XML::Node#search for details.
 
-  def_delegator :parser, :search, :search
+  ##
+  # :method: css
+  #
+  # Shorthand for +parser.css+.
+  #
+  # See also Nokogiri::XML::Node#css for details.
 
-  alias / search
+  ##
+  # :method: xpath
+  #
+  # Shorthand for +parser.xpath+.
+  #
+  # See also Nokogiri::XML::Node#xpath for details.
 
   ##
   # :method: at
   #
-  # Search through the page for +path+ under +namespace+ using Nokogiri's #at.
-  # The +path+ may be either a CSS or XPath expression.
+  # Shorthand for +parser.at+.
+  #
+  # See also Nokogiri::XML::Node#at for details.
+
+  ##
+  # :method: at_css
+  #
+  # Shorthand for +parser.at_css+.
+  #
+  # See also Nokogiri::XML::Node#at_css for details.
+
+  ##
+  # :method: at_xpath
   #
-  # See also Nokogiri::XML::Node#at
+  # Shorthand for +parser.at_xpath+.
+  #
+  # See also Nokogiri::XML::Node#at_xpath for details.
 
-  def_delegator :parser, :at, :at
+  def_delegators :parser, :search, :css, :xpath, :at, :at_css, :at_xpath
+
+  alias / search
+  alias % at
 
   ##
   # :method: form_with
   #
   # :call-seq:
   #   form_with(criteria)
+  #   form_with(criteria) { |form| ... }
   #
-  # Find a single form matching +criteria+.
-  # Example:
-  #   page.form_with(:action => '/post/login.php') do |f|
+  # Find a single form matching +criteria+.  See +forms_with+ for
+  # details of +criteria+.
+  #
+  # Examples:
+  #   page.form_with(action: '/post/login.php') do |f|
   #     ...
   #   end
 
   ##
-  # :mehtod: form_with!(criteria)
+  # :method: form_with!(criteria)
+  #
+  # :call-seq:
+  #   form_with!(criteria)
+  #   form_with!(criteria) { |form| ... }
   #
   # Same as +form_with+ but raises an ElementNotFoundError if no button matches
   # +criteria+
@@ -232,11 +269,35 @@ class Mechanize::Page < Mechanize::File
   ##
   # :method: forms_with
   #
-  # :call-seq: forms_with(criteria)
+  # :call-seq:
+  #   forms_with(name)
+  #   forms_with(name: name_matcher, id: id_matcher, class: class_matcher,
+  #              search: search_expression, xpath: xpath_expression, css: css_expression,
+  #              action: action_matcher, ...)
+  #
+  # Find all forms form matching criteria.  If a string is given, it
+  # is taken as a name attribute value.  If a hash is given, forms
+  # are narrowed by the key-value pairs as follows.
+  #
+  # :id, :dom_id: selects forms with a #dom_id value that matches this
+  # value.
+  #
+  # :class, :dom_class: selects forms with a #dom_class value that
+  # matches this value.  Note that class attribute values are compared
+  # literally as string, so forms_with(class: "a") does not match a
+  # form with class="a b".  Use forms_with(css: "form.a") instead.
+  #
+  # :search: only selects forms matching this selector expression.
+  #
+  # :xpath: only selects forms matching this XPath expression.
+  #
+  # :css: only selects forms matching this CSS selector expression.
+  #
+  # :action, :method, etc.: narrows forms by a given attribute value
+  # using the === operator.
   #
-  # Find all forms form matching +criteria+.
   # Example:
-  #   page.forms_with(:action => '/post/login.php').each do |f|
+  #   page.forms_with(css: '#content table.login_box form', method: /\APOST\z/i, ).each do |f|
   #     ...
   #   end
 
@@ -245,14 +306,22 @@ class Mechanize::Page < Mechanize::File
   ##
   # :method: link_with
   #
-  # :call-seq: link_with(criteria)
+  # :call-seq:
+  #   link_with(criteria)
+  #   link_with(criteria) { |link| ... }
+  #
+  # Find a single link matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "link(s)".
   #
-  # Find a single link matching +criteria+.
   # Example:
-  #   page.link_with(:href => /foo/).click
+  #   page.link_with(href: /foo/).click
 
   ##
-  # :mehtod: link_with!(criteria)
+  # :method: link_with!
+  #
+  # :call-seq:
+  #   link_with!(criteria)
+  #   link_with!(criteria) { |link| ... }
   #
   # Same as +link_with+ but raises an ElementNotFoundError if no button matches
   # +criteria+
@@ -263,9 +332,11 @@ class Mechanize::Page < Mechanize::File
   # :call-seq:
   #   links_with(criteria)
   #
-  # Find all links matching +criteria+.
+  # Find all links matching +criteria+.  See +forms_with+ for details
+  # of +criteria+, where for "form(s)" read "link(s)".
+  #
   # Example:
-  #   page.links_with(:href => /foo/).each do |link|
+  #   page.links_with(href: /foo/).each do |link|
   #     puts link.href
   #   end
 
@@ -274,14 +345,22 @@ class Mechanize::Page < Mechanize::File
   ##
   # :method: base_with
   #
-  # :call-seq: base_with(criteria)
+  # :call-seq:
+  #   base_with(criteria)
+  #   base_with(criteria) { |base| ... }
+  #
+  # Find a single base tag matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "base tag(s)".
   #
-  # Find a single base tag matching +criteria+.
   # Example:
-  #   page.base_with(:href => /foo/).click
+  #   page.base_with(href: /foo/).click
 
   ##
-  # :mehtod: base_with!(criteria)
+  # :method: base_with!(criteria)
+  #
+  # :call-seq:
+  #   base_with!(criteria)
+  #   base_with!(criteria) { |base| ... }
   #
   # Same as +base_with+ but raises an ElementNotFoundError if no button matches
   # +criteria+
@@ -291,9 +370,11 @@ class Mechanize::Page < Mechanize::File
   #
   # :call-seq: bases_with(criteria)
   #
-  # Find all base tags matching +criteria+.
+  # Find all base tags matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "base tag(s)".
+  #
   # Example:
-  #   page.bases_with(:href => /foo/).each do |base|
+  #   page.bases_with(href: /foo/).each do |base|
   #     puts base.href
   #   end
 
@@ -302,14 +383,22 @@ class Mechanize::Page < Mechanize::File
   ##
   # :method: frame_with
   #
-  # :call-seq: frame_with(criteria)
+  # :call-seq:
+  #   frame_with(criteria)
+  #   frame_with(criteria) { |frame| ... }
+  #
+  # Find a single frame tag matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "frame tag(s)".
   #
-  # Find a single frame tag matching +criteria+.
   # Example:
-  #   page.frame_with(:src => /foo/).click
+  #   page.frame_with(src: /foo/).click
 
   ##
-  # :mehtod: frame_with!(criteria)
+  # :method: frame_with!
+  #
+  # :call-seq:
+  #   frame_with!(criteria)
+  #   frame_with!(criteria) { |frame| ... }
   #
   # Same as +frame_with+ but raises an ElementNotFoundError if no button matches
   # +criteria+
@@ -319,9 +408,11 @@ class Mechanize::Page < Mechanize::File
   #
   # :call-seq: frames_with(criteria)
   #
-  # Find all frame tags matching +criteria+.
+  # Find all frame tags matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "frame tag(s)".
+  #
   # Example:
-  #   page.frames_with(:src => /foo/).each do |frame|
+  #   page.frames_with(src: /foo/).each do |frame|
   #     p frame.src
   #   end
 
@@ -330,14 +421,22 @@ class Mechanize::Page < Mechanize::File
   ##
   # :method: iframe_with
   #
-  # :call-seq: iframe_with(criteria)
+  # :call-seq:
+  #   iframe_with(criteria)
+  #   iframe_with(criteria) { |iframe| ... }
+  #
+  # Find a single iframe tag matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "iframe tag(s)".
   #
-  # Find a single iframe tag matching +criteria+.
   # Example:
-  #   page.iframe_with(:src => /foo/).click
+  #   page.iframe_with(src: /foo/).click
 
   ##
-  # :mehtod: iframe_with!(criteria)
+  # :method: iframe_with!
+  #
+  # :call-seq:
+  #   iframe_with!(criteria)
+  #   iframe_with!(criteria) { |iframe| ... }
   #
   # Same as +iframe_with+ but raises an ElementNotFoundError if no button
   # matches +criteria+
@@ -347,9 +446,11 @@ class Mechanize::Page < Mechanize::File
   #
   # :call-seq: iframes_with(criteria)
   #
-  # Find all iframe tags matching +criteria+.
+  # Find all iframe tags matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "iframe tag(s)".
+  #
   # Example:
-  #   page.iframes_with(:src => /foo/).each do |iframe|
+  #   page.iframes_with(src: /foo/).each do |iframe|
   #     p iframe.src
   #   end
 
@@ -358,14 +459,22 @@ class Mechanize::Page < Mechanize::File
   ##
   # :method: image_with
   #
-  # :call-seq: image_with(criteria)
+  # :call-seq:
+  #   image_with(criteria)
+  #   image_with(criteria) { |image| ... }
+  #
+  # Find a single image matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "image(s)".
   #
-  # Find a single image matching +criteria+.
   # Example:
-  #   page.image_with(:alt => /main/).fetch.save
+  #   page.image_with(alt: /main/).fetch.save
 
   ##
-  # :mehtod: image_with!(criteria)
+  # :method: image_with!
+  #
+  # :call-seq:
+  #   image_with!(criteria)
+  #   image_with!(criteria) { |image| ... }
   #
   # Same as +image_with+ but raises an ElementNotFoundError if no button matches
   # +criteria+
@@ -375,9 +484,11 @@ class Mechanize::Page < Mechanize::File
   #
   # :call-seq: images_with(criteria)
   #
-  # Find all images matching +criteria+.
+  # Find all images matching +criteria+.  See +forms_with+ for
+  # details of +criteria+, where for "form(s)" read "image(s)".
+  #
   # Example:
-  #   page.images_with(:src => /jpg\Z/).each do |img|
+  #   page.images_with(src: /jpg\Z/).each do |img|
   #     img.fetch.save
   #   end