mechanize 1.0.1.beta.20110107104205 → 2.0.pre.1

data/lib/mechanize/form/image_button.rb

@@ -12,9 +12,8 @@ class Mechanize
       end
 
       def query_value
-        super <<
-          [@name + ".x", (@x || 0).to_s] <<
-          [@name + ".y", (@y || 0).to_s]
+        [["#{@name}.x", (@x || 0).to_s],
+         ["#{@name}.y", (@y || 0).to_s]]
       end
     end
   end

data/lib/mechanize/form/multi_select_list.rb

@@ -1,67 +1,83 @@
-class Mechanize
-  class Form
-    # This class represents a select list where multiple values can be selected.
-    # MultiSelectList#value= accepts an array, and those values are used as
-    # values for the select list.  For example, to select multiple values,
-    # simply do this:
-    #  list.value = ['one', 'two']
-    # Single values are still supported, so these two are the same:
-    #  list.value = ['one']
-    #  list.value = 'one'
-    class MultiSelectList < Field
-      attr_accessor :options
+# This class represents a select list where multiple values can be selected.
+# MultiSelectList#value= accepts an array, and those values are used as
+# values for the select list.  For example, to select multiple values,
+# simply do this:
+#
+#  list.value = ['one', 'two']
+#
+# Single values are still supported, so these two are the same:
+#
+#  list.value = ['one']
+#  list.value = 'one'
+class Mechanize::Form::MultiSelectList < Mechanize::Form::Field
+  extend Mechanize::ElementMatcher
 
-      def initialize node
-        value = []
-        @options = []
+  attr_accessor :options
 
-        # parse
-        node.search('option').each do |n|
-          option = Option.new(n, self)
-          @options << option
-        end
-        super(node, value)
-      end
+  def initialize node
+    value = []
+    @options = []
 
-      def query_value
-        value ? value.collect { |v| [name, v] } : ''
-      end
+    # parse
+    node.search('option').each do |n|
+      option = Mechanize::Form::Option.new(n, self)
+      @options << option
+    end
+    super(node, value)
+  end
 
-      # Select no options
-      def select_none
-        @value = []
-        options.each { |o| o.untick }
-      end
+  ##
+  # Find one option on this select list with +criteria+
+  # Example:
+  #   select_list.option_with(:value => '1').value = 'foo'
 
-      # Select all options
-      def select_all
-        @value = []
-        options.each { |o| o.tick }
-      end
+  ##
+  # Find all options on this select list with +criteria+
+  # Example:
+  #   select_list.options_with(:value => /1|2/).each do |field|
+  #     field.value = '20'
+  #   end
 
-      # Get a list of all selected options
-      def selected_options
-        @options.find_all { |o| o.selected? }
-      end
+  elements_with :option
 
-      def value=(values)
-        select_none
-        [values].flatten.each do |value|
-          option = options.find { |o| o.value == value }
-          if option.nil?
-            @value.push(value)
-          else
-            option.select
-          end
-        end
-      end
+  def query_value
+    value ? value.collect { |v| [name, v] } : ''
+  end
 
-      def value
-        value = []
-        value.push(*@value)
-        value.push(*selected_options.collect { |o| o.value })
-        value
+  # Select no options
+  def select_none
+    @value = []
+    options.each { |o| o.untick }
+  end
+
+  # Select all options
+  def select_all
+    @value = []
+    options.each { |o| o.tick }
+  end
+
+  # Get a list of all selected options
+  def selected_options
+    @options.find_all { |o| o.selected? }
+  end
+
+  def value=(values)
+    select_none
+    [values].flatten.each do |value|
+      option = options.find { |o| o.value == value }
+      if option.nil?
+        @value.push(value)
+      else
+        option.select
       end
     end
   end
+
+  def value
+    value = []
+    value.push(*@value)
+    value.push(*selected_options.collect { |o| o.value })
+    value
+  end
+
 end

