kovid 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0bc9550073aaff0f2e6fb4a4175b4147bacf6c43d4d47d0177771845d30f01
-  data.tar.gz: 5e960a7772a01ad8c67c77284eaebc46cb55827522e6890f62b935b87d6e3494
+  metadata.gz: 2896f04560ac519045555f79fc0d8cdcbcee7ed9069aecd1ebdbcba181584927
+  data.tar.gz: fe15af9091b1a03ae8ac6a78e712c5a7dc7dd1a7b433e45b9c6bdad05c709f22
 SHA512:
-  metadata.gz: 7f65a6ea777bde11958ab2c3d43f73b63d83d23b18f5c21757be1e46e8ebda407b762714b32d1cab819cde75a41344735799670e41b17bd9e5a175d2e52892a0
-  data.tar.gz: d542e777ce15d0d0236faf62264d7fd2679b4655295e51be4871ba2f1c4990fb658f9d02fc6824357a73cb94e8cd54013b8a5106819e21ded1ad6d9c07b0dbcd
+  metadata.gz: 9a4260377fa1d38f2b9dd9f7b94bdcf3527e437f2c89e15d15d1a0b87df11a09934baa56a6d8b13f1e1a588b0590b4a1646f7ca6f9c96a141f1b2178054bc358
+  data.tar.gz: c9c313cf8982980845c5d73d5da9e9d9cab82738825762bbceb3a07e511f7ccae1d12516cadd80bfb86fa88c8a2dd4b58615db396a0ba901d7fa94fbddcd21c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.12)
+    kovid (0.6.13)
       carmen (~> 1.1.3)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
@@ -11,12 +11,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     carmen (1.1.3)
       activesupport (>= 3.0.0)
     concurrent-ruby (1.1.6)
@@ -24,25 +24,25 @@ GEM
     docile (1.3.2)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.12.2)
-    i18n (1.8.2)
+    ffi (1.13.0)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -51,7 +51,7 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)

data/lib/kovid/constants.rb

@@ -13,8 +13,9 @@ module Kovid
       'Cases Today'.paint_white,
       'Deaths'.paint_red,
       'Deaths Today'.paint_red,
+      'Active'.paint_yellow,
       'Recovered'.paint_green,
-      'Tests'.paint_white,
+      'Tests'.paint_white
     ].freeze
 
     DATE_CASES_DEATHS_RECOVERED = [
@@ -63,10 +64,12 @@ module Kovid
 
     FULL_COUNTRY_TABLE_HEADINGS = [
       'Cases'.paint_white,
-      'Deaths'.paint_red,
-      'Recovered'.paint_green,
       'Cases Today'.paint_white,
+      'Deaths'.paint_red,
       'Deaths Today'.paint_red,
+      'Active'.paint_yellow,
+      'Recovered'.paint_green,
+      'Tests'.paint_white,
       'Critical'.paint_yellow,
       'Cases/Million'.paint_white
     ].freeze
@@ -110,6 +113,9 @@ module Kovid
 
     FOOTER_LINE_FOUR_COLUMNS = FOOTER_LINE_COLUMN * 4
 
+    # Add footer if rows exceed this number
+    ADD_FOOTER_SIZE = 10
+
     COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
     RIGHT_ALIGN_COLUMNS = {

data/lib/kovid/helpers.rb

@@ -25,12 +25,6 @@ module Kovid
     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)

data/lib/kovid/historians.rb

@@ -5,42 +5,32 @@ module Kovid
     include Constants
     include AsciiCharts
 
-    def history(location, days)
-      rows = []
+    def history(data, days)
+      rows = history_rows(data, days)
 
-      stats = Kovid.format_country_history_numbers(location).last(days.to_i)
-      dates = location['timeline']['cases'].keys.last(days.to_i)
-
-      if days.to_i >= 30
-        stats = stats.reject { |stat| stat[0].to_i.zero? && stat[1].to_i.zero? }
-        dates = dates.last(stats.count)
+      if rows.size > ADD_FOOTER_SIZE
+        rows << FOOTER_LINE_FOUR_COLUMNS
+        rows << DATE_CASES_DEATHS_RECOVERED
       end
 
-      stats.each_with_index do |val, index|
-        val.unshift(Kovid.dateman(dates[index]))
-      end.each do |row|
-        rows << row
-      end
+      Terminal::Table.new(
+        title: data['country'].try(:upcase),
+        headings: DATE_CASES_DEATHS_RECOVERED,
+        rows: rows
+      )
+    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
+    def history_us_state(data, days)
+      rows = history_rows(data, days)
 
-      if stats.size > 10
-        rows << footer
-        rows << col_format
+      if rows.size > ADD_FOOTER_SIZE
+        rows << FOOTER_LINE_THREE_COLUMNS
+        rows << DATE_CASES_DEATHS 
       end
 
       Terminal::Table.new(
-        title: title,
-        headings: col_format,
+        title: data['state'].try(:upcase),
+        headings:  DATE_CASES_DEATHS,
         rows: rows
       )
     end
@@ -106,5 +96,20 @@ module Kovid
         AsciiCharts::Cartesian.new(data, bar: true, hide_zero: true).draw
       end
     end
+
+    private
+
+      def history_rows(data, days)
+        data['timeline']['cases'].map do |date, cases|
+          formatted_date = Kovid.dateman(date)
+          cases          = Kovid.comma_delimit(cases)
+          deaths         = Kovid.comma_delimit(data['timeline']['deaths'][date])
+          recovered      = Kovid.comma_delimit(data['timeline']['recovered'][date]) if data['timeline'].has_key? 'recovered'
+
+          row = [formatted_date, cases, deaths]
+          row << recovered unless recovered.nil?
+          row
+        end.last(days.to_i)
+      end
   end
 end

data/lib/kovid/request.rb

@@ -162,13 +162,7 @@ module Kovid
       end
 
       def history(country, days)
-        history_path = UriBuilder.new('/v2/historical').url
-
-        response = JSON.parse(
-          Typhoeus.get(
-            history_path + "/#{country}", cache_ttl: 900
-          ).response_body
-        )
+        response = fetch_history(country)
 
         if response.key?('message')
           not_found(country) do |c|
@@ -182,14 +176,8 @@ module Kovid
       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
-        )
+        state    = Kovid.lookup_us_state(state).downcase
+        response = fetch_us_history(state)
 
         if response.respond_to?(:key?) && response.key?('message')
           return not_found(state)
