webrat 0.5.3 → 0.6.0

data/lib/webrat/core/locators/button_locator.rb

@@ -20,24 +20,24 @@ module Webrat
       end
 
       def matches_id?(element)
-        (@value.is_a?(Regexp) && Webrat::XML.attribute(element, "id") =~ @value) ||
-        (!@value.is_a?(Regexp) && Webrat::XML.attribute(element, "id") == @value.to_s)
+        (@value.is_a?(Regexp) && element["id"] =~ @value) ||
+        (!@value.is_a?(Regexp) && element["id"] == @value.to_s)
       end
 
       def matches_value?(element)
-        Webrat::XML.attribute(element, "value") =~ /^\W*#{Regexp.escape(@value.to_s)}/i
+        element["value"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
       end
 
       def matches_html?(element)
-        Webrat::XML.inner_html(element) =~ /#{Regexp.escape(@value.to_s)}/i
+        element.inner_html =~ /#{Regexp.escape(@value.to_s)}/i
       end
 
       def matches_alt?(element)
-        Webrat::XML.attribute(element, "alt") =~ /^\W*#{Regexp.escape(@value.to_s)}/i
+        element["alt"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
       end
 
       def button_elements
-        Webrat::XML.xpath_search(@dom, *ButtonField.xpath_search)
+        @dom.xpath(*ButtonField.xpath_search)
       end
 
       def error_message

data/lib/webrat/core/locators/field_by_id_locator.rb

@@ -12,15 +12,15 @@ module Webrat
       def field_element
         field_elements.detect do |field_element|
           if @value.is_a?(Regexp)
-            Webrat::XML.attribute(field_element, "id") =~ @value
+            field_element["id"] =~ @value
           else
-            Webrat::XML.attribute(field_element, "id") == @value.to_s
+            field_element["id"] == @value.to_s
           end
         end
       end
 
       def field_elements
-        Webrat::XML.xpath_search(@dom, *Field.xpath_search)
+        @dom.xpath(*Field.xpath_search)
       end
 
       def error_message

data/lib/webrat/core/locators/field_labeled_locator.rb

@@ -25,7 +25,7 @@ module Webrat
       end
 
       def label_elements
-        Webrat::XML.xpath_search(@dom, Label.xpath_search)
+        @dom.xpath(*Label.xpath_search)
       end
 
       def error_message
@@ -33,7 +33,7 @@ module Webrat
       end
 
       def text(element)
-        str = Webrat::XML.all_inner_text(element)
+        str = element.inner_text
         str.gsub!("\n","")
         str.strip!
         str.squeeze!(" ")

data/lib/webrat/core/locators/field_named_locator.rb

@@ -11,19 +11,19 @@ module Webrat
 
       def field_element
         field_elements.detect do |field_element|
-          Webrat::XML.attribute(field_element, "name") == @value.to_s
+          field_element["name"] == @value.to_s
         end
       end
 
       def field_elements
-        Webrat::XML.xpath_search(@dom, *xpath_searches)
+        @dom.xpath(*xpath_searches)
       end
 
       def xpath_searches
         if @field_types.any?
           @field_types.map { |field_type| field_type.xpath_search }.flatten
         else
-          Array(Field.xpath_search)
+          Field.xpath_search
         end
       end
 

data/lib/webrat/core/locators/form_locator.rb

@@ -10,7 +10,7 @@ module Webrat
       end
 
       def form_element
-        Webrat::XML.css_at(@dom, "#" + @value)
+        @dom.css("#" + @value).first
       end
 
     end

data/lib/webrat/core/locators/label_locator.rb

@@ -17,11 +17,11 @@ module Webrat
       end
 
       def label_elements
-        Webrat::XML.xpath_search(@dom, Label.xpath_search)
+        @dom.xpath(*Label.xpath_search)
       end
 
       def text(label_element)
-        str = Webrat::XML.all_inner_text(label_element)
+        str = label_element.inner_text
         str.gsub!("\n","")
         str.strip!
         str.squeeze!(" ")

data/lib/webrat/core/locators/link_locator.rb

@@ -10,7 +10,7 @@ module Webrat
       end
 
       def link_element
-        matching_links.min { |a, b| Webrat::XML.all_inner_text(a).length <=> Webrat::XML.all_inner_text(b).length }
+        matching_links.min { |a, b| a.inner_text.length <=> b.inner_text.length }
       end
 
       def matching_links
@@ -27,21 +27,21 @@ module Webrat
           matcher = /#{Regexp.escape(@value.to_s)}/i
         end
 
-        replace_nbsp(Webrat::XML.all_inner_text(link)) =~ matcher ||
-        replace_nbsp_ref(Webrat::XML.inner_html(link)) =~ matcher ||
-        Webrat::XML.attribute(link, "title")=~ matcher
+        replace_nbsp(link.inner_text) =~ matcher ||
+        replace_nbsp_ref(link.inner_html) =~ matcher ||
+        link["title"] =~ matcher
       end
 
       def matches_id?(link)
         if @value.is_a?(Regexp)
-          (Webrat::XML.attribute(link, "id") =~ @value) ? true : false
+          link["id"] =~ @value ? true : false
         else
-          (Webrat::XML.attribute(link, "id") == @value) ? true : false
+          link["id"] == @value ? true : false
         end
       end
 
       def link_elements
-        Webrat::XML.xpath_search(@dom, *Link.xpath_search)
+        @dom.xpath(*Link.xpath_search)
       end
 
       def replace_nbsp(str)

data/lib/webrat/core/locators/select_option_locator.rb

@@ -19,17 +19,17 @@ module Webrat
 
           field.options.detect do |o|
             if @option_text.is_a?(Regexp)
-              Webrat::XML.inner_html(o.element) =~ @option_text
+              o.element.inner_text =~ @option_text
             else
-              Webrat::XML.inner_html(o.element) == @option_text.to_s
+              o.inner_text == @option_text.to_s
             end
           end
         else
           option_element = option_elements.detect do |o|
             if @option_text.is_a?(Regexp)
-              Webrat::XML.inner_html(o) =~ @option_text
+              o.inner_text =~ @option_text
             else
-              Webrat::XML.inner_html(o) == @option_text.to_s
+              o.inner_text == @option_text.to_s
             end
           end
 
@@ -38,7 +38,7 @@ module Webrat
       end
 
       def option_elements
-        Webrat::XML.xpath_search(@dom, *SelectOption.xpath_search)
+        @dom.xpath(*SelectOption.xpath_search)
       end
 
       def error_message

data/lib/webrat/core/logging.rb

@@ -1,3 +1,5 @@
+require "logger"
+
 module Webrat
   module Logging #:nodoc:
 
@@ -11,12 +13,9 @@ module Webrat
       when :rails
         defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil
       when :merb
-        Merb.logger
+        ::Merb.logger
       else
-        @logger ||= begin
-          require "logger"
-          ::Logger.new("webrat.log")
-        end
+        @logger ||= ::Logger.new("webrat.log")
       end
     end
 

data/lib/webrat/core/matchers/have_content.rb

@@ -7,13 +7,8 @@ module Webrat
       end
 
       def matches?(stringlike)
-        if Webrat.configuration.parse_with_nokogiri?
-          @document = Webrat.nokogiri_document(stringlike)
-        else
-          @document = Webrat.hpricot_document(stringlike)
-        end
-
-        @element = Webrat::XML.inner_text(@document)
+        @document = Webrat::XML.document(stringlike)
+        @element = @document.inner_text
 
         case @content
         when String

data/lib/webrat/core/matchers/have_xpath.rb

@@ -1,5 +1,4 @@
-require "webrat/core/xml/nokogiri"
-require "webrat/core/xml/rexml"
+require "webrat/core/xml"
 
 module Webrat
   module Matchers
@@ -16,38 +15,14 @@ module Webrat
         matched = matches(stringlike)
 
         if @options[:count]
-          matched.size == @options[:count] && (!@block || @block.call(matched))
+          matched.size == @options[:count].to_i && (!@block || @block.call(matched))
         else
           matched.any? && (!@block || @block.call(matched))
         end
       end
 
       def matches(stringlike)
-        if Webrat.configuration.parse_with_nokogiri?
-          nokogiri_matches(stringlike)
-        else
-          rexml_matches(stringlike)
-        end
-      end
-
-      def rexml_matches(stringlike)
-        if REXML::Node === stringlike || Array === stringlike
-          @query = query.map { |q| q.gsub(%r'^//', './/') }
-        else
-          @query = query
-        end
-
-        add_options_conditions_to(@query)
-
-        @document = Webrat.rexml_document(stringlike)
-
-        @query.map do |q|
-          if @document.is_a?(Array)
-            @document.map { |d| REXML::XPath.match(d, q) }
-          else
-            REXML::XPath.match(@document, q)
-          end
-        end.flatten.compact
+        nokogiri_matches(stringlike)
       end
 
       def nokogiri_matches(stringlike)

data/lib/webrat/core/methods.rb

@@ -39,6 +39,7 @@ module Webrat
       :unchecks, :uncheck,
       :chooses, :choose,
       :selects, :select,
+      :unselects, :unselect,
       :attaches_file, :attach_file,
       :current_page,
       :current_url,

data/lib/webrat/core/scope.rb

@@ -112,6 +112,21 @@ module Webrat
 
     webrat_deprecate :selects, :select
 
+    # Verifies that a an option element exists on the current page with the specified
+    # text. You can optionally restrict the search to a specific select list by
+    # assigning <tt>options[:from]</tt> the value of the select list's name or
+    # a label. Remove the option's value before the form is submitted.
+    #
+    # Examples:
+    #   unselect "January"
+    #   unselect "February", :from => "event_month"
+    #   unselect "February", :from => "Event Month"
+    def unselect(option_text, options={})
+      select_option(option_text, options[:from]).unchoose
+    end
+
+    webrat_deprecate :unselects, :unselect
+
     DATE_TIME_SUFFIXES = {
       :year   => '1i',
       :month  => '2i',
@@ -312,12 +327,12 @@ module Webrat
         dom = Webrat::XML.html_document(@response_body)
       end
 
-      Webrat.define_dom_method(@response, dom)
+      Webrat::XML.define_dom_method(@response, dom)
       return dom
     end
 
     def scoped_dom
-      Webrat::XML.css_at(@scope.dom, @selector)
+      @scope.dom.css(@selector).first
     end
 
     def locate_field(field_locator, *field_types) #:nodoc:

data/lib/webrat/core/session.rb

@@ -105,7 +105,7 @@ For example:
     end
 
     def basic_auth(user, pass)
-      encoded_login = ["#{user}:#{pass}"].pack("m*")
+      encoded_login = ["#{user}:#{pass}"].pack("m*").gsub(/\n/, '')
       header('HTTP_AUTHORIZATION', "Basic #{encoded_login}")
     end
 
@@ -260,6 +260,7 @@ For example:
     def_delegators :current_scope, :uncheck,            :unchecks
     def_delegators :current_scope, :choose,             :chooses
     def_delegators :current_scope, :select,             :selects
+    def_delegators :current_scope, :unselect,           :unselects
     def_delegators :current_scope, :select_datetime,    :selects_datetime
     def_delegators :current_scope, :select_date,        :selects_date
     def_delegators :current_scope, :select_time,        :selects_time

data/lib/webrat/core/xml.rb

@@ -1,115 +1,72 @@
-require "webrat/core/xml/nokogiri"
-require "webrat/core/xml/hpricot"
-require "webrat/core/xml/rexml"
+require "webrat/core_extensions/meta_class"
 
 module Webrat #:nodoc:
   module XML #:nodoc:
 
     def self.document(stringlike) #:nodoc:
-      if Webrat.configuration.parse_with_nokogiri?
-        Webrat.nokogiri_document(stringlike)
+      return stringlike.dom if stringlike.respond_to?(:dom)
+
+      if Nokogiri::HTML::Document === stringlike
+        stringlike
+      elsif Nokogiri::XML::NodeSet === stringlike
+        stringlike
+      elsif stringlike.respond_to?(:body)
+        Nokogiri::HTML(stringlike.body.to_s)
       else
-        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+        Nokogiri::HTML(stringlike.to_s)
       end
     end
 
     def self.html_document(stringlike) #:nodoc:
-      if Webrat.configuration.parse_with_nokogiri?
-        Webrat.html_nokogiri_document(stringlike)
+      return stringlike.dom if stringlike.respond_to?(:dom)
+
+      if Nokogiri::HTML::Document === stringlike
+        stringlike
+      elsif Nokogiri::XML::NodeSet === stringlike
+        stringlike
+      elsif stringlike.respond_to?(:body)
+        Nokogiri::HTML(stringlike.body.to_s)
       else
-        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+        Nokogiri::HTML(stringlike.to_s)
       end
     end
 
     def self.xml_document(stringlike) #:nodoc:
-      if Webrat.configuration.parse_with_nokogiri?
-        Webrat.xml_nokogiri_document(stringlike)
+      return stringlike.dom if stringlike.respond_to?(:dom)
+
+      if Nokogiri::HTML::Document === stringlike
+        stringlike
+      elsif Nokogiri::XML::NodeSet === stringlike
+        stringlike
+      elsif stringlike.respond_to?(:body)
+        Nokogiri::XML(stringlike.body.to_s)
       else
-        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+        Nokogiri::XML(stringlike.to_s)
       end
     end
 
-    def self.to_html(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.to_html
-      else
-        element.to_s
+    def self.define_dom_method(object, dom) #:nodoc:
+      object.meta_class.send(:define_method, :dom) do
+        dom
       end
     end
 
-    def self.inner_html(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.inner_html
-      else
-        element.text
-      end
-    end
-
-    def self.all_inner_text(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.inner_text
-      else
-        Hpricot(element.to_s).children.first.inner_text
-      end
-    end
+  end
+end
 
-    def self.inner_text(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.inner_text
-      else
-        if defined?(Hpricot::Doc) && element.is_a?(Hpricot::Doc)
-          element.inner_text
-        else
-          element.text
-        end
-      end
-    end
+module Nokogiri #:nodoc:
+  module CSS #:nodoc:
+    class XPathVisitor #:nodoc:
 
-    def self.xpath_to(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.path
-      else
-        element.xpath
+      def visit_pseudo_class_text(node) #:nodoc:
+        "@type='text'"
       end
-    end
-
-    def self.attribute(element, attribute_name)
-      return element[attribute_name] if element.is_a?(Hash)
 
-      if Webrat.configuration.parse_with_nokogiri?
-        element[attribute_name]
-      else
-        element.attributes[attribute_name]
+      def visit_pseudo_class_password(node) #:nodoc:
+        "@type='password'"
       end
-    end
-
-    def self.xpath_at(*args)
-      xpath_search(*args).first
-    end
-
-    def self.css_at(*args)
-      css_search(*args).first
-    end
-
-    def self.xpath_search(element, *searches)
-      searches.flatten.map do |search|
-        if Webrat.configuration.parse_with_nokogiri?
-          element.xpath(search)
-        else
-          REXML::XPath.match(element, search)
-        end
-      end.flatten.compact
-    end
 
-    def self.css_search(element, *searches) #:nodoc:
-      xpath_search(element, css_to_xpath(*searches))
     end
-
-    def self.css_to_xpath(*selectors)
-      selectors.map do |rule|
-        Nokogiri::CSS.xpath_for(rule, :prefix => ".//")
-      end.flatten.uniq
-    end
-
   end
 end
+