Merge pull request rails#53440 from fatkodima/current_attributes-new-…

…object

Fix `CurrentAttributes#attributes` to return new object each time

activesupport/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   `ActiveSupport::CurrentAttributes#attributes` now will return a new hash object on each call.
+
+    Previously, the same hash object was returned each time that method was called.
+
+    *fatkodima*
+
 *   `ActiveSupport::JSON.encode` supports CIDR notation.
 
     Previously:

activesupport/lib/active_support/current_attributes.rb

@@ -122,13 +122,13 @@ def attribute(*names, default: NOT_SET)
             owner.define_cached_method(name, namespace: :current_attributes) do |batch|
               batch <<
                 "def #{name}" <<
-                "attributes[:#{name}]" <<
+                "@attributes[:#{name}]" <<
                 "end"
             end
             owner.define_cached_method("#{name}=", namespace: :current_attributes) do |batch|
               batch <<
                 "def #{name}=(value)" <<
-                "attributes[:#{name}] = value" <<
+                "@attributes[:#{name}] = value" <<
                 "end"
             end
           end
@@ -194,12 +194,16 @@ def method_added(name)
 
     class_attribute :defaults, instance_writer: false, default: {}.freeze
 
-    attr_accessor :attributes
+    attr_writer :attributes
 
     def initialize
       @attributes = resolve_defaults
     end
 
+    def attributes
+      @attributes.dup
+    end
+
     # Expose one or more attributes within a block. Old values are returned after the block concludes.
     # Example demonstrating the common use of needing to set Current attributes outside the request-cycle:
     #

activesupport/test/current_attributes_test.rb

@@ -251,6 +251,10 @@ def after_teardown
     assert_equal({ counter_integer: 0, counter_callable: 0 }, Current.attributes)
   end
 
+  test "#attributes returns different objects each time" do
+    assert_not_same Current.attributes, Current.attributes
+  end
+
   test "CurrentAttributes restricted attribute names" do
     assert_raises ArgumentError, match: /Restricted attribute names: reset, set/ do
       class InvalidAttributeNames < ActiveSupport::CurrentAttributes