Merge pull request rails#50470 from seanpdoyle/object-with-block-argument

Yield instance to `Object#with` block

Author: byroot

activesupport/CHANGELOG.md

@@ -1,3 +1,13 @@
+*   Yield instance to `Object#with` block
+
+    ```ruby
+    client.with(timeout: 5_000) do |c|
+      c.get("/commits")
+    end
+    ```
+
+    *Sean Doyle*
+
 *   Use logical core count instead of physical core count to determine the
     default number of workers when parallelizing tests.
 

activesupport/lib/active_support/core_ext/object/with.rb

@@ -4,11 +4,13 @@ class Object
   # Set and restore public attributes around a block.
   #
   #   client.timeout # => 5
-  #   client.with(timeout: 1) do
-  #     client.timeout # => 1
+  #   client.with(timeout: 1) do |c|
+  #     c.timeout # => 1
   #   end
   #   client.timeout # => 5
   #
+  # The receiver is yielded to the provided block.
+  #
   # This method is a shorthand for the common begin/ensure pattern:
   #
   #   old_value = object.attribute
@@ -28,7 +30,7 @@ def with(**attributes)
         old_values[key] = public_send(key)
         public_send("#{key}=", value)
       end
-      yield
+      yield self
     ensure
       old_values.each do |key, old_value|
         public_send("#{key}=", old_value)

activesupport/test/core_ext/object/with_test.rb

@@ -88,6 +88,10 @@ def initialize
     assert_equal :mixed, @object.mixed_attr
   end
 
+  test "yields the instance to the block" do
+    assert_equal "1", @object.with(public_attr: "1", &:public_attr)
+  end
+
   test "basic immediates don't respond to #with" do
     assert_not_respond_to nil, :with
     assert_not_respond_to true, :with