Merge PR rails#45698

Author: rafaelfranca

activesupport/CHANGELOG.md

@@ -1,3 +1,16 @@
+*   `ActiveSupport::CurrentAttributes.resets` now accepts a method name
+
+    The block API is still the recommended approach, but now both APIs are supported:
+
+    ```ruby
+    class Current < ActiveSupport::CurrentAttributes
+      resets { Time.zone = nil }
+      resets :clear_time_zone
+    end
+    ```
+
+    *Alex Ghiculescu*
+
 *   Ensure `ActiveSupport::Testing::Isolation::Forking` closes pipes
 
     Previously, `Forking.run_in_isolation` opened two ends of a pipe. The fork

activesupport/lib/active_support/current_attributes.rb

@@ -133,14 +133,14 @@ def attribute(*names)
         end
       end
 
-      # Calls this block before #reset is called on the instance. Used for resetting external collaborators that depend on current values.
-      def before_reset(&block)
-        set_callback :reset, :before, &block
+      # Calls this callback before #reset is called on the instance. Used for resetting external collaborators that depend on current values.
+      def before_reset(*methods, &block)
+        set_callback :reset, :before, *methods, &block
       end
 
-      # Calls this block after #reset is called on the instance. Used for resetting external collaborators, like Time.zone.
-      def resets(&block)
-        set_callback :reset, :after, &block
+      # Calls this callback after #reset is called on the instance. Used for resetting external collaborators, like Time.zone.
+      def resets(*methods, &block)
+        set_callback :reset, :after, *methods, &block
       end
       alias_method :after_reset, :resets
 

activesupport/test/current_attributes_test.rb

@@ -17,10 +17,11 @@ class Current < ActiveSupport::CurrentAttributes
     before_reset { Session.previous = person&.id }
 
     resets do
-      Time.zone = "UTC"
       Session.current = nil
     end
 
+    resets :clear_time_zone
+
     def account=(account)
       super
       self.person = Person.new(1, "#{account}'s person")
@@ -52,6 +53,11 @@ def request
     def intro
       "#{person.name}, in #{time_zone}"
     end
+
+    private
+      def clear_time_zone
+        Time.zone = "UTC"
+      end
   end
 
   class Session < ActiveSupport::CurrentAttributes