kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

get deprecation methods and callers straight

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2006-09-04 00:17:01 +00:00
parent 528618a910
commit 29cec6d0ab
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activesupport/lib/active_support/deprecation.rb
View file

@ -38,8 +38,8 @@ module ActiveSupport
private
def deprecation_message(callstack, message = nil)
file, line, method = extract_callstack(callstack)
message ||= "#{method} is deprecated and will be removed from Rails 2.0."
"DEPRECATION WARNING: #{message}. See http://www.rubyonrails.org/deprecation for details. (#{method} at #{file}:#{line})"
message ||= "You are using deprecated behavior which will be removed from Rails 2.0."
"DEPRECATION WARNING: #{message} See http://www.rubyonrails.org/deprecation for details. (called from #{method} at #{file}:#{line})"
end
def extract_callstack(callstack)
@ -57,7 +57,7 @@ module ActiveSupport
method_names.each do |method_name|
class_eval(<<-EOS, __FILE__, __LINE__)
def #{method_name}_with_deprecation(*args, &block)
::ActiveSupport::Deprecation.warn
::ActiveSupport::Deprecation.warn("#{method_name} is deprecated and will be removed from Rails 2.0", caller)
#{method_name}_without_deprecation(*args, &block)
end
EOS

2
activesupport/test/deprecation_test.rb
View file

@ -47,7 +47,7 @@ class DeprecationTest < Test::Unit::TestCase
end
def test_deprecate_class_method
assert_deprecated(/none is deprecated/) do
assert_deprecated(/none is deprecated.*test_deprecate_class_method at/) do
assert_equal 1, @dtc.none
end