kovid 0.6.4 → 0.6.9

data/lib/kovid/cache.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'typhoeus'
-
 module Kovid
   class Cache
     def initialize

data/lib/kovid/cli.rb

@@ -9,20 +9,26 @@ module Kovid
       true
     end
 
-    desc 'province PROVINCE or province "PROVINCE NAME"', 'Returns reported data on provided province. eg "kovid check "new brunswick".'
+    desc 'province PROVINCE or province "PROVINCE NAME"',
+         'Returns reported data on provided province. ' \
+         'eg "kovid check "new brunswick".'
     method_option :full, aliases: '-p'
     def province(name)
       puts Kovid.province(name)
       data_source
     end
 
-    desc 'provinces PROVINCE PROVINCE', 'Returns full comparison table for the given provinces. Accepts multiple provinces.'
+    desc 'provinces PROVINCE PROVINCE',
+         'Returns full comparison table for the given provinces. ' \
+         'Accepts multiple provinces.'
     def provinces(*names)
       puts Kovid.provinces(names)
       data_source
     end
 
-    desc 'check COUNTRY or check "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid check "hong kong".'
+    desc 'check COUNTRY or check "COUNTRY NAME"',
+         'Returns reported data on provided country. ' \
+         'eg: "kovid check "hong kong".'
     method_option :full, aliases: '-f'
     def check(*name)
       if name.size == 1
@@ -48,18 +54,18 @@ module Kovid
       data_source
     end
 
-    desc 'states STATE STATE', 'Returns full comparison table for the given states. Accepts multiple states.'
+    desc 'states STATE STATE or states --all',
+         'Returns full comparison table for the given states. ' \
+         'Accepts multiple states.'
+    method_option :all, aliases: '-a'
     def states(*states)
-      downcased_states = states.map(&:downcase)
-
-      puts Kovid.states(downcased_states)
-      data_source
-    end
+      if options[:all]
+        puts Kovid.all_us_states
+      else
+        downcased_states = states.map(&:downcase)
+        puts Kovid.states(downcased_states)
+      end
 
-    desc 'states -a', 'Returns full comparison table for all US states'
-    method_option :all, aliases: '-a'
-    def states
-      puts Kovid.all_us_states
       data_source
     end
 
@@ -69,12 +75,15 @@ module Kovid
       data_source
     end
 
-    desc 'history COUNTRY or history COUNTRY N', 'Return history of incidents of COUNTRY (in the last N days)'
-    def history(*params)
-      if params.size == 2
-        puts Kovid.history(params.first, params.last)
+    desc 'history COUNTRY or history COUNTRY N or' \
+         'history STATE --usa',
+         'Return history of incidents of COUNTRY|STATE (in the last N days)'
+    option :usa, :type => :boolean
+    def history(location, days=30)
+      if options[:usa]
+        puts Kovid.history_us_state(location, days)
       else
-        puts Kovid.history(params.first, nil)
+        puts Kovid.history(location, days)
       end
       data_source
     end
@@ -138,8 +147,8 @@ module Kovid
       source = <<~TEXT
         #{Time.now}
         Sources:
-         * JHU CSSE GISand Data
-         * https://www.worldometers.info/coronavirus/
+         * Johns Hopkins University
+         * https://www.worldometers.info/coronavirus
       TEXT
       puts source
     end

data/lib/kovid/constants.rb

@@ -23,6 +23,12 @@ module Kovid
       'Recovered'.paint_green
     ].freeze
 
+    DATE_CASES_DEATHS = [
+      'Date'.paint_white,
+      'Cases'.paint_white,
+      'Deaths'.paint_red
+    ].freeze
+
     CONTINENTAL_AGGREGATE_HEADINGS = [
       'Cases'.paint_white,
       'Cases Today'.paint_white,
@@ -63,6 +69,20 @@ module Kovid
       'Cases/Million'.paint_white
     ].freeze
 
