From 987766b10d9b4e2c940ea206a56376c84ea68225 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Mon, 10 Aug 2009 20:14:48 -0400 Subject: [PATCH] Don't require rubygems at runtime (Simon Rozet) --- History.txt | 6 ++++++ lib/webrat.rb | 24 ++---------------------- lib/webrat/selenium.rb | 1 - spec/private/core/field_spec.rb | 2 +- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/History.txt b/History.txt index ed5b451..867ed6e 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,9 @@ +== Git + +* Minor enhancements + + * Don't require rubygems at runtime (Simon Rozet) + == 0.4.5 / 2009-08-10 * Major enhancements diff --git a/lib/webrat.rb b/lib/webrat.rb index 4985ccb..60ba6dd 100644 --- a/lib/webrat.rb +++ b/lib/webrat.rb @@ -1,29 +1,9 @@ -require "rubygems" - -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__))) - module Webrat # The common base class for all exceptions raised by Webrat. class WebratError < StandardError end - - def self.require_xml - if on_java? - gem "nokogiri", ">= 1.2.4" - else - gem "nokogiri", ">= 1.0.6" - end - - require "nokogiri" - require "webrat/core/xml/nokogiri" - end - - def self.on_java? - RUBY_PLATFORM =~ /java/ - end - end -Webrat.require_xml - +require "nokogiri" +require "webrat/core/xml/nokogiri" require "webrat/core" diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb index 42db25c..2f823ab 100644 --- a/lib/webrat/selenium.rb +++ b/lib/webrat/selenium.rb @@ -1,5 +1,4 @@ require "webrat" -gem "selenium-client", ">=1.2.16" require "selenium/client" require "webrat/selenium/silence_stream" require "webrat/selenium/selenium_session" diff --git a/spec/private/core/field_spec.rb b/spec/private/core/field_spec.rb index 1e7f199..654f8c1 100644 --- a/spec/private/core/field_spec.rb +++ b/spec/private/core/field_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") module Webrat describe Field do - unless Webrat.on_java? + unless RUBY_PLATFORM =~ /java/ it "should have nice inspect output" do html = <<-HTML