data/lib/mechanize/form/select_list.rb

@@ -1,68 +1,40 @@
-class Mechanize
-  class Form
-    # 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 lists value to the option value:
-    #  selectlist.value = selectlist.options.first.value
-    # Options can also be selected by "clicking" or selecting them.  See Option
-    class SelectList < MultiSelectList
-      def initialize node
-        super
-        if selected_options.length > 1
-          selected_options.reverse[1..selected_options.length].each do |o|
-            o.unselect
-          end
-        end
-      end
-
-      ##
-      # Find all options on this select list with +criteria+
-      # Example:
-      #   select_list.options_with(:value => /1|2/).each do |field|
-      #     field.value = '20'
-      #   end
-      def options_with criteria
-        criteria = {:name => criteria} if String === criteria
-        f = @options.find_all do |thing|
-          criteria.all? { |k,v| v === thing.send(k) }
-        end
-        yield f if block_given?
-        f
-      end
-
-      ##
-      # Find one option on this select list with +criteria+
-      # Example:
-      #   select_list.option_with(:value => '1').value = 'foo'
-      def option_with criteria
-        f = options_with(criteria).first
-          yield f if block_given?
-        f
-      end
-
-      def value
-        value = super
-        if value.length > 0
-          value.last
-        elsif @options.length > 0
-          @options.first.value
-        else
-          nil
-        end
+  # 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 lists value to the option value:
+  #  selectlist.value = selectlist.options.first.value
+  # Options can also be selected by "clicking" or selecting them.  See Option
+class Mechanize::Form::SelectList < Mechanize::Form::MultiSelectList
+  def initialize node
+    super
+    if selected_options.length > 1
+      selected_options.reverse[1..selected_options.length].each do |o|
+        o.unselect
       end
+    end
+  end
 
-      def value=(new)
-        if new != new.to_s and new.respond_to? :first
-          super([new.first])
-        else
-          super([new.to_s])
-        end
-      end
+  def value
+    value = super
+    if value.length > 0
+      value.last
+    elsif @options.length > 0
+      @options.first.value
+    else
+      nil
+    end
+  end
 
-      def query_value
-        value ? [[name, value]] : nil
-      end
+  def value=(new)
+    if new != new.to_s and new.respond_to? :first
+      super([new.first])
+    else
+      super([new.to_s])
     end
   end
+
+  def query_value
+    value ? [[name, value]] : nil
+  end
 end
+

data/lib/mechanize/monkey_patch.rb

@@ -1,14 +1,16 @@
-module Net
-  class HTTP
-    alias :old_keep_alive? :keep_alive?
-    def keep_alive?(req, res)
-      return false if /close/i =~ req['connection'].to_s
-      return false if @seems_1_0_server
-      return false if /close/i      =~ res['connection'].to_s
-      return true  if /keep-alive/i =~ res['connection'].to_s
-      return false if /close/i      =~ res['proxy-connection'].to_s
-      return true  if /keep-alive/i =~ res['proxy-connection'].to_s
-      (@curr_http_version == '1.1')
+if RUBY_VERSION < '1.9' then
+  module Net
+    class HTTP
+      alias :old_keep_alive? :keep_alive?
+      def keep_alive?(req, res)
+        return false if /close/i =~ req['connection'].to_s
+        return false if @seems_1_0_server
+        return false if /close/i      =~ res['connection'].to_s
+        return true  if /keep-alive/i =~ res['connection'].to_s
+        return false if /close/i      =~ res['proxy-connection'].to_s
+        return true  if /keep-alive/i =~ res['proxy-connection'].to_s
+        (@curr_http_version == '1.1')
+      end
     end
   end
 end

data/lib/mechanize/page.rb

@@ -1,313 +1,320 @@
-require 'mechanize/page/link'
-require 'mechanize/page/meta'
-require 'mechanize/page/base'
-require 'mechanize/page/frame'
-require 'mechanize/page/image'
-require 'mechanize/page/label'
-require 'mechanize/headers'
+# = Synopsis
+# This class encapsulates an HTML page.  If Mechanize finds a content
+# type of 'text/html', this class will be instantiated and returned.
+#
+# == Example
+#  require 'rubygems'
+#  require 'mechanize'
+#
+#  agent = Mechanize.new
+#  agent.get('http://google.com/').class  #=> Mechanize::Page
+#
+class Mechanize::Page < Mechanize::File
+  extend Forwardable
+  extend Mechanize::ElementMatcher
+
+  attr_accessor :mech
+
+  def initialize(uri=nil, response=nil, body=nil, code=nil, mech=nil)
+    raise Mechanize::ContentTypeError, response['content-type'] unless
+      response['content-type'] =~ /^(text\/html)|(application\/xhtml\+xml)/i
+
+    @bases = nil
+    @encoding = nil
+    @encodings = [nil]
+    @forms = nil
+    @frames = nil
+    @iframes = nil
+    @links = nil
+    @mech = mech
+    @meta = nil
+    @parser = nil
+
+    @encodings << Mechanize::Util.detect_charset(body) if body
+
+    response.each do |header, value|
+      next unless value =~ /charset/i
+      @encodings << charset(value)
+    end
 
