kovid 0.6.3 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21479be2e8fdc2c40fd9f38d37808bd3a3d13ec36080119896fa95cc291d127
-  data.tar.gz: 94431cdc81ea6de25240aada27cdf680a4bd6a37a88e060ba51b6197cac015bd
+  metadata.gz: 68cf72c0e99add59625ce1a9763db32b5eeecb69220d78b236e929f08adb1dec
+  data.tar.gz: 84d95391d43e67b62f865f6e0ab585700aae3790e1f968793d11a99bf02e6ce8
 SHA512:
-  metadata.gz: 865a466405a2b6be0068781dc4f11f1573c761fc9bde7994ed32f28573842b95df4cbcbd609436e1c1713c05ac5564fb582755b35e7586af938df145b77e5bf4
-  data.tar.gz: b477fc309bd688bc7195e90cb3e4bcfd201a37a38170abbb95aaa018d89e9afa18bae3e35a1dddf7211adab8f00d483c13984597f837bb4a98cdeca9a1c3d00c
+  metadata.gz: daf6517f2d15ab2670bb9ad1124faa683db07eb3308a37d057b6af08b0d5a3f2ada1a4f76f54048556878df14435a71a82632a2995c28a6c830755aff7263338
+  data.tar.gz: 77862be6a1adf08d40568326bcf24a4aa1ae0c60ad5f0b462b7ef3e5e1b64292c812e0c96b47d70702dad2635ee3640739883a5afbd28b2e2411b2488a23c279

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,59 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-04-07 20:38:28 -0300 using RuboCop version 0.67.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 54
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 2
+Metrics/BlockLength:
+  Exclude:
+    - 'kovid.gemspec'
+    - 'spec/kovid_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 220
+  Exclude:
+    - 'lib/kovid/cli.rb'
+    - 'lib/kovid/request.rb'
+    - 'lib/kovid/tablelize.rb'
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 44
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 1
+Style/CaseEquality:
+  Exclude:
+    - 'lib/kovid/request.rb'
+
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/kovid.rb'
+    - 'lib/kovid/helpers.rb'
+
+# Offense count: 5
+Style/MultilineBlockChain:
+  Exclude:
+    - 'lib/kovid/historians.rb'
+    - 'lib/kovid/request.rb'

data/Gemfile

@@ -6,4 +6,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'
+gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.2)
+    kovid (0.6.8)
       ascii_charts (~> 0.9.1)
+      carmen (~> 1.1.3)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
@@ -11,12 +12,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    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)
     ascii_charts (0.9.1)
