github-migration/webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving requiring of Nokogiri/Hpricot/REXML to a method

Browse Source
This commit is contained in:
Bryan Helmkamp 2008-11-19 15:52:56 -05:00
parent ec8bc82c24
commit f1b4486594
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/webrat.rb
View File

@ -12,9 +12,8 @@ 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"
@ -23,11 +22,18 @@ else
require "nokogiri" require "nokogiri"
require "webrat/core/nokogiri" require "webrat/core/nokogiri"
end end
end
def self.on_java?
RUBY_PLATFORM =~ /java/
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