From e6d14279b881d8482c124bd55d0830a7ddcbcb0e Mon Sep 17 00:00:00 2001
From: raggi <jftucker@gmail.com>
Date: Wed, 27 Oct 2010 06:10:01 +0800
Subject: Add support for try to just yield the object to a block if no method
 is to be called. Kind of like a tap_if_present.

---
 activesupport/lib/active_support/core_ext/object/try.rb  | 14 +++++++++++++-
 activesupport/test/core_ext/object_and_class_ext_test.rb | 10 ++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb
index 48e9d04787..4d742b9ed2 100644
--- a/activesupport/lib/active_support/core_ext/object/try.rb
+++ b/activesupport/lib/active_support/core_ext/object/try.rb
@@ -8,6 +8,8 @@ class Object
   # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised
   # and +nil+ will be returned instead, if the receiving object is a +nil+ object or NilClass.
   #
+  # If try is called without a method to call, it will yield any given block with the object.
+  #
   # ==== Examples
   #
   # Without try
@@ -21,10 +23,20 @@ class Object
   # +try+ also accepts arguments and/or a block, for the method it is trying
   #   Person.try(:find, 1)
   #   @people.try(:collect) {|p| p.name}
+  #
+  # Without a method argument try will yield to the block unless the reciever is nil.
+  #   @person.try { |p| "#{p.first_name} #{p.last_name}" }
   #--
   # +try+ behaves like +Object#send+, unless called on +NilClass+.
 
-  alias_method :try, :__send__
+  def try(*a, &b)
+    if a.empty? && block_given?
+      yield self
+    else
+      __send__(*a, &b)
+    end
+  end
+
 end
 
 class NilClass #:nodoc:
diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb
index 64f339ed90..398e6ca9b2 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -134,4 +134,14 @@ class ObjectTryTest < Test::Unit::TestCase
   def test_false_try
     assert_equal 'false', false.try(:to_s)
   end
+
+  def test_try_only_block
+    assert_equal @string.reverse, @string.try { |s| s.reverse }
+  end
+
+  def test_try_only_block_nil
+    ran = false
+    nil.try { ran = true }
+    assert_equal false, ran
+  end
 end
-- 
cgit v1.2.3