language_cards 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30c6492cc8237c15ce2dc1d7ff4ecf6d134fd1cf04f0dac4ddcc9b40d9241632
-  data.tar.gz: 71c83da0b18da3593a60cc7662c7bfac4715cdc06475f93ba84a209063a4504a
+  metadata.gz: 68244f488493379dce92d1879109a72e4031bc1a7ccfb0e26a29bc99ba65201e
+  data.tar.gz: 5d2ad35183a3e9cb97d18092d2abf47623b45fdeca0febba8bab22264b141778
 SHA512:
-  metadata.gz: 10dc5db923a7dfde208de9e8c25e517fb3de597ce049fd43f028a920f53777264821726d11c1166b4d49a8c24b3296ac9c48e7afb86a5f7775b3a403044e2051
-  data.tar.gz: 5255775dacd450df114b8839700c01771d7ef61a8d101ee91b635ca19cf3738e2f50b708987891b5786783db102988f25f528ea873243f1e1d78eebfa38d6d29
+  metadata.gz: 53e788b04c2d03bec478647f0fb1dadba2c698c977d1e152b88e27e51f25f507232697a7f3db8476ca6beef97ccca6394b70cbc6480c1f6dba87c82be837312b
+  data.tar.gz: 843d4a4b94f07afd463eff60b5ed61452f6e5bd4e12b424d1496aec7b5dc2ddfb6173a9de16eab46432d6feb1a51d1ac837535f4042d4f3d5537376a1141f452

data/lib/language_cards/comparator.rb

@@ -19,9 +19,9 @@ module LanguageCards
     def mapped_as
       case @mapping.first
       when :k
-        @mapped_as.keys
+        @mapped_as.keys.first
       else
-        @mapped_as.values
+        @mapped_as.values.first
       end
     end
 

data/lib/language_cards/user_interface.rb

@@ -4,26 +4,34 @@ module LanguageCards
   class UserInterface
     def initialize
       @last = nil
+      @mode = [:translate, :typing].cycle
     end
 
     def main_menu(courses:)
       title = I18n.t 'Menu.Title'
+      select = I18n.t 'Menu.Choose'
+      mode = case @mode.peek
+             when :translate then I18n.t('Menu.ModeTranslate')
+             when :typing then I18n.t('Menu.ModeTyping')
+             end
+      mexit = I18n.t 'Menu.Exit'
+
 <<-MAINMENU
 #{'~' * SUBMENUWIDTH}
 #{title}#{('v' + VERSION).rjust(SUBMENUWIDTH - title.length)}
 #{'~' * SUBMENUWIDTH}
-
-Select an option:
+#{select}#{(I18n.t('Menu.GameMode') + mode).rjust(SUBMENUWIDTH - select.length)}
 
 #{ courses.each.with_index.map {|item,index| "#{index + 1}: #{item}\n" }.join.chop }
-#{I18n.t 'Menu.Exit'}
 
+#{mexit}#{("m: " + I18n.t('Menu.ToggleGameMode')).rjust(SUBMENUWIDTH - mexit.length)}
 #{'~' * SUBMENUWIDTH}
 MAINMENU
     end
 
     def score_menu(correct:, incorrect:)
       score = "#{I18n.t 'Game.ScoreMenu.Score'}: #{correct.to_i} #{I18n.t 'Game.ScoreMenu.OutOf'} #{correct.to_i + incorrect.to_i}"
+
 <<-SCOREMENU
 #{'~' * SUBMENUWIDTH}
 #{score + I18n.t('Menu.Exit').rjust(SUBMENUWIDTH - score.length)}
@@ -33,6 +41,7 @@ SCOREMENU
     end
 
     def start(cards)
+      @courses = cards.classes
       clear
 
       CLI.say SPLASH_SCREEN
@@ -41,33 +50,22 @@ SCOREMENU
       begin
         loop do
           clear
-          
-          CLI.say main_menu(courses: cards.classes)
-          value = CLI.ask("").to_i - 1
-          courses = cards.classes
+
+          CLI.say main_menu(courses: courses)
+
+          value = CLI.ask("")
+
+          next @mode.next if value =~ /\Am\z/i
+          value = value.to_i - 1 rescue next
+
+          @last = nil
           if (0..courses.length-1).include? value
-            collection = cards.select_collection(courses[value])
+            collection = cards.select_collection(courses(value))
             begin
               loop do
                 clear
                 CLI.say score_menu(correct: @correct, incorrect: @incorrect)
-                comp_bitz = collection.rand
-                input = CLI.ask("#{I18n.t('Game.TypeThis')} #{collection.mapped_as.first}: #{comp_bitz.display}")
-                if collection.correct? input, comp_bitz
-                  @correct = @correct.to_i + 1
-                  @last = [
-                    I18n.t('Game.Correct'),
-                    "#{input} = #{comp_bitz.display}"
-                  ].join(" ")
-                else
-                  @incorrect = @incorrect.to_i + 1
-                  @last = [
-                    I18n.t('Game.Incorrect'),
-                    "#{input} != #{comp_bitz.display}",
-                    I18n.t('Game.Its'),
-                    "#{comp_bitz.expected}"
-                  ].join(" ")
-                end
+                game_logic(collection)
               end
             rescue SystemExit, Interrupt
             end
@@ -82,6 +80,67 @@ SCOREMENU
     def clear
       printf ::LanguageCards::ESC::CLEAR
     end
+
+    IC=Struct.new(:collection, :mode) do
+      def input
+        @input 
+      end
+
+      def get_input
+        @input ||= CLI.ask("#{I18n.t('Game.TypeThis')} #{collection.mapped_as}: #{display}")
+      end
+
+      def comp_bitz
+        @comp_bitz ||= collection.rand
+      end
+
+      def display
+        comp_bitz.display
+      end
+
+      def expected
+        comp_bitz.expected
+      end
+
+      def correct_msg
+        "#{I18n.t('Game.Correct')} #{input} = #{display}"
+      end
+
+      def incorrect_msg
+        output = "#{I18n.t('Game.Incorrect')} #{input} != #{display}"
+        output << " #{I18n.t('Game.Its')} #{expected}" if mode == :translate
+        output
+      end
+
+      def valid?
+        collection.correct?(input, comp_bitz)
+      end
+    end
+
+    def game_logic(c)
+      ic = IC.new(c, @mode.peek)
+      ic.get_input
+      ic.valid? ? last_was_correct(ic) : last_was_incorrect(ic)
+    end
+
+    def last_was_correct(ic)
+      @correct = @correct.to_i + 1
+      @last = ic.correct_msg
+    end
+
+    def last_was_incorrect(ic)
+      @incorrect = @incorrect.to_i + 1
+      @last = ic.incorrect_msg
+    end
+
+    def courses(value = nil)
+      courses = @courses.select {|c| detect_course_mode(c) == @mode.peek }
+      value ? courses[value] : courses
+    end
+
+    def detect_course_mode str
+      str.split(JOIN).last.split(" => ").inject(:==) ? :typing : :translate
+    end
   end
 end
 

data/lib/language_cards/version.rb

@@ -1,3 +1,3 @@
 module LanguageCards
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/locales/en.yml

@@ -1,7 +1,11 @@
 en:
   Menu:
     Title: Language Cards by @6ftdan
-    Choose: Choose your flash cards.
+    Choose: Select an option
+    GameMode: "GAME MODE: "
+    ToggleGameMode: Change Mode
+    ModeTranslate: Translate
+    ModeTyping: Typing
     Exit: Press CTRL-C to quit.
   Game:
     TypeThis: Type the following in

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: language_cards
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel P. Clark