Skip to content
Browse files

Revert "Object#in? also accepts multiple parameters"

This reverts commit ebf69ab.

`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
  • Loading branch information...
1 parent 7ead1d8 commit d7da403dde3a037a014741420bb7c6e7c7521a48 @BMorearty BMorearty committed May 1, 2013
View
28 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
View
10 activesupport/test/core_ext/object/inclusion_test.rb
@@ -2,16 +2,6 @@
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])

0 comments on commit d7da403

Please sign in to comment.
Something went wrong with that request. Please try again.