diff options
Diffstat (limited to 'activesupport')
3 files changed, 26 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/object_and_class.rb b/activesupport/lib/active_support/core_ext/object_and_class.rb index eb54f79534..be486b0816 100644 --- a/activesupport/lib/active_support/core_ext/object_and_class.rb +++ b/activesupport/lib/active_support/core_ext/object_and_class.rb @@ -21,6 +21,13 @@ class Object #:nodoc: !self end end + + def suppress(*exception_classes) + begin yield + rescue Exception => e + raise unless exception_classes.any? {|cls| e.kind_of? cls} + end + end end class Class #:nodoc: diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 9518dfab90..a189da189a 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -21,8 +21,6 @@ module Dependencies require_or_load(file_name) rescue LoadError raise unless swallow_load_errors - rescue Object => e - raise ScriptError, "#{e.message}" end end end @@ -179,8 +177,8 @@ class Object #:nodoc: begin require_or_load(class_id.to_s.demodulize.underscore) if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end - rescue LoadError - raise NameError, "uninitialized constant #{class_id}" + rescue LoadError => e + raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e) end end end @@ -216,4 +214,9 @@ class Exception return nil if blamed_files.empty? "This error occured while loading the following files:\n #{blamed_files.join "\n "}" end + + def copy_blame!(exc) + @blamed_files = exc.blamed_files.clone + self + end end diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb index 71eeb4bdb8..a0a6243480 100644 --- a/activesupport/test/core_ext/object_and_class_ext_test.rb +++ b/activesupport/test/core_ext/object_and_class_ext_test.rb @@ -19,3 +19,15 @@ class ClassExtTest < Test::Unit::TestCase assert !defined?(ClassD) end end + +class ObjectTests < Test::Unit::TestCase + def test_suppress_re_raises + assert_raises(LoadError) { suppress(ArgumentError) {raise LoadError} } + end + def test_suppress_supresses + suppress(ArgumentError) { raise ArgumentError } + suppress(LoadError) { raise LoadError } + suppress(LoadError, ArgumentError) { raise LoadError } + suppress(LoadError, ArgumentError) { raise ArgumentError } + end +end
\ No newline at end of file |