Moving requiring of Nokogiri/Hpricot/REXML to a method
This commit is contained in:
parent
ec8bc82c24
commit
f1b4486594
|
@ -12,22 +12,28 @@ module Webrat
|
||||||
defined?(RAILS_ROOT) ? RAILS_ROOT : Merb.root
|
defined?(RAILS_ROOT) ? RAILS_ROOT : Merb.root
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
def self.require_xml
|
||||||
|
if on_java?
|
||||||
if RUBY_PLATFORM =~ /java/
|
|
||||||
# We need Nokogiri's CSS to XPath support, even if using REXML and Hpricot for parsing and searching
|
# We need Nokogiri's CSS to XPath support, even if using REXML and Hpricot for parsing and searching
|
||||||
require "nokogiri/css"
|
require "nokogiri/css"
|
||||||
require "hpricot"
|
require "hpricot"
|
||||||
require "rexml/document"
|
require "rexml/document"
|
||||||
else
|
else
|
||||||
require "nokogiri"
|
require "nokogiri"
|
||||||
require "webrat/core/nokogiri"
|
require "webrat/core/nokogiri"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.on_java?
|
||||||
|
RUBY_PLATFORM =~ /java/
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Webrat.require_xml
|
||||||
|
|
||||||
require "webrat/core"
|
require "webrat/core"
|
||||||
|
|
||||||
# TODO: This is probably not a good idea.
|
# TODO: This is probably not a good idea.
|
||||||
# Probably better for webrat users to require "webrat/rails" etc. directly
|
# Probably better for webrat users to require "webrat/rails" etc. directly
|
||||||
if defined?(RAILS_ENV)
|
require "webrat/rails" if defined?(RAILS_ENV)
|
||||||
require "webrat/rails"
|
|
||||||
end
|
|
||||||
|
|
Loading…
Reference in New Issue