top-headlines 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19cfb1ab3fbb5072c0a8cf152e586320e54503f2
-  data.tar.gz: ae26dc172f3c7f1be00eac01fa8f3655fe8a3246
+  metadata.gz: 69a64c2e0e854732484489a18aa7216dc5624a38
+  data.tar.gz: d45aef0a56a7ca1419d04419bf3951268e2305f1
 SHA512:
-  metadata.gz: 9ebad380cbe2c270e1ab0deecd65b2acaa3981b97bde7df59f52bc4c17c6c252b267356d57f7ad2c34bf1cc1e9db88f108dedd5c29e1fcfe4975ac48a349f779
-  data.tar.gz: 66ddef15c291fa00fd5b1a5c59f1c59c9769bffd3a2873c90e481b2d6de392284baa2804b7ec3b9971ecd03b742d99073b198f75a2f4444b8f91254f547f3a74
+  metadata.gz: 65307c1c2b1f22140ee7fb7736a6b5fcdde3025749198f351d83f1433d8fbe8ddf33123eb9fc0827b3825a76e07526db7d0a04dd3edd665929097018a7d5296c
+  data.tar.gz: 854da69febe17708f6bde650e4e3f5e6bbf0d18db8bb4c48e8f7b0f56623d2e663120f68b9030fe14bfc3129ae78a81dcd930901684c3334d779a778a3a1213c

data/lib/top-headlines/cli.rb

@@ -21,9 +21,7 @@ class TopHeadlines::CLI
       if @input == "ALL"
         list_all_headlines_banner
         list_all_headlines
-        # open_headline_in_browser
-        puts request_input_full_menu
-        print "YOUR SELECTION: "
+        all_headlines_open_in_browser
       elsif @input == "SOURCES"
         news_sources_banner
         news_sources
@@ -31,7 +29,7 @@ class TopHeadlines::CLI
         print "YOUR SELECTION: "
       elsif source_includes?(@input)
         list_headlines_from_source
-        open_headline_in_browser
+        headlines_from_source_open_in_browser
       elsif @input != "EXIT"
         invalid_entry
       else
@@ -91,46 +89,57 @@ class TopHeadlines::CLI
     puts "\n"
   end
 
-  def open_headline_in_browser
+  def all_headlines_open_in_browser
+    puts "Select source and headline number to open the full article in the browser. \n(e.g. 'cnn 3') \n\nAlternatively, #{request_input_full_menu.downcase}"
+    print "\nYOUR SELECTION: "
+    @num = gets.strip.upcase
+
+    while @num[-1].to_i.between?(1,5) && !num_included_in_menu_if_statements
+      source = @num[0...-1].strip.upcase
+      headline = @num.strip[-1].to_i
+
+      open_url(source, headline)
+
+      sleep(1)
+      puts "\nSelect another source and headline number to open full article in the browser. \n\nAlternatively, #{request_input_full_menu.downcase}"
+      print "\nYOUR SELECTION: "
+      @num = gets.strip.upcase
+    end
+
+    num_included_in_menu_if_statements ? @input = @num : invalid_entry
+    menu_if_statement
+  end
+
+  def headlines_from_source_open_in_browser
     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) && !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..."
-
-          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. \n\nAlternatively, #{request_input_full_menu.downcase}"
-          print "\nYOUR SELECTION: "
-          @num = gets.strip.upcase
-          @input = @num if num_included_in_menu_if_statements
-        # end
-      end
-    invalid_entry unless num_included_in_menu_if_statements
-    @input = @num if num_included_in_menu_if_statements
+
+    while @num.to_i.between?(1,5) && !num_included_in_menu_if_statements
+      open_url(@input, @num)
+      
+      sleep(1)
+      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_included_in_menu_if_statements
+    end
+      
+    num_included_in_menu_if_statements ? @input = @num : invalid_entry
     menu_if_statement
   end
 
+  def open_url(source, number)
+    headline = TopHeadlines::Source.scrape_headlines(source)[number.to_i-1]
+    puts "\n=> You selected the #{number.to_i.ordinalize} headline: '#{headline}'."
+    puts "=> Opening..."
+
+    sleep(2)
+    url = TopHeadlines::Source.scrape_urls(source)[number.to_i-1]
+    url != nil ? system("open", url) : invalid_entry
+  end
+
   def num_included_in_menu_if_statements
     @num == "EXIT" || @num == "ALL" || @num == "SOURCES" || source_includes?(@num)
   end

data/lib/top-headlines/source.rb

@@ -122,10 +122,9 @@ class TopHeadlines::Source
   end
 
   def self.list_all_headlines
-    article_sum = 0  
     SOURCES.keys.sort.each do |source|
       puts "*** #{source} ***"
-      scrape_headlines(source)[0,5].each {|headline| puts "#{article_sum+1}. #{headline}"; article_sum += 1}
+      scrape_headlines(source)[0,5].each_with_index {|headline, index| puts "#{index+1}. #{headline}"}
       puts "\n"
     end
   end

data/lib/top-headlines/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: top-headlines
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - zachnewburgh