webrat 0.4.4 → 0.4.5

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

@@ -3,23 +3,23 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class LabelLocator < Locator # :nodoc:
-  
+
       def locate
         Label.load(@session, label_element)
       end
-      
+
       def label_element
         label_elements.detect do |label_element|
-          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}\b/i
+          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
         end
       end
-  
+
       def label_elements
         Webrat::XML.xpath_search(@dom, Label.xpath_search)
       end
-      
+
       def text(label_element)
         str = Webrat::XML.all_inner_text(label_element)
         str.gsub!("\n","")
@@ -27,8 +27,8 @@ module Webrat
         str.squeeze!(" ")
         str
       end
-      
+
     end
-    
+
   end
-end
+end

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

@@ -2,24 +2,24 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class LinkLocator < Locator # :nodoc:
-  
+
       def locate
         Link.load(@session, link_element)
       end
-  
+
       def link_element
         matching_links.min { |a, b| Webrat::XML.all_inner_text(a).length <=> Webrat::XML.all_inner_text(b).length }
       end
-  
+
       def matching_links
         @matching_links ||= link_elements.select do |link_element|
           matches_text?(link_element) ||
           matches_id?(link_element)
         end
       end
-  
+
       def matches_text?(link)
         if @value.is_a?(Regexp)
           matcher = @value
@@ -39,28 +39,36 @@ module Webrat
           (Webrat::XML.attribute(link, "id") == @value) ? true : false
         end
       end
-  
+
       def link_elements
         Webrat::XML.xpath_search(@dom, *Link.xpath_search)
       end
-  
+
       def replace_nbsp(str)
-        str.gsub([0xA0].pack('U'), ' ')
+        if str.respond_to?(:valid_encoding?)
+          if str.valid_encoding?
+            str.gsub(/\xc2\xa0/u, ' ')
+          else
+            str.force_encoding('UTF-8').gsub(/\xc2\xa0/u, ' ')
+          end
+        else
+          str.gsub(/\xc2\xa0/u, ' ')
+        end
       end
 
       def replace_nbsp_ref(str)
         str.gsub('&#xA0;',' ').gsub('&nbsp;', ' ')
       end
-  
+
       def error_message
         "Could not find link with text or title or id #{@value.inspect}"
       end
-      
+
     end
-    
+
     def find_link(text_or_title_or_id) #:nodoc:
       LinkLocator.new(@session, dom, text_or_title_or_id).locate!
     end
-    
+
   end
-end
+end

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

@@ -1,6 +1,6 @@
 module Webrat
   module Locators
-  
+
     class Locator # :nodoc:
 
       def initialize(session, dom, value, *field_types)
@@ -9,12 +9,12 @@ module Webrat
         @value = value
         @field_types = field_types
       end
-  
+
       def locate!
         locate || raise(NotFoundError.new(error_message))
       end
-      
+
     end
-    
+
   end
-end
+end

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

@@ -3,20 +3,20 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class SelectOptionLocator < Locator # :nodoc:
-  
+
       def initialize(session, dom, option_text, id_or_name_or_label)
         @session = session
         @dom = dom
         @option_text = option_text
         @id_or_name_or_label = id_or_name_or_label
       end
-      
+
       def locate
         if @id_or_name_or_label
           field = FieldLocator.new(@session, @dom, @id_or_name_or_label, SelectField).locate!
-          
+
           field.options.detect do |o|
             if @option_text.is_a?(Regexp)
               Webrat::XML.inner_html(o.element) =~ @option_text
@@ -32,15 +32,15 @@ module Webrat
               Webrat::XML.inner_html(o) == @option_text.to_s
             end
           end
-          
+
           SelectOption.load(@session, option_element)
         end
       end
-      
+
       def option_elements
         Webrat::XML.xpath_search(@dom, *SelectOption.xpath_search)
       end
-      
+
       def error_message
         if @id_or_name_or_label
           "The '#{@option_text}' option was not found in the #{@id_or_name_or_label.inspect} select box"
@@ -48,12 +48,12 @@ module Webrat
           "Could not find option #{@option_text.inspect}"
         end
       end
-  
+
     end
-    
+
     def select_option(option_text, id_or_name_or_label = nil) #:nodoc:
       SelectOptionLocator.new(@session, dom, option_text, id_or_name_or_label).locate!
     end
-    
+
   end
-end
+end

data/lib/webrat/core/logging.rb

@@ -1,6 +1,6 @@
 module Webrat
   module Logging #:nodoc:
-    
+
     def debug_log(message) # :nodoc:
       return unless logger
       logger.debug message
@@ -13,9 +13,12 @@ module Webrat
       when :merb
         Merb.logger
       else
-        nil
+        @logger ||= begin
+          require "logger"
+          ::Logger.new("webrat.log")
+        end
       end
     end
-  
+
   end
-end
+end

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

@@ -1,20 +1,20 @@
 module Webrat
   module Matchers
-  
+
     class HasContent #:nodoc:
       def initialize(content)
         @content = content
       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)
-      
+
         case @content
         when String
           @element.include?(@content)
@@ -22,7 +22,7 @@ module Webrat
           @element.match(@content)
         end
       end
-      
+
       # ==== Returns
       # String:: The failure message.
       def failure_message
@@ -34,11 +34,11 @@ module Webrat
       def negative_failure_message
         "expected the following element's content to not #{content_message}:\n#{squeeze_space(@element)}"
       end
-      
+
       def squeeze_space(inner_text)
         inner_text.gsub(/^\s*$/, "").squeeze("\n")
       end
-      
+
       def content_message
         case @content
         when String
@@ -48,26 +48,26 @@ module Webrat
         end
       end
     end
-    
+
     # Matches the contents of an HTML document with
     # whatever string is supplied
     def contain(content)
       HasContent.new(content)
     end
-    
+
     # Asserts that the body of the response contain
     # the supplied string or regexp
     def assert_contain(content)
       hc = HasContent.new(content)
       assert hc.matches?(response_body), hc.failure_message
     end
-    
+
     # Asserts that the body of the response
     # does not contain the supplied string or regepx
     def assert_not_contain(content)
       hc = HasContent.new(content)
       assert !hc.matches?(response_body), hc.negative_failure_message
     end
-    
+
   end
-end
+end

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

@@ -2,7 +2,7 @@ require "webrat/core/matchers/have_xpath"
 
 module Webrat
   module Matchers
-    
+
     class HaveSelector < HaveXpath #:nodoc:
       # ==== Returns
       # String:: The failure message.
@@ -15,7 +15,7 @@ module Webrat
       def negative_failure_message
         "expected following output to omit a #{tag_inspect}:\n#{@document}"
       end
-      
+
       def tag_inspect
         options = @options.dup
         count = options.delete(:count)
@@ -40,9 +40,9 @@ module Webrat
           ast.to_xpath
         end.first
       end
-      
+
     end
-    
+
     # Matches HTML content against a CSS 3 selector.
     #
     # ==== Parameters
@@ -54,21 +54,21 @@ module Webrat
       HaveSelector.new(name, attributes, &block)
     end
     alias_method :match_selector, :have_selector
-    
-    
+
+
     # Asserts that the body of the response contains
     # the supplied selector
     def assert_have_selector(name, attributes = {}, &block)
       matcher = HaveSelector.new(name, attributes, &block)
       assert matcher.matches?(response_body), matcher.failure_message
     end
-    
+
     # Asserts that the body of the response
     # does not contain the supplied string or regepx
     def assert_have_no_selector(name, attributes = {}, &block)
       matcher = HaveSelector.new(name, attributes, &block)
       assert !matcher.matches?(response_body), matcher.negative_failure_message
     end
-    
+
   end
-end
+end

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

@@ -6,16 +6,16 @@ module Webrat
     def have_tag(*args, &block)
       have_selector(*args, &block)
     end
-    
+
     alias_method :match_tag, :have_tag
-    
+
     def assert_have_tag(*args, &block)
       assert_have_selector(*args, &block)
     end
-    
+
     def assert_have_no_tag(*args, &block)
       assert_have_no_selector(*args, &block)
     end
 
   end
-end
+end

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

@@ -3,25 +3,25 @@ require "webrat/core/xml/rexml"
 
 module Webrat
   module Matchers
-    
+
     class HaveXpath #:nodoc:
       def initialize(expected, options = {}, &block)
         @expected = expected
         @options  = options
         @block    = block
       end
-    
+
       def matches?(stringlike, &block)
         @block ||= block
         matched = matches(stringlike)
-        
+
         if @options[:count]
           matched.size == @options[:count] && (!@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)
@@ -29,10 +29,10 @@ module Webrat
           rexml_matches(stringlike)
         end
       end
-    
+
       def rexml_matches(stringlike)
         if REXML::Node === stringlike || Array === stringlike
-          @query = query.map { |q| q.gsub(%r'//', './') }
+          @query = query.map { |q| q.gsub(%r'^//', './/') }
         else
           @query = query
         end
@@ -49,48 +49,48 @@ module Webrat
           end
         end.flatten.compact
       end
-    
+
       def nokogiri_matches(stringlike)
         if Nokogiri::XML::NodeSet === stringlike
-          @query = query.gsub(%r'//', './')
+          @query = query.gsub(%r'^//', './/')
         else
           @query = query
         end
-        
+
         add_options_conditions_to(@query)
-        
+
         @document = Webrat::XML.document(stringlike)
         @document.xpath(*@query)
       end
-      
+
       def add_options_conditions_to(query)
         add_attributes_conditions_to(query)
         add_content_condition_to(query)
       end
-      
+
       def add_attributes_conditions_to(query)
         attribute_conditions = []
-        
+
         @options.each do |key, value|
           next if [:content, :count].include?(key)
           attribute_conditions << "@#{key} = #{xpath_escape(value)}"
         end
-        
+
         if attribute_conditions.any?
           query << "[#{attribute_conditions.join(' and ')}]"
         end
       end
-      
+
       def add_content_condition_to(query)
         if @options[:content]
           query << "[contains(., #{xpath_escape(@options[:content])})]"
         end
       end
-      
+
       def query
         @expected
       end
-    
+
       # ==== Returns
       # String:: The failure message.
       def failure_message
@@ -102,15 +102,15 @@ module Webrat
       def negative_failure_message
         "expected following text to not match xpath #{@expected}:\n#{@document}"
       end
-      
+
     protected
-    
+
       def xpath_escape(string)
         if string.include?("'") && string.include?('"')
           parts = string.split("'").map do |part|
             "'#{part}'"
           end
-          
+
           "concat(" + parts.join(", \"'\", ") + ")"
         elsif string.include?("'")
           "\"#{string}\""
@@ -118,9 +118,9 @@ module Webrat
           "'#{string}'"
         end
       end
-      
+
     end
-    
+
     # Matches HTML content against an XPath query
     #
     # ==== Parameters
@@ -132,16 +132,16 @@ module Webrat
       HaveXpath.new(expected, options, &block)
     end
     alias_method :match_xpath, :have_xpath
-    
+
     def assert_have_xpath(expected, options = {}, &block)
       hs = HaveXpath.new(expected, options, &block)
       assert hs.matches?(response_body), hs.failure_message
     end
-    
+
     def assert_have_no_xpath(expected, options = {}, &block)
       hs = HaveXpath.new(expected, options, &block)
       assert !hs.matches?(response_body), hs.negative_failure_message
     end
-    
+
   end
-end
+end