mechanize 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f42c3bb7351deeb2a1a68c33b118e666925ed20a
-  data.tar.gz: 751d2ffcf39675f4668a7d069a707a3782cafcfe
+  metadata.gz: 7e684f2f1ceb7fca81909282b30a28c04272caef
+  data.tar.gz: c08ef7e0f2aefd788f9808175afb4f97bce60b3f
 SHA512:
-  metadata.gz: c1b85a0469fbdd35bb9ce230cf5752d4cef8f9416eab11f72ca00bc25f0f3b40065a94e31ef63944ecf8ef270a3388bbbab310b190ffbf4582f0305da3d24259
-  data.tar.gz: 4e94e81383dccbf49bec0312e1ffe0183eaf7668679f7a77d4d5b42c2ece81337797cc16b8d61fef02dfac9077aa46ece2acce0b2418204f231ef476416b8df8
+  metadata.gz: fed2bde694313e6ddae6d44bbbf0ac90aa6b651ab7027628125b2095b33a73dc3fdaf8481335197ab0cf9cbea7c9dfa9396f4e3c4199cdc3563f76b20728f18c
+  data.tar.gz: a547f0f8d1c6f8d0b7c8ff580e487b64b79fbec3cca64a514407243529248e6892f66d9af746bc6c429458750e7b5782510cb3e8180f8464f08c8c0c0c0351b9

data/.travis.yml

@@ -5,27 +5,32 @@ notifications:
   - drbrain@segment7.net
   - 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.1
-- ruby-head
-- jruby-1.7.25
-- jruby-9.1.2.0
-- jruby-head
-- rbx-19mode
+before_install:
+  - gem install --conservative bundler -v'1.13.7'
+
 script: rake test
+
 matrix:
-  allow_failures:
-    - rvm: 2.3
+  include:
+    - rvm: 1.9.3
+    - rvm: 2.0.0
+    - rvm: 2.1
+    - rvm: 2.2
+    - rvm: 2.3.3
+    - rvm: 2.4.0
     - rvm: ruby-head
-    - rvm: jruby-1.7.25
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-1.7.27
+    - rvm: jruby-9.1.14.0
+    - rvm: jruby-head
+  allow_failures:
+    - rvm: jruby-9.1.14.0
     - rvm: jruby-head
-    - rvm: rbx-19mode
+
+env:
+  global:
+    - JRUBY_OPTS="--debug"

data/CHANGELOG.rdoc

@@ -1,5 +1,17 @@
 = Mechanize CHANGELOG
 
+=== 2.7.6
+
+* New Features
+  * Mechanize#set_proxy accepts an HTTP URL/URI. (#513)
+
+* Bug fix
+  * Fix element(s)_with(search: selector) methods not working for forms, form fields and frames. (#444)
+  * Improve the filename parser for the `Content-Disposition` header. (#496, #517)
+  * Accept `Content-Encoding: identity`. (#515)
+  * Mechanize::Page#title no longer picks a title in an embeded SVG/RDF element. (#503)
+  * Make Mechanize::Form#has_field? boolean. (#501)
+
 === 2.7.5
 
 * New Features

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+# In order to be able to install on 1.9.3 and 2.0.0
+ruby RUBY_VERSION
+
 gemspec

data/README.rdoc

@@ -1,4 +1,4 @@
-= Mechanize {<img src="https://secure.travis-ci.org/sparklemotion/mechanize.svg?rvm=1.9.3" />}[http://travis-ci.org/sparklemotion/mechanize]
+= Mechanize {<img src="https://secure.travis-ci.org/sparklemotion/mechanize.svg?rvm=2.3.3" />}[http://travis-ci.org/sparklemotion/mechanize]
 
 * http://docs.seattlerb.org/mechanize
 * https://github.com/sparklemotion/mechanize

data/lib/mechanize/element_matcher.rb

@@ -15,6 +15,9 @@ module Mechanize::ElementMatcher
               h[:dom_class] = v
             when :search, :xpath, :css
               if v
+                if method
+                  warn "multiple search selectors are given; previous selector (\#{method}: \#{selector.inspect}) is ignored."
+                end
                 selector = v
                 method = k
               end
@@ -26,7 +29,7 @@ module Mechanize::ElementMatcher
 
         f = select_#{plural}(selector, method).find_all do |thing|
           criteria.all? do |k,v|
-            v === thing.send(k)
+            v === thing.__send__(k)
           end
         end
         yield f if block_given?

data/lib/mechanize/form.rb

@@ -16,7 +16,7 @@ require 'mechanize/element_matcher'
 #   puts form['name']
 
 class Mechanize::Form
-
+  extend Forwardable
   extend Mechanize::ElementMatcher
 
   attr_accessor :method, :action, :name
@@ -35,12 +35,13 @@ class Mechanize::Form
 
   alias :elements :fields
 
-  attr_reader :form_node
+  attr_reader :node
+  alias form_node node  # for backward compatibility
   attr_reader :page
 
   def initialize(node, mech = nil, page = nil)
     @enctype = node['enctype'] || 'application/x-www-form-urlencoded'
-    @form_node        = node
+    @node             = node
     @action           = Mechanize::Util.html_unescape(node['action'])
     @method           = (node['method'] || 'GET').upcase
     @name             = node['name']
@@ -55,14 +56,14 @@ class Mechanize::Form
 
   # Returns whether or not the form contains a field with +field_name+
   def has_field?(field_name)
-    fields.find { |f| f.name == field_name }
+    fields.any? { |f| f.name == field_name }
   end
 
   alias :has_key? :has_field?
 
   # Returns whether or not the form contains a field with +value+
   def has_value?(value)
-    fields.find { |f| f.value == value }
+    fields.any? { |f| f.value == value }
   end
 
   # Returns all field names (keys) for this form
@@ -136,7 +137,7 @@ class Mechanize::Form
   # Note that you can also use +:id+ to get to this method:
   #   page.form_with(:id => "foorm")
   def dom_id
-    form_node['id']
+    @node['id']
   end
 
   # This method is a shortcut to get form's DOM class.
@@ -144,10 +145,57 @@ class Mechanize::Form
   #   page.form_with(:dom_class => "foorm")
   # Note that you can also use +:class+ to get to this method:
   #   page.form_with(:class => "foorm")
+  # However, attribute values are compared literally as string, so
+  # form_with(class: "a") does not match a form with class="a b".
+  # Use form_with(css: "form.a") instead.
   def dom_class
-    form_node['class']
+    @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
+
   # Add a field with +field_name+ and +value+
   def add_field!(field_name, value = nil)
     fields << Field.new({'name' => field_name}, value)
@@ -207,7 +255,7 @@ class Mechanize::Form
 
   # Treat form fields like accessors.
   def method_missing(meth, *args)
-    method = meth.to_s.gsub(/=$/, '')
+    (method = meth.to_s).chomp!('=')
 
     if field(method)
       return field(method).value if args.empty?
@@ -319,7 +367,7 @@ class Mechanize::Form
   # This method adds a button to the query.  If the form needs to be
   # submitted with multiple buttons, pass each button to this method.
   def add_button_to_query(button)
-    unless button.node.document == @form_node.document then
+    unless button.node.document == @node.document then
       message =
         "#{button.inspect} does not belong to the same page as " \
         "the form #{@name.inspect} in #{@page.uri}"
@@ -535,7 +583,7 @@ class Mechanize::Form
     @checkboxes   = []
 
     # Find all input tags
-    form_node.search('input').each do |node|
+    @node.search('input').each do |node|
       type = (node['type'] || 'text').downcase
       name = node['name']
       next if name.nil? && !%w[submit button image].include?(type)
@@ -566,13 +614,13 @@ class Mechanize::Form
     end
 
     # Find all textarea tags
-    form_node.search('textarea').each do |node|
+    @node.search('textarea').each do |node|
       next unless node['name']
       @fields << Textarea.new(node, node.inner_text)
     end
 
     # Find all select tags
-    form_node.search('select').each do |node|
+    @node.search('select').each do |node|
       next unless node['name']
       if node.has_attribute? 'multiple'
         @fields << MultiSelectList.new(node)
@@ -583,14 +631,14 @@ class Mechanize::Form
 
     # Find all submit button tags
     # FIXME: what can I do with the reset buttons?
-    form_node.search('button').each do |node|
+    @node.search('button').each do |node|
       type = (node['type'] || 'submit').downcase
       next if type == 'reset'
       @buttons << Button.new(node)
     end
 
     # Find all keygen tags
-    form_node.search('keygen').each do |node|
+    @node.search('keygen').each do |node|
       @fields << Keygen.new(node, node['value'] || '')
     end
   end

data/lib/mechanize/form/field.rb

@@ -14,6 +14,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 +69,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/multi_select_list.rb

@@ -12,19 +12,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

data/lib/mechanize/form/option.rb

@@ -8,12 +8,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/http/agent.rb

@@ -183,7 +183,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
@@ -530,8 +536,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
@@ -644,14 +650,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
@@ -681,6 +679,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
 
@@ -817,7 +822,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
@@ -1212,31 +1217,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