webrat 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.3 / 2008-12-28
+
+* Minor enhancements
+
+  * Fix compatibility with Nokogiri 1.1.0 on MRI
+  
 == 0.3.2 / 2008-11-08
 
 * Minor enhancements

data/lib/webrat.rb

@@ -3,25 +3,32 @@ require "rubygems"
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Webrat
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   
   def self.root #:nodoc:
     defined?(RAILS_ROOT) ? RAILS_ROOT : Merb.root
   end
+  
+  def self.require_xml
+    gem "nokogiri", ">= 1.1.0"
+    
+    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
 
-# We need Nokogiri's CSS to XPath support, even if using REXML
-require "nokogiri/css"
-
-# Require nokogiri and fall back on rexml
-begin
-  require "nokogiri"
-  require "webrat/core/nokogiri"
-rescue LoadError => e
-  require "rexml/document"
-  warn("Standard REXML library is slow. Please consider installing nokogiri.\nUse \"sudo gem install nokogiri\"")
-end
-
+Webrat.require_xml
 require "webrat/core"
 
 # TODO: This is probably not a good idea.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-08 00:00:00 -05:00
+date: 2008-12-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - lib/webrat/selenium/selenium_session.rb
 - lib/webrat/selenium.rb
 - lib/webrat/sinatra.rb
+- lib/webrat/test
 - lib/webrat.rb
 has_rdoc: true
 homepage: http://github.com/brynary/webrat
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Webrat. Ruby Acceptance Testing for Web applications