Revert "Object#in? also accepts multiple parameters"

This reverts commit ebf69ab1636df74c76332c53bcd3d8494fb91b45.

`in?` must not take multiple parameters because its behavior would be
ambiguous:

    # Test if "B" is included in a list of names with `"B".in?(*names)`:
    names = ["BMorearty"]
    "B".in?(*names)   # => true

    names = ["BMorearty","rubyduo"]
    "B".in?(*names)   # => false

Conflicts:
	activesupport/lib/active_support/core_ext/object/inclusion.rb
	activesupport/test/core_ext/object/inclusion_test.rb

2 files changed, 9 insertions, 29 deletions

diff --git a/activesupport/lib/active_support/core_ext/object/inclusion.rb b/activesupport/lib/active_support/core_ext/object/inclusion.rb
index 3fec465ec0..b5671f66d0 100644
--- a/activesupport/lib/active_support/core_ext/object/inclusion.rb
+++ b/activesupport/lib/active_support/core_ext/object/inclusion.rb
@@ -1,25 +1,15 @@
 class Object
-  # Returns true if this object is included in the argument(s). Argument must be
-  # any object which responds to +#include?+ or optionally, multiple arguments can be passed in. Usage:
+  # Returns true if this object is included in the argument. Argument must be
+  # any object which responds to +#include?+. Usage:
   #
-  #   characters = ['Konata', 'Kagami', 'Tsukasa']
-  #   'Konata'.in?(characters) # => true
+  #   characters = ["Konata", "Kagami", "Tsukasa"]
+  #   "Konata".in?(characters) # => true
   #
-  #   character = 'Konata'
-  #   character.in?('Konata', 'Kagami', 'Tsukasa') # => true
-  #
-  # This will throw an ArgumentError if a single argument is passed in and it doesn't respond
+  # This will throw an ArgumentError if the argument doesn't respond
   # to +#include?+.
-  def in?(*args)
-    if args.length > 1
-      args.include? self
-    else
-      another_object = args.first
-      if another_object.respond_to? :include?
-        another_object.include? self
-      else
-        raise ArgumentError.new 'The single parameter passed to #in? must respond to #include?'
-      end
-    end
+  def in?(another_object)
+    another_object.include?(self)
+  rescue NoMethodError
+    raise ArgumentError.new("The parameter passed to #in? must respond to #include?")
   end
 end
diff --git a/activesupport/test/core_ext/object/inclusion_test.rb b/activesupport/test/core_ext/object/inclusion_test.rb
index 22888333f5..478706eeae 100644
--- a/activesupport/test/core_ext/object/inclusion_test.rb
+++ b/activesupport/test/core_ext/object/inclusion_test.rb
@@ -2,16 +2,6 @@ require 'abstract_unit'
 require 'active_support/core_ext/object/inclusion'
 
 class InTest < ActiveSupport::TestCase
-  def test_in_multiple_args
-    assert :b.in?(:a,:b)
-    assert !:c.in?(:a,:b)
-  end
-  
-  def test_in_multiple_arrays
-    assert [1,2].in?([1,2],[2,3])
-    assert ![1,2].in?([1,3],[2,1])
-  end
-  
   def test_in_array
     assert 1.in?([1,2])
     assert !3.in?([1,2])