kovid 0.6.4 → 0.6.9

data/lib/kovid/tablelize.rb

@@ -2,7 +2,7 @@
 
 require 'terminal-table'
 require 'date'
-require 'ascii_charts'
+require_relative 'ascii_charts'
 require_relative 'painter'
 require_relative 'constants'
 require_relative 'aggregators'
@@ -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.4'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.9
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-05-01 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
@@ -105,6 +105,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -119,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