@@ -201,22 +189,20 @@ module Kovid
         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)
+        Kovid::Tablelize.history_us_state(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
+            HISTORICAL_URL + "/#{country}", cache_ttl: 900
           ).response_body
         )
 
@@ -312,6 +298,22 @@ module Kovid
         end.first
       end
 
+      def fetch_history(country)
+        JSON.parse(
+          Typhoeus.get(
+            HISTORICAL_URL + "/#{country}", cache_ttl: 900
+          ).response_body
+        )
+      end
+
+      def fetch_us_history(state)
+        JSON.parse(
+          Typhoeus.get(
+            HISTORICAL_US_URL + "/#{state}", cache_ttl: 900
+          ).response_body
+        )
+      end
+
       def aggregator(isos, meth)
         countries_array = JSON.parse(countries_request)
         country_array = countries_array.select do |hash|
@@ -325,9 +327,7 @@ module Kovid
       end
 
       def countries_request
-        Typhoeus.get(
-          UriBuilder.new('/v2/countries').url, cache_ttl: 900
-        ).response_body
+        Typhoeus.get(COUNTRIES_PATH, cache_ttl: 900).response_body
       end
 
       def countries_aggregator(country_array)

data/lib/kovid/tablelize.rb

@@ -39,7 +39,7 @@ module Kovid
         Terminal::Table.new(
           title: state['state'].upcase,
           headings: FULL_STATE_TABLE_HEADINGS,
-          rows: [country_row(state)]
+          rows: [state_row(state)]
         )
       end
 
@@ -136,7 +136,6 @@ module Kovid
         ]
       end
 
-      # Also works for state
       def country_row(data)
         [
           Kovid.comma_delimit(data['cases']),
@@ -144,6 +143,7 @@ module Kovid
           Kovid.comma_delimit(data['deaths']),
           Kovid.add_plus_sign(data['todayDeaths']),
           Kovid.comma_delimit(data['active']),
+          Kovid.comma_delimit(data['recovered']),
           Kovid.comma_delimit(data['tests'])
         ]
       end
@@ -151,15 +151,29 @@ module Kovid
       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.comma_delimit(data['deaths']),
           Kovid.add_plus_sign(data['todayDeaths']),
+          Kovid.comma_delimit(data['active']),
+          Kovid.comma_delimit(data['recovered']),
+          Kovid.comma_delimit(data['tests']),
+
           Kovid.comma_delimit(data['critical']),
           Kovid.comma_delimit(data['casesPerOneMillion'])
         ]
       end
 
+      def state_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['active']),
+          Kovid.comma_delimit(data['tests'])
+        ]
+      end
+
       def province_row(data)
         [
           data['stats']['confirmed'],
@@ -255,17 +269,16 @@ module Kovid
       end
 
       def top_heading(options)
-        if options[:location] == :countries
-          return ['Country'.paint_white] + FULL_COUNTRY_TABLE_HEADINGS
-        end
+        full_country_table = ['Country'.paint_white] + FULL_COUNTRY_TABLE_HEADINGS
+        full_state_table = ['State'.paint_white] + FULL_STATE_TABLE_HEADINGS
 
-        ['State'.paint_white] + FULL_STATE_TABLE_HEADINGS
+        options[:location] == :countries ? full_country_table : full_state_table
       end
 
       def top_title(options)
         incident = options[:incident].to_s
         location = options[:location].to_s
-        "🌍 Top #{options[:count]} #{location} in #{incident}".upcase
+        "🌍 Top #{options[:count]} #{location} by #{incident}".upcase
       end
     end
   end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carmen