Ticket #11450: deprecation_warnings_for_the_masses.diff

activesupport/test/deprecation_test.rb

@@ -24 +24 @@
-  def d; end
-  def e; end
-  deprecate :a, :b, :c => :e, :d => "you now need to do something extra for this one"
+  
+  def custom
+    ActiveSupport::Deprecation.warn("Don't go using this method")
+  end
-end
-
-
@@ -148 +152 @@
-    assert_not_deprecated { error.message }
-    assert_nil @last_message
-  end
+  
+  def test_deprecated_warning_with_custom_details_message
+    ActiveSupport::Deprecation.detail_message = "This message is so 90s"
+    assert_deprecated(/This message is so 90s/) {@dtc.custom}
+  ensure
+    ActiveSupport::Deprecation.detail_message = ActiveSupport::Deprecation.detail_message = ActiveSupport::Deprecation::DEFAULT_DETAIL_MESSAGE
+  end
+  
+  def test_oldskool_deprecation_details
+    assert_deprecated(/#{ActiveSupport::Deprecation::DEFAULT_DETAIL_MESSAGE}/) {@dtc.custom}
+  end
+  
-end

activesupport/lib/active_support/deprecation.rb

@@ -1 +1 @@
-require 'yaml'
-
-module ActiveSupport
-
-
+
+
+
+
+
+
+
+
-    self.debug = false
+    
+    mattr_accessor :detail_message
+    
+    #
+    # This is the default message that Rails adds to all of its deprecation messages.
+    # You can override it with your own message using ActiveSupport.Deprecation.detail_message 
+    # This can be handy if you have a particular webpage or document that details all the deprecations.
+    DEFAULT_DETAIL_MESSAGE = "See http://www.rubyonrails.org/deprecation for details."
+    self.detail_message = DEFAULT_DETAIL_MESSAGE
-
-    # Choose the default warn behavior according to RAILS_ENV.
-    # Ignore deprecation warnings in production.
@@ -18 +33 @@
-                         logger.debug callstack.join("\n  ") if debug
-                       }
-    }
-
+
-    class << self
+      # Use warn to mark your methods as deprecated with a message.
+      # Pass in an appropriate <tt>message</tt> detailing what the user of the method should do instead.
-      def warn(message = nil, callstack = caller)
-        behavior.call(deprecation_message(callstack, message), callstack) if behavior && !silenced?
-      end
-
-
+ #:nodoc:
-        if defined?(RAILS_ENV)
-          DEFAULT_BEHAVIORS[RAILS_ENV.to_s]
-        else
@@ -50 +67 @@
-
-
-      private
-
+, details_message = nil
-          message ||= "You are using deprecated behavior which will be removed from Rails 2.0."
-See http://www.rubyonrails.org/deprecation for details.
+#{self.detail_message}
-        end
-
-        def deprecation_caller_message(callstack)