Permalink
Browse files

whiny nil shouldn't depend on Active Record

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6818 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed May 23, 2007
1 parent 9f51eb2 commit a11374ad5a48b76455b352b8336489e9f79b00b2
Showing with 12 additions and 12 deletions.
  1. +12 −12 activesupport/lib/active_support/whiny_nil.rb
@@ -1,23 +1,23 @@
-# Extensions to nil which allow for more helpful error messages for
+# Extensions to nil which allow for more helpful error messages for
# people who are new to rails.
#
# The aim is to ensure that when users pass nil to methods where that isn't
# appropriate, instead of NoMethodError and the name of some method used
-# by the framework users will see a message explaining what type of object
+# by the framework users will see a message explaining what type of object
# was expected.
class NilClass
- WHINERS = [ ::ActiveRecord::Base, ::Array ]
-
+ WHINERS = [::Array]
+ WHINERS << ::ActiveRecord::Base if defined? ::ActiveRecord
+
@@method_class_map = Hash.new
-
+
WHINERS.each do |klass|
methods = klass.public_instance_methods - public_instance_methods
- methods.each do |method|
- @@method_class_map[method.to_sym] = klass
- end
+ class_name = klass.name
+ methods.each { |method| @@method_class_map[method.to_sym] = class_name }
end
-
+
def 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
@@ -27,11 +27,11 @@ def method_missing(method, *args, &block)
raise_nil_warning_for @@method_class_map[method], method, caller
end
- def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil)
+ def raise_nil_warning_for(class_name = 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 << "\nYou might have expected an instance of #{class_name}." if class_name
message << "\nThe error occurred while evaluating nil.#{selector}" if selector
-
+
raise NoMethodError, message, with_caller || caller
end
end

4 comments on commit a11374a

@dbackeus

This comment has been minimized.

Show comment Hide comment
@dbackeus

dbackeus Mar 2, 2010

I get the following error on this one:

 activesupport/lib/active_support/whiny_nil.rb:29:in `<class:NilClass>': uninitialized constant ActiveRecord::Base (NameError)

Changing the conditional to include ::Base makes it work allright though:

WHINERS << ::ActiveRecord::Base if defined? ::ActiveRecord::Base

I'm using ruby 1.9.1 p378 through rvm.

I get the following error on this one:

 activesupport/lib/active_support/whiny_nil.rb:29:in `<class:NilClass>': uninitialized constant ActiveRecord::Base (NameError)

Changing the conditional to include ::Base makes it work allright though:

WHINERS << ::ActiveRecord::Base if defined? ::ActiveRecord::Base

I'm using ruby 1.9.1 p378 through rvm.

@jeremy

This comment has been minimized.

Show comment Hide comment
@jeremy

jeremy Mar 2, 2010

Owner

dbackeus, you probably have a plugin or something that opens the ActiveRecord module. Could you submit a patch to Lighthouse?

Owner

jeremy replied Mar 2, 2010

dbackeus, you probably have a plugin or something that opens the ActiveRecord module. Could you submit a patch to Lighthouse?

@dbackeus

This comment has been minimized.

Show comment Hide comment
@sundbp

This comment has been minimized.

Show comment Hide comment
Please sign in to comment.