diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-31 11:55:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-31 11:55:24 +0200 |
| commit | 3d7099891f07395ed889e7da9e13b3ff9244d539 (patch) | |
| tree | 6a988362ec4a6b58c90a12e6b715cd6926a111ce /activesupport/lib/active_support/xml_mini/nokogiri.rb | |
| parent | 0e20e3ebc20250174867f33e0ad3972f7e7c76d0 (diff) | |
| parent | d3819daaac0d2f730f2b34af31700c914e697375 (diff) | |
| download | rails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.gz rails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.bz2 rails-3d7099891f07395ed889e7da9e13b3ff9244d539.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activesupport/lib/active_support/xml_mini/nokogiri.rb')
| -rw-r--r-- | activesupport/lib/active_support/xml_mini/nokogiri.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb index eb61a7fc22..e03a744257 100644 --- a/activesupport/lib/active_support/xml_mini/nokogiri.rb +++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb @@ -1,4 +1,9 @@ -require 'nokogiri' +begin + require 'nokogiri' +rescue LoadError => e + $stderr.puts "You don't have nokogiri installed in your application. Please add it to your Gemfile and run bundle install" + raise e +end require 'active_support/core_ext/object/blank' # = XmlMini Nokogiri implementation |