Fix deprecating =-methods by using send [#2431 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
rails · Aug 9, 2009 · d811864 · d811864
1 parent 32bde66
commit d811864
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/activesupport/lib/active_support/deprecation/method_wrappers.rb b/activesupport/lib/active_support/deprecation/method_wrappers.rb
@@ -11,15 +11,15 @@ def deprecate_methods(target_module, *method_names)
       method_names.each do |method_name|
         target_module.alias_method_chain(method_name, :deprecation) do |target, punctuation|
           target_module.module_eval(<<-end_eval, __FILE__, __LINE__ + 1)
-            def #{target}_with_deprecation#{punctuation}(*args, &block)   # def generate_secret_with_deprecation(*args, &block)
-              ::ActiveSupport::Deprecation.warn(                          #   ::ActiveSupport::Deprecation.warn(
-                ::ActiveSupport::Deprecation.deprecated_method_warning(   #     ::ActiveSupport::Deprecation.deprecated_method_warning(
-                  :#{method_name},                                        #       :generate_secret,
-                  #{options[method_name].inspect}),                       #       "You should use ActiveSupport::SecureRandom.hex(64)"),
-                caller                                                    #     caller
-              )                                                           #   )
-              #{target}_without_deprecation#{punctuation}(*args, &block)  #   generate_secret_without_deprecation(*args, &block)
-            end                                                           # end
+            def #{target}_with_deprecation#{punctuation}(*args, &block)          # def generate_secret_with_deprecation(*args, &block)
+              ::ActiveSupport::Deprecation.warn(                                 #   ::ActiveSupport::Deprecation.warn(
+                ::ActiveSupport::Deprecation.deprecated_method_warning(          #     ::ActiveSupport::Deprecation.deprecated_method_warning(
+                  :#{method_name},                                               #       :generate_secret,
+                  #{options[method_name].inspect}),                              #       "You should use ActiveSupport::SecureRandom.hex(64)"),
+                caller                                                           #     caller
+              )                                                                  #   )
+              send(:#{target}_without_deprecation#{punctuation}, *args, &block)  #   send(:generate_secret_without_deprecation, *args, &block)
+            end                                                                  # end
           end_eval
         end
       end

diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
@@ -25,6 +25,9 @@ def d; end
   def e; end
   deprecate :a, :b, :c => :e, :d => "you now need to do something extra for this one"
 
+  def f=(v); end
+  deprecate :f=
+
   module B
     C = 1
   end
@@ -133,6 +136,7 @@ def test_silence
   def test_deprecation_without_explanation
     assert_deprecated { @dtc.a }
     assert_deprecated { @dtc.b }
+    assert_deprecated { @dtc.f = :foo }
   end
 
   def test_deprecation_with_alternate_method