Change Object#either? to Object#among? -- thanks to @jamesarosen for the suggestion!

8 files changed, 9 insertions, 9 deletions

diff --git a/railties/guides/rails_guides/textile_extensions.rb b/railties/guides/rails_guides/textile_extensions.rb
index f1486a7c10..9beeefb551 100644
--- a/railties/guides/rails_guides/textile_extensions.rb
+++ b/railties/guides/rails_guides/textile_extensions.rb
@@ -5,7 +5,7 @@ module RailsGuides
     def notestuff(body)
       body.gsub!(/^(IMPORTANT|CAUTION|WARNING|NOTE|INFO)[.:](.*)$/) do |m|
         css_class = $1.downcase
-        css_class = 'warning' if css_class.either?('caution', 'important')
+        css_class = 'warning' if css_class.among?('caution', 'important')
 
         result = "<div class='#{css_class}'><p>"
         result << $2.strip
@@ -35,7 +35,7 @@ module RailsGuides
     def code(body)
       body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
         es = ERB::Util.h($2)
-        css_class = $1.either?('erb', 'shell') ? 'html' : $1
+        css_class = $1.among?('erb', 'shell') ? 'html' : $1
         %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>}
       end
     end
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 28dff23890..7108d4157e 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -71,7 +71,7 @@ when '--version', '-v'
   require 'rails/commands/application'
 
 else
-  puts "Error: Command not recognized" unless command.either?('-h', '--help')
+  puts "Error: Command not recognized" unless command.among?('-h', '--help')
   puts <<-EOT
 Usage: rails COMMAND [ARGS]
 
diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
index ecdcccfd8d..e10ec8fd38 100644
--- a/railties/lib/rails/commands/benchmarker.rb
+++ b/railties/lib/rails/commands/benchmarker.rb
@@ -1,6 +1,6 @@
 require 'active_support/core_ext/object/inclusion'
 
-if ARGV.first.either?(nil, "-h", "--help")
+if ARGV.first.among?(nil, "-h", "--help")
   puts "Usage: rails benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..."
   exit 1
 end
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index 829d29dad7..d082ba592c 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/inclusion'
 
 Rails::Generators.configure!
 
-if ARGV.first.either?(nil, "-h", "--help")
+if ARGV.first.among?(nil, "-h", "--help")
   Rails::Generators.help 'destroy'
   exit
 end
diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index bef4c6df14..789e5ebedb 100644
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/inclusion'
 
 Rails::Generators.configure!
 
-if ARGV.first.either?(nil, "-h", "--help")
+if ARGV.first.among?(nil, "-h", "--help")
   Rails::Generators.help 'generate'
   exit
 end
diff --git a/railties/lib/rails/commands/profiler.rb b/railties/lib/rails/commands/profiler.rb
index baa3baaec0..d3195a204e 100644
--- a/railties/lib/rails/commands/profiler.rb
+++ b/railties/lib/rails/commands/profiler.rb
@@ -1,6 +1,6 @@
 require 'active_support/core_ext/object/inclusion'
 
-if ARGV.first.either?(nil, "-h", "--help")
+if ARGV.first.among?(nil, "-h", "--help")
   $stderr.puts "Usage: rails profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]"
   exit(1)
 end
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index e2c19340f4..2b0eaea3a4 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -165,7 +165,7 @@ module Rails
         names.each do |name|
           defaults = if options[:type] == :boolean
             { }
-          elsif default_value_for_option(name, options).either?(true, false)
+          elsif default_value_for_option(name, options).among?(true, false)
             { :banner => "" }
           else
             { :desc => "#{name.to_s.humanize} to be invoked", :banner => "NAME" }
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 8ed3b18872..f85375b2a3 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -45,7 +45,7 @@ module Rails
       end
 
       def reference?
-        self.type.either?(:references, :belongs_to)
+        self.type.among?(:references, :belongs_to)
       end
     end
   end