bored-wikipedia-explorer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d29d190ca0bc1d8ba2b6f92c25e209ec61c673c459e17817db5152867322b5
-  data.tar.gz: 399c7d6412efae78e1c04017783d3e7f80770c33f2a4a342ce28933754c80a35
+  metadata.gz: 61605819cb8c595b91dae3d3b164cb29ad3fc72fcb9e3eb520a60359dbf2dd54
+  data.tar.gz: 8c37ee1fd0b0760f91d4e1f1ec2f0e030de15615bf0e9ed1c9195a3f173ad675
 SHA512:
-  metadata.gz: 0202a827284aef2efce15fdb6945cd5683520aab95a0a37863bd17914283bc0c57a83bc4e0c281eb56db90671c1c9406ec84dd6120a745039b303315dfa248ef
-  data.tar.gz: 8d9f81d3314fe86fe3a41695d45fee0e6f3ba2698e006a0cd9805cebb1ba111fad609bd5029255fafd8bdbe2b506d29e2bf8ebd6b3730a88a8cf875fd63f2066
+  metadata.gz: 6ec9fdabccc9ada10e59afe24a522dfc614aec564b16fb461eedea606d51712ee651e6563bee74d423fb63bdc2d38d78352d4316726c63dd826c941b0c5344a4
+  data.tar.gz: 6ee474808b3b1bb683b276da1655969a4de7dc157f9c2aecda96d6967be896a90fb9e3ec2973246e1e285c4133a516dd52edc97c9ce4acf2eca1379abcbaf6f7

data/bin/run

@@ -1,4 +1,4 @@
-require_relative "../lib/command_line_interface.rb"
+require_relative "../config"
 
 
 CommandLineInterface.run

data/lib/command_line_interface.rb

@@ -1,19 +1,49 @@
-require_relative "../lib/topic.rb"
-require "colorize"
-require "launchy"
-
 class CommandLineInterface
   def self.run
     puts "Welcome to Did-You-Know Wikipedia Edition!"
-    puts "Please select a topic to be given a random Wikipedia Portal to read:"
+    puts "To quit the Wikipedia explorer at anytime type 'exit'."
+    @status = "online"
     generate_topic_list
-    get_inputs #starts cli flow
+    start
+  end
+
+  def self.start
+    puts "Please select a topic to be given a random Wikipedia Portal to read:"
+    while @status == "online"
+      get_inputs #starts cli flow
+    end
+  end
+
+  def self.get_current_input
+    @current_input = gets.strip.upcase
+  end
+
+  def self.quit?(option)
+    if option == "EXIT"
+      @status = "offline"
+      puts "Goodbye explorer."
+    else
+      false
+    end
+  end
+
+  def self.generate_topic_list
+    @list = Scraper.all_topics
+  end
+
+  def self.get_rand_url
+    # binding.pry
+    @randurl = Scraper.scrape_portals_page(@topic.name)
+    @portal = Portal.find_or_create_by_url(@randurl)
+    @selected = Scraper.get_portal_name(@randurl)
+    @portal.name = @selected
+    @portal.topic = @topic
+    @topic.portals << @portal
   end
 
   def self.get_inputs
     display_all_topics         #Displays all available main topics
-    puts "Select a number to explore that topic"
-    get_choice #gets users main topic choice
+    get_topic_choice #gets users main topic choice
     get_rand_url #gets random sub-topic and creates Portal objects
     visit_portal #asks user if they want to visit the randomnly select sub-topic
   end
@@ -26,41 +56,72 @@ class CommandLineInterface
     }
   end
 
-  def self.generate_topic_list
-    @list = []
-    Topic.all_topics_list.each{|item|
-      @list << item
-    }
-  end
 
-  def self.get_choice
-    @choice = @list[gets.strip.to_i - 1]
-    @topic = Topic.find_or_create_by_name(@choice)
-  end
-
-  def self.get_rand_url
-    @randurl = Scraper.scrape_portals_page(@choice)
-    @portal = Portal.find_or_create_by_url(@randurl)
-    @portal.name = Scraper.get_portal_name(@randurl)
-    @portal.topic = @topic
-    @topic.portals << @portal
+  def self.get_topic_choice
+    puts "Select a number (1-12) to explore that topic"
+    get_current_input
+    # binding.pry
+    if !quit?(@current_input)
+      while !@current_input.to_i.between?(1,12)#ask_input != "1"
+        # self.send(__callee__)
+        puts "Invalid input. Please choose a number between 1 and 12."
+        get_topic_choice
+      end
+      @choice = @list[@current_input.to_i - 1]
+      @topic = Topic.find_or_create_by_name(@choice)
+      # binding.pry
+    else
+      quit?(@current_input)
+    end
   end
 
   def self.visit_portal
-    puts "We've selected " + Scraper.get_portal_name(@randurl)
+    puts "We've selected " + @selected
  + " for you within the " + @choice +" topic you selected."
     puts "Would you like to visit this page? (Y/N)"
-    if gets.strip.upcase == "Y"
-      puts @randurl
-      Launchy.open(@randurl)
+    visit_page?
+  end
+
+  def self.visit_page?
+    #checks if user wants to visit the selected portal page
+    get_current_input
+    if !quit?(@current_input)
+      case @current_input
+      when "Y"
+        puts @randurl
+        Launchy.open(@randurl)
+        puts "Do you want to continue exploring? (Y/N)"
+        keep_exploring?
+      when "N"
+        explore_more
+      end
+    end
+  end
+
+  def self.keep_exploring?
+    get_current_input
+    if @current_input == "Y"
+      start
+    elsif @current_input == "N"
+      quit?("EXIT")
     else
-      puts "Either type 'reroll' to choose another page within the " + @choice + " topic you selected. Or select a new topic with 'new'."
-      choice = gets.strip
-      if choice == "reroll"
+      puts "Please enter a valid command (Y/N) to keep exploring."
+      keep_exploring?
+    end
+  end
+
+  def self.explore_more
+    puts "Either type 'reroll' to choose another page within the " + @choice + " topic you selected. Or select a new topic with 'new'."
+    get_current_input
+    if !quit?(@current_input)
+      if @current_input == "REROLL"
         get_rand_url
         visit_portal
-      elsif choice == "new"
+      elsif @current_input == "NEW"
         get_inputs
+      else
+        puts "Invalid input please enter (reroll/new)."
+        explore_more
       end
     end
   end

data/lib/portal.rb

@@ -1,5 +1,3 @@
-require_relative "../lib/scraper.rb"
-
 class Portal
   attr_accessor :url, :topic, :name
   @@all = []
@@ -18,8 +16,7 @@ class Portal
       @portal = Portal.all.detect{|portal| url == portal.url}
     else
       @portal = Portal.new(url)
-      # @@all << @portal
-      return @portal
+      @portal
     end
   end
 end

data/lib/scraper.rb

@@ -1,7 +1,3 @@
-require 'open-uri'
-require 'nokogiri'
-require 'pry'
-
 class Scraper
   @@all_topics = []
 
@@ -15,6 +11,7 @@ class Scraper
       config.noblanks
     end
 
+    puts "***Scraping Portals Page"
     #set portals-container class for all portal links for each topic
     #Thus there are 12 portal links containers but we're skipping the first one
     doc.search("div").each{|anchor|
@@ -27,11 +24,11 @@ class Scraper
     randval = Random.new
     randnum = randval.rand(doc.search(".portals-container")[choice_index].search("a").count{|i| i.attribute("href").value.include?("/wiki/Portal:")})
     randportal = doc.search(".portals-container")[choice_index].search("a")[randnum].attribute("href").value.prepend("https://en.wikipedia.org")
-    return randportal
-
+    randportal
    end
-
+##################################
    #Scrapes all main topics from all portals main page
+   #creates all topic instances
    def self.all_topics
     html = open("https://en.wikipedia.org/wiki/Portal:Contents/Portals")
     doc = Nokogiri::HTML(html) do |config|
@@ -56,15 +53,20 @@ class Scraper
       copy.slice!(-3..-1)
       @@all_topics << copy
     }
-    return @@all_topics
+
+    @@all_topics.each{|item|
+      Topic.new(item)
+    }
+    @@all_topics
    end
 
    def self.get_portal_name(url)
      html = open(url)
+     puts "***Scraping Portal Name"
      doc = Nokogiri::HTML(html) do |config|
        config.noblanks
      end
-     return doc.search("title").text
+     doc.search("title").text
    end
 
 end

data/lib/topic.rb

@@ -1,6 +1,3 @@
-require_relative "../lib/scraper.rb"
-require_relative "../lib/portal.rb"
-
 class Topic
   #has many Portals
   @@all = []
@@ -18,10 +15,6 @@ class Topic
     # return create_portal
   end
 
-  def self.all_topics_list
-    return Scraper.all_topics
-  end
-
   def portals
     @portals
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bored-wikipedia-explorer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Katrina Brinson