aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/whiny_nil.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 2f8ae61559..961c912f01 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added an exception if calling id on nil to WhinyNil #584 [kevin-temp@writesoon.com]
+
* Added Fix/Bignum#multiple_of? which returns true on 14.multiple_of?(7) and false on 16.multiple_of?(7) #1464 [Thomas Fuchs]
* Added even? and odd? to work with Bignums in addition to Fixnums #1464 [Thomas Fuchs]
diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
index 4a83cd585e..3612c6acbf 100644
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ b/activesupport/lib/active_support/whiny_nil.rb
@@ -18,6 +18,10 @@ class NilClass
@@method_class_map[method.to_sym] = klass
end
end
+
+ def id
+ raise "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id"
+ end
private
def method_missing(method, *args, &block)