diabolo-webrat 0.4.4.2 → 0.5.1

data/lib/webrat/core/elements/select_option.rb

@@ -4,7 +4,7 @@ module Webrat
   class SelectOption < Element #:nodoc:
 
     def self.xpath_search
-      ".//option"
+      [".//option"]
     end
 
     def choose
@@ -28,7 +28,7 @@ module Webrat
     end
 
     def value
-      Webrat::XML.attribute(@element, "value") || Webrat::XML.inner_html(@element)
+      @element["value"] || @element.inner_html
     end
 
   end

data/lib/webrat/core/locators.rb

@@ -13,7 +13,7 @@ module Webrat
   module Locators
 
     def field_by_xpath(xpath)
-      Field.load(@session, Webrat::XML.xpath_at(dom, xpath))
+      Field.load(@session, dom.xpath(xpath).first)
     end
 
   end

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

@@ -11,8 +11,8 @@ module Webrat
 
       def area_element
         area_elements.detect do |area_element|
-          Webrat::XML.attribute(area_element, "title") =~ matcher ||
-          Webrat::XML.attribute(area_element, "id") =~ matcher
+          area_element["title"] =~ matcher ||
+          area_element["id"] =~ matcher
         end
       end
 
@@ -21,7 +21,7 @@ module Webrat
       end
 
       def area_elements
-        Webrat::XML.xpath_search(@dom, Area.xpath_search)
+        @dom.xpath(*Area.xpath_search)
       end
 
       def error_message

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
@@ -28,33 +28,41 @@ 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 matches_class?(link)
         if @value.is_a?(Regexp)
-          (Webrat::XML.attribute(link, "class") =~ @value) ? true : false
+          link["class"] =~ @value ? true : false
         else
-          Webrat::XML.attribute(link, "class").split(%r{\s}).include?(@value) unless Webrat::XML.attribute(link, "class").nil?
+          link["class"].split(%r{\s}).include?(@value) unless link["class"].nil?
         end
       end
-
+      
       def link_elements
-        Webrat::XML.xpath_search(@dom, *Link.xpath_search)
+        @dom.xpath(*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)

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_html =~ @option_text
             else
-              Webrat::XML.inner_html(o.element) == @option_text.to_s
+              o.element.inner_html == @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_html =~ @option_text
             else
-              Webrat::XML.inner_html(o) == @option_text.to_s
+              o.inner_html == @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

@@ -11,7 +11,7 @@ module Webrat
       when :rails
         defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil
       when :merb
-        Merb.logger
+        ::Merb.logger
       else
         @logger ||= begin
           require "logger"

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
@@ -23,31 +22,7 @@ module Webrat
       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

@@ -16,10 +16,10 @@ module Webrat
     end
 
     def webrat_session
-      if Webrat.configuration.mode == :rack_test
-        @_webrat_session ||= ::Webrat::RackTestSession.new(rack_test_session)
-      else
-        @_webrat_session ||= ::Webrat.session_class.new(self)
+      @_webrat_session ||= begin
+        session = Webrat.session_class.new
+        session.adapter = Webrat.adapter_class.new(self) if session.respond_to?(:adapter=)
+        session
       end
     end
 

data/lib/webrat/core/mime.rb

@@ -1,29 +1,18 @@
 module Webrat #:nodoc:
   module MIME #:nodoc:
+    MIME_TYPES = Rack::Mime::MIME_TYPES.dup.merge(
+      ".multipart_form"   => "multipart/form-data",
+      ".url_encoded_form" => "application/x-www-form-urlencoded"
+    ).freeze
 
-    def self.mime_type(string_or_symbol) #:nodoc:
-      if string_or_symbol.is_a?(String)
-        string_or_symbol
-      else
-        case string_or_symbol
-        when :text              then "text/plain"
-        when :html              then "text/html"
-        when :js                then "text/javascript"
-        when :css               then "text/css"
-        when :ics               then "text/calendar"
-        when :csv               then "text/csv"
-        when :xml               then "application/xml"
-        when :rss               then "application/rss+xml"
-        when :atom              then "application/atom+xml"
-        when :yaml              then "application/x-yaml"
-        when :multipart_form    then "multipart/form-data"
-        when :url_encoded_form  then "application/x-www-form-urlencoded"
-        when :json              then "application/json"
-        else
-          raise ArgumentError.new("Invalid Mime type: #{string_or_symbol.inspect}")
-        end
-      end
+    def mime_type(type)
+      return type if type.nil? || type.to_s.include?("/")
+      type = ".#{type}" unless type.to_s[0] == ?.
+      MIME_TYPES.fetch(type) { |type|
+        raise ArgumentError.new("Invalid Mime type: #{type}")
+      }
     end
 
+    module_function :mime_type
   end
 end

data/lib/webrat/core/save_and_open_page.rb

@@ -18,17 +18,15 @@ module Webrat
     end
 
     def open_in_browser(path) # :nodoc
-      platform = ruby_platform
-      if platform =~ /cygwin/ || platform =~ /win32/
-        `rundll32 url.dll,FileProtocolHandler #{path.gsub("/", "\\\\")}`
-      elsif platform =~ /darwin/
-        `open #{path}`
-      end
+      require "launchy"
+      Launchy::Browser.run(path)
+    rescue LoadError
+      warn "Sorry, you need to install launchy to open pages: `gem install launchy`"
     end
 
     def rewrite_css_and_image_references(response_html) # :nodoc:
       return response_html unless doc_root
-      response_html.gsub(/"\/(stylesheets|images)/, doc_root + '/\1')
+      response_html.gsub(/("|')\/(stylesheets|images)/, '\1' + doc_root + '/\2')
     end
 
     def saved_page_dir #:nodoc:

data/lib/webrat/core/scope.rb

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

@@ -13,21 +13,30 @@ module Webrat
   end
 
   def self.session_class
+    if Webrat.configuration.mode == :selenium
+      SeleniumSession
+    else
+      Session
+    end
+  end
+
+  def self.adapter_class
     case Webrat.configuration.mode
     when :rails
-      RailsSession
+      RailsAdapter
     when :merb
-      MerbSession
-    when :selenium
-      SeleniumSession
+      MerbAdapter
     when :rack
-      RackSession
+      RackAdapter
+    when :rack_test
+      warn("The :rack_test mode is deprecated. Please use :rack instead")
+      require "webrat/rack"
+      RackAdapter
     when :sinatra
-      SinatraSession
+      warn("The :sinatra mode is deprecated. Please use :rack instead")
+      SinatraAdapter
     when :mechanize
-      MechanizeSession
-    when :rack_test
-      RackTestSession
+      MechanizeAdapter
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -50,16 +59,22 @@ For example:
     extend Forwardable
     include Logging
     include SaveAndOpenPage
+
+    attr_accessor :adapter
+
     attr_reader :current_url
     attr_reader :elements
 
-    def initialize(context = nil) #:nodoc:
+    def_delegators :@adapter, :response, :response_code, :response_body,
+      :response_body=, :response_code=,
+      :get, :post, :put, :delete
+
+    def initialize(adapter = nil)
+      @adapter         = adapter
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
-      @context         = context
-
       reset
     end
 
@@ -69,6 +84,7 @@ For example:
 
     # For backwards compatibility -- removing in 1.0
     def current_page #:nodoc:
+      warn "current_page is deprecated and will be going away in the next release. Use current_url instead."
       page = OpenStruct.new
       page.url = @current_url
       page.http_method = @http_method
@@ -143,7 +159,7 @@ For example:
     end
 
     def redirect? #:nodoc:
-      response_code / 100 == 3
+      (response_code / 100).to_i == 3
     end
 
     def internal_redirect?
@@ -272,7 +288,7 @@ For example:
     end
 
     def current_host
-      URI.parse(current_url).host || "www.example.com"
+      URI.parse(current_url).host || @custom_headers["Host"] || "www.example.com"
     end
 
     def response_location_host