Changing requiring of nokogiri to work on jruby

brynary · Nov 17, 2008 · 3abaa92 · 3abaa92
1 parent 1bdead1
commit 3abaa92
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/lib/webrat.rb b/lib/webrat.rb
@@ -14,16 +14,14 @@ def self.root #:nodoc:
 
 end
 
-# We need Nokogiri's CSS to XPath support, even if using REXML and Hpricot for parsing and searching
-require "nokogiri/css"
-
-# Require nokogiri and fall back on rexml+Hpricot
-begin
-  require "nokogiri"
-  require "webrat/core/nokogiri"
-rescue LoadError => e
+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
 
 require "webrat/core"