Changeset 5356

Timestamp:

10/24/06 16:56:59 (2 years ago)

Author:

minam

Message:

Extend deprecate so that alternatives can be specified via the deprecation

Files:

• trunk/activesupport/lib/active_support/deprecation.rb (modified) (2 diffs)
• trunk/activesupport/test/deprecation_test.rb (modified) (2 diffs)

trunk/activesupport/lib/active_support/deprecation.rb

@@ -72 +72 @@
-      # Declare that a method has been deprecated.
-      def deprecate(*method_names)
+        options = method_names.last.is_a?(Hash) ? method_names.pop : {}
+        method_names = method_names + options.keys
-        method_names.each do |method_name|
-          alias_method_chain(method_name, :deprecation) do |target, punctuation|
-            class_eval(<<-EOS, __FILE__, __LINE__)
-              def #{target}_with_deprecation#{punctuation}(*args, &block)
-
+, #{options[method_name].inspect}
-                #{target}_without_deprecation#{punctuation}(*args, &block)
-              end
@@ -84 +86 @@
-      end
-
-
-
+
+
+
+
+
+
+
-      end
-

trunk/activesupport/test/deprecation_test.rb

@@ -18 +18 @@
-  def multi(a,b,c) [a,b,c] end
-  deprecate :none, :one, :multi
+
+  def a; end
+  def b; end
+  def c; end
+  def d; end
+  def e; end
+  deprecate :a, :b, :c => :e, :d => "you now need to do something extra for this one"
-end
-
@@ -109 +116 @@
-    ActiveSupport::Deprecation.silenced = false
-  end
+
+  def test_deprecation_without_explanation
+    assert_deprecated { @dtc.a }
+    assert_deprecated { @dtc.b }
+  end
+
+  def test_deprecation_with_alternate_method
+    assert_deprecated(/use e instead/) { @dtc.c }
+  end
+
+  def test_deprecation_with_explicit_message
+    assert_deprecated(/you now need to do something extra for this one/) { @dtc.d }
+  end
-end