whatsa 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1993b2561b3445bf9b58411f7febd1f450f61a0b
-  data.tar.gz: 213a0acf46b568f07db9d8b05990870212584bcb
+  metadata.gz: 8113d3fcfece3bbf0348d753aa9c374fb4cceb5c
+  data.tar.gz: 268e16d05650463eb399a6d94a49c73ea03a841f
 SHA512:
-  metadata.gz: 0cb9214339408ba6b176ca9910213f6555d2f59f5934ecbc491ac2ff50ebbda735c404114a1c05273eca16d57d4753f6b69c0741826c8e9dd30e3b72293728b2
-  data.tar.gz: 02a43daaf63c4c110e79b3fd8947f74106f4f81832bc660efd600a62ce4eb39cd1fd6b08da07d5a80382e35b326d66fde44e8ac0c9a7dc5f8c2a32a4f1103c89
+  metadata.gz: 2d0b3b4ee5c3a1e72b2126d62256b94e1b599dca3c7113f73939ff3aaa07fcb49a91a9e610977ae4355b4b7503aa4a44d397dccf2f1eecfb910b10eac9a5a833
+  data.tar.gz: 982fc16934278e8f2eacb70943e1f1b2f226c3e1c2fed6cbc2f0946784e31618cce7d6c1c7bb2f233dec5bfc645ec12cfbc0012009e2c5e772ff4b460f18834e

data/lib/whatsa/cli.rb

@@ -24,10 +24,8 @@ class Whatsa::CLI
     input = nil
     loop do
       print "> "
-      input = gets.strip
+      input = gets.strip.downcase
       case input
-      when ""
-        puts "Please enter a valid input."
       when "exit"
         exit
       when "help"
@@ -94,19 +92,25 @@ class Whatsa::CLI
     choice = nil
     loop do
       choice = gets_command
-      in_choices = disambig.choices.detect { |c| c.downcase == choice.downcase }
+      in_choices = disambig.choices.detect { |c| c.downcase == choice }
       break if in_choices || choice.to_i > 0
     end
     disambig.choose_article(choice)
   end
 
+  def get_sec_choice(article)
+    display_sections(article)
+    choice = gets_command
+    article.choose_section(choice)
+  end
+
   def summarize(text)
     system("clear")
     return full(text) if text.summary == text.full_text
     puts word_wrap(text.summary)
     summary_helpline
     input = gets_command
-    input.downcase == "more" ? full(text) : input
+    input == "more" ? full(text) : input
   end
 
   def full(text)
@@ -116,39 +120,53 @@ class Whatsa::CLI
     gets_command
   end
 
-  def categories(article)
-    display_sections(article)
-    choice = gets_command
-    section = article.choose_section(choice)
-    summarize(section)
-  end
-
   def run
+    # This is the main method for running the CLI.
+    # It consists of three main parts:
+    # Part one - decorative - Welcome the user, give instructions for use
+    # Part two - initialize - Get a query from the user and try to make an
+    #                         article out of whatever comes back (results page,
+    #                         disambiguation page, or article)
+    # Part three - article  - We've gotten to an article, display it to the user
+    #                         and loop as long as they wish to select different
+    #                         sections
+
+
+    ##########
+    # PART ONE
+
     welcome
     instructions
 
-    loop do
-      # get a search term
-      input = ask
-      scraper = Whatsa::Scraper.new(input)
-
-      # get an article from the search, or restart the loop if it can't be found
-      if scraper.not_found?
-        puts "Hmmm... I don't know what '#{input}' means! Try something else."
-        next
-      elsif scraper.disambig?
-        article = get_dmb_choice(scraper.make_disambig)
-      else
-        article = scraper.make_article
-      end
 
-      # summarize that article
-      input = summarize(article)
+    ##########
+    # PART TWO
+
+    # get a search term
+    input = ask
+    scraper = Whatsa::Scraper.new(input)
 
-      # the only valid input here that would go uncaught is "other", so
-      # keep asking until you get a caught input (logic determined by
-      # #gets_command, e.g. "help", "exit", "new") or "other"
-      loop { input = input.downcase == "other" ? categories(article) : gets_command }
+    # get an article from the search, or restart the loop if it can't be found
+    if scraper.not_found?
+      print "Hmmm... I don't know what '#{input}' means!\nPress 'enter' to try something else."
+      gets
+      run
+    elsif scraper.disambig?
+      article = get_dmb_choice(scraper.make_disambig)
+    else
+      article = scraper.make_article
     end
+
+
+    ############
+    # PART THREE
+
+    # summarize that article
+    input = summarize(article)
+
+    # the only valid input here that would go uncaught is "other", so
+    # keep asking until you get a caught input (logic determined by
+    # #gets_command, e.g. "help", "exit", "new") or "other"
+    loop { input = input == "other" ? summarize(get_sec_choice(article)) : gets_command }
   end
 end

data/lib/whatsa/version.rb

@@ -1,3 +1,3 @@
 module Whatsa
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whatsa
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Keegan Leitz