+    FULL_PROVINCE_TABLE_HEADINGS = [
+      'Confirmed'.paint_white,
+      'Deaths'.paint_red,
+      'Recovered'.paint_green
+    ].freeze
+
+    FULL_STATE_TABLE_HEADINGS = [
+      'Cases'.paint_white,
+      'Cases Today'.paint_white,
+      'Deaths'.paint_red,
+      'Deaths Today'.paint_red,
+      'Active'.paint_yellow
+    ].freeze
+
     COMPARE_STATES_HEADINGS = [
       'State'.paint_white,
       'Cases'.paint_white,
@@ -79,7 +99,19 @@ module Kovid
       'Recovered'.paint_green
     ].freeze
 
-    FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
+    FOOTER_LINE_THREE_COLUMNS = [
+      '------------',
+      '------------',
+      '------------'
+    ].freeze
+
+    FOOTER_LINE_FOUR_COLUMNS = [
+      '------------',
+      '------------',
+      '------------',
+      '------------'
+    ].freeze
+
     COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
     RIGHT_ALIGN_COLUMNS = {

data/lib/kovid/helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'terminal-table'
+
 module Kovid
   module_function
 
@@ -14,4 +15,25 @@ module Kovid
     date_to_parse = Date.strptime(date, '%m/%d/%y').to_s
     Date.parse(date_to_parse).strftime('%d %b, %y')
   end
+
+  def comma_delimit(number)
+    number.to_s.chars.to_a.reverse.each_slice(3).map(&:join).join(',').reverse
+  end
+
+  # Insert + sign to format positive numbers
+  def add_plus_sign(num)
+    num.to_i.positive? ? "+#{comma_delimit(num)}" : comma_delimit(num).to_s
+  end
+
+  def format_country_history_numbers(load)
+    load['timeline'].values.map(&:values).transpose.each do |data|
+      data.map! { |number| Kovid.comma_delimit(number) }
+    end
+  end
+
+  def lookup_us_state(state)
+    us = Carmen::Country.coded('USA')
+    lookup = us.subregions.coded(state) || us.subregions.named(state)
+    lookup ? lookup.name : state
+  end
 end

data/lib/kovid/historians.rb

@@ -3,25 +3,15 @@
 module Kovid
   module Historians
     include Constants
+    include AsciiCharts
 
-    def history(country, last)
-      # Write checks for when country is spelt wrong.
-      headings = DATE_CASES_DEATHS_RECOVERED
+    def history(location, days)
       rows = []
 
-      stats = if last
-                transpose(country).last(last.to_i)
-              else
-                transpose(country)
-              end
+      stats = Kovid.format_country_history_numbers(location).last(days.to_i)
+      dates = location['timeline']['cases'].keys.last(days.to_i)
 
-      dates = if last
-                country['timeline']['cases'].keys.last(last.to_i)
-              else
-                country['timeline']['cases'].keys
-              end
-
-      unless last
+      if days.to_i >= 30
         stats = stats.reject { |stat| stat[0].to_i.zero? && stat[1].to_i.zero? }
         dates = dates.last(stats.count)
       end
@@ -32,14 +22,25 @@ module Kovid
         rows << row
       end
 
+      # Title and Column format if Country or US State
+      if location['country']
+        title      = location['country'].try(:upcase)
+        col_format = DATE_CASES_DEATHS_RECOVERED
+        footer     = FOOTER_LINE_FOUR_COLUMNS
+      else
+        title      = location['state'].try(:upcase)
+        col_format = DATE_CASES_DEATHS
+        footer     = FOOTER_LINE_THREE_COLUMNS
+      end
+
       if stats.size > 10
-        rows << FOOTER_LINE
-        rows << DATE_CASES_DEATHS_RECOVERED
+        rows << footer
+        rows << col_format
       end
 
       Terminal::Table.new(
-        title: country['country'].upcase,
-        headings: headings,
+        title: title,
+        headings: col_format,
         rows: rows
       )
     end
@@ -53,8 +54,9 @@ module Kovid
       end
 
       # From dates where number of !cases.zero?
-      positive_cases_figures = country['timeline']['cases'].values.reject(&:zero?)
-      dates = country['timeline']['cases'].reject { |_k, v| v.zero? }.keys
+      country_cases = country['timeline']['cases']
+      positive_cases_figures = country_cases.values.reject(&:zero?)
+      dates = country_cases.reject { |_k, v| v.zero? }.keys
       data = []
 
       # TODO: Refactor
@@ -88,12 +90,16 @@ module Kovid
         dates.each_with_index do |val, index|
           data << [val, positive_cases_figures[index]]
         end
-        y_range = AsciiCharts::Cartesian.new(data, bar: true, hide_zero: true).y_range
+        y_range = Kovid::AsciiCharts::Cartesian.new(
+          data, bar: true, hide_zero: true
+        ).y_range
 
         last_two_y = y_range.last 2
         y_interval = last_two_y.last - last_two_y.first
 
-        scale("Scale on Y: #{y_interval}:#{(y_interval / last_two_y.last.to_f * positive_cases_figures.last).round(2) / y_interval}")
+        scale("Scale on Y: #{y_interval}:#{(
+          y_interval / last_two_y.last.to_f * positive_cases_figures.last
+        ).round(2) / y_interval}")
 
         puts 'Experimental feature, please report issues.'
 

data/lib/kovid/painter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rainbow'
-
 class String
   def paint_white
     Rainbow(self).white.bg(:black).bold

data/lib/kovid/request.rb

@@ -1,30 +1,35 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'carmen'
 require_relative 'tablelize'
 require_relative 'cache'
 require_relative 'uri_builder'
 
 module Kovid
   class Request
-    COUNTRIES_PATH = UriBuilder.new('/countries').url
-    STATES_URL = UriBuilder.new('/states').url
-    JHUCSSE_URL = UriBuilder.new('/v2/jhucsse').url
+    COUNTRIES_PATH    = UriBuilder.new('/v2/countries').url
+    STATES_URL        = UriBuilder.new('/v2/states').url
+    JHUCSSE_URL       = UriBuilder.new('/v2/jhucsse').url
+    HISTORICAL_URL    = UriBuilder.new('/v2/historical').url
+    HISTORICAL_US_URL = UriBuilder.new('/v2/historical/usacounties').url
 
     SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
     EU_ISOS = %w[AT BE BG CY CZ DE DK EE ES FI FR GR HR HU IE IT LT \
                  LU LV MT NL PL PT RO SE SI SK].freeze
-    EUROPE_ISOS = EU_ISOS + %w[GB IS NO CH MC AD SM VA BA RS ME MK AL\
-                               BY UA RU MD]
+    EUROPE_ISOS = EU_ISOS + %w[GB IS NO CH MC AD SM VA BA RS ME MK AL \
+                               BY UA RU MD].freeze
     AFRICA_ISOS = %w[DZ AO BJ BW BF BI CM CV CF TD KM CD CG CI DJ EG \
-                     GQ ER SZ ET GA GM GH GN GW KE LS LR LY MG MW ML MR MU MA MZ NA NE \
-                     NG RW ST SN SC SL SO ZA SS SD TZ TG TN UG ZM ZW EH].freeze
-    SOUTH_AMERICA_ISOS = ['AR' 'BO', 'BV', 'BR', 'CL', 'CO', 'EC', \
-                          'FK', 'GF', 'GY', 'PY', 'PE', 'GS', 'SR', 'UY', 'VE'].freeze
+                     GQ ER SZ ET GA GM GH GN GW KE LS LR LY MG MW ML \
+                     MR MU MA MZ NA NE NG RW ST SN SC SL SO ZA SS SD \
+                     TZ TG TN UG ZM ZW EH].freeze
+    SOUTH_AMERICA_ISOS = %w[AR BO BV BR CL CO EC FK GF GY PY PE GS SR \
+                            UY VE].freeze
     ASIA_ISOS = %w[AE AF AM AZ BD BH BN BT CC CN CX GE HK ID IL IN \
-                   IQ IR JO JP KG KH KP KR KW KZ LA LB LK MM MN MO MY NP OM PH PK \
-                   PS QA SA SG SY TH TJ TL TM TR TW UZ VN YE].freeze
+                   IQ IR JO JP KG KH KP KR KW KZ LA LB LK MM MN MO \
+                   MY NP OM PH PK PS QA SA SG SY TH TJ TL TM TR TW \
+                   UZ VN YE].freeze
 
     class << self
       def eu_aggregate
@@ -107,7 +112,7 @@ module Kovid
       end
 
       def state(state)
-        response = fetch_state(state)
+        response = fetch_state(Kovid.lookup_us_state(state))
         if response.nil?
           not_found(state)
         else
@@ -119,7 +124,6 @@ module Kovid
 
       def states(states)
         compared_states = fetch_compared_states(states)
-
         Kovid::Tablelize.compare_us_states(compared_states)
       rescue JSON::ParserError
         puts SERVER_DOWN
@@ -147,25 +151,73 @@ module Kovid
       end
 
       def cases
-        response = JSON.parse(Typhoeus.get(UriBuilder.new('/all').url, cache_ttl: 900).response_body)
+        response = JSON.parse(
+          Typhoeus.get(UriBuilder.new('/v2/all').url, cache_ttl: 900).response_body
+        )
 
         Kovid::Tablelize.cases(response)
       rescue JSON::ParserError
         puts SERVER_DOWN
       end
 
-      def history(country, last)
+      def history(country, days)
         history_path = UriBuilder.new('/v2/historical').url
-        response = JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
 
-        Kovid::Tablelize.history(response, last)
+        response = JSON.parse(
+          Typhoeus.get(
+            history_path + "/#{country}", cache_ttl: 900
+          ).response_body
+        )
+
+        if response.key?('message')
+          not_found(country) do |c|
+            "Could not find cases for #{c}.\nIf searching United States, add --usa option" 
+          end
+        else
+          Kovid::Tablelize.history(response, days)
+        end
       rescue JSON::ParserError
         puts SERVER_DOWN
       end
 
+      def history_us_state(state, days)
+        history_path = UriBuilder.new('/v2/historical/usacounties').url
+        state        = Kovid.lookup_us_state(state).downcase()
+
+        response = JSON.parse(
+          Typhoeus.get(
+            history_path + "/#{state}", cache_ttl: 900
+          ).response_body
+        )
+
+        if response.respond_to?(:key?) and response.key?('message')
+          return not_found(state)
+        end
+
+        # API Endpoint returns list of counties for given state, so
+        # we aggreage cases for all counties
+        # Note: no data for 'Recovered'
+        cases  = usacounties_aggregator(response, 'cases')
+        deaths = usacounties_aggregator(response, 'deaths')
+
+        # normalize data so we can call Kovid::Tablelize.history on US State data
+        response = {
+          "state"    => state,
+          "timeline" => { "cases" => cases, "deaths" => deaths }
+        }
+
+        Kovid::Tablelize.history(response, days)
+      rescue JSON::ParserError
+          puts SERVER_DOWN
+      end
+
       def histogram(country, date)
         history_path = UriBuilder.new('/v2/historical').url
-        response = JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
+        response = JSON.parse(
+          Typhoeus.get(
+            history_path + "/#{country}", cache_ttl: 900
+          ).response_body
+        )
 
         Kovid::Tablelize.histogram(response, date)
       end
@@ -176,21 +228,35 @@ module Kovid
 
       private
 
-      def not_found(country)
-        rows = [["Wrong spelling/No reported cases on #{country.upcase}."]]
-        Terminal::Table.new title: "You checked: #{country.upcase}", rows: rows
+      def not_found(location)
+        rows = []
+        default_warning = "Wrong spelling/No reported cases on #{location.upcase}."
+
+        if block_given?
+          rows << [ yield(location) ]
+        else
+          rows << [ default_warning ]
+        end
+
+        Terminal::Table.new title: "You checked: #{location.upcase}", rows: rows
       end
 
       def fetch_countries(list)
         list.map do |country|
-          JSON.parse(Typhoeus.get(COUNTRIES_PATH + "/#{country}", cache_ttl: 900).response_body)
+          JSON.parse(
+            Typhoeus.get(
+              COUNTRIES_PATH + "/#{country}", cache_ttl: 900
+            ).response_body
+          )
         end.sort_by { |json| -json['cases'] }
       end
 
       def fetch_compared_states(submitted_states)
-        state_data = fetch_state_data
+        submitted_states.map! { |s| Kovid.lookup_us_state(s) }
 
-        state_data.select { |state| submitted_states.include?(state['state'].downcase) }
+        fetch_state_data.select do |state|
+          submitted_states.include?(state['state'])
+        end
       end
 
       def fetch_state_data
@@ -198,6 +264,8 @@ module Kovid
       end
 
       def fetch_country(country_name)
+        # TODO: Match ISOs to full country names
+        country_name = 'nl' if country_name == 'netherlands'
         country_url = COUNTRIES_PATH + "/#{country_name}"
 
         JSON.parse(Typhoeus.get(country_url, cache_ttl: 900).response_body)
@@ -209,7 +277,9 @@ module Kovid
 
       def fetch_province(province)
         response = fetch_jhucsse
-        response.select { |datum| datum['province'] == capitalize_words(province) }.first
+        response.select do |datum|
+          datum['province'] == capitalize_words(province)
+        end.first
       end
 
       def fetch_provinces(provinces)
@@ -219,19 +289,35 @@ module Kovid
       end
 
       def fetch_state(state)
-        states_array = JSON.parse(Typhoeus.get(STATES_URL, cache_ttl: 900).response_body)
+        states_array = JSON.parse(
+          Typhoeus.get(STATES_URL, cache_ttl: 900).response_body
+        )
 
-        states_array.select { |state_name| state_name['state'] == capitalize_words(state) }.first
+        states_array.select do |state_name|
+          state_name['state'] == capitalize_words(state)
+        end.first
       end
 
       def aggregator(isos, meth)
-        countries_array = JSON.parse(Typhoeus.get(UriBuilder.new('/countries').url, cache_ttl: 900).response_body)
-
+        countries_array = JSON.parse(countries_request)
         country_array = countries_array.select do |hash|
           isos.include?(hash['countryInfo']['iso2'])
         end
+        data = countries_aggregator(country_array)
+
+        meth === data
+      rescue JSON::ParserError
+        puts SERVER_DOWN
+      end
 
-        data = country_array.inject do |base, other|
+      def countries_request
+        Typhoeus.get(
+          UriBuilder.new('/v2/countries').url, cache_ttl: 900
+        ).response_body
+      end
+
+      def countries_aggregator(country_array)
+        country_array.inject do |base, other|
           base.merge(other) do |key, left, right|
             left  ||= 0
             right ||= 0
@@ -239,10 +325,16 @@ module Kovid
             left + right unless %w[country countryInfo].include?(key)
           end
         end.compact
+      end
 
-        meth === data
-      rescue JSON::ParserError
-        puts SERVER_DOWN
+      def usacounties_aggregator(data, key=nil)
+        data.inject({}) do |base,other|
+          base.merge(other['timeline'][key]) do |k,l,r|
+            l ||= 0
+            l ||= 0
+            l + r
+          end
+        end.compact
       end
     end
   end