top-headlines 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c88668ec85c6c26dff66038f0f954c04eb10bfa
-  data.tar.gz: 0cd78d10749f7bf9d911a43be3f234461a5a0869
+  metadata.gz: 19cfb1ab3fbb5072c0a8cf152e586320e54503f2
+  data.tar.gz: ae26dc172f3c7f1be00eac01fa8f3655fe8a3246
 SHA512:
-  metadata.gz: 87138d600b6568d5534924a0a33ab2733dea4d425f89eb9c83dd933c5c0ba7a93b86a3d048cd68b018e31529113a285f2d8a341accb95ceff30288af66595432
-  data.tar.gz: 7749ecadb7de1f85a57eb0a31be441ed9f4170012410f37b8bfb7c4eabf3b659591761c0a167759a56707e558ef1cc86e7b17cceb9d7e6d0261112ae267e85a7
+  metadata.gz: 9ebad380cbe2c270e1ab0deecd65b2acaa3981b97bde7df59f52bc4c17c6c252b267356d57f7ad2c34bf1cc1e9db88f108dedd5c29e1fcfe4975ac48a349f779
+  data.tar.gz: 66ddef15c291fa00fd5b1a5c59f1c59c9769bffd3a2873c90e481b2d6de392284baa2804b7ec3b9971ecd03b742d99073b198f75a2f4444b8f91254f547f3a74

data/README.md

@@ -1,6 +1,6 @@
 # TopHeadlines
 
-This gem allows users to view the top headlines from major news sources. Users can open the headlines in the browser directly from the command line. Functionality includes: AP, BBC, Bloomberg, CNN, The Daily Beast, FiveThirtyEight, Forbes, Fox News, The Guardian, Huffington Post, MSNBC, New York Times, Politico, Wall Street Journal, Washington Post, and Yahoo.
+This gem allows users to view the top headlines from major news sources. Users can open the headlines in the browser directly from the command line. Functionality includes: AP, BBC, Bloomberg, CNN, Daily Beast, FiveThirtyEight, Forbes, Fox News, Guardian, Huffington Post, MSNBC, New York Times, Politico, Wall Street Journal, Washington Post, and Yahoo News.
 
 ## Installation
 

data/lib/top-headlines/cli.rb

@@ -13,6 +13,11 @@ class TopHeadlines::CLI
     @input = nil
     while @input != "EXIT" && @num != "EXIT"
       @input = gets.strip.upcase 
+      menu_if_statement
+    end
+  end
+
+  def menu_if_statement
       if @input == "ALL"
         list_all_headlines_banner
         list_all_headlines
@@ -24,7 +29,7 @@ class TopHeadlines::CLI
         news_sources
         puts request_input_full_menu
         print "YOUR SELECTION: "
-      elsif TopHeadlines::Source.all.keys.include?(@input)
+      elsif source_includes?(@input)
         list_headlines_from_source
         open_headline_in_browser
       elsif @input != "EXIT"
@@ -32,7 +37,6 @@ class TopHeadlines::CLI
       else
         nil
       end
-    end
   end
 
   def welcome_banner
@@ -69,6 +73,10 @@ class TopHeadlines::CLI
     "Select a source, type 'sources' to view sources, type 'all' to view all headlines, or type 'exit' to exit."
   end
 
+  def source_includes?(input)
+    TopHeadlines::Source.all.keys.include?(input)
+  end
+
   def news_sources_banner
     puts "\n"
     puts "NEWS SOURCES"
@@ -84,10 +92,25 @@ class TopHeadlines::CLI
   end
 
   def open_headline_in_browser
-    puts "Select headline number to open the full article in the browser."
-    print "YOUR SELECTION: "
+    puts "Select headline number to open the full article in the browser. \n\nAlternatively, #{request_input_full_menu.downcase}"
+    print "\nYOUR SELECTION: "
     @num = gets.strip.upcase
-      while @num.to_i.between?(1,5)
+      while @num.to_i.between?(1,5) && !num_included_in_menu_if_statements
+        # if @input == "ALL"
+        #   @input == TopHeadlines::Source.all.keys[@num/3]
+        #   headline = TopHeadlines::Source.scrape_headlines(@input)[@num.to_i-1]
+        #   puts "=> Opening..."
+
+        #   sleep(2)
+        #   url = TopHeadlines::Source.scrape_urls(@input)[@num.to_i-1]
+        #   system("open", url)
+
+        #   sleep(1)
+        #   puts "\nSelect another headline number to open full article in the browser."
+        #   print "YOUR SELECTION: "
+        #   @num = gets.strip.upcase
+        #   @input = @num if @num == "EXIT"
+        # else
           headline = TopHeadlines::Source.scrape_headlines(@input)[@num.to_i-1]
           puts "\n=> You selected the #{@num.to_i.ordinalize} headline: '#{headline}'."
           puts "=> Opening..."
@@ -97,12 +120,19 @@ class TopHeadlines::CLI
           system("open", url)
 
           sleep(1)
-          puts "\nSelect another headline number to open full article in the browser."
-          print "YOUR SELECTION: "
+          puts "\nSelect another headline number to open full article in the browser. \n\nAlternatively, #{request_input_full_menu.downcase}"
+          print "\nYOUR SELECTION: "
           @num = gets.strip.upcase
-          @input = @num if @num == "EXIT"
+          @input = @num if num_included_in_menu_if_statements
+        # end
       end
-    invalid_entry unless @input == "EXIT"
+    invalid_entry unless num_included_in_menu_if_statements
+    @input = @num if num_included_in_menu_if_statements
+    menu_if_statement
+  end
+
+  def num_included_in_menu_if_statements
+    @num == "EXIT" || @num == "ALL" || @num == "SOURCES" || source_includes?(@num)
   end
 
   def invalid_entry

data/lib/top-headlines/source.rb

@@ -147,7 +147,7 @@ class TopHeadlines::Source
     child_selector = source[:child_selector]
     
     doc = Nokogiri::HTML(open(page_url))
-    page_url = page_url[0...-5] if page_url[-4...-1]+page_url[-1] == "news" ### BBC CORNER CASE
+    page_url = page_url[0...-5] if page_url[-4...-1]+page_url[-1] == "news" ### EDGE CASES (BBC & YAHOO)
     urls = doc.css(urls_selector).children.css(child_selector).map {|url| url.attribute('href').value[0] == 'h' ? url.attribute('href').value : page_url + url.attribute('href').value}
   end
 end

data/lib/top-headlines/version.rb

@@ -1,3 +1,3 @@
 module TopHeadlines
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/top-headlines.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["zachnewburgh"]
   spec.email         = ["zach.newburgh@gmail.com"]
 
-  spec.summary       = %q{This gem allows users to view the top headlines from major news sources. Users can open the headlines in the browser directly from the command line for articles from AP, BBC, Bloomberg, CNN, The Daily Beast, FiveThirtyEight, Forbes, Fox News, The Guardian, Huffington Post, MSNBC, New York Times, Politico, Wall Street Journal, Washington Post, and Yahoo.}
+  spec.summary       = %q{This gem allows users to view the top headlines from major news sources. Users can open the headlines in the browser directly from the command line for articles from AP, BBC, Bloomberg, CNN, Daily Beast, FiveThirtyEight, Forbes, Fox News, Guardian, Huffington Post, MSNBC, New York Times, Politico, Wall Street Journal, Washington Post, and Yahoo News.}
   spec.homepage      = "https://github.com/zachnewburgh/top-headlines-cli-gem"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: top-headlines
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - zachnewburgh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,8 +103,6 @@ files:
 - lib/top-headlines/cli.rb
 - lib/top-headlines/source.rb
 - lib/top-headlines/version.rb
-- top-headlines-0.1.0.gem
-- top-headlines-0.1.1.gem
 - top-headlines.gemspec
 homepage: https://github.com/zachnewburgh/top-headlines-cli-gem
 licenses:
@@ -132,7 +130,7 @@ signing_key:
 specification_version: 4
 summary: This gem allows users to view the top headlines from major news sources.
   Users can open the headlines in the browser directly from the command line for articles
-  from AP, BBC, Bloomberg, CNN, The Daily Beast, FiveThirtyEight, Forbes, Fox News,
-  The Guardian, Huffington Post, MSNBC, New York Times, Politico, Wall Street Journal,
-  Washington Post, and Yahoo.
+  from AP, BBC, Bloomberg, CNN, Daily Beast, FiveThirtyEight, Forbes, Fox News, Guardian,
+  Huffington Post, MSNBC, New York Times, Politico, Wall Street Journal, Washington
+  Post, and Yahoo News.
 test_files: []