kovid 0.6.6 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6abc6282e6ec84a393eee2b5383d70f88643d7633f8bd7537c207dae341ead1b
-  data.tar.gz: a93e83c437e3b1f740fe7471cca72ad2e83c837d0a637c5fe8c71636bdd545dd
+  metadata.gz: 14f3598372d551bf07a3acd856b1eaa965aa6802794d8e7020fd9a234bb14df9
+  data.tar.gz: 5717fd5599aa8b3a6521c2dda5ccbe4e74580df794a0613d30e4bb09071abd9e
 SHA512:
-  metadata.gz: dbc95ba0e85745d9369e15b0e81b6f5d36a7199b1227aaaec56eb57b8aac067750e4e2c71f937a97b333fdf57693547d6f98a09e70d214a5300b5b09cd5eeb25
-  data.tar.gz: a2a458068aefa1f001ad85426ef5eba0317ba23a0320fab970eed818a9009186cc966f757c0a4f1b693a85cf668098ffa477acc3587849ed5864dcfc53a3b5fe
+  metadata.gz: 355d8fcc18cc07dd0e080722aa8d45a034b5da18c0ade97d2b052fb7603f4e2463d98447ea3dc985ec5bfb8682b12b88e7e74c0b26d2a55c99bad2f1fbaf04b0
+  data.tar.gz: d80ec1720c3b47b6906fe4be773e696a494b2f3877dc851b60ce8b6d8d8a00653b39cda43682082bbee3afd76a2bf08f1028d18d35056332b8d7ed71513939ae

data/.rubocop.yml

@@ -2,3 +2,6 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   TargetRubyVersion: 2.6
+
+Style/Documentation:
+  Enabled: false

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.5)
-      ascii_charts (~> 0.9.1)
+    kovid (0.6.10)
+      carmen (~> 1.1.3)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
@@ -11,12 +11,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ascii_charts (0.9.1)
+    activesupport (6.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    carmen (1.1.3)
+      activesupport (>= 3.0.0)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.2)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.12.2)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.0)
     rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
@@ -39,9 +50,13 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
+    thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -46,6 +46,8 @@ You can fetch US state-specific data:
 * `kovid state STATE` OR `kovid state "STATE NAME"`.
 * `kovid states --all` or `kovid states -a` for data on all US states.
 
+You can also use USPS abbreviations.  Example: `kovid state me`
+
 Provinces
 
 You can fetch province specific data:
@@ -64,7 +66,7 @@ You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `k
 🇺🇸🇺🇸🇺🇸
 
 You can compare US states with:
-* `kovid states STATE STATE` Example: `kovid states illinois "new york" california`
+* `kovid states STATE STATE` Example: `kovid states illinois "new york" california` OR `kovid states il ny ca`
 
 You can compare provicnes with:
 * `kovid provinces PROVINCE PROVINCE` Example: `kovid provinces ontario manitoba`
@@ -72,6 +74,7 @@ ___
 😷 **History**
 * `kovid history COUNTRY` (full history).
 * `kovid history COUNTRY N` (history in the last N days).
+* `kovid history STATE --usa`
 ___
 
 **NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.

data/kovid.gemspec

@@ -22,12 +22,11 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/siaw23/kovid'
   spec.metadata['changelog_uri'] = 'https://github.com/siaw23/kovid'
 
-  spec.add_dependency 'ascii_charts', '~> 0.9.1'
+  spec.add_dependency 'carmen', '~> 1.1.3'
   spec.add_dependency 'rainbow', '~> 3.0'
   spec.add_dependency 'terminal-table', '~> 1.8'
   spec.add_dependency 'thor', '~> 1.0'
   spec.add_dependency 'typhoeus', '~> 1.3'
-
   spec.add_development_dependency 'simplecov', '~>  0.18'
 
   # Specify which files should be added to the gem when it is released.

data/lib/kovid.rb

@@ -6,8 +6,6 @@ require 'kovid/request'
 module Kovid
   require 'kovid/helpers'
 
-  class Error < StandardError; end
-
   module_function
 
   def eu_aggregate
@@ -70,8 +68,12 @@ module Kovid
     Kovid::Request.cases
   end
 
-  def history(country, last)
-    Kovid::Request.history(country, last)
+  def history(country, days = 30)
+    Kovid::Request.history(country, days)
+  end
+
+  def history_us_state(state, days = 30)
+    Kovid::Request.history_us_state(state, days)
   end
 
   def histogram(country, date)

data/lib/kovid/aggregators.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Kovid
-  # Sends info about continents to Tablelize
   module Aggregators
     def eu_aggregate(eu_data)
       aggregated_table(eu_data, 'The EU', Kovid::Request::EU_ISOS, '🇪🇺')

data/lib/kovid/ascii_charts.rb

@@ -0,0 +1,276 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2011 Ben Lund
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Kovid
+  module AsciiCharts
+    VERSION = '0.9.1'
+
+    class Chart
+      attr_reader :options, :data
+
+      DEFAULT_MAX_Y_VALS = 20
+      DEFAULT_MIN_Y_VALS = 10
+
+      # data is a sorted array of [x, y] pairs
+
+      def initialize(data, options = {})
+        @data = data
+        @options = options
+      end
+
+      def rounded_data
+        @rounded_data ||= data.map { |pair| [pair[0], round_value(pair[1])] }
+      end
+
+      def step_size
+        unless defined? @step_size
+          if options[:y_step_size]
+            @step_size = options[:y_step_size]
+          else
+            max_y_vals = options[:max_y_vals] || DEFAULT_MAX_Y_VALS
+            min_y_vals = options[:max_y_vals] || DEFAULT_MIN_Y_VALS
+            y_span = (max_yval - min_yval).to_f
+
+            step_size = nearest_step(y_span.to_f / (data.size + 1))
+
+            if @all_ints && (step_size < 1)
+              step_size = 1
+            else
+              while (y_span / step_size) < min_y_vals
+                candidate_step_size = next_step_down(step_size)
+                if @all_ints && (candidate_step_size < 1)
+                  break
+                  end ## don't go below one
+
+                step_size = candidate_step_size
+              end
+            end
+
+            # go up if we undershot, or were never over
+            while (y_span / step_size) > max_y_vals
+              step_size = next_step_up(step_size)
+            end
+            @step_size = step_size
+          end
+          if !@all_ints && @step_size.is_a?(Integer)
+            @step_size = @step_size.to_f
+          end
+        end
+        @step_size
+      end
+
+      STEPS = [1, 2, 5].freeze
+
+      def from_step(val)
+        if val == 0
+          [0, 0]
+        else
+          order = Math.log10(val).floor.to_i
+          num = (val / (10**order))
+          [num, order]
+        end
+      end
+
+      def to_step(num, order)
+        s = num * (10**order)
+        if order < 0
+          s.to_f
+        else
+          s
+        end
+      end
+
+      def nearest_step(val)
+        num, order = from_step(val)
+        to_step(2, order) # #@@
+      end
+
+      def next_step_up(val)
+        num, order = from_step(val)
+        next_index = STEPS.index(num.to_i) + 1
+        if STEPS.size == next_index
+          next_index = 0
+          order += 1
+        end
+        to_step(STEPS[next_index], order)
+      end
+
+      def next_step_down(val)
+        num, order = from_step(val)
+        next_index = STEPS.index(num.to_i) - 1
+        if next_index == -1
+          STEPS.size - 1
+          order -= 1
+        end
+        to_step(STEPS[next_index], order)
+      end
+
+      # round to nearest step size, making sure we curtail precision to same order of magnitude as the step size to avoid 0.4 + 0.2 = 0.6000000000000001
+      def round_value(val)
+        remainder = val % step_size
+        unprecised = if (remainder * 2) >= step_size
+                       (val - remainder) + step_size
+                     else
+                       val - remainder
+                      end
+        if step_size < 1
+          precision = -Math.log10(step_size).floor
+          (unprecised * (10**precision)).to_i.to_f / (10**precision)
+        else
+          unprecised
+        end
+      end
+
+      def max_yval
+        scan_data unless defined? @max_yval
+        @max_yval
+      end
+
+      def min_yval
+        scan_data unless defined? @min_yval
+        @min_yval
+      end
+
+      def all_ints
+        scan_data unless defined? @all_ints
+        @all_ints
+      end
+
+      def scan_data
+        @max_yval = 0
+        @min_yval = 0
+        @all_ints = true
+
+        @max_xval_width = 1
+
+        data.each do |pair|
+          @max_yval = pair[1] if pair[1] > @max_yval
+          @min_yval = pair[1] if pair[1] < @min_yval
+          @all_ints = false if @all_ints && !pair[1].is_a?(Integer)
+
+          if (xw = pair[0].to_s.length) > @max_xval_width
+            @max_xval_width = xw
+          end
+        end
+      end
+
+      def max_xval_width
+        scan_data unless defined? @max_xval_width
+        @max_xval_width
+      end
+
+      def max_yval_width
+        scan_y_range unless defined? @max_yval_width
+        @max_yval_width
+      end
+
+      def scan_y_range
+        @max_yval_width = 1
+
+        y_range.each do |yval|
+          if (yw = yval.to_s.length) > @max_yval_width
+            @max_yval_width = yw
+          end
+        end
+      end
+
+      def y_range
+        unless defined? @y_range
+          @y_range = []
+          first_y = round_value(min_yval)
+          first_y -= step_size if first_y > min_yval
+          last_y = round_value(max_yval)
+          last_y += step_size if last_y < max_yval
+          current_y = first_y
+          while current_y <= last_y
+            @y_range << current_y
+            current_y = round_value(current_y + step_size) ## to avoid fp arithmetic oddness
+          end
+        end
+        @y_range
+      end
+
+      def lines
+        raise 'lines must be overridden'
+      end
+
+      def draw
+        lines.join("\n")
+      end
+
+      def to_string
+        draw
+      end
+    end
+
+    class Cartesian < Chart
+      def lines
+        return [[' ', options[:title], ' ', '|', '+-', ' ']] if data.empty?
+
+        lines = [' ']
+
+        bar_width = max_xval_width + 1
+
+        lines << (' ' * max_yval_width) + ' ' + rounded_data.map { |pair| pair[0].to_s.center(bar_width) }.join('')
+
+        y_range.each_with_index do |current_y, i|
+          yval = current_y.to_s
+          bar = if i == 0
+                  '+'
+                else
+                  '|'
+                end
+          current_line = [(' ' * (max_yval_width - yval.length)) + "#{current_y}#{bar}"]
+
+          rounded_data.each do |pair|
+            marker = if (i == 0) && options[:hide_zero]
+                       '-'
+                     else
+                       '*'
+                     end
+            filler = if i == 0
+                       '-'
+                     else
+                       ' '
+                     end
+            comparison = if options[:bar]
+                           current_y <= pair[1]
+                         else
+                           current_y == pair[1]
+                         end
+            current_line << if comparison
+                              marker.center(bar_width, filler)
+                            else
+                              filler * bar_width
+                            end
+          end
+          lines << current_line.join('')
+          current_y += step_size
+        end
+        lines << ' '
+        lines << options[:title].center(lines[1].length) if options[:title]
+        lines << ' '
+        lines.reverse
+      end
+    end
+    end
+end

data/lib/kovid/cache.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 require 'typhoeus'
-
-# rubocop:disable Style/Documentation
 module Kovid
-  # rubocop:enable Style/Documentation
-  # Caches HTTP requests
   class Cache
     def initialize
       @memory = {}

data/lib/kovid/cli.rb

@@ -4,8 +4,6 @@ require 'thor'
 require 'kovid'
 
 module Kovid
-  # Describes the commands that can be run by the user
-  # Descriptions are returned to STDOUT
   class CLI < Thor
     def self.exit_on_failure?
       true
@@ -77,13 +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
@@ -147,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

@@ -13,7 +13,8 @@ module Kovid
       'Cases Today'.paint_white,
       'Deaths'.paint_red,
       'Deaths Today'.paint_red,
-      'Recovered'.paint_green
+      'Recovered'.paint_green,
+      'Tests'.paint_white,
     ].freeze
 
     DATE_CASES_DEATHS_RECOVERED = [
@@ -23,6 +24,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,
@@ -74,7 +81,8 @@ module Kovid
       'Cases Today'.paint_white,
       'Deaths'.paint_red,
       'Deaths Today'.paint_red,
-      'Active'.paint_yellow
+      'Active'.paint_yellow,
+      'Tests'.paint_white
     ].freeze
 
     COMPARE_STATES_HEADINGS = [
@@ -93,7 +101,13 @@ module Kovid
       'Recovered'.paint_green
     ].freeze
 
-    FOOTER_LINE = [
+    FOOTER_LINE_THREE_COLUMNS = [
+      '------------',
+      '------------',
+      '------------'
+    ].freeze
+
+    FOOTER_LINE_FOUR_COLUMNS = [
       '------------',
       '------------',
       '------------',

data/lib/kovid/helpers.rb

@@ -30,4 +30,10 @@ module Kovid
       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

@@ -1,28 +1,17 @@
 # frozen_string_literal: true
 
 module Kovid
-  # Constructs history data for specified country
   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
-                Kovid.format_country_history_numbers(country).last(last.to_i)
-              else
-                Kovid.format_country_history_numbers(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
@@ -33,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
@@ -90,7 +90,7 @@ module Kovid
         dates.each_with_index do |val, index|
           data << [val, positive_cases_figures[index]]
         end
-        y_range = AsciiCharts::Cartesian.new(
+        y_range = Kovid::AsciiCharts::Cartesian.new(
           data, bar: true, hide_zero: true
         ).y_range
 

data/lib/kovid/painter.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'rainbow'
-
-# Adds text color functionalities to String class
 class String
   def paint_white
     Rainbow(self).white.bg(:black).bold

data/lib/kovid/request.rb

@@ -1,33 +1,35 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'carmen'
 require_relative 'tablelize'
 require_relative 'cache'
 require_relative 'uri_builder'
 
 module Kovid
-  # Makes requests to external source to collect cases data
   class Request
-    COUNTRIES_PATH = UriBuilder.new('/countries').url
-    STATES_URL = UriBuilder.new('/states').url
-    JHUCSSE_URL = UriBuilder.new('/v2/jhucsse').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].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 = %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
+    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].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  = %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
 
     class << self
       def eu_aggregate
@@ -110,7 +112,8 @@ 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
@@ -122,7 +125,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
@@ -151,7 +153,7 @@ module Kovid
 
       def cases
         response = JSON.parse(
-          Typhoeus.get(UriBuilder.new('/all').url, cache_ttl: 900).response_body
+          Typhoeus.get(UriBuilder.new('/v2/all').url, cache_ttl: 900).response_body
         )
 
         Kovid::Tablelize.cases(response)
@@ -159,15 +161,53 @@ module Kovid
         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)
+        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?) && 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
@@ -189,9 +229,17 @@ 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}."
+
+        rows << if block_given?
+                  [yield(location)]
+                else
+                  [default_warning]
+                end
+
+        Terminal::Table.new title: "You checked: #{location.upcase}", rows: rows
       end
 
       def fetch_countries(list)
@@ -205,10 +253,10 @@ module Kovid
       end
 
       def fetch_compared_states(submitted_states)
-        state_data = fetch_state_data
+        submitted_states.map! { |s| Kovid.lookup_us_state(s) }
 
-        state_data.select do |state|
-          submitted_states.include?(state['state'].downcase)
+        fetch_state_data.select do |state|
+          submitted_states.include?(state['state'])
         end
       end
 
@@ -218,9 +266,7 @@ module Kovid
 
       def fetch_country(country_name)
         # TODO: Match ISOs to full country names
-        if country_name == "netherlands"
-          country_name = "nl"
-        end
+        country_name = 'nl' if country_name == 'netherlands'
         country_url = COUNTRIES_PATH + "/#{country_name}"
 
         JSON.parse(Typhoeus.get(country_url, cache_ttl: 900).response_body)
@@ -267,7 +313,7 @@ module Kovid
 
       def countries_request
         Typhoeus.get(
-          UriBuilder.new('/countries').url, cache_ttl: 900
+          UriBuilder.new('/v2/countries').url, cache_ttl: 900
         ).response_body
       end
 
@@ -281,6 +327,16 @@ module Kovid
           end
         end.compact
       end
+
+      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
 end

data/lib/kovid/tablelize.rb

@@ -2,14 +2,13 @@
 
 require 'terminal-table'
 require 'date'
-require 'ascii_charts'
+require_relative 'ascii_charts'
 require_relative 'painter'
 require_relative 'constants'
 require_relative 'aggregators'
 require_relative 'historians'
 
 module Kovid
-  # Constructs the tables according to specified input
   class Tablelize
     extend Kovid::Constants
     extend Kovid::Aggregators
@@ -128,7 +127,8 @@ module Kovid
           Kovid.add_plus_sign(data['todayCases']),
           Kovid.comma_delimit(data['deaths']),
           Kovid.add_plus_sign(data['todayDeaths']),
-          Kovid.comma_delimit(data['recovered'])
+          Kovid.comma_delimit(data['active']),
+          Kovid.comma_delimit(data['tests'])
         ]
       end
 

data/lib/kovid/uri_builder.rb

@@ -3,7 +3,6 @@
 require 'uri'
 
 module Kovid
-  # Prepares base URI before requests
   class UriBuilder
     attr_reader :path
 

data/lib/kovid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kovid
-  VERSION = '0.6.6'
+  VERSION = '0.6.11'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.11
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ascii_charts
+  name: carmen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - kovid.gemspec
 - lib/kovid.rb
 - lib/kovid/aggregators.rb
+- lib/kovid/ascii_charts.rb
 - lib/kovid/cache.rb
 - lib/kovid/cli.rb
 - lib/kovid/constants.rb