language_cards 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63589a48bd2f0c2326af779dcf874f2ccef9f1a7
-  data.tar.gz: 5cc7ad11580b6c00b5419479d140f04dd9ad9e46
+  metadata.gz: f22e96585dc1b1e68ac22cdf4c2f3a4952e0c89b
+  data.tar.gz: ae89a8be6614e9707d4ac400bd1a87535718ae63
 SHA512:
-  metadata.gz: ecad707c3a93bca4f1185838436ee397d7118dc86d876d4ba539dc46c3074c1891c8a3442944c2f91d8eaa675120369b5f32896f6faaa73964acd4ffed258f86
-  data.tar.gz: c847ce04ab37c5f9a5888288aa0526c845c7d8b76683bc9312ca54c53e5214fd8bef451e75ae3c2c5ca14806dfa7e013e990fae0fcb567a4ace0cf33e04b2468
+  metadata.gz: 8ff61fd64bf7e765c593e642799d2a869a47f40cc620fb3b71d27af34f722cbdc548b4861f24cf7b74c5cb7942c2fe374c2600f0a20a62c6f8cf47b17e9019b4
+  data.tar.gz: 8170a20139eeb403cb5b99b361e0edffb0a64e39788e90100a5f30f55fa6e709c08ed33dde30626e444a63e3b35d6541105acc7138d6ee243b229540197b42ee

data/lib/language_cards/controllers/game.rb

@@ -0,0 +1,66 @@
+module LanguageCards
+  module Controllers
+    module Game
+      class << self
+        include Helpers::ViewHelper
+        include Helpers::GameHelper
+
+        def render(correct:, incorrect:, title:, timer:, last:)
+          _score = t('Game.ScoreMenu.Score') + ": %0.2d%" % calc_score(correct, incorrect)
+          _timer = [((t('Timer.Timer') + ": " + timer.ha) if timer.time?), nil, timer.h]
+          _mexit = t 'Menu.Exit'
+
+          view = ERB.new(IO.read(File.expand_path('../view/game.erb', __dir__)))
+          view.result(binding)
+        end
+
+        def process(card_collection, mode)
+          ic = struct_data.new(card_collection, mode.peek)
+          ic.get_input
+          {
+            correct: ic.valid?,
+            last: ic.valid? ? ic.correct_msg : ic.incorrect_msg
+          }
+        end
+
+        def struct_data
+          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
+        end
+      end
+    end
+  end
+end

data/lib/language_cards/controllers/main_menu.rb

@@ -0,0 +1,23 @@
+module LanguageCards
+  module Controllers
+    module MainMenu
+      class << self
+        include Helpers::ViewHelper
+
+        def render(courses:, mode:)
+          _title = t 'Menu.Title'
+          _select = t 'Menu.Choose'
+          _mode = case mode.peek
+                  when :translate then t 'Menu.ModeTranslate'
+                  when :typing then t 'Menu.ModeTyping'
+                  end
+          _courses = courses.each.with_index.map {|item,index| "#{index + 1}: #{item}" }
+          _mexit = t 'Menu.Exit'
+
+          view = ERB.new(IO.read(File.expand_path('../view/main_menu.erb', __dir__)))
+          view.result(binding)
+        end
+      end
+    end
+  end
+end

data/lib/language_cards/helpers/game_helper.rb

@@ -0,0 +1,9 @@
+module LanguageCards
+  module Helpers
+    module GameHelper
+      def calc_score c, i # correct, incorrect
+        (0.001+c.to_i)*100.0/(c.to_i+i.to_i+0.001)*1.0
+      end
+    end
+  end
+end

data/lib/language_cards/helpers/view_helper.rb

@@ -0,0 +1,24 @@
+module LanguageCards
+  module Helpers
+    module ViewHelper
+      def divider
+        '~' * SUBMENUWIDTH
+      end
+
+      def t str
+        I18n.t str
+      end
+
+      def draw left=nil, center=nil, right=nil
+        width = SUBMENUWIDTH
+        str = left.to_s
+        str = str + center.to_s.rjust(width/2 - str.length + center.to_s.length/2)
+        str + right.to_s.rjust(width - str.length)
+      end
+
+      def clear
+        printf ::LanguageCards::ESC::CLEAR
+      end
+    end
+  end
+end

data/lib/language_cards/language_cards.rb

@@ -24,11 +24,12 @@ module LanguageCards
         end
 
       end
+      # Recursive Builder
       @CARDS = CardCollection.new @CARDS
     end
 
     def start
-      UserInterface.new.start(@CARDS)
+      UserInterface.new(@CARDS).start
     end
   end
 end

data/lib/language_cards/user_interface.rb

@@ -1,55 +1,21 @@
 require_relative 'timer'
+require_relative 'helpers/view_helper'
+require_relative 'helpers/game_helper'
+require_relative 'controllers/main_menu'
+require_relative 'controllers/game'
+require 'erb'
 
 module LanguageCards
   class UserInterface
-    def initialize
-      @last = nil
+    include Helpers::ViewHelper
+    include Controllers
+    def initialize cards
+      @cards = cards
+      @courses = cards.classes
       @mode = [:translate, :typing].cycle
-      @title = ""
-    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}#{(I18n.t('Menu.GameMode') + mode).rjust(SUBMENUWIDTH - select.length)}
-
-#{ courses.each.with_index.map {|item,index| "#{index + 1}: #{item}\n" }.join.chop }
-
-#{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}"
-      timer = @timer.time? ? (I18n.t('Timer.Timer') + ": " + @timer.ha) : ""
-      timer = timer + @timer.h.rjust(SUBMENUWIDTH - timer.length)
-      title = @title.to_s
-<<-SCOREMENU
-#{'~' * SUBMENUWIDTH}
-#{title.rjust(SUBMENUWIDTH/2+title.length/2)}
-#{'~' * SUBMENUWIDTH}
-#{timer}
-#{'~' * SUBMENUWIDTH}
-#{score + I18n.t('Menu.Exit').rjust(SUBMENUWIDTH - score.length)}
-
-#{@last}
-#{'~' * SUBMENUWIDTH}
-SCOREMENU
     end
 
-    def start(cards)
-      @courses = cards.classes
+    def start
       clear
 
       CLI.say SPLASH_SCREEN
@@ -59,24 +25,29 @@ SCOREMENU
         loop do
           clear
 
-          CLI.say main_menu(courses: courses)
+          CLI.say MainMenu.render courses: courses, mode: mode
 
           value = CLI.ask("")
 
-          next @mode.next if value =~ /\Am\z/i
+          next mode.next if value =~ /\Am\z/i
           value = value.to_i - 1 rescue next
 
-          @last = nil
+          last = nil
           if (0..courses.length-1).include? value
             collection = cards.select_collection(courses(value))
-            @title = collection.name
-            @timer = Timer.new
+            timer = Timer.new
             begin
               loop do
                 clear
-                @timer.mark
-                CLI.say score_menu(correct: @correct, incorrect: @incorrect)
-                game_logic(collection)
+                timer.mark
+                CLI.say Game.render correct: @correct,
+                                    incorrect: @incorrect,
+                                    title: collection.name,
+                                    timer: timer,
+                                    last: last
+                result = Game.process(collection, mode)
+                result[:correct] ? correct : incorrect
+                last = result[:last]
               end
             rescue SystemExit, Interrupt
             end
@@ -88,64 +59,17 @@ SCOREMENU
     end
 
     private
-    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)
+    attr_reader :mode, :cards
+    def correct
       @correct = @correct.to_i + 1
-      @last = ic.correct_msg
     end
 
-    def last_was_incorrect(ic)
+    def incorrect
       @incorrect = @incorrect.to_i + 1
-      @last = ic.incorrect_msg
     end
 
     def courses(value = nil)
-      courses = @courses.select {|c| detect_course_mode(c) == @mode.peek }
+      courses = @courses.select {|c| detect_course_mode(c) == mode.peek }
       value ? courses[value] : courses
     end
 

data/lib/language_cards/version.rb

@@ -1,3 +1,3 @@
 module LanguageCards
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/language_cards/view/game.erb

@@ -0,0 +1,9 @@
+<%= divider %>
+<%= draw nil, title %>
+<%= divider %>
+<%= draw(*_timer) %>
+<%= divider %>
+<%= draw (if correct || incorrect then _score end), nil, _mexit %>
+
+<%= last %>
+<%= divider %>

data/lib/language_cards/view/main_menu.erb

@@ -0,0 +1,9 @@
+<%= divider %>
+<%= draw(_title, nil, 'v' + VERSION) %>
+<%= divider %>
+<%= draw(_select, nil, I18n.t('Menu.GameMode') + _mode) %>
+<% _courses.each do |course| %>
+  <%= course.chomp %><% end %>
+
+<%= draw(_mexit, nil, ("m: " + I18n.t('Menu.ToggleGameMode'))) %>
+<%= divider %>

data/locales/en.yml

@@ -14,7 +14,6 @@ en:
     Its: it's
     ScoreMenu:
       Score: Your score is
-      OutOf: out of
   Timer:
     Timer: Timer
     AverageSeconds: second average

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: language_cards
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel P. Clark
@@ -106,11 +106,17 @@ files:
 - lib/language_cards/card_collection.rb
 - lib/language_cards/comp_bitz.rb
 - lib/language_cards/comparator.rb
+- lib/language_cards/controllers/game.rb
+- lib/language_cards/controllers/main_menu.rb
+- lib/language_cards/helpers/game_helper.rb
+- lib/language_cards/helpers/view_helper.rb
 - lib/language_cards/language_cards.rb
 - lib/language_cards/mappings.rb
 - lib/language_cards/timer.rb
 - lib/language_cards/user_interface.rb
 - lib/language_cards/version.rb
+- lib/language_cards/view/game.erb
+- lib/language_cards/view/main_menu.erb
 - locales/en.yml
 homepage: http://github.com/danielpclark/language_cards
 licenses: