whatsa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af060bbf71de26b4ead13edd883d9000ddf4b4a
-  data.tar.gz: 99867e5ed581e21a914b9de22b68f9b6f89683f4
+  metadata.gz: 7ac4a4382455cb767f687b48ee577cfbea776f34
+  data.tar.gz: ee220697878ad879a70bac12da3eb7dd84f54a2c
 SHA512:
-  metadata.gz: 86cead7f90f162db69e272da8b9effba956c7e73d07e95e98835348a19a61e104164cc899b1868a9f40c39f14f53a9b036fc5fca18fc45ace9c54965699de769
-  data.tar.gz: f1d404aafd2c7468b72362d322e9afcf7c8c8d0f15455f2bdc9e770276ac071a25483a73c3ff45742cd074c1d06fd095e085914201f0ccf0c63cfa9949b292b8
+  metadata.gz: 02c69d6cc696b0e5d8b185de1b0634a335bf154660ed6d31790b03a4e891b5fe8cc3e9959743581c570d1a8206856f6c220348b921d08b5334586126ee12989f
+  data.tar.gz: 372691d81e21c453a06c37c5cc6365641cdc3922f3375c2e908cabda78d215e7a85afa9fe369877f903cbba13c79e5847a12accac1e4f09db7ac7a333febf2c4

data/README.md

@@ -8,7 +8,7 @@ Whatsa is a CLI app that allows you to search a word or phrase and receive a qui
 
 ### How does it do that?
 
-It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (usually a surprisingly decent summary).
+It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (often a surprisingly decent summary).
 
 If you're not super satisfied with that bit of information (and you need to know a little more) you can type `more` to get a better picture of that subject. If you're _still_ not satisfied, and you want to know something _specific_ about the thing you've searched, type `other`, and it will list the categories of information Wikipedia knows about the subject (its "History", "Early Life", "Uses", etc.). You can select one of those sections, if you'd like, and it will give you the first paragraph of that section, too (which you can extend similarly with another `more` command). You can make a new query with `new`, ask for help at any time with `help`, or exit the application with `exit`.
 
@@ -18,7 +18,7 @@ Simple!
 
 ### No, but like, _how_ does it do that?
 
-You can find a little more information in a blog post I made [here](http://cogsandcurves.com/2016/11/28/so_you_made_a_cli_data_gem_eh/)!
+You can find a little more information in a [blog post I made](http://cogsandcurves.com/2016/11/28/so_you_made_a_cli_data_gem_eh/)!
 
 ## Installing Whatsa
 

data/lib/whatsa/cli.rb

@@ -1,7 +1,12 @@
 class Whatsa::CLI
 
-  def welcome
+  def clear_screen
+    50.times { puts "\n" }
     system('clear')
+  end
+
+  def welcome
+    clear_screen
     puts "Whatsa is a quick-and-dirty lookup utility, powered by Wikipedia!"
     puts "-----------------------------------------------------------------"
   end
@@ -39,14 +44,15 @@ class Whatsa::CLI
     input
   end
 
-  def word_wrap(text)
+  # setting an indent will indent the lines AFTER the first line of a paragraph
+  def word_wrap(text, indent=0)
     count = 0
     words = text.split(/ /)
     words.each_with_index do |word, index|
       count += word.length + 1
       if count > 80
-        words.insert(index, "\n")
-        count = 0
+        words.insert(index, "\n#{' ' * indent}")
+        count = indent
       elsif word.index("\n")
         count = word.length
       end
@@ -56,21 +62,25 @@ class Whatsa::CLI
 
   def display_dmb(dmb)
     raise TypeError unless dmb.is_a?(Whatsa::Disambig)
-    system("clear")
+    clear_screen
     stripped_title = dmb.title.gsub("(disambiguation)", "").strip
-    puts "Hmmm... #{stripped_title} could mean a few different things:\n"
+    puts word_wrap("Hmmm... #{stripped_title} could mean a few different things:\n")
     dmb.descriptions.each_with_index do |kvp, i|
+      num = "#{i + 1}. "
+      item = "#{kvp[0].to_s}"
       desc = kvp[1].empty? ? "" : " - #{kvp[1]}"
-      puts "#{i + 1}. #{kvp[0].to_s}" + desc
+      puts word_wrap(num + item + desc, num.length)
     end
     puts "\nPlease select a choice, either by name or number."
   end
 
   def display_sections(text)
     text = text.article if text.is_a?(Whatsa::Section)
-    system("clear")
-    puts "Here are some specific subjects about '#{text.title}':\n"
-    text.section_titles.each_with_index {|title, i| puts "#{i + 1}. #{title}"}
+    clear_screen
+    puts word_wrap("Here are some specific subjects about '#{text.title}':\n")
+    text.section_titles.each_with_index do |title, i|
+      puts word_wrap("#{i + 1}. #{title}", "#{i + 1}. ".length)
+    end
     puts "\nPlease select a choice, either by name or number."
   end
 
@@ -105,7 +115,7 @@ class Whatsa::CLI
   end
 
   def summarize(text)
-    system("clear")
+    clear_screen
     return full(text) if text.summary == text.full_text
     puts word_wrap(text.summary)
     summary_helpline
@@ -114,7 +124,7 @@ class Whatsa::CLI
   end
 
   def full(text)
-    system("clear")
+    clear_screen
     puts word_wrap(text.full_text)
     full_text_helpline
     gets_command
@@ -148,7 +158,7 @@ class Whatsa::CLI
 
     # 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."
+      print word_wrap("Hmmm... I don't know what '#{input}' means!\nPress 'enter' to try something else.")
       gets
       run
     elsif scraper.disambig?

data/lib/whatsa/disambig.rb

@@ -32,7 +32,7 @@ class Whatsa::Disambig
         all_link = key.match("All pages with titles")
         unless toc_link || dmb_link || all_link
           desc = item.text.split("\n").first.strip
-          memo[key] = desc.gsub(key, "").gsub(/\A[^\w"]/, "").strip
+          memo[key] = desc.gsub(/^#{Regexp.escape(key)}[^\w"]/, "").strip
         end
       end
       memo

data/lib/whatsa/section.rb

@@ -18,7 +18,7 @@ class Whatsa::Section
   private
 
   def remove_citations
-    self.paragraphs.map! { |par| par.gsub(/\[\d+\]/, "") }
+    self.paragraphs.map! { |par| par.gsub(/\[(\d+|citation needed)\]/, "") }
   end
 
 end

data/lib/whatsa/version.rb

@@ -1,3 +1,3 @@
 module Whatsa
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/whatsa.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["kjleitz@gmail.com"]
 
   spec.summary       = %q{What is that? Okay, okay, I don't need a lecture... just gimme the short 'n sweet!}
-  spec.description   = %q{Whatsa is a CLI app that allows you to search a word or phrase and receive a quick summary about that subject. It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (usually a surprisingly decent summary).
+  spec.description   = %q{Whatsa is a CLI app that allows you to search a word or phrase and receive a quick summary about that subject. It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (often a surprisingly decent summary).
 
 If you're not super satisfied with that bit of information (and you need to know a little more) you can type `more` to get a better picture of that subject. If you're _still_ not satisfied, and you want to know something _specific_ about the thing you've searched, type `other`, and it will list the categories of information Wikipedia knows about the subject (its "History", "Early Life", "Uses", etc.). You can select one of those sections, if you'd like, and it will give you the first paragraph of that section, too (which you can extend similarly with another `more` command). You can make a new query with `new`, ask for help at any time with `help`, or exit the application with `exit`.}
   spec.homepage      = "https://github.com/kjleitz/whatsa"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whatsa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Keegan Leitz
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
-  Whatsa is a CLI app that allows you to search a word or phrase and receive a quick summary about that subject. It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (usually a surprisingly decent summary).
+  Whatsa is a CLI app that allows you to search a word or phrase and receive a quick summary about that subject. It searches your query on Wikipedia and finds the page you're most likely looking for. If you've been somewhat vague, or your search term could refer to multiple things, it will ask you to select from a disambiguation of topics. Usually, however, your term will go straight to an article. Whatsa then gives you the first paragraph of that article (often a surprisingly decent summary).
 
   If you're not super satisfied with that bit of information (and you need to know a little more) you can type `more` to get a better picture of that subject. If you're _still_ not satisfied, and you want to know something _specific_ about the thing you've searched, type `other`, and it will list the categories of information Wikipedia knows about the subject (its "History", "Early Life", "Uses", etc.). You can select one of those sections, if you'd like, and it will give you the first paragraph of that section, too (which you can extend similarly with another `more` command). You can make a new query with `new`, ask for help at any time with `help`, or exit the application with `exit`.
 email: