diabolo-webrat 0.4.2 → 0.4.3

data/lib/webrat/core/session.rb

@@ -11,7 +11,7 @@ module Webrat
 
   class InfiniteRedirectError < WebratError
   end
-  
+
   def self.session_class
     case Webrat.configuration.mode
     when :rails
@@ -77,7 +77,7 @@ For example:
     def doc_root #:nodoc:
       nil
     end
-    
+
     def header(key, value)
       @custom_headers[key] = value
     end
@@ -122,13 +122,13 @@ For example:
 
       return response
     end
-    
+
     def check_for_infinite_redirects
       if current_url == response_location
         @_identical_redirect_count ||= 0
         @_identical_redirect_count += 1
       end
-      
+
       if infinite_redirect_limit_exceeded?
         raise InfiniteRedirectError.new("#{Webrat.configuration.infinite_redirect_limit} redirects to the same URL (#{current_url.inspect})")
       end
@@ -138,7 +138,7 @@ For example:
        Webrat.configuration.infinite_redirect_limit &&
        (@_identical_redirect_count || 0) > Webrat.configuration.infinite_redirect_limit
     end
-    
+
     def success_code? #:nodoc:
       (200..499).include?(response_code)
     end
@@ -154,7 +154,7 @@ For example:
       response_location_host_domain = response_location_host.split('.')[-2..-1].join('.') rescue response_location_host
       current_host_domain == response_location_host_domain
     end
-    
+
     #easy helper to pull out where we were redirected to
     def redirected_to
       redirect? ? response_location : nil
@@ -276,6 +276,6 @@ For example:
       @_scopes      = nil
       @_page_scope  = nil
     end
-    
+
   end
 end

data/lib/webrat/core/xml/hpricot.rb

@@ -1,5 +1,5 @@
 module Webrat
-  
+
   def self.hpricot_document(stringlike)
     return stringlike.dom if stringlike.respond_to?(:dom)
 
@@ -15,5 +15,5 @@ module Webrat
       Hpricot(stringlike.to_s)
     end
   end
-  
-end
+
+end

data/lib/webrat/core/xml/nokogiri.rb

@@ -1,10 +1,10 @@
 require "webrat/core_extensions/meta_class"
 
 module Webrat
-  
+
   def self.nokogiri_document(stringlike) #:nodoc:
     return stringlike.dom if stringlike.respond_to?(:dom)
-    
+
     if Nokogiri::HTML::Document === stringlike
       stringlike
     elsif Nokogiri::XML::NodeSet === stringlike
@@ -17,10 +17,10 @@ module Webrat
       Nokogiri::HTML(stringlike.to_s)
     end
   end
-  
+
   def self.html_nokogiri_document(stringlike) #:nodoc:
     return stringlike.dom if stringlike.respond_to?(:dom)
-    
+
     if Nokogiri::HTML::Document === stringlike
       stringlike
     elsif Nokogiri::XML::NodeSet === stringlike
@@ -33,10 +33,10 @@ module Webrat
       Nokogiri::HTML(stringlike.to_s)
     end
   end
-  
+
   def self.xml_nokogiri_document(stringlike) #:nodoc:
     return stringlike.dom if stringlike.respond_to?(:dom)
-    
+
     if Nokogiri::HTML::Document === stringlike
       stringlike
     elsif Nokogiri::XML::NodeSet === stringlike
@@ -49,20 +49,20 @@ module Webrat
       Nokogiri::XML(stringlike.to_s)
     end
   end
-  
+
   def self.define_dom_method(object, dom) #:nodoc:
     object.meta_class.send(:define_method, :dom) do
       dom
     end
   end
-  
+
 end
 
 
 module Nokogiri #:nodoc:
   module CSS #:nodoc:
     class XPathVisitor #:nodoc:
-      
+
       def visit_pseudo_class_text(node) #:nodoc:
         "@type='text'"
       end
@@ -70,7 +70,7 @@ module Nokogiri #:nodoc:
       def visit_pseudo_class_password(node) #:nodoc:
         "@type='password'"
       end
-      
+
     end
   end
-end
+end

data/lib/webrat/core/xml/rexml.rb

@@ -1,5 +1,5 @@
 module Webrat
-  
+
   def self.rexml_document(stringlike)
     stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
 
@@ -20,5 +20,5 @@ module Webrat
       end
     end
   end
-  
-end
+
+end

data/lib/webrat/core/xml.rb

@@ -4,7 +4,7 @@ require "webrat/core/xml/rexml"
 
 module Webrat #:nodoc:
   module XML #:nodoc:
-    
+
     def self.document(stringlike) #:nodoc:
       if Webrat.configuration.parse_with_nokogiri?
         Webrat.nokogiri_document(stringlike)
@@ -12,7 +12,7 @@ module Webrat #:nodoc:
         Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
-    
+
     def self.html_document(stringlike) #:nodoc:
       if Webrat.configuration.parse_with_nokogiri?
         Webrat.html_nokogiri_document(stringlike)
@@ -20,7 +20,7 @@ module Webrat #:nodoc:
         Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
-    
+
     def self.xml_document(stringlike) #:nodoc:
       if Webrat.configuration.parse_with_nokogiri?
         Webrat.xml_nokogiri_document(stringlike)
@@ -36,7 +36,7 @@ module Webrat #:nodoc:
         element.to_s
       end
     end
-    
+
     def self.inner_html(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.inner_html
@@ -44,7 +44,7 @@ module Webrat #:nodoc:
         element.text
       end
     end
-    
+
     def self.all_inner_text(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.inner_text
@@ -52,7 +52,7 @@ module Webrat #:nodoc:
         Hpricot(element.to_s).children.first.inner_text
       end
     end
-    
+
     def self.inner_text(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.inner_text
@@ -64,7 +64,7 @@ module Webrat #:nodoc:
         end
       end
     end
-    
+
     def self.xpath_to(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.path
@@ -72,25 +72,25 @@ module Webrat #:nodoc:
         element.xpath
       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]
       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?
@@ -100,16 +100,16 @@ module Webrat #:nodoc:
         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
+end

data/lib/webrat/core_extensions/blank.rb

@@ -12,7 +12,7 @@ class Object #:nodoc:
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end
-    
+
   # An object is present if it's not blank.
   def present?
     !blank?

data/lib/webrat/core_extensions/deprecate.rb

@@ -5,4 +5,4 @@ class Module #:nodoc:
       __send__(new_method_name, *args)
     end
   end
-end
+end

data/lib/webrat/core_extensions/detect_mapped.rb

@@ -1,12 +1,12 @@
 class Array #:nodoc:
-  
+
   def detect_mapped
     each do |element|
       result = yield element
       return result if result
     end
-    
+
     return nil
   end
-  
-end
+
+end

data/lib/webrat/core_extensions/meta_class.rb

@@ -3,4 +3,4 @@ class ::Object #:nodoc:
     class << self; self end
   end
 end
-    
+

data/lib/webrat/mechanize.rb

@@ -2,14 +2,14 @@ require "mechanize"
 
 module Webrat #:nodoc:
   class MechanizeSession < Session #:nodoc:
-    
+
     attr_accessor :response
     alias :page :response
-    
+
     def request_page(url, http_method, data) #:nodoc:
       super(absolute_url(url), http_method, data)
     end
-    
+
     def get(url, data, headers_argument_not_used = nil)
       @response = mechanize.get(url, data)
     end
@@ -26,7 +26,7 @@ module Webrat #:nodoc:
       end
       @response = mechanize.post(url, post_data)
     end
-    
+
     def response_body
       @response.content
     end
@@ -34,13 +34,13 @@ module Webrat #:nodoc:
     def response_code
       @response.code.to_i
     end
-    
+
     def mechanize
-      @mechanize = WWW::Mechanize.new
+      @mechanize ||= WWW::Mechanize.new
     end
 
     def_delegators :mechanize, :basic_auth
-    
+
     def absolute_url(url) #:nodoc:
       current_host, current_path = split_current_url
       if url =~ Regexp.new('^https?://')
@@ -53,13 +53,13 @@ module Webrat #:nodoc:
         url
       end
     end
-    
+
     private
       def split_current_url
         current_url =~ Regexp.new('^(https?://[^/]+)(/.*)?')
         [Regexp.last_match(1), Regexp.last_match(2)]
       end
-      
+
       def absolute_path(current_path, url)
         levels_up = url.split('/').find_all { |x| x == '..' }.size
         ancestor = if current_path.nil?

data/lib/webrat/merb.rb

@@ -6,4 +6,4 @@ require "webrat"
 
 Webrat.configure do |config|
   config.mode = :merb
-end
+end

data/lib/webrat/merb_session.rb

@@ -10,36 +10,36 @@ require "merb-core"
 module Webrat
   class MerbSession < Session #:nodoc:
     include Merb::Test::MakeRequest
-    
+
     attr_accessor :response
-    
+
     def get(url, data, headers = nil)
       do_request(url, data, headers, "GET")
     end
-  
+
     def post(url, data, headers = nil)
       do_request(url, data, headers, "POST")
     end
-  
+
     def put(url, data, headers = nil)
       do_request(url, data, headers, "PUT")
     end
-  
+
     def delete(url, data, headers = nil)
       do_request(url, data, headers, "DELETE")
     end
-    
+
     def response_body
       @response.body.to_s
     end
-    
+
     def response_code
       @response.status
     end
-    
+
     def do_request(url, data, headers, method)
-      @response = request(url, 
-        :params => (data && data.any?) ? data : nil, 
+      @response = request(url,
+        :params => (data && data.any?) ? data : nil,
         :headers => headers,
         :method => method)
     end

data/lib/webrat/rails.rb

@@ -7,7 +7,7 @@ require "action_controller/record_identifier"
 module Webrat
   class RailsSession < Session #:nodoc:
     include ActionController::RecordIdentifier
-    
+
     # The Rails version of within supports passing in a model and Webrat
     # will apply a scope based on Rails' dom_id for that model.
     #
@@ -22,7 +22,7 @@ module Webrat
         super('#' + dom_id(selector_or_object), &block)
       end
     end
-    
+
     def doc_root
       File.expand_path(File.join(RAILS_ROOT, 'public'))
     end

data/lib/webrat/rspec-rails.rb

@@ -1,6 +1,6 @@
 # Supports using the matchers in controller, helper, and view specs if you're
 # using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
-# 
+#
 #   require 'webrat/rspec-rails'
 #
 require "webrat/core/matchers"
@@ -10,4 +10,4 @@ Spec::Runner.configure do |config|
   config.include(Webrat::Matchers, :type => :controller)
   config.include(Webrat::Matchers, :type => :helper)
   config.include(Webrat::Matchers, :type => :view)
-end
+end

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

@@ -5,14 +5,14 @@ module Webrat
         def initialize(content)
           @content = content
         end
-        
+
         def matches?(response)
           if @content.is_a?(Regexp)
             text_finder = "regexp:#{@content.source}"
           else
             text_finder = @content
           end
-          
+
           response.session.wait_for do
             response.selenium.is_text_present(text_finder)
           end
@@ -47,7 +47,7 @@ module Webrat
       def contain(content)
         HasContent.new(content)
       end
-      
+
       # Asserts that the body of the response contain
       # the supplied string or regexp
       def assert_contain(content)
@@ -63,4 +63,4 @@ module Webrat
       end
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module Webrat
         def initialize(expected)
           @expected = expected
         end
-        
+
         def matches?(response)
           response.session.wait_for do
             response.selenium.is_element_present("css=#{@expected}")
@@ -26,11 +26,11 @@ module Webrat
           "expected following text to not match selector #{@expected}:\n#{@document}"
         end
       end
-      
+
       def have_selector(content)
         HaveSelector.new(content)
       end
-      
+
       # Asserts that the body of the response contains
       # the supplied selector
       def assert_have_selector(expected)
@@ -46,4 +46,4 @@ module Webrat
       end
     end
   end
-end
+end

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

@@ -1,72 +1,72 @@
 module Webrat
   module Selenium
     module Matchers
-  
+
       class HaveTag < HaveSelector #:nodoc:
         # ==== Returns
         # String:: The failure message.
         def failure_message
           "expected following output to contain a #{tag_inspect} tag:\n#{@document}"
         end
-  
+
         # ==== Returns
         # String:: The failure message to be displayed in negative matches.
         def negative_failure_message
           "expected following output to omit a #{tag_inspect}:\n#{@document}"
         end
-  
+
         def tag_inspect
           options = @expected.last.dup
           content = options.delete(:content)
-  
+
           html = "<#{@expected.first}"
           options.each do |k,v|
             html << " #{k}='#{v}'"
           end
-  
+
           if content
             html << ">#{content}</#{@expected.first}>"
           else
             html << "/>"
           end
-  
+
           html
         end
-  
+
         def query
           options  = @expected.last.dup
           selector = @expected.first.to_s
-  
+
           selector << ":contains('#{options.delete(:content)}')" if options[:content]
-  
+
           options.each do |key, value|
             selector << "[#{key}='#{value}']"
           end
-  
+
           Nokogiri::CSS.parse(selector).map { |ast| ast.to_xpath }
         end
       end
-  
+
       def have_tag(name, attributes = {}, &block)
         HaveTag.new([name, attributes], &block)
       end
-      
+
       alias_method :match_tag, :have_tag
-      
+
       # Asserts that the body of the response contains
       # the supplied tag with the associated selectors
       def assert_have_tag(name, attributes = {})
         ht = HaveTag.new([name, attributes])
         assert ht.matches?(response), ht.failure_message
       end
-      
+
       # Asserts that the body of the response
       # does not contain the supplied string or regepx
       def assert_have_no_tag(name, attributes = {})
         ht = HaveTag.new([name, attributes])
         assert !ht.matches?(response), ht.negative_failure_message
       end
-  
+
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module Webrat
         def initialize(expected)
           @expected = expected
         end
-        
+
         def matches?(response)
           response.session.wait_for do
             response.selenium.is_element_present("xpath=#{@expected}")
@@ -26,11 +26,11 @@ module Webrat
           "expected following text to not match xpath #{@expected}:\n#{@document}"
         end
       end
-      
+
       def have_xpath(xpath)
         HaveXpath.new(xpath)
       end
-      
+
       def assert_have_xpath(expected)
         hs = HaveXpath.new(expected)
         assert hs.matches?(response), hs.failure_message
@@ -42,4 +42,4 @@ module Webrat
       end
     end
   end
-end
+end

data/lib/webrat/selenium/matchers.rb

@@ -1,4 +1,4 @@
 require "webrat/selenium/matchers/have_xpath"
 require "webrat/selenium/matchers/have_selector"
 # require "webrat/selenium/matchers/have_tag"
-require "webrat/selenium/matchers/have_content"
+require "webrat/selenium/matchers/have_content"