@@ -12,22 +12,28 @@ module Webrat defined?(RAILS_ROOT) ? RAILS_ROOT : Merb.root end + def self.require_xml + if on_java? + # We need Nokogiri's CSS to XPath support, even if using REXML and Hpricot for parsing and searching + require "nokogiri/css" + require "hpricot" + require "rexml/document" + else + require "nokogiri" + require "webrat/core/nokogiri" + end + end + + def self.on_java? + RUBY_PLATFORM =~ /java/ + end + end -if RUBY_PLATFORM =~ /java/ - # We need Nokogiri's CSS to XPath support, even if using REXML and Hpricot for parsing and searching - require "nokogiri/css" - require "hpricot" - require "rexml/document" -else - require "nokogiri" - require "webrat/core/nokogiri" -end +Webrat.require_xml require "webrat/core" # TODO: This is probably not a good idea. # Probably better for webrat users to require "webrat/rails" etc. directly -if defined?(RAILS_ENV) - require "webrat/rails" -end +require "webrat/rails" if defined?(RAILS_ENV) lib/webrat.rb ec8bc82c243541a1fef06de19ed1ecd338881984 Bryan Helmkamp bryan@brynary.com http://github.com/brynary/webrat/commit/f1b4486594311d1daaef4c9038657d7d28c18386 f1b4486594311d1daaef4c9038657d7d28c18386 2008-11-19T12:52:56-08:00 2008-11-19T12:52:56-08:00 Moving requiring of Nokogiri/Hpricot/REXML to a method 1fc4d3b0a5ea8358ff6b0a8e895084251dd52ba3 Bryan Helmkamp bryan@brynary.com