From ff47ba9adb39976723752abfd6fbb72d7a55eaf1 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 2 Jan 2008 09:08:14 +0000 Subject: Ruby 1.9 compat: add #raise to AS::BasicObject, fixup Duration argument error. Closes #10594. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8523 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/basic_object.rb | 5 +++++ activesupport/lib/active_support/duration.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb index 009a521a40..bb01a47508 100644 --- a/activesupport/lib/active_support/basic_object.rb +++ b/activesupport/lib/active_support/basic_object.rb @@ -6,6 +6,11 @@ module ActiveSupport class BasicObject < ::BasicObject undef_method :== undef_method :equal? + + # Let ActiveSupport::BasicObject at least raise exceptions. + def raise(*args) + ::Object.send(:raise, *args) + end end else require 'blankslate' diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb index 82b38e79b5..ff51b49dcf 100644 --- a/activesupport/lib/active_support/duration.rb +++ b/activesupport/lib/active_support/duration.rb @@ -82,7 +82,7 @@ module ActiveSupport t.advance(type => sign * number) end else - raise ArgumentError, "expected a time or date, got #{time.inspect}" + raise ::ArgumentError, "expected a time or date, got #{time.inspect}" end end end -- cgit v1.2.3