Updated whiny nil to be more concise and useful.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2602 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
07b4ea2e4b
commit
43c34e20d2
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Updated whiny nil to be more concise and useful. [Nicholas Seckar]
|
||||
|
||||
* Added Enumerable#first_match [Nicholas Seckar]
|
||||
|
||||
* Fixed that Time#change should also reset usec when also resetting minutes #2459 [ikeda@dream.big.or.jp]
|
||||
|
|
|
@ -24,23 +24,15 @@ class NilClass
|
|||
|
||||
private
|
||||
def method_missing(method, *args, &block)
|
||||
if @@method_class_map.include?(method)
|
||||
raise_nil_warning_for @@method_class_map[method], caller
|
||||
else
|
||||
super
|
||||
end
|
||||
raise_nil_warning_for @@method_class_map[method], method, caller
|
||||
end
|
||||
|
||||
def raise_nil_warning_for(klass, with_caller = nil)
|
||||
raise NoMethodError, NIL_WARNING_MESSAGE % klass, with_caller || caller
|
||||
def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil)
|
||||
message = "You have a nil object when you didn't expect it!"
|
||||
message << "\nYou might have expected an instance of #{klass}." if klass
|
||||
message << "\nThe error occured while evaluating nil.#{selector}" if selector
|
||||
|
||||
raise NoMethodError, message, with_caller || caller
|
||||
end
|
||||
|
||||
NIL_WARNING_MESSAGE = <<-end_message unless const_defined?(:NIL_WARNING_MESSAGE)
|
||||
WARNING: You have a nil object when you probably didn't expect it! Odds are you
|
||||
want an instance of %s instead.
|
||||
|
||||
Look in the callstack to see where you're working with an object that could be nil.
|
||||
Investigate your methods and make sure the object is what you expect!
|
||||
end_message
|
||||
end
|
||||
|
||||
|
|
|
@ -15,19 +15,21 @@ class WhinyNilTest < Test::Unit::TestCase
|
|||
def test_unchanged
|
||||
nil.method_thats_not_in_whiners
|
||||
rescue NoMethodError => nme
|
||||
assert_match(/nil:NilClass/, nme.message)
|
||||
assert_match(/nil.method_thats_not_in_whiners/, nme.message)
|
||||
end
|
||||
|
||||
def test_active_record
|
||||
nil.save!
|
||||
rescue NoMethodError => nme
|
||||
assert(!(nme.message =~ /nil:NilClass/))
|
||||
assert_match(/nil\.save!/, nme.message)
|
||||
end
|
||||
|
||||
def test_array
|
||||
nil.each
|
||||
rescue NoMethodError => nme
|
||||
assert(!(nme.message =~ /nil:NilClass/))
|
||||
assert_match(/nil\.each/, nme.message)
|
||||
end
|
||||
|
||||
def test_id
|
||||
|
|
Loading…
Reference in New Issue