diabolo-webrat 0.4.4.2 → 0.5.1

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
+

data/lib/webrat/integrations/merb.rb

@@ -0,0 +1,10 @@
+module Merb #:nodoc:
+  module Test #:nodoc:
+    module RequestHelper #:nodoc:
+      def request(uri, env = {})
+        @_webrat_session ||= Webrat::MerbAdapter.new
+        @_webrat_session.response = @_webrat_session.request(uri, env)
+      end
+    end
+  end
+end

data/lib/webrat/integrations/rails.rb

@@ -0,0 +1,9 @@
+require "action_controller"
+require "action_controller/integration"
+
+module ActionController #:nodoc:
+  IntegrationTest.class_eval do
+    include Webrat::Methods
+    include Webrat::Matchers
+  end
+end

data/lib/webrat/integrations/rspec-rails.rb

@@ -0,0 +1,10 @@
+# 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"
+
+Spec::Runner.configure do |config|
+  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
+end

data/lib/webrat/integrations/selenium.rb

@@ -0,0 +1,11 @@
+require "webrat/selenium"
+
+if defined?(ActionController::IntegrationTest)
+  module ActionController #:nodoc:
+    IntegrationTest.class_eval do
+      include Webrat::Methods
+      include Webrat::Selenium::Methods
+      include Webrat::Selenium::Matchers
+    end
+  end
+end

data/lib/webrat/rspec-rails.rb

@@ -1,13 +1,2 @@
-# 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"
-
-Spec::Runner.configure do |config|
-  # rspec should support :type => [:controller, :helper, :view] - but until it does ...
-  config.include(Webrat::Matchers, :type => :controller)
-  config.include(Webrat::Matchers, :type => :helper)
-  config.include(Webrat::Matchers, :type => :view)
-end
+warn("Requiring 'webrat/rspec-rails' is deprecated. Please require 'webrat/integrations/rspec-rails' instead")
+require "webrat/integrations/rspec-rails"

data/lib/webrat/selenium.rb

@@ -1,5 +1,4 @@
 require "webrat"
-gem "selenium-client", ">=1.2.14"
 require "selenium/client"
 require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"
@@ -69,13 +68,3 @@ module Webrat
     end
   end
 end
-
-if defined?(ActionController::IntegrationTest)
-  module ActionController #:nodoc:
-    IntegrationTest.class_eval do
-      include Webrat::Methods
-      include Webrat::Selenium::Methods
-      include Webrat::Selenium::Matchers
-    end
-  end
-end

data/lib/webrat/selenium/application_server_factory.rb

@@ -0,0 +1,40 @@
+module Webrat
+  module Selenium
+
+    class ApplicationServerFactory
+
+      def self.app_server_instance
+        case Webrat.configuration.application_framework
+        when :sinatra
+          require "webrat/selenium/application_servers/sinatra"
+          return Webrat::Selenium::ApplicationServers::Sinatra.new
+        when :merb
+          require "webrat/selenium/application_servers/merb"
+          return Webrat::Selenium::ApplicationServers::Merb.new
+        when :rails
+          require "webrat/selenium/application_servers/rails"
+          return Webrat::Selenium::ApplicationServers::Rails.new
+        when :external
+          require "webrat/selenium/application_servers/external"
+          return Webrat::Selenium::ApplicationServers::External.new
+        else
+          raise WebratError.new(<<-STR)
+Unknown Webrat application_framework: #{Webrat.configuration.application_framework.inspect}
+
+Please ensure you have a Webrat configuration block that specifies an application_framework
+in your test_helper.rb, spec_helper.rb, or env.rb (for Cucumber).
+
+For example:
+
+  Webrat.configure do |config|
+    # ...
+    config.application_framework = :rails
+  end
+      STR
+        end
+      end
+
+    end
+
+  end
+end

data/lib/webrat/selenium/application_servers.rb

@@ -0,0 +1,5 @@
+require "webrat/selenium/application_servers/base"
+require "webrat/selenium/application_servers/sinatra"
+require "webrat/selenium/application_servers/merb"
+require "webrat/selenium/application_servers/rails"
+require "webrat/selenium/application_servers/external"

data/lib/webrat/selenium/application_servers/base.rb

@@ -0,0 +1,46 @@
+require "webrat/selenium/silence_stream"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Base
+        include Webrat::Selenium::SilenceStream
+
+        def boot
+          start
+          wait
+          stop_at_exit
+        end
+
+        def stop_at_exit
+          at_exit do
+            stop
+          end
+        end
+
+        def wait
+          $stderr.print "==> Waiting for #{Webrat.configuration.application_framework} application server on port #{Webrat.configuration.application_port}... "
+          wait_for_socket
+          $stderr.print "Ready!\n"
+        end
+
+        def wait_for_socket
+          silence_stream(STDOUT) do
+            TCPSocket.wait_for_service_with_timeout \
+              :host     => "0.0.0.0",
+              :port     => Webrat.configuration.application_port.to_i,
+              :timeout  => 30 # seconds
+          end
+          rescue SocketError
+          fail
+        end
+
+        def prepare_pid_file(file_path, pid_file_name)
+          FileUtils.mkdir_p File.expand_path(file_path)
+          File.expand_path("#{file_path}/#{pid_file_name}")
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/external.rb

@@ -0,0 +1,26 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class External < Webrat::Selenium::ApplicationServers::Base
+        def start
+          warn "Webrat Ignoring Start Of Application Server Due to External Mode"
+        end
+
+        def stop
+        end
+
+        def fail
+        end
+
+        def pid_file
+        end
+
+        def wait
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/merb.rb

@@ -0,0 +1,50 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Merb < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          system start_command
+        end
+
+        def stop
+          silence_stream(STDOUT) do
+            pid = File.read(pid_file)
+            system("kill -9 #{pid}")
+            FileUtils.rm_f pid_file
+          end
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the Merb application server... exiting!"
+          $stderr.puts
+          $stderr.puts "Verify you can start a Merb server on port #{Webrat.configuration.application_port} with the following command:"
+          $stderr.puts
+          $stderr.puts "    #{start_command}"
+          exit
+        end
+
+        def pid_file
+        "log/merb.#{Webrat.configuration.application_port}.pid"
+        end
+
+        def start_command
+        "#{merb_command} -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}"
+        end
+
+        def merb_command
+          if File.exist?('bin/merb')
+            merb_cmd = 'bin/merb'
+          else
+            merb_cmd = 'merb'
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/webrat/selenium/application_servers/rails.rb

@@ -0,0 +1,44 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Rails < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          system start_command
+        end
+
+        def stop
+          silence_stream(STDOUT) do
+            system stop_command
+          end
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the Rails application server... exiting!"
+          $stderr.puts
+          $stderr.puts "Verify you can start a Rails server on port #{Webrat.configuration.application_port} with the following command:"
+          $stderr.puts
+          $stderr.puts "    #{start_command}"
+          exit
+        end
+
+        def pid_file
+          prepare_pid_file("#{RAILS_ROOT}/tmp/pids", "mongrel_selenium.pid")
+        end
+
+        def start_command
+        "mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
+        end
+
+        def stop_command
+        "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
+        end
+
+      end
+    end
+  end
+end