-class Mechanize
-  # = Synopsis
-  # This class encapsulates an HTML page.  If Mechanize finds a content
-  # type of 'text/html', this class will be instantiated and returned.
-  #
-  # == Example
-  #  require 'rubygems'
-  #  require 'mechanize'
-  #
-  #  agent = Mechanize.new
-  #  agent.get('http://google.com/').class  #=> Mechanize::Page
-  #
-  class Page < Mechanize::File
-    extend Forwardable
+    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.scan(/<meta .*?>/i) do |meta|
+        next unless meta =~ /http-equiv\s*=\s*(["'])?content-type\1/i
 
-    attr_accessor :mech
+        meta =~ /content=(["'])?(.*?)\1/i
 
-    def initialize(uri=nil, response=nil, body=nil, code=nil, mech=nil)
-      @encoding = nil
+        encoding = charset $2
 
-      method = response.respond_to?(:each_header) ? :each_header : :each
-      response.send(method) do |header,v|
-        next unless v =~ /charset/i
-        encoding = v[/charset=([^; ]+)/, 1]
-        @encoding = encoding unless encoding == 'none'
+        @encodings << encoding if encoding
       end
+    end
 
-      # 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 && body.respond_to?(:force_encoding)
+    super(uri, response, body, code)
+  end
 
-      @encoding ||= Util.detect_charset(body)
+  def title
+    @title ||=
+      if doc = parser
+        title = doc.search('title').inner_text
+        title.empty? ? nil : title
+      end
+  end
 
-      super(uri, response, body, code)
-      @mech           ||= mech
+  def charset content_type
+    charset = content_type[/charset=([^; ]+)/i, 1]
+    return nil if charset == 'none'
+    charset
+  end
 
-      @encoding = nil if html_body =~ /<meta[^>]*charset[^>]*>/i
+  def encoding=(encoding)
+    @encoding = encoding
 
-      raise Mechanize::ContentTypeError.new(response['content-type']) unless
-        response['content-type'] =~ /^(text\/html)|(application\/xhtml\+xml)/i
-      @parser = @links = @forms = @meta = @bases = @frames = @iframes = nil
+    if @parser
+      parser_encoding = @parser.encoding
+      if (parser_encoding && parser_encoding.downcase) != (encoding && encoding.downcase)
+        # lazy reinitialize the parser with the new encoding
+        @parser = nil
+      end
     end
 
-    def title
-      @title ||=
-        if doc = parser
-          title = if doc.respond_to?(:title)
-                    doc.title
-                  else
-                    doc.search('title').inner_text
-                  end
-          if title && !title.empty?
-            title
-          else
-            nil
-          end
-        end
-    end
+    encoding
+  end
+
+  def encoding
+    parser.respond_to?(:encoding) ? parser.encoding : nil
+  end
+
+  def parser
+    return @parser if @parser
+    return nil unless @body
+
+    if @encoding then
+      @parser = mech.html_parser.parse(html_body, nil, @encoding)
+    else
+      @encodings.reverse_each do |encoding|
+        @parser = mech.html_parser.parse(html_body, nil, encoding)
 
-    def encoding=(encoding)
-      @encoding = encoding
+        break if @parser.errors.empty?
 
-      if @parser
-        parser_encoding = @parser.encoding
-        if (parser_encoding && parser_encoding.downcase) != (encoding && encoding.downcase)
-          # lazy reinitialize the parser with the new encoding
-          @parser = nil
+        break unless @parser.errors.any? do |error|
+          error.message =~ /(indicate encoding)|(Invalid char)/
         end
       end
-
-      encoding
     end
 
-    def encoding
-      parser.respond_to?(:encoding) ? parser.encoding : nil
-    end
+    @parser
+  end
 
-    def parser
-      return @parser if @parser
+  alias :root :parser
 
-      if body && response
-        if mech.html_parser == Nokogiri::HTML
-          @parser = mech.html_parser.parse(html_body, nil, @encoding)
-        else
-          @parser = mech.html_parser.parse(html_body)
-        end
-      end
+  # Get the content type
+  def content_type
+    response['content-type']
+  end
 
-      @parser
-    end
-    alias :root :parser
+  # Search through the page like HPricot
+  def_delegator :parser, :search, :search
+  def_delegator :parser, :/, :/
+  def_delegator :parser, :at, :at
 
-    # Get the content type
-    def content_type
-      response['content-type']
-    end
+  ##
+  # :method: form_with(criteria)
+  #
+  # Find a single form matching +criteria+.
+  # Example:
+  #   page.form_with(:action => '/post/login.php') do |f|
+  #     ...
+  #   end
+
+  ##
+  # :method: forms_with(criteria)
+  #
+  # Find all forms form matching +criteria+.
+  # Example:
+  #   page.forms_with(:action => '/post/login.php').each do |f|
+  #     ...
+  #   end
 
-    # Search through the page like HPricot
-    def_delegator :parser, :search, :search
-    def_delegator :parser, :/, :/
-    def_delegator :parser, :at, :at
-
-    ##
-    # :method: form_with(criteria)
-    #
-    # Find a single form matching +criteria+.
-    # Example:
-    #   page.form_with(:action => '/post/login.php') do |f|
-    #     ...
-    #   end
-
-    ##
-    # :method: forms_with(criteria)
-    #
-    # Find all forms form matching +criteria+.
-    # Example:
-    #   page.forms_with(:action => '/post/login.php').each do |f|
-    #     ...
-    #   end
-
-    ##
-    # :method: link_with(criteria)
-    #
-    # Find a single link matching +criteria+.
-    # Example:
-    #   page.link_with(:href => /foo/).click
-
-    ##
-    # :method: links_with(criteria)
-    #
-    # Find all links matching +criteria+.
-    # Example:
-    #   page.links_with(:href => /foo/).each do |link|
-    #     puts link.href
-    #   end
-
-    ##
-    # :method: base_with(criteria)
-    #
-    # Find a single base tag matching +criteria+.
-    # Example:
-    #   page.base_with(:href => /foo/).click
-
-    ##
-    # :method: bases_with(criteria)
-    #
-    # Find all base tags matching +criteria+.
-    # Example:
-    #   page.bases_with(:href => /foo/).each do |base|
-    #     puts base.href
-    #   end
-
-    ##
-    # :method: frame_with(criteria)
-    #
-    # Find a single frame tag matching +criteria+.
-    # Example:
-    #   page.frame_with(:src => /foo/).click
-
-    ##
-    # :method: frames_with(criteria)
-    #
-    # Find all frame tags matching +criteria+.
-    # Example:
-    #   page.frames_with(:src => /foo/).each do |frame|
-    #     p frame.src
-    #   end
-
-    ##
-    # :method: iframe_with(criteria)
-    #
-    # Find a single iframe tag matching +criteria+.
-    # Example:
-    #   page.iframe_with(:src => /foo/).click
-
-    ##
-    # :method: iframes_with(criteria)
-    #
-    # Find all iframe tags matching +criteria+.
-    # Example:
-    #   page.iframes_with(:src => /foo/).each do |iframe|
-    #     p iframe.src
-    #   end
-
-    # let's meta program!
-    [:form, :link, :base, :frame, :iframe].each do |type|
-      eval(<<-eomethod)
-          def #{type}s_with(criteria)
-            criteria = {:name => criteria} if String === criteria
-            f = #{type}s.find_all do |thing|
-              criteria.all? do |k,v|
-                k = :dom_id if(k.to_s == "id")
-                v === thing.send(k)
-              end
-            end
-            yield f if block_given?
-            f
-          end
-
-          def #{type}_with(criteria)
-            f = #{type}s_with(criteria).first
-            yield f if block_given?
-            f
-          end
-          alias :#{type} :#{type}_with
-        eomethod
-    end
+  elements_with :form
 
-    ##
-    # Return a list of all link and area tags
-    def links
-      @links ||= %w{ a area }.map do |tag|
-        search(tag).map do |node|
-          Link.new(node, @mech, self)
-        end
-      end.flatten
-    end
+  ##
+  # :method: link_with(criteria)
+  #
+  # Find a single link matching +criteria+.
+  # Example:
+  #   page.link_with(:href => /foo/).click
+
+  ##
+  # :method: links_with(criteria)
+  #
+  # Find all links matching +criteria+.
+  # Example:
+  #   page.links_with(:href => /foo/).each do |link|
+  #     puts link.href
+  #   end
 
-    ##
-    # Return a list of all form tags
-    def forms
-      @forms ||= search('form').map do |html_form|
-        form = Form.new(html_form, @mech, self)
-        form.action ||= @uri.to_s
-        form
+  elements_with :link
+
+  ##
+  # :method: base_with(criteria)
+  #
+  # Find a single base tag matching +criteria+.
+  # Example:
+  #   page.base_with(:href => /foo/).click
+
+  ##
+  # :method: bases_with(criteria)
+  #
+  # Find all base tags matching +criteria+.
+  # Example:
+  #   page.bases_with(:href => /foo/).each do |base|
+  #     puts base.href
+  #   end
+
+  elements_with :base
+
+  ##
+  # :method: frame_with(criteria)
+  #
+  # Find a single frame tag matching +criteria+.
+  # Example:
+  #   page.frame_with(:src => /foo/).click
+
+  ##
+  # :method: frames_with(criteria)
+  #
+  # Find all frame tags matching +criteria+.
+  # Example:
+  #   page.frames_with(:src => /foo/).each do |frame|
+  #     p frame.src
+  #   end
+
+  elements_with :frame
+
+  ##
+  # :method: iframe_with(criteria)
+  #
+  # Find a single iframe tag matching +criteria+.
+  # Example:
+  #   page.iframe_with(:src => /foo/).click
+
+  ##
+  # :method: iframes_with(criteria)
+  #
+  # Find all iframe tags matching +criteria+.
+  # Example:
+  #   page.iframes_with(:src => /foo/).each do |iframe|
+  #     p iframe.src
+  #   end
+
+  elements_with :iframe
+
+  ##
+  # Return a list of all link and area tags
+  def links
+    @links ||= %w{ a area }.map do |tag|
+      search(tag).map do |node|
+        Link.new(node, @mech, self)
       end
+    end.flatten
+  end
+
+  ##
+  # Return a list of all form tags
+  def forms
+    @forms ||= search('form').map do |html_form|
+      form = Mechanize::Form.new(html_form, @mech, self)
+      form.action ||= @uri.to_s
+      form
     end
+  end
 
-    ##
-    # Return a list of all meta tags
-    def meta
-      @meta ||= search('head > meta').map do |node|
-        next unless node['http-equiv'] && node['content']
-        (equiv, content) = node['http-equiv'], node['content']
-        if equiv && equiv.downcase == 'refresh'
-          Meta.parse(content, uri) do |delay, href|
-            node['delay'] = delay
-            node['href'] = href
-            Meta.new(node, @mech, self)
-          end
+  ##
+  # Return a list of all meta tags
+  def meta
+    @meta ||= search('head > meta').map do |node|
+      next unless node['http-equiv'] && node['content']
+      (equiv, content) = node['http-equiv'], node['content']
+      if equiv && equiv.downcase == 'refresh'
+        Meta.parse(content, uri) do |delay, href|
+          node['delay'] = delay
+          node['href'] = href
+          Meta.new(node, @mech, self)
         end
-      end.compact
-    end
+      end
+    end.compact
+  end
 
-    ##
-    # Return a list of all base tags
-    def bases
-      @bases ||=
-        search('base').map { |node| Base.new(node, @mech, self) }
-    end
+  ##
+  # Return a list of all base tags
+  def bases
+    @bases ||=
+      search('base').map { |node| Base.new(node, @mech, self) }
+  end
 
-    ##
-    # Return a list of all frame tags
-    def frames
-      @frames ||=
-        search('frame').map { |node| Frame.new(node, @mech, self) }
-    end
+  ##
+  # Return a list of all frame tags
+  def frames
+    @frames ||=
+      search('frame').map { |node| Frame.new(node, @mech, self) }
+  end
 
-    ##
-    # Return a list of all iframe tags
-    def iframes
-      @iframes ||=
-        search('iframe').map { |node| Frame.new(node, @mech, self) }
-    end
+  ##
+  # Return a list of all iframe tags
+  def iframes
+    @iframes ||=
+      search('iframe').map { |node| Frame.new(node, @mech, self) }
+  end
 
-    ##
-    # Return a list of all img tags
-    def images
-      @images ||=
-        search('img').map { |node| Image.new(node, self) }
-    end
+  ##
+  # Return a list of all img tags
+  def images
+    @images ||=
+      search('img').map { |node| Image.new(node, self) }
+  end
 
-    def image_urls
-      @image_urls ||= images.map(&:url).uniq
-    end
+  def image_urls
+    @image_urls ||= images.map(&:url).uniq
+  end
 
-    ##
-    # Return a list of all label tags
-    def labels
-      @labels ||=
-        search('label').map { |node| Label.new(node, self) }
-    end
+  ##
+  # Return a list of all label tags
+  def labels
+    @labels ||=
+      search('label').map { |node| Label.new(node, self) }
+  end
 
-    def labels_hash
-      unless @labels_hash
-        hash = {}
-        labels.each do |label|
-          hash[label.node['for']] = label if label.for
-        end
-        @labels_hash = hash
+  def labels_hash
+    unless @labels_hash
+      hash = {}
+      labels.each do |label|
+        hash[label.node['for']] = label if label.for
       end
-      return @labels_hash
+      @labels_hash = hash
     end
+    return @labels_hash
+  end
 
-    private
+  private
 
-    def html_body
-      if body
-        body.length > 0 ? body : '<html></html>'
-      else
-        ''
-      end
+  def html_body
+    if @body
+      @body.empty? ? '<html></html>' : @body
+    else
+      ''
     end
   end
 end
+
+require 'mechanize/headers'
+require 'mechanize/page/image'
+require 'mechanize/page/label'
+require 'mechanize/page/link'
+require 'mechanize/page/base'
+require 'mechanize/page/frame'
+require 'mechanize/page/meta'
+