discrete_math 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e45a8cdaf4ad82e1927449206cbaa1679adf0ae
-  data.tar.gz: 6c05cbdf8143aadd7c09f916828b096a6c04b700
+  metadata.gz: 95fe313a20fd00b1257ce3ee13d19acb786c0729
+  data.tar.gz: d4b6b3c748543c6d863bf3130259116098929180
 SHA512:
-  metadata.gz: 015a9691585883f86bd8ba7451e5501834307b7d25068adb5091619e288041f7de8902b824f4a774810759297482904356a737e662da55bef945301a59e85d7c
-  data.tar.gz: b5d4018501b49a64e6c947fc239d5101cb8613430563fdde40b87888484a9288cb5012af473928967a8588453db62b3e438302255de7c78cefa4f75f1b43e50d
+  metadata.gz: 82917bee86d8614a0ac09bc2478e4ef6fdfe1c3e19fd2103ecd59dbfa57b15bef4f0999276bd7efd68c0340969779a0100388592929caa2cf2720c8481b489c0
+  data.tar.gz: fff013ad3ed58a972f44dded130a03fc76ef15cf30f611d57e63dd90617f6c3dc0d9c10ecd84da79d50876f89a301ece2de67e5360da75575df679defb924465

data/lib/discrete_math.rb

@@ -1,53 +1,7 @@
-require_relative './modules/discrete_math_topics'
+require_relative './modules/menus/menu'
 
 module DiscreteMath
-  module Power
-    include DiscreteMathTopics::PreliminaryMath # AbsoluteValuesDemo
-    include DiscreteMathTopics::PreliminaryMath::AbsoluteValuesDemo::LocationConfig # @@location_coordinates
-
-    def self.get_distance
-      location_first = AbsoluteValuesDemo::Location.new(@@location_coordinates[:sydney])
-      location_second = AbsoluteValuesDemo::Location.new(@@location_coordinates[:melbourne])
-      route_first = AbsoluteValuesDemo::Route.new(location_first, location_second)
-    end
-  end
-
-  module Menu
-    include DiscreteMathTopics::PreliminaryMath::AbsoluteValuesDemo::LocationConfig # @@location_coordinates
-
-    USER_OPTIONS = {
-      "1": :demo_power_of
-    }
-
-    def self.request_user_choice_demo
-      user_choice = ""
-      while not USER_OPTIONS.keys.include? user_choice.to_i
-        # system('clear')
-        if user_choice == "invalid"
-          puts "== Invalid option chosen. Try again ==\n"
-        end
-        puts """
-        Select demo number to run or 'q' to quit:\n
-        1) Demo power of
-        """
-        user_choice = gets.chomp
-        if user_choice == "1"
-          puts "Calculating distance from Sydney to Melbourne..."
-          route_first = DiscreteMath::Power.get_distance
-          Menu.show_result(route_first.distance)
-          break
-        elsif user_choice == "q"
-          break
-        else
-          user_choice = "invalid"
-        end
-      end
-    end
-
-    def self.show_result(result)
-      puts "=====> Demo Power Of result is: #{result}"
-    end
-  end
+  include Menu
 
   def self.run(arg)
     ARGV << '--help' if ARGV.empty? and not arg
@@ -65,9 +19,11 @@ module DiscreteMath
       puts "Gem Developer Contributor Usage: Try running 'rake discrete:run[d]' or 'ruby bin/discrete d'"
     # i.e. require 'discrete_math'; DiscreteMath.run("d")
     when "d", "default"
-      DiscreteMath::Menu.request_user_choice_demo
+      Menu.show_choices_main_menu
     else
-      DiscreteMath::Menu.request_user_choice_demo
+      Menu.show_choices_main_menu
     end
   end
 end
+
+DiscreteMath.run("d")

data/lib/helpers/menus/menu_helpers.rb