+    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 +52,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`

data/Rakefile

@@ -7,3 +7,4 @@ RSpec::Core::RakeTask.new(:spec)
 
 # rubocop:disable Style/HashSyntax
 task :default => :spec
+# rubocop:enable Style/HashSyntax

data/kovid.gemspec

@@ -8,8 +8,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Emmanuel Hayford']
   spec.email         = ['siawmensah@gmail.com']
 
-  spec.summary       = 'A CLI to fetch and compare the 2019 coronavirus pandemic statistics.'
-  spec.description   = 'A CLI to fetch and compare the 2019 coronavirus pandemic statistics.'
+  summary = 'A CLI to fetch and compare the 2019 ' \
+            'coronavirus pandemic statistics.'
+  spec.summary       = summary
+  spec.description   = summary
   spec.homepage      = 'https://github.com/siaw23/kovid'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
@@ -25,13 +27,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'terminal-table', '~> 1.8'
   spec.add_dependency 'thor', '~> 1.0'
   spec.add_dependency 'typhoeus', '~> 1.3'
-
+  spec.add_dependency 'carmen', '~> 1.1.3'
   spec.add_development_dependency 'simplecov', '~>  0.18'
 
   # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  # The `git ls-files -z` loads the files in the RubyGem
+  #   that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

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

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,7 +75,8 @@ module Kovid
       data_source
     end
 
-    desc 'history COUNTRY or history COUNTRY N', 'Return history of incidents of COUNTRY (in the last N days)'
+    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)

data/lib/kovid/constants.rb

@@ -63,6 +63,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 +93,13 @@ module Kovid
       'Recovered'.paint_green
     ].freeze
 
-    FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
+    FOOTER_LINE = [
+      '------------',
+      '------------',
+      '------------',
+      '------------'
+    ].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

@@ -5,14 +5,13 @@ module Kovid
     include Constants
 
     def history(country, last)
-      # Write checks for when country is spelt wrong.
-      headings = DATE_CASES_DEATHS_RECOVERED
+      # TODO: Write checks for when country is spelt wrong.
       rows = []
 
       stats = if last
-                transpose(country).last(last.to_i)
+                Kovid.format_country_history_numbers(country).last(last.to_i)
               else
-                transpose(country)
+                Kovid.format_country_history_numbers(country)
               end
 
       dates = if last
@@ -39,7 +38,7 @@ module Kovid
 
       Terminal::Table.new(
         title: country['country'].upcase,
-        headings: headings,
+        headings: DATE_CASES_DEATHS_RECOVERED,
         rows: rows
       )
     end
@@ -53,8 +52,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 +88,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 = 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,33 @@
 # 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
+    COUNTRIES_PATH = UriBuilder.new('/v2/countries').url
+    STATES_URL = UriBuilder.new('/v2/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]
+    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
@@ -69,26 +72,24 @@ module Kovid
 
       def by_country(country_name)
         response = fetch_country(country_name)
-        Kovid::Tablelize.country_table(response)
 
-        # if response.values.first.include?('not found')
-        #   not_found(country_name)
-        # else
-        #   Kovid::Tablelize.country_table(response)
-        # end
+        if response.key?('message')
+          not_found(country_name)
+        else
+          Kovid::Tablelize.country_table(response)
+        end
       rescue JSON::ParserError
         puts SERVER_DOWN
       end
 
       def by_country_full(country_name)
         response = fetch_country(country_name)
-        Kovid::Tablelize.full_country_table(response)
 
-        # if response.values.first.include?('not found')
-        #   not_found(country_name)
-        # else
-        #   Kovid::Tablelize.full_country_table(response)
-        # end
+        if response.key?('message')
+          not_found(country_name)
+        else
+          Kovid::Tablelize.full_country_table(response)
+        end
       rescue JSON::ParserError
         puts SERVER_DOWN
       end
@@ -109,7 +110,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
@@ -121,7 +122,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
@@ -149,7 +149,9 @@ 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
@@ -158,7 +160,11 @@ module Kovid
 
       def history(country, last)
         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.history(response, last)
       rescue JSON::ParserError
@@ -167,7 +173,11 @@ module Kovid
 
       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
@@ -185,14 +195,20 @@ module Kovid
 
       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
@@ -200,6 +216,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)
@@ -211,7 +229,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)
@@ -221,19 +241,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)
 
-        data = country_array.inject do |base, other|
+        meth === data
+      rescue JSON::ParserError
+        puts SERVER_DOWN
+      end
+
+      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
@@ -241,10 +277,6 @@ module Kovid
             left + right unless %w[country countryInfo].include?(key)
           end
         end.compact
-
-        meth === data
-      rescue JSON::ParserError
-        puts SERVER_DOWN
       end
     end
   end

data/lib/kovid/tablelize.rb

@@ -16,120 +16,50 @@ module Kovid
 
     class << self
       def country_table(data)
-        rows = [
-          [
-            comma_delimit(data['cases']),
-            check_if_positve(data['todayCases']),
-            comma_delimit(data['deaths']),
-            check_if_positve(data['todayDeaths']),
-            comma_delimit(data['recovered'])
-          ]
-        ]
-
-        if (iso = data['countryInfo']['iso2'])
-          Terminal::Table.new(title: "#{country_emoji(iso)} #{data['country'].upcase}",
-                              headings: CASES_DEATHS_RECOVERED_CTODAY_DTODAY,
-                              rows: rows)
-        else
-          Terminal::Table.new(title: data['country'].upcase,
-                              headings: CASES_DEATHS_RECOVERED_CTODAY_DTODAY,
-                              rows: rows)
-        end
+        Terminal::Table.new(title: country_title(data),
+                            headings: CASES_DEATHS_RECOVERED_CTODAY_DTODAY,
+                            rows: [country_row(data)])
       end
 
       def full_country_table(data)
-        rows = []
-        rows << [
-          comma_delimit(data['cases']),
-          comma_delimit(data['deaths']),
-          comma_delimit(data['recovered']),
-          check_if_positve(data['todayCases']),
-          check_if_positve(data['todayDeaths']),
-          comma_delimit(data['critical']),
-          comma_delimit(data['casesPerOneMillion'])
-        ]
-
-        if iso = data['countryInfo']['iso2']
-          Terminal::Table.new(title: "#{country_emoji(iso)} #{data['country'].upcase}",
-                              headings: FULL_COUNTRY_TABLE_HEADINGS,
-                              rows: rows)
-        else
-          Terminal::Table.new(title: data['country'].upcase,
-                              headings: FULL_COUNTRY_TABLE_HEADINGS,
-                              rows: rows)
-        end
+        Terminal::Table.new(title: country_title(data),
+                            headings: FULL_COUNTRY_TABLE_HEADINGS,
+                            rows: [full_country_row(data)])
       end
 
       def full_province_table(province)
-        headings = [
-          'Confirmed'.paint_white,
-          'Deaths'.paint_red,
-          'Recovered'.paint_green
-        ]
-        rows = []
-        rows << [province['stats']['confirmed'], province['stats']['deaths'], province['stats']['recovered']]
-
-        Terminal::Table.new(title: province['province'].upcase, headings: headings, rows: rows)
+        Terminal::Table.new(
+          title: province['province'].upcase,
+          headings: FULL_PROVINCE_TABLE_HEADINGS,
+          rows: [province_row(province)]
+        )
       end
 
       def full_state_table(state)
-        headings = [
-          'Cases'.paint_white,
-          'Cases Today'.paint_white,
-          'Deaths'.paint_red,
-          'Deaths Today'.paint_red,
-          'Active'.paint_yellow
-        ]
-
-        rows = []
-        rows << [
-          comma_delimit(state['cases']),
-          check_if_positve(state['todayCases']),
-          comma_delimit(state['deaths']),
-          check_if_positve(state['todayDeaths']),
-          comma_delimit(state['active'])
-        ]
-
-        Terminal::Table.new(title: state['state'].upcase, headings: headings, rows: rows)
+        Terminal::Table.new(
+          title: state['state'].upcase,
+          headings: FULL_STATE_TABLE_HEADINGS,
+          rows: [country_row(state)]
+        )
       end
 
       def compare_countries_table(data)
         rows = []
 
         data.each do |country|
-          base_rows = [
-            comma_delimit(country['cases']),
-            check_if_positve(country['todayCases']),
-            comma_delimit(country['deaths']),
-            check_if_positve(country['todayDeaths']),
-            comma_delimit(country['recovered'])
-          ]
-
-          rows << if (iso = country['countryInfo']['iso2'])
-                    base_rows.unshift("#{country_emoji(iso)} #{country['country'].upcase}")
-                  else
-                    base_rows.unshift(country['country'].upcase.to_s)
-                  end
+          base_rows = country_row(country)
+          rows << base_rows.unshift(country_title(country))
         end
 
         align_columns(:compare_country_table,
-                      Terminal::Table.new(headings: COMPARE_COUNTRIES_TABLE_HEADINGS,
-                                          rows: rows))
+                      Terminal::Table.new(
+                        headings: COMPARE_COUNTRIES_TABLE_HEADINGS,
+                        rows: rows
+                      ))
       end
 
       def compare_countries_table_full(data)
-        rows = data.map do |country|
-          [
-            country.fetch('country'),
-            comma_delimit(country.fetch('cases')),
-            comma_delimit(country.fetch('deaths')),
-            comma_delimit(country.fetch('recovered')),
-            check_if_positve(country.fetch('todayCases')),
-            check_if_positve(country.fetch('todayDeaths')),
-            comma_delimit(country.fetch('critical')),
-            comma_delimit(country.fetch('casesPerOneMillion'))
-          ]
-        end
+        rows = data.map { |country| compare_countries_full_row(country) }
 
         align_columns(:compare_country_table_full,
                       Terminal::Table.new(headings: COMPARE_COUNTRY_TABLE_FULL,
@@ -139,23 +69,9 @@ module Kovid
       def compare_us_states(data)
         rows = data.map.with_index do |state, index|
           if index.odd?
-            [
-              state.fetch('state').upcase,
-              comma_delimit(state.fetch('cases')),
-              check_if_positve(state['todayCases']),
-              comma_delimit(state['deaths']),
-              check_if_positve(state['todayDeaths']),
-              comma_delimit(state.fetch('active'))
-            ]
+            us_state_row(state)
           else
-            [
-              state.fetch('state').upcase.paint_highlight,
-              comma_delimit(state.fetch('cases')).paint_highlight,
-              check_if_positve(state['todayCases']).paint_highlight,
-              comma_delimit(state['deaths']).paint_highlight,
-              check_if_positve(state['todayDeaths']).paint_highlight,
-              comma_delimit(state.fetch('active')).paint_highlight
-            ]
+            us_state_row(state).map(&:paint_highlight)
           end
         end
 
@@ -165,14 +81,7 @@ module Kovid
       end
 
       def compare_provinces(data)
-        rows = data.map do |province|
-          [
-            province['province'].upcase,
-            province['stats']['confirmed'],
-            province['stats']['deaths'],
-            province['stats']['recovered']
-          ]
-        end
+        rows = data.map { |province| compare_provinces_row(province) }
 
         align_columns(:compare_provinces,
                       Terminal::Table.new(headings: COMPARE_PROVINCES_HEADINGS,
@@ -180,29 +89,22 @@ module Kovid
       end
 
       def cases(cases)
-        headings = CASES_DEATHS_RECOVERED
-        rows = [
-          [
-            comma_delimit(cases['cases']),
-            comma_delimit(cases['deaths']),
-            comma_delimit(cases['recovered'])
-          ]
-        ]
-
-        Terminal::Table.new(title: '🌍 Total Number of Incidents Worldwide'.upcase, headings: headings, rows: rows)
+        Terminal::Table.new(
+          title: '🌍 Total Number of Incidents Worldwide'.upcase,
+          headings: CASES_DEATHS_RECOVERED,
+          rows: [cases_row(cases)]
+        )
       end
 
       private
 
-      def comma_delimit(number)
-        number.to_s.chars.to_a.reverse.each_slice(3)
-              .map(&:join)
-              .join(',')
-              .reverse
-      end
-
-      def check_if_positve(num)
-        num.to_i.positive? ? "+#{comma_delimit(num)}" : comma_delimit(num).to_s
+      def country_title(data)
+        iso = data['countryInfo']['iso2']
+        if iso.nil?
+          data['country'].upcase
+        else
+          "#{country_emoji(iso)} #{data['country'].upcase}"
+        end
       end
 
       def country_emoji(iso)
@@ -210,10 +112,80 @@ module Kovid
           8203.chr(Encoding::UTF_8)
       end
 
-      def transpose(load)
-        load['timeline'].values.map(&:values).transpose.each do |data|
-          data.map! { |number| comma_delimit(number) }
-        end
+      def cases_row(data)
+        [
+          Kovid.comma_delimit(data['cases']),
+          Kovid.comma_delimit(data['deaths']),
+          Kovid.comma_delimit(data['recovered'])
+        ]
+      end
+
+      # Also works for state
+      def country_row(data)
+        [
+          Kovid.comma_delimit(data['cases']),
+          Kovid.add_plus_sign(data['todayCases']),
+          Kovid.comma_delimit(data['deaths']),
+          Kovid.add_plus_sign(data['todayDeaths']),
+          Kovid.comma_delimit(data['recovered'])
+        ]
+      end
+
+      def full_country_row(data)
+        [
+          Kovid.comma_delimit(data['cases']),
+          Kovid.comma_delimit(data['deaths']),
+          Kovid.comma_delimit(data['recovered']),
+          Kovid.add_plus_sign(data['todayCases']),
+          Kovid.add_plus_sign(data['todayDeaths']),
+          Kovid.comma_delimit(data['critical']),
+          Kovid.comma_delimit(data['casesPerOneMillion'])
+        ]
+      end
+
+      def province_row(data)
+        [
+          data['stats']['confirmed'],
+          data['stats']['deaths'],
+          data['stats']['recovered']
+        ]
+      end
+
+      def compare_provinces_row(data)
+        [
+          data['province'].upcase,
+          province_row(data)
+        ].flatten
+      end
+
+      def compare_countries_full_row(data)
+        [
+          data.fetch('country'),
+          full_country_row(data)
+        ].flatten
+      end
+
+      def us_state_row(data)
+        [
+          data.fetch('state').upcase,
+          Kovid.comma_delimit(data.fetch('cases')),
+          Kovid.add_plus_sign(data['todayCases']),
+          Kovid.comma_delimit(data['deaths']),
+          Kovid.add_plus_sign(data['todayDeaths']),
+          Kovid.comma_delimit(data.fetch('active'))
+        ]
+      end
+
+      def aggregated_row(data)
+        [
+          Kovid.comma_delimit(data['cases']),
+          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['critical'])
+        ]
       end
 
       def scale(msg)
@@ -222,32 +194,26 @@ module Kovid
       end
 
       def aggregated_table(collated_data, continent, iso, emoji)
-        title = if emoji.codepoints.size > 1
-                  emoji + 8203.chr(Encoding::UTF_8) + \
-                    " Aggregated Data on #{continent} (#{iso.size} States)".upcase
-                else
-                  emoji + \
-                    " Aggregated Data on #{continent} (#{iso.size} States)".upcase
-                end
-
-        rows = []
-        rows << [
-          comma_delimit(collated_data['cases']),
-          check_if_positve(collated_data['todayCases']),
-          comma_delimit(collated_data['deaths']),
-          check_if_positve(collated_data['todayDeaths']),
-          comma_delimit(collated_data['recovered']),
-          comma_delimit(collated_data['active']),
-          comma_delimit(collated_data['critical'])
-        ]
+        title = aggregated_table_title(continent, iso, emoji)
 
         Terminal::Table.new(
           title: title,
           headings: CONTINENTAL_AGGREGATE_HEADINGS,
-          rows: rows
+          rows: [aggregated_row(collated_data)]
         )
       end
 
+      def aggregated_table_title(continent, iso, emoji)
+        aggregated_data_continent = ' Aggregated Data on ' \
+          "#{continent} (#{iso.size} States)".upcase
+
+        if emoji.codepoints.size > 1
+          emoji + 8203.chr(Encoding::UTF_8) + aggregated_data_continent
+        else
+          emoji + aggregated_data_continent
+        end
+      end
+
       def align_columns(table_type, table)
         return table unless RIGHT_ALIGN_COLUMNS[table_type]
 

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.8
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ascii_charts
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: carmen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +119,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile