mechanize 2.7.4 → 2.8.1

data/lib/mechanize/form/button.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A Submit button in a Form
 

data/lib/mechanize/form/check_box.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class represents a check box found in a Form.  To activate the CheckBox
 # in the Form, set the checked method to true.

data/lib/mechanize/form/field.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class represents a field in a form.  It handles the following input
 # tags found in a form:
@@ -14,6 +15,8 @@
 #   field.value = "foo"
 
 class Mechanize::Form::Field
+  extend Forwardable
+
   attr_accessor :name, :value, :node, :type
 
   # This fields value before it's sent through Util.html_unescape.
@@ -67,6 +70,50 @@ class Mechanize::Form::Field
     node['class']
   end
 
+  ##
+  # :method: search
+  #
+  # Shorthand for +node.search+.
+  #
+  # See Nokogiri::XML::Node#search for details.
+
+  ##
+  # :method: css
+  #
+  # Shorthand for +node.css+.
+  #
+  # See also Nokogiri::XML::Node#css for details.
+
+  ##
+  # :method: xpath
+  #
+  # Shorthand for +node.xpath+.
+  #
+  # See also Nokogiri::XML::Node#xpath for details.
+
+  ##
+  # :method: at
+  #
+  # Shorthand for +node.at+.
+  #
+  # See also Nokogiri::XML::Node#at for details.
+
+  ##
+  # :method: at_css
+  #
+  # Shorthand for +node.at_css+.
+  #
+  # See also Nokogiri::XML::Node#at_css for details.
+
+  ##
+  # :method: at_xpath
+  #
+  # Shorthand for +node.at_xpath+.
+  #
+  # See also Nokogiri::XML::Node#at_xpath for details.
+
+  def_delegators :node, :search, :css, :xpath, :at, :at_css, :at_xpath
+
   def inspect # :nodoc:
     "[%s:0x%x type: %s name: %s value: %s]" % [
       self.class.name.sub(/Mechanize::Form::/, '').downcase,

data/lib/mechanize/form/file_upload.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This class represents a file upload field found in a form.  To use this
 # class, set FileUpload#file_data= to the data of the file you want to upload
 # and FileUpload#mime_type= to the appropriate mime type of the file.

data/lib/mechanize/form/hidden.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::Form::Hidden < Mechanize::Form::Field
 end
 

data/lib/mechanize/form/image_button.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class represents an image button in a form.  Use the x and y methods to
 # set the x and y positions for where the mouse "clicked".

data/lib/mechanize/form/keygen.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class represents a keygen (public / private key generator) found in a
 # Form. The field will automatically generate a key pair and compute its own

data/lib/mechanize/form/multi_select_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class represents a select list where multiple values can be selected.
 # MultiSelectList#value= accepts an array, and those values are used as
@@ -12,19 +13,15 @@
 #   list.value = 'one'
 
 class Mechanize::Form::MultiSelectList < Mechanize::Form::Field
-
   extend Mechanize::ElementMatcher
 
   attr_accessor :options
 
   def initialize node
     value = []
-    @options = []
-
-    # parse
-    node.search('option').each do |n|
-      @options << Mechanize::Form::Option.new(n, self)
-    end
+    @options = node.search('option').map { |n|
+      Mechanize::Form::Option.new(n, self)
+    }
 
     super node, value
   end
@@ -64,18 +61,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 +88,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/form/option.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class contains an option found within SelectList.  A SelectList can
 # have many Option classes associated with it.  An option can be selected by
@@ -8,12 +9,13 @@
 #   select_list.first.tick
 
 class Mechanize::Form::Option
-  attr_reader :value, :selected, :text, :select_list
+  attr_reader :value, :selected, :text, :select_list, :node
 
   alias :to_s :value
   alias :selected? :selected
 
   def initialize(node, select_list)
+    @node     = node
     @text     = node.inner_text
     @value    = Mechanize::Util.html_unescape(node['value'] || node.inner_text)
     @selected = node.has_attribute? 'selected'

data/lib/mechanize/form/radio_button.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class represents a radio button found in a Form.  To activate the
 # RadioButton in the Form, set the checked method to true.

data/lib/mechanize/form/reset.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::Form::Reset < Mechanize::Form::Button
 end
 

data/lib/mechanize/form/select_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This class represents a select list or drop down box in a Form.  Set the
 # value for the list by calling SelectList#value=.  SelectList contains a list
 # of Option that were found.  After finding the correct option, set the select

data/lib/mechanize/form/submit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::Form::Submit < Mechanize::Form::Button
 end
 

data/lib/mechanize/form/text.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::Form::Text < Mechanize::Form::Field
 end
 

data/lib/mechanize/form/textarea.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::Form::Textarea < Mechanize::Form::Field
 end
 

data/lib/mechanize/headers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Mechanize::Headers < Hash
   def [](key)
     super(key.downcase)

data/lib/mechanize/history.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This class manages history for your mechanize object.
 
@@ -16,7 +17,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.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Mechanize::HTTP contains classes for communicated with HTTP servers.  All
 # API under this namespace is considered private and is subject to change at

data/lib/mechanize/http/agent.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 require 'tempfile'
 require 'net/ntlm'
-require 'kconv'
 require 'webrobots'
 
 ##
@@ -9,6 +9,9 @@ require 'webrobots'
 
 class Mechanize::HTTP::Agent
 
+  CREDENTIAL_HEADERS = ['Authorization', 'Cookie']
+  POST_HEADERS = ['Content-Length', 'Content-MD5', 'Content-Type']
+
   # :section: Headers
 
   # Disables If-Modified-Since conditional requests (enabled by default)
@@ -71,7 +74,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 +86,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 +157,7 @@ class Mechanize::HTTP::Agent
     @redirection_limit        = 20
     @request_headers          = {}
     @robots                   = false
+    @robots_mutex             = Mutex.new
     @user_agent               = nil
     @webrobots                = nil
 
@@ -176,7 +186,13 @@ class Mechanize::HTTP::Agent
     @scheme_handlers['relative']  = @scheme_handlers['http']
     @scheme_handlers['file']      = @scheme_handlers['http']
 
-    @http = Net::HTTP::Persistent.new connection_name
+    @http =
+      if defined?(Net::HTTP::Persistent::DEFAULT_POOL_SIZE)
+        Net::HTTP::Persistent.new(name: connection_name)
+      else
+        # net-http-persistent < 3.0
+        Net::HTTP::Persistent.new(connection_name)
+      end
     @http.idle_timeout = 5
     @http.keep_alive   = 300
   end
@@ -523,8 +539,8 @@ class Mechanize::HTTP::Agent
 
   def request_auth request, uri
     base_uri = uri + '/'
-    base_uri.user     = nil
-    base_uri.password = nil
+    base_uri.user     &&= nil
+    base_uri.password &&= nil
     schemes = @authenticate_methods[base_uri]
 
     if realm = schemes[:digest].find { |r| r.uri == base_uri } then
@@ -637,14 +653,6 @@ class Mechanize::HTTP::Agent
     scheme = uri.relative? ? 'relative' : uri.scheme.downcase
     uri = @scheme_handlers[scheme].call(uri, referer)
 
-    if referer_uri
-      if uri.path.length == 0 && uri.relative?
-        uri.path = referer_uri.path
-      end
-    end
-
-    uri.path = '/' if uri.path.length == 0
-
     if uri.relative?
       raise ArgumentError, "absolute URL needed (not #{uri})" unless
         referer_uri
@@ -674,6 +682,13 @@ class Mechanize::HTTP::Agent
       raise ArgumentError, "unsupported scheme: #{uri.scheme}"
     end
 
+    case uri.path
+    when nil
+      raise ArgumentError, "hierarchical URL needed (not #{uri})"
+    when ''.freeze
+      uri.path = '/'
+    end
+
     uri
   end
 
@@ -810,7 +825,7 @@ class Mechanize::HTTP::Agent
     return body_io if length.zero?
 
     out_io = case response['Content-Encoding']
-             when nil, 'none', '7bit', "" then
+             when nil, 'none', '7bit', 'identity', "" then
                body_io
              when 'deflate' then
                content_encoding_inflate body_io
@@ -826,7 +841,7 @@ class Mechanize::HTTP::Agent
 
     out_io
   rescue Zlib::Error => e
-    message = "error handling content-encoding #{response['Content-Encoding']}:"
+    message = String.new("error handling content-encoding #{response['Content-Encoding']}:")
     message << " #{e.message} (#{e.class})"
     raise Mechanize::Error, message
   ensure
@@ -974,25 +989,46 @@ class Mechanize::HTTP::Agent
 
     redirect_method = method == :head ? :head : :get
 
+    new_uri = secure_resolve!(response['Location'].to_s, page)
+    @history.push(page, page.uri)
+
     # Make sure we are not copying over the POST headers from the original request
-    ['Content-Length', 'Content-MD5', 'Content-Type'].each do |key|
-      headers.delete key
+    POST_HEADERS.each do |key|
+      headers.delete_if { |h| h.casecmp?(key) }
     end
 
-    new_uri = secure_resolve! response['Location'].to_s, page
-
-    @history.push(page, page.uri)
+    # Make sure we clear credential headers if being redirected to another site
+    if new_uri.host != page.uri.host
+      CREDENTIAL_HEADERS.each do |ch|
+        headers.delete_if { |h| h.casecmp?(ch) }
+      end
+    end
 
     fetch new_uri, redirect_method, headers, [], referer, redirects + 1
   end
 
   # :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 +1042,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
@@ -1190,31 +1226,39 @@ class Mechanize::HTTP::Agent
   end
 
   ##
-  # Sets the proxy address, port, user, and password +addr+ should be a host,
-  # with no "http://", +port+ may be a port number, service name or port
-  # number string.
-
-  def set_proxy addr, port, user = nil, pass = nil
-    unless addr and port then
+  # Sets the proxy address, port, user, and password. +addr+ may be
+  # an HTTP URL/URI or a host name, +port+ may be a port number, service
+  # name or port number string.
+
+  def set_proxy addr, port = nil, user = nil, pass = nil
+    case addr
+    when URI::HTTP
+      proxy_uri = addr.dup
+    when %r{\Ahttps?://}i
+      proxy_uri = URI addr
+    when String
+      proxy_uri = URI "http://#{addr}"
+    when nil
       @http.proxy = nil
-
       return
     end
 
-    unless Integer === port then
+    case port
+    when Integer
+      proxy_uri.port = port
+    when nil
+    else
       begin
-        port = Socket.getservbyname port
+        proxy_uri.port = Socket.getservbyname port
       rescue SocketError
         begin
-          port = Integer port
+          proxy_uri.port = Integer port
         rescue ArgumentError
           raise ArgumentError, "invalid value for port: #{port.inspect}"
         end
       end
     end
 
-    proxy_uri = URI "http://#{addr}"
-    proxy_uri.port = port
     proxy_uri.user     = user if user
     proxy_uri.password = pass if pass
 
@@ -1243,4 +1287,3 @@ class Mechanize::HTTP::Agent
 end
 
 require 'mechanize/http/auth_store'
-