Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Improved the whiny nil #1600 [Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 117ee110d7cbe199f94d2422eb20c0066eb41a10 1 parent a62485a
@dhh dhh authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 activesupport/lib/active_support/whiny_nil.rb
View
8 activesupport/lib/active_support/whiny_nil.rb
@@ -19,20 +19,20 @@ class NilClass
end
def id
- raise "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id"
+ raise RuntimeError, "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id", caller
end
private
def method_missing(method, *args, &block)
if @@method_class_map.include?(method)
- raise_nil_warning_for @@method_class_map[method]
+ raise_nil_warning_for @@method_class_map[method], caller
else
super
end
end
- def raise_nil_warning_for(klass)
- raise NoMethodError, NIL_WARNING_MESSAGE % klass
+ def raise_nil_warning_for(klass, with_caller = nil)
+ raise NoMethodError, NIL_WARNING_MESSAGE % klass, with_caller || caller
end
NIL_WARNING_MESSAGE = <<-end_message unless const_defined?(:NIL_WARNING_MESSAGE)
Please sign in to comment.
Something went wrong with that request. Please try again.