@@ -0,0 +1,46 @@
+require 'terminal-table'
+require_relative '../../modules/menus/menu'
+require_relative '../../modules/menus/submenu_help'
+require_relative '../../modules/menus/submenu_demo'
+
+module MenuHelpers
+  # Reference: https://github.com/scarsam/crypto_market/blob/master/lib/crypto_market.rb
+  def self.terminal_table(headings = [], *rows, &block)
+    Terminal::Table.new :headings => headings.to_a, :rows => rows, &block
+  end
+
+  def self.clear
+    system('clear')
+  end
+
+  def self.validate_input_for_menu_kind(menu_kind)
+    MenuHelpers.clear
+    puts "== Invalid option chosen. Try again ==\n"
+    Menu.show_main_menu
+    case menu_kind
+      when "main"
+        Menu.show_main_menu
+      when "sub_help"
+        SubmenuHelp.show_sub_menu
+      when "sub_demo"
+        SubmenuDemo.show_sub_menu
+    end
+  end
+
+  def self.show_menu_for_menu_kind(menu_kind)
+    case menu_kind
+      when "main"
+        Menu.show_main_menu
+      when "sub_help"
+        SubmenuHelp.show_sub_menu
+      when "sub_demo"
+        SubmenuDemo.show_sub_menu
+    end
+  end
+
+  def self.request_input_continue_for_menu(menu_kind)
+    puts "\nPress any key to continue..."
+    gets.chomp
+    MenuHelpers.show_menu_for_menu_kind(menu_kind)
+  end
+end

data/lib/modules/menus/menu.rb

@@ -0,0 +1,54 @@
+require_relative '../../helpers/menus/menu_helpers'
+require_relative './submenu_help'
+require_relative './submenu_demo'
+
+module Menu
+  EXIT_MAIN_MENU_OPTIONS = ["3"]
+
+  def self.show_greeting
+    puts "Welcome to Discrete Math Demo\nEnter a number to navigate"
+  end
+
+  def self.exit
+    puts "\nThank you for trying Discrete Math Demo"
+    Kernel.exit(false)
+  end
+
+  def self.request_input_for_menu(menu_kind)
+    MenuHelpers.clear
+    MenuHelpers.show_menu_for_menu_kind(menu_kind)
+    puts 'Enter a number: '
+  end
+
+  def self.show_main_menu
+    table = MenuHelpers.terminal_table do |t|
+      t.title = Menu.show_greeting
+      t.add_row [1, 'Demos']
+      t.add_row [2, 'Help']
+      t.add_row [3, 'Exit']
+      t.style = { all_separators: true }
+    end
+    puts table
+    puts ''
+  end
+
+  def self.show_choices_main_menu
+    Menu.request_input_for_menu("main")
+
+    user_input = ""
+    while not EXIT_MAIN_MENU_OPTIONS.include? user_input
+      user_input = gets.chomp
+      case user_input
+        when "1"
+          SubmenuDemo.show_choices_sub_menu
+        when "2"
+          SubmenuHelp.show_choices_sub_menu
+        when "3"
+          Menu.exit
+        else
+          MenuHelpers.validate_input_for_menu_kind("main")
+          Menu.show_choices_main_menu
+      end
+    end
+  end
+end

data/lib/modules/menus/submenu_demo.rb

@@ -0,0 +1,40 @@
+require_relative '../../helpers/menus/menu_helpers'
+require_relative './menu'
+require_relative '../topics/discrete_math_topics'
+
+module SubmenuDemo
+  include DiscreteMathTopics::PreliminaryMath
+
+  EXIT_SUB_MENU_OPTIONS = ["2"]
+
+  def self.show_sub_menu
+    table = MenuHelpers.terminal_table do |t|
+      t.title = 'Select a number'
+      t.add_row [1, 'Demo Power']
+      t.add_row [2, 'Return to main menu']
+      t.style = { all_separators: true }
+    end
+    puts table
+    puts ''
+  end
+
+  def self.show_choices_sub_menu
+    Menu.request_input_for_menu("sub_demo")
+
+    user_input = ""
+    while not EXIT_SUB_MENU_OPTIONS.include? user_input
+      user_input = gets.chomp
+      case user_input
+        when "1"
+          AbsoluteValuesDemo::Calculate.run
+          MenuHelpers.request_input_continue_for_menu("sub_demo")
+          SubmenuDemo.show_choices_sub_menu
+        when "2"
+          Menu.show_choices_main_menu
+        else
+          MenuHelpers.validate_input_for_menu_kind("sub_demo")
+          SubmenuDemo.show_choices_sub_menu
+      end
+    end
+  end
+end

data/lib/modules/menus/submenu_help.rb

@@ -0,0 +1,37 @@
+require_relative '../../helpers/menus/menu_helpers'
+require_relative './menu'
+
+module SubmenuHelp
+  EXIT_SUB_MENU_OPTIONS = ["2"]
+
+  def self.show_sub_menu
+    table = MenuHelpers.terminal_table do |t|
+      t.title = 'Select a number'
+      t.add_row [1, 'Symbols']
+      t.add_row [2, 'Return to main menu']
+      t.style = { all_separators: true }
+    end
+    puts table
+    puts ''
+  end
+
+  def self.show_choices_sub_menu
+    Menu.request_input_for_menu("sub_help")
+
+    user_input = ""
+    while not EXIT_SUB_MENU_OPTIONS.include? user_input
+      user_input = gets.chomp
+      case user_input
+        when "1"
+          puts "Sub-set - ⊆"
+          MenuHelpers.request_input_continue_for_menu("sub_help")
+          SubmenuHelp.show_choices_sub_menu
+        when "2"
+          Menu.show_choices_main_menu
+        else
+          MenuHelpers.validate_input_for_menu_kind("sub_help")
+          SubmenuHelp.show_choices_sub_menu
+      end
+    end
+  end
+end

data/lib/modules/{discrete_math_topics.rb → topics/discrete_math_topics.rb}

@@ -1,4 +1,4 @@
-require_relative '../helpers/math/math_helpers'
+require_relative '../../helpers/math/math_helpers'
 
 # DiscreteMath::Preliminary
 module DiscreteMathTopics
@@ -13,6 +13,26 @@ module DiscreteMathTopics
         }
       end
 
+      module Calculate
+        include LocationConfig # @@location_coordinates
+
+        def self.run
+          Calculate.get_distance
+        end
+
+        def self.get_distance
+          puts "\nCalculating distance from Sydney to Melbourne..."
+          location_first = Location.new(@@location_coordinates[:sydney])
+          location_second = Location.new(@@location_coordinates[:melbourne])
+          route_first = Route.new(location_first, location_second)
+          Calculate.show_result(route_first.distance)
+        end
+
+        def self.show_result(result)
+          puts "=====> Result: #{result}\n"
+        end
+      end
+
       class Location
         attr_accessor :coordinates
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discrete_math
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Luke Schoen
@@ -31,7 +31,7 @@ cert_chain:
   RUP9VQvKiqnZW3xf19PNWEFF3GFRr27wNxjtGyYdsI3+NM9N83clEfP900gORild
   pwru5JMBqMBVtqGxaVPl+1Vi/i4QZ71P
   -----END CERTIFICATE-----
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies: []
 description: A discrete math gem
 email: ltfschoen@gmail.com
@@ -43,7 +43,11 @@ files:
 - bin/discrete
 - lib/discrete_math.rb
 - lib/helpers/math/math_helpers.rb
-- lib/modules/discrete_math_topics.rb
+- lib/helpers/menus/menu_helpers.rb
+- lib/modules/menus/menu.rb
+- lib/modules/menus/submenu_demo.rb
+- lib/modules/menus/submenu_help.rb
+- lib/modules/topics/discrete_math_topics.rb
 homepage: https://github.com/ltfschoen/discrete_math
 licenses:
 - MIT