covid_19_updates 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ad7e8b17a3d5c38143a605e8eb00435d36d05fedecc226caef34059fe3a8de5
-  data.tar.gz: 94b65be7797916ca34910ccb711d2d0f203c1e3010b6b786a01a800715ec2c23
+  metadata.gz: 2bc6389206b8ead069229e95ee7e6696336962cdfe3747d6106ffc42370a72ee
+  data.tar.gz: 709fc65b06d47d24d2ce7f1f11482426c29ddaa9d8e8bb7823a142615e5daa38
 SHA512:
-  metadata.gz: 1848ffadea7048b82ce790def43f951e5db4187c8c420d83b4b8980d73436081efe634901282d4ae4420f386cedf86ff6c484d7c54e8553e8870cce10a27c03a
-  data.tar.gz: f42f6cca5388d8c3208989e65e14df85c11a1a413eccfc0c0c1999f8ff088afe73db2d54c77605e93958f8143463ff55ea9fd1cf94be1d2ba0565e11e2a39738
+  metadata.gz: 8f2ccd963f760eb77a18d8e6162ea55656ca27cc5253d252ff8e6c1ce4b2b6979a076ddff48b80a6fc5597d23bd0be2f71cf829473df9d62e3418e83e051ec8a
+  data.tar.gz: 921c4cad272d152cb6ace59d44092eea6a3c4049180d158c9d2dc1ee8fef1e4956e561b1c28421e3ff1799d462c032b427bb9338190b7be280518fdfbf9154cd

data/Gemfile

@@ -5,6 +5,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in covid_19_updates.gemspec
 gemspec
 
-gem 'covid_19_updates'
+# gem 'covid_19_updates'
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    covid_19_updates (0.1.0)
+    covid_19_updates (0.1.1)
       colorize
       nokogiri
       thor (>= 1.0.1)
@@ -39,4 +39,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
     $ gem install covid_19_updates
 
 ## Usage
-When gem has been downloaded, run 'cov list' to start program. All other instructions will be placed on screen for user to respond to. Thank you and be safe out there!
+When gem has been downloaded, run 'cov start' to start program. All other instructions will be placed on screen for user to respond to. Thank you and be safe out there!
 
 
 ## Development

data/lib/covid_19_updates/cli.rb

@@ -4,6 +4,8 @@ require 'thor'
 require 'nokogiri'
 require 'open-uri'
 require 'colorize'
+require_relative 'headlines'
+require_relative 'scraper'
 
 module Covid19Updates
   class CLI < Thor
@@ -13,66 +15,31 @@ module Covid19Updates
 
     desc 'start', 'Prints out greeting and basic commands'
     def start
-      list 
+      list
     end
 
     desc 'start', 'Prints out greeting and basic commands'
     def list
       list_new_networks
-
-      news_net = ask('Enter number assigned to news network')
-
-      case news_net
-      when '1'
-        cnbc_headline
-      when '2'
-        fox_headline
-      when '3'
-        stat_headline
-      else
-        puts 'No news source by that number.'.red.bold
-        puts ""
-        puts ""
-        call
-      end
+      enter_news_network_number
     end
 
     private
 
     def cnbc_headline
-      doc = Nokogiri::HTML(URI.open('https://www.cnbc.com/coronavirus/'))
-
-      items = doc.css('div.Card-titleContainer')
-
-      array = []
-      items.each do |item|
-        array << { title: item.text, link: item.children.attribute('href').value }
-      end
+      array = Headlines.new('https://www.cnbc.com/coronavirus/', 'div.Card-titleContainer').show_headlines
 
-      array.each_with_index do |news, index|
-        puts "#{index.succ}: #{news[:title]}"
-      end
+      puts_headlines(array)
 
-      puts
-      pick = ask('Please pick a number to view an update: ')
-      puts
+      pick
 
-      print Nokogiri::HTML(URI.open((array[pick.to_i - 1][:link]).to_s)).css('div.group').text.gsub('Â', '').light_blue
-      puts
+      Scraper.fetch(array, @pick, 'cnbc')
 
-     continue
+      continue
     end
 
     def fox_headline
-      doc = Nokogiri::HTML(URI.open('https://www.foxnews.com/category/health/infectious-disease/coronavirus'))
-      items = doc.css('header.info-header')
-
-      array = []
-      items.each do |item|
-        if item.at_css('h4.title a')&.text != nil
-          array << { title: item.at_css('h4.title a')&.text, link: item.at_css('h4.title a')&.attribute('href')&.value }
-        end
-      end
+      array = Headlines.new('https://www.foxnews.com/category/health/infectious-disease/coronavirus', 'header.info-header').show_headlines
 
       final = array.map! do |item|
         item unless item[:link].start_with?('https')
@@ -81,72 +48,69 @@ module Covid19Updates
       end
 
       final.each_with_index do |news, index|
-        puts "#{index.succ}: #{news[:title]}"
+        puts "#{index.succ}: #{news[:title]}".red
       end
 
-      puts
-        pick = ask('Please pick a number to view an update: ')
-      puts
+      pick
 
-
-      # n.css('p')[rand(3..(n.css('p').count))].text (n.css('p').count)
-      n = final[pick.to_i - 1][:link].to_s
+      n = final[@pick.to_i - 1][:link].to_s
       node = Nokogiri::HTML(URI.open(n)).css('p')
 
-      print node[rand(3..(node.count-4))].text.light_blue
+      print node[rand(3..(node.count - 2))].text.light_blue
       puts
 
-     continue
+      continue
     end
 
     def stat_headline
-      doc = Nokogiri::HTML(URI.open('https://www.statnews.com/tag/coronavirus/'))
-      items = doc.css('a.post-title-link')
+      array = Headlines.new('https://www.statnews.com/tag/coronavirus/', 'a.topic-block__preview-title').show_headlines
 
-      # binding.irb
-
-      array = []
-      items.each do |item|
-        array << { title: item.text, link: item.attribute('href').value }
-      end
-
-      array.each_with_index do |news, index|
-        puts "#{index.succ}: #{news[:title]}"
-      end
+      puts_headlines(array)
 
-      puts
-      pick = ask('Please pick a number to view an update: ')
-      puts
+      pick
 
-      print Nokogiri::HTML(URI.open((array[pick.to_i - 1][:link]).to_s)).css('a.post-title-link').text.light_blue
-      puts
+      Scraper.fetch(array, @pick, 'stat')
 
       continue
     end
 
     def continue
-      puts ""
-      puts ""
-      message = ask('Would you like to continue reading updates? (y/n)') 
+      puts ''
+      puts ''
+      message = ask('Would you like to continue reading updates? (y/n)')
 
-      if message == "y"
+      if message == 'y'
         call
       else
-        puts "Thank you and be safe out there!".light_blue
+        puts 'Thank you and be safe out there!'.light_blue
       end
     end
 
-
     def call
       greeting = <<~DOC
-
           1. CNBC
           2. FOX NEWS
           3. STAT NEWS
-
         Enter the number of news website you would like to see updates from.\n Please type cov list to see options or exit to leave.
-        DOC
+      DOC
       puts greeting.green.bold
+
+      enter_news_network_number
+    end
+
+    def list_new_networks
+      greeting = <<~DOC
+        Welcome to Covid-19 Updates!
+        View the top headlines from the following sites:
+            1. CNBC
+            2. FOX NEWS
+            3. STAT NEWS
+          Enter the number of news website you would like to see updates from.\nPlease type list to see options or exit to leave.
+      DOC
+      puts greeting.cyan.bold
+    end
+
+    def enter_news_network_number
       news_net = ask('Enter number assigned to news network')
 
       case news_net
@@ -158,25 +122,23 @@ module Covid19Updates
         stat_headline
       else
         puts 'No news source by that number.'.red.bold
-        puts ""
-        puts ""
+        puts ''
+        puts ''
+
         call
       end
     end
 
+    def pick
+      puts
+      @pick = ask('Please pick a number to view an update: ')
+      puts
+    end
 
-    def list_new_networks
-      greeting = <<~DOC
-      Welcome to Covid-19 Updates!
-      View the top headlines from the following sites:
-
-          1. CNBC
-          2. FOX NEWS
-          3. STAT NEWS
-
-        Enter the number of news website you would like to see updates from.\n Please type list to see options or exit to leave.
-      DOC
-      puts greeting.cyan.bold
+    def puts_headlines(array)
+      array.each_with_index do |news, index|
+        puts "#{index.succ}: #{news[:title]}"
+      end
     end
   end
 end

data/lib/covid_19_updates/headlines.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class Headlines
+  attr_reader :url, :css_class
+
+  def initialize(url, css_class)
+    @url = url
+    @css_class = css_class
+  end
+
+  def show_headlines
+    doc = Nokogiri::HTML(URI.open(url))
+    items = doc.css(css_class)
+
+    array = []
+
+    if url.include?('foxnews')
+      items.each do |item|
+        if item.at_css('h4.title a')&.text != nil
+          array << { title: item.at_css('h4.title a')&.text, link: item.at_css('h4.title a')&.attribute('href')&.value }
+        end
+      end
+    else
+      items.each do |item|
+        array << if url.include?('cnbc')
+                   { title: item.text.strip.red, link: item.children.attribute('href').value }
+                 else
+                   { title: item.text.strip.red, link: item.attribute('href').value }
+                 end
+      end
+    end
+
+    array
+  end
+ end

data/lib/covid_19_updates/scraper.rb

@@ -0,0 +1,12 @@
+class Scraper
+  def self.fetch(array, pick, network)
+    case network
+    when 'cnbc'
+      print Nokogiri::HTML(URI.open((array[pick.to_i - 1][:link]).to_s)).css('div.group').text.gsub('Â', '').light_blue
+      puts
+    when 'stat'
+      print Nokogiri::HTML(URI.open((array[pick.to_i - 1][:link]).to_s)).css('a.post-title-link').text.light_blue
+      puts
+    end
+  end
+end

data/lib/covid_19_updates/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Covid19Updates
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: covid_19_updates
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jack Madden
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -78,6 +78,8 @@ files:
 - lib/.DS_Store
 - lib/covid_19_updates.rb
 - lib/covid_19_updates/cli.rb
+- lib/covid_19_updates/headlines.rb
+- lib/covid_19_updates/scraper.rb
 - lib/covid_19_updates/version.rb
 homepage: https://rubygems.org/
 licenses: []
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Find out the latest on the Covd-19 Pandemic.