Proudly Merge pull request #243 from The Biggest Mobprogramming Session Ever Ana06/mobprogramming

 Add new capital_letter option to menu index

3 files changed, 22 insertions, 7 deletions

diff --git a/examples/menus.rb b/examples/menus.rb
index 64e20e6..855f6b7 100644
--- a/examples/menus.rb
+++ b/examples/menus.rb
@@ -33,7 +33,7 @@ end
 
 say("\nThis is letter indexing...")
 choose do |menu|
-  menu.index        = :letter
+  menu.index        = :letter # Use :capital_letter for uppercase
   menu.index_suffix = ") "
 
   menu.prompt = "Please choose your favorite programming language?  "
diff --git a/lib/highline/menu.rb b/lib/highline/menu.rb
index 8029b49..2ae1ad3 100755
--- a/lib/highline/menu.rb
+++ b/lib/highline/menu.rb
@@ -374,9 +374,10 @@ class HighLine
     end
 
     def map_items_by_index
-      if @index == :letter
-        l_index = "`"
-        all_items.map { l_index.succ!.dup }
+      if [:letter, :capital_letter].include?(@index)
+        # @ and ` are the previous ASCII characters to A and a respectively
+        prev_char = (@index == :capital_letter ? '@' : '`')
+        all_items.map { prev_char.succ!.dup }
       else
         (1..all_items.size).map(&:to_s)
       end
@@ -436,7 +437,7 @@ class HighLine
 
       # 97 is the "a" letter at ascii table
       # Ex: For "a" it will return 0, and for "c" it will return 2
-      index = selection.ord - 97
+      index = selection.downcase.ord - 97
       items[index]
     end
 
@@ -517,8 +518,9 @@ class HighLine
       case @index
       when :number
         ["#{ix + 1}#{@index_suffix}", text]
-      when :letter
-        ["#{('a'.ord + ix).chr}#{@index_suffix}", text]
+      when :letter, :capital_letter
+        first_letter = (@index == :capital_letter ? 'A' : 'a')
+        ["#{(first_letter.ord + ix).chr}#{@index_suffix}", text]
       when :none
         [text, ""]
       else
diff --git a/test/test_menu.rb b/test/test_menu.rb
index 6278c7c..2a8cbaf 100755
--- a/test/test_menu.rb
+++ b/test/test_menu.rb
@@ -539,6 +539,19 @@ class TestMenu < Minitest::Test
     assert_equal(:load, selected)
   end
 
+  def test_select_by_capital_letter
+    @input << "B\n"
+    @input.rewind
+
+    selected = @terminal.choose do |menu|
+      menu.index = :capital_letter
+      menu.choice   :save
+      menu.choice   :load
+      menu.choice   :quit
+    end
+    assert_equal(:load, selected)
+  end
+
   def test_shell
     @input << "save --some-option my_file.txt\n"
     @input.rewind