covid19 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8668b8285c3111972349d7c38b95be0dd3cc0e801485f96c0d3b6f225b09f0f3
-  data.tar.gz: 70822cf4c46cee7358df27cd6cd30c928a714304b0e10ca2f3a74e6dcb3868aa
+  metadata.gz: dc1038b03cac572d43eb89be333e2f96b296b3dec003f5201caad9562e0436fa
+  data.tar.gz: 3e289944a83f9d3e4b7a33325048e8da6d5ddadc03c4810eb674438fbd513781
 SHA512:
-  metadata.gz: 5376e2689957f74daa8e5801cf7aadbbb4ea0d9e1c349061874282c573ac91f8b5e152a6e7dc7d087384940c5c38921c02e71648caf720b9af8852194039f7a3
-  data.tar.gz: 9dfcbded2200f24163080712ed5a3c6cc6534c4f67350180393ee5a92253e376ef0f0c7348477bb61196a50558c3175d43f4f0ba2dad72803e2d4a8eff769ed1
+  metadata.gz: a4439749f50f0f13701b63578443f2a62ac9468645d46ac005d9ad749d3537207b1c61aaad90dc1bffe69d7a02be10ed3b15f9c4da58699035c53d0fd20a8eb7
+  data.tar.gz: 9ca8f27fdd2df65fffa2db508c0e26a1ec4e6278b5eed407375ebce055b0f7bfe7aed2785b9a409a2ae09bc1163502884d6c374d50868ea0e0206a86794676c6

data/.rubocop.yml

@@ -1,12 +1,21 @@
 AllCops:
   TargetRubyVersion: 2.5
 
+Layout/CaseIndentation:
+    Enabled: false
+
+Layout/HashAlignment:
+    EnforcedHashRocketStyle: table
+
 Layout/IndentationWidth:
     Width: 4
 
 Layout/LineLength:
     Enabled: false
 
+Layout/SpaceInsideArrayLiteralBrackets:
+    Enabled: false
+
 Layout/SpaceAroundOperators:
     Enabled: false
 
@@ -37,6 +46,9 @@ Style/FormatStringToken:
 Style/FrozenStringLiteralComment:
     Enabled: false
 
+Style/GlobalVars:
+    Enabled: false
+
 Style/HashEachMethods:
     Enabled: false
 

data/CHANGELOG.md

@@ -5,11 +5,19 @@ All notable changes to this project will be documented in this file.
 
 This changelog was automatically generated using [Caretaker](https://github.com/WolfAtheneum/covid19) by [Wolf Software](https://github.com/WolfSoftware)
 
+### [v1.0.0](https://github.com/WolfAtheneum/covid19/compare/v0.1.3...v1.0.0)
+
+> Released on June, 14th 2020
+
+- Update the gem version [`[62e4ebd]`](https://github.com/WolfAtheneum/covid19/commit/62e4ebd730975d8199a0a5a4ba0e9e0130c74716) [`[TGWolf]`](https://github.com/TGWolf)
+
+- Complete rewrite using a new faster API [`[2bed745]`](https://github.com/WolfAtheneum/covid19/commit/2bed7459acdee4036c1f31e585cf65fdee704d4e) [`[TGWolf]`](https://github.com/TGWolf)
+
 ### [v0.1.3](https://github.com/WolfAtheneum/covid19/compare/v0.1.2...v0.1.3)
 
 > Released on March, 26th 2020
 
-- Minor tweak to the output death rate percentage [`[b2181fa]`](https://github.com/WolfAtheneum/covid19/commit/b2181fa254c9d049cbde07d03b2646b4646c4782) [`[TGWolf]`](https://github.com/TGWolf)
+- Minor tweak to the output death rate percentage [`[24fdf44]`](https://github.com/WolfAtheneum/covid19/commit/24fdf44a1eb22499b47044e580d9a52ff298bfc0) [`[TGWolf]`](https://github.com/TGWolf)
 
 ### [v0.1.2](https://github.com/WolfAtheneum/covid19/compare/v0.1.0...v0.1.2)
 

data/README.md

@@ -33,28 +33,22 @@ gem install covid19
 
 ## Usage
 
-Get the latest amount of total confirmed cases, deaths, and recoveries globally:
+Get the latest stats by in summary form and broken down country by country.
 
 ```ruby
-Covid19.latest_stats
+Covid19.latest_stats_all
 ```
 
-Get case data for all locations with reported cases:
-
-```ruby
-Covid19.latest_stats_split_by_country
-```
-
-Find case data by country code with an optional argument to include timelines:
+Get the latest stats by in summary form.
 
 ```ruby
-Covid19.latest_stats_by_country_code('GB', true)
+Covid19.latest_stats_global
 ```
 
-Find case data by location:
+Get case data for all locations with reported cases:
 
 ```ruby
-Covid19.latest_stats_by_country_id(id)
+Covid19.latest_stats_split_by_country
 ```
 
 ## Error Handling
@@ -68,11 +62,19 @@ The gem also comes with a command line tool called covid19.
 ```
 Usage: covid19
     -h, --help                       Display this screen
-    -s, --split                      View the latestest information split by country
-    -c, --confirmed                  Order results by confirmed cases
-    -d, --deaths                     Order results by deaths
-    -p, --death-rate                 Order results by percentage of deaths (death rate)
-    -r, --recovered                  Order results by recovered numbers
+    -s, --summary                    Show a summary of the totals [Default]
+    -l, --latest                     Show the latest (todays) totals split by country (same as -t)
+    -t, --today                      Show the latest (todays) totals split by country (same as -l)
+    -T, --totals                     Show the full totals split by country
+
+Coloumn Sorting Options:
+    -c, --confirmed                  Order the output based on 'Confirmed' column
+    -r, --recovered                  Order the output based on 'Recovered' column
+    -d, --deaths                     Order the output based on 'Deaths' column
+    -a, --active                     Order the output based on 'Active' column
+    -D, --death-rate                 Order the output based on 'Death Rate' column
+    -R, --recovery-rate              Order the output based on 'Recovery Rate' column
+    -C, --cases-per-million          Order the output based on 'Cases P/M' column
 
 ```
 

data/VERSION.txt

@@ -1 +1 @@
-0.1.3
+1.0.0

data/covid19.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |spec|
     spec.required_ruby_version = '>= 2.5'
 
     spec.add_development_dependency 'bundler', '~> 2'
+    spec.add_development_dependency 'colorize', '~> 0.8'
     spec.add_development_dependency 'rake', '~> 13.0'
     spec.add_development_dependency 'rspec', '~> 3.0'
     spec.add_development_dependency 'terminal-table', '~> 1.8'
 
+    spec.add_runtime_dependency 'colorize', '~> 0.8'
     spec.add_runtime_dependency 'terminal-table', '~> 1.8'
 end

data/exe/covid19

@@ -2,83 +2,187 @@
 
 $LOAD_PATH.unshift('./lib')
 
+require 'colorize'
 require 'optparse'
 require 'covid19'
 require 'terminal-table'
 
 # -------------------------------------------------------------------------------- #
-# Format Global Stats                                                              #
+# Global Variables                                                                 #
 # -------------------------------------------------------------------------------- #
-# Create a nice table view of the latest global stats.                             #
+# A simple set of global variables to avoid having to do multiple string compares  #
+# as one typo can cause weird things to happen.                                    #
 # -------------------------------------------------------------------------------- #
 
-def format_latest_stats(results)
-    formatted = []
-    results['latest'].each do |key, value|
-        formatted << [key, value]
-    end
+$_confirmed = 1
+$_recovered = 2
+$_deaths = 3
+$_active = 4
+$_death_rate = 5
+$_recovery_rate = 6
+$_cases_pm = 7
 
-    confirmed = results['latest']['confirmed']
-    deaths = results['latest']['deaths']
+# -------------------------------------------------------------------------------- #
+# Get Hash Value                                                                   #
+# -------------------------------------------------------------------------------- #
+# Simple wrapper to locate a value from a hash and handle error states.            #
+# -------------------------------------------------------------------------------- #
 
-    percentage = ((deaths.to_f / confirmed) * 100)
+def get_hash_value(hash, name, default_val = 0)
+    return default_val unless hash.is_a?(Hash)
 
-    formatted << ['death rate', "%.2f%%" % percentage]
+    return hash.fetch(name, default_val)
+end
 
-    puts Terminal::Table.new :title => 'Latest Global Statistics', :rows => formatted, :style => { :width => 80 }
+# -------------------------------------------------------------------------------- #
+# Commify                                                                          #
+# -------------------------------------------------------------------------------- #
+# Simple wrapper to make numbers a little more human readable.                     #
+# -------------------------------------------------------------------------------- #
+
+def commify(number)
+    return number.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(',').reverse
 end
 
 # -------------------------------------------------------------------------------- #
-# Format Country Stats                                                             #
+# Add Heading                                                                      #
 # -------------------------------------------------------------------------------- #
-# Create a nice table view of the latest country stats.                            #
+# Simple wrapper to generate a heading entry with optional alignment override.     #
 # -------------------------------------------------------------------------------- #
-def format_latest_country_stats(results, options = {})
-    processed = {}
 
-    results['locations'].each do |item|
-        country_code = item['country_code'].to_s
+def add_heading(name, alignment = :center)
+    return { :value => name, :alignment => alignment }
+end
 
-        if processed[country_code]
-            confirmed = processed[country_code]['confirmed'] + item['latest']['confirmed']
-            deaths = processed[country_code]['deaths'] + item['latest']['deaths']
-            recovered = processed[country_code]['recovered'] + item['latest']['recovered']
-        else
-            confirmed = item['latest']['confirmed']
-            deaths = item['latest']['deaths']
-            recovered = item['latest']['recovered']
-        end
-        percentage = ((deaths.to_f / confirmed) * 100)
+# -------------------------------------------------------------------------------- #
+# Show Summary Data                                                                #
+# -------------------------------------------------------------------------------- #
+# Create a nice table view of the latest global statistics.                        #
+# -------------------------------------------------------------------------------- #
 
-        percentage = 0 if percentage.nil?
+def show_summary_data(results)
+    title = 'Global Statistics Summary'
+    headings = []
+    rows = []
 
-        processed[country_code] = { 'country' => item['country'], 'country_code' => country_code, 'id' => item['id'], 'confirmed' => confirmed, 'deaths' => deaths, 'recovered' => recovered, 'death_rate' => percentage }
-    end
+    headings << ''
+    headings << add_heading('Today')
+    headings << add_heading('Total')
+
+    rows << [ 'Confirmed Cases', commify(get_hash_value(results, 'ConfirmedToday')), commify(get_hash_value(results, 'ConfirmedTotal')) ]
+    rows << [ 'Recovered', commify(get_hash_value(results, 'RecoveredToday')), commify(get_hash_value(results, 'RecoveredTotal')) ]
+    rows << [ 'Deaths', commify(get_hash_value(results, 'DeathsToday')), commify(get_hash_value(results, 'DeathsTotal')) ]
+    rows << [ 'Active', '', commify(get_hash_value(results, 'ActiveTotal')) ]
+
+    table = Terminal::Table.new :title => title.colorize(:light_green), :headings => headings, :rows => rows, :style => { :padding_left => 2, :padding_right => 2 }
+    table.align_column(1, :right)
+    table.align_column(2, :right)
+    puts table
+end
+
+# -------------------------------------------------------------------------------- #
+# Show Todays Totals By Country                                                    #
+# -------------------------------------------------------------------------------- #
+# Create a nice table view of todays totals available per country.                 #
+# -------------------------------------------------------------------------------- #
+
+def show_todays_totals_by_country(results, options = {})
+    title = 'Latest Totals by Country'
+    headings = []
+    rows = []
+
+    headings << add_heading('Country', :left)
+    headings << add_heading('Confirmed')
+    headings << add_heading('Recovered')
+    headings << add_heading('Deaths')
+
+    unless results.nil? && results.length.positive?
+        case options[:order]
+            when $_confirmed
+                results = results.sort_by { |k| k['ConfirmedToday'] }.reverse
+                title += ' Ordered by \'Confirmed\''
+            when $_recovered
+                results = results.sort_by { |k| k['RecoveredToday'] }.reverse
+                title += ' Ordered by \'Recovered\''
+            when $_deaths
+                results = results.sort_by { |k| k['DeathsToday'] }.reverse
+                title += ' Ordered by \'Deaths\''
+            else
+                results = results.sort_by { |k| k['Country'] }
+        end
 
-    sorted = []
-    processed.each do |_key, value|
-        sorted << value
+        results.each do |value|
+            rows << [ value['Country'], commify(value['ConfirmedToday']), commify(value['RecoveredToday']), commify(value['DeathsToday']) ]
+        end
     end
 
-    sorted = sorted.sort_by { |k| k['country'] }
-    sorted = sorted.sort_by { |k| k['confirmed'] }.reverse if options[:confirmed]
-    sorted = sorted.sort_by { |k| k['deaths'] }.reverse if options[:deaths]
-    sorted = sorted.sort_by { |k| k['recovered'] }.reverse if options[:recovered]
-    sorted = sorted.sort_by { |k| k['death_rate'] }.reverse if options[:percentage]
+    table = Terminal::Table.new :title => title.colorize(:light_green), :headings => headings, :rows => rows, :style => { :padding_left => 2, :padding_right => 2 }
+    table.align_column(1, :right)
+    table.align_column(2, :right)
+    table.align_column(3, :right)
+    puts table
+end
 
-    formatted = []
-    sorted.each do |item|
-        formatted << [item['country'], item['country_code'], item['id'], item['confirmed'], item['deaths'], item['recovered'], "%.2f" % item['death_rate']]
+# -------------------------------------------------------------------------------- #
+# Show Grand Totals By Country                                                     #
+# -------------------------------------------------------------------------------- #
+# Create a nice table view of the grand totals available per country.              #
+# -------------------------------------------------------------------------------- #
+
+def show_grand_totals_by_country(results, options = {})
+    title = 'Grand Totals by Country'
+    headings = []
+    rows = []
+
+    headings << add_heading('Country', :left)
+    headings << add_heading('Confirmed')
+    headings << add_heading('Recovered')
+    headings << add_heading('Deaths')
+    headings << add_heading('Active')
+    headings << add_heading('Death Rate')
+    headings << add_heading('Recovery Rate')
+    headings << add_heading('Cases P/M')
+
+    unless results.nil? && results.length.positive?
+        case options[:order]
+            when $_confirmed
+                results = results.sort_by { |k| k['ConfirmedTotal'] }.reverse
+                title += ' Ordered by \'Confirmed\''
+            when $_recovered
+                results = results.sort_by { |k| k['RecoveredTotal'] }.reverse
+                title += ' Ordered by \'Recovered\''
+            when $_deaths
+                results = results.sort_by { |k| k['DeathsTotal'] }.reverse
+                title += ' Ordered by \'Deaths\''
+            when $_active
+                results = results.sort_by { |k| k['ActiveTotal'] }.reverse
+                title += ' Ordered by \'Active\''
+            when $_death_rate
+                results = results.sort_by { |k| k['DeathRate'] }.reverse
+                title += ' Ordered by \'Death Rate\''
+            when $_recovery_rate
+                results = results.sort_by { |k| k['RecoveryRate'] }.reverse
+                title += ' Ordered by \'Recovery Rate\''
+            when $_cases_pm
+                results = results.sort_by { |k| k['CasesPerMillion'] }.reverse
+                title += ' Ordered by \'Cases Per Million\''
+            else
+                results = results.sort_by { |k| k['Country'] }
+        end
+
+        results.each do |value|
+            rows << [ value['Country'], commify(value['ConfirmedTotal']), commify(value['RecoveredTotal']), commify(value['DeathsTotal']), commify(value['ActiveTotal']), "%.2f %%" % value['DeathRate'], "%.2f %%" % value['RecoveryRate'], commify(value['CasesPerMillion']) ]
+        end
     end
 
-    table = Terminal::Table.new :title => 'Latest Statistics by Country', :headings => ['Country', 'Code', 'ID', 'Confirmed', 'Deaths', 'Recovered', 'Death Rate (%)'], :rows => formatted, :style => { :padding_left => 2, :padding_right => 2 }
-    table.align_column(1, :center)
+    table = Terminal::Table.new :title => title.colorize(:light_green), :headings => headings, :rows => rows, :style => { :padding_left => 2, :padding_right => 2 }
+    table.align_column(1, :right)
     table.align_column(2, :right)
     table.align_column(3, :right)
     table.align_column(4, :right)
     table.align_column(5, :right)
     table.align_column(6, :right)
-
+    table.align_column(7, :right)
     puts table
 end
 
@@ -90,8 +194,9 @@ end
 
 def get_covid19_stats(options)
     begin
-        format_latest_stats(Covid19.latest_stats) if options[:latest]
-        format_latest_country_stats(Covid19.latest_stats_split_by_country, options) unless options[:latest]
+        show_summary_data(Covid19.latest_stats_global) if options[:summary]
+        show_todays_totals_by_country(Covid19.latest_stats_split_by_country, options) if options[:latest]
+        show_grand_totals_by_country(Covid19.latest_stats_split_by_country, options) if options[:totals]
     rescue StandardError => e
         puts "Error: #{e}"
         puts e.backtrace
@@ -109,7 +214,7 @@ end
 # -------------------------------------------------------------------------------- #
 
 def process_arguments
-    options = { :latest => true }
+    options = { :summary => true }
     # Enforce the presence of
     mandatory = %I[]
 
@@ -120,37 +225,50 @@ def process_arguments
             puts opts
             exit(1)
         end
-
-        opts.on('-s', '--split', 'View the latestest information for all locations') do
+        opts.on('-s', '--summary', 'Show a summary of the totals [Default]') do
+            options[:summary] = true
             options[:latest] = false
+            options[:totals] = false
         end
-
-        opts.on('-c', '--confirmed', 'Order results by confirmed cases') do
-            options[:confirmed] = true
-            options[:deaths] = false
-            options[:percentage] = false
-            options[:recovered] = false
+        opts.on('-l', '--latest', 'Show the latest (todays) totals split by country (same as -t)') do
+            options[:summary] = false
+            options[:latest] = true
+            options[:totals] = false
         end
-
-        opts.on('-d', '--deaths', 'Order results by deaths') do
-            options[:confirmed] = false
-            options[:deaths] = true
-            options[:percentage] = false
-            options[:recovered] = false
+        opts.on('-t', '--today', 'Show the latest (todays) totals split by country (same as -l)') do
+            options[:summary] = false
+            options[:latest] = true
+            options[:totals] = false
         end
-
-        opts.on('-p', '--death-rate', 'Order results by percentage of deaths (death rate)') do
-            options[:confirmed] = false
-            options[:deaths] = false
-            options[:percentage] = true
-            options[:recovered] = false
+        opts.on('-T', '--totals', 'Show the full totals split by country') do
+            options[:summary] = false
+            options[:latest] = false
+            options[:totals] = true
         end
 
-        opts.on('-r', '--recovered', 'Order results by recovered numbers') do
-            options[:confirmed] = false
-            options[:deaths] = false
-            options[:percentage] = false
-            options[:recovered] = true
+        opts.separator('')
+        opts.separator('Coloumn Sorting Options:')
+
+        opts.on('-c', '--confirmed', 'Order the output based on \'Confirmed\' column') do
+            options[:order] = $_confirmed
+        end
+        opts.on('-r', '--recovered', 'Order the output based on \'Recovered\' column') do
+            options[:order] = $_recovered
+        end
+        opts.on('-d', '--deaths', 'Order the output based on \'Deaths\' column') do
+            options[:order] = $_deaths
+        end
+        opts.on('-a', '--active', 'Order the output based on \'Active\' column') do
+            options[:order] = $_active
+        end
+        opts.on('-D', '--death-rate', 'Order the output based on \'Death Rate\' column') do
+            options[:order] = $_death_rate
+        end
+        opts.on('-R', '--recovery-rate', 'Order the output based on \'Recovery Rate\' column') do
+            options[:order] = $_recovery_rate
+        end
+        opts.on('-C', '--cases-per-million', 'Order the output based on \'Cases P/M\' column') do
+            options[:order] = $_cases_pm
         end
     end
 

data/lib/covid19.rb

@@ -1,40 +1,143 @@
 require 'covid19/version'
 
 require 'json'
+require 'uri'
 require 'net/http'
 
 #
 # To Follow
 #
 class Covid19
-    API_URL = 'https://coronavirus-tracker-api.herokuapp.com/v2/'.freeze
+    API_URL = 'https://corona-api.com/countries?include=timeline'.freeze
 
     class <<  self
-        def latest_stats
-            return retrieve_api_data('latest')
+        def latest_stats_all
+            return create_live_data_set
         end
 
-        def latest_stats_split_by_country
-            return retrieve_api_data('locations')
+        def latest_stats_global
+            return create_live_data_set['Global']
         end
 
-        def latest_stats_by_country_code(country_code, with_timelines = false)
-            timelines = with_timelines ? '&timelines=true' : ''
-            return retrieve_api_data("locations?country_code=#{country_code.upcase}#{timelines}")
+        def latest_stats_split_by_country
+            return create_live_data_set['Countries']
         end
 
-        def latest_stats_by_country_id(id)
-            return retrieve_api_data("locations/#{id}")
+        private
+
+        def get_max(left, right)
+            return (left <=> right) >= 0 ? left : right
         end
 
-        private
+        def create_live_data_set
+            global = { 'todays_confirmed' => 0, 'todays_recovered' => 0, 'todays_deaths' => 0, 'total_confirmed' => 0, 'total_recovered' => 0, 'total_deaths' => 0, 'total_active' => 0 }
+            country_list = []
+
+            data = retrieve_api_data['data']
+
+            data.each do |country|
+                todays_data = get_hash_value(country, 'today', [])
+                latest_data = get_hash_value(country, 'latest_data', [])
+                calculated_data = get_hash_value(latest_data, 'calculated', [])
+                timeline_data = get_hash_value(country, 'timeline', [])
+
+                #
+                # If we have timeline data then lets grab the most recent (current row)
+                #
+                current_data = if timeline_data.empty?
+                                   []
+                               else
+                                   timeline_data.first
+                               end
+
+                timeline_confirmed       = get_hash_value(current_data, 'new_confirmed')
+                timeline_recovered       = get_hash_value(current_data, 'new_recovered')
+                timeline_deaths          = get_hash_value(current_data, 'new_deaths')
+                timeline_total_confirmed = get_hash_value(current_data, 'confirmed')
+                timeline_total_recovered = get_hash_value(current_data, 'recovered')
+                timeline_total_deaths    = get_hash_value(current_data, 'deaths')
+                timeline_total_active    = get_hash_value(current_data, 'active')
+
+                #
+                # Get todays data from the todays data set
+                #
+                todays_confirmed = get_hash_value(todays_data, 'confirmed')
+                todays_recovered = get_hash_value(todays_data, 'recovered')
+                todays_deaths    = get_hash_value(todays_data, 'deaths')
 
-        def retrieve_api_data(uri)
-            url = URI("#{API_URL}#{uri}")
+                #
+                # Get the latest data from the latest dataset
+                #
+                total_confirmed = get_hash_value(latest_data, 'confirmed')
+                total_recovered = get_hash_value(latest_data, 'recovered')
+                total_deaths    = get_hash_value(latest_data, 'deaths')
+                total_active    = total_confirmed - (total_deaths + total_recovered)
+
+                #
+                # Use the biggest value - as timeline is updated at a different rate
+                #
+                todays_confirmed = get_max(timeline_confirmed, todays_confirmed)
+                todays_recovered = get_max(timeline_recovered, todays_recovered)
+                todays_deaths    = get_max(timeline_deaths, todays_deaths)
+                total_confirmed  = get_max(timeline_total_confirmed, total_confirmed)
+                total_recovered  = get_max(timeline_total_recovered, total_recovered)
+                total_deaths     = get_max(timeline_total_deaths, total_deaths)
+                total_active     = get_max(timeline_total_active, total_active)
+
+                # This normally means the country has stopped given updates on recoveries
+                if get_hash_value(latest_data, 'recovered').zero?
+                    todays_recovered = 0
+                    total_recovered = 0
+                    total_active = 0
+                end
+
+                global['todays_confirmed'] += todays_confirmed
+                global['todays_recovered'] += todays_recovered
+                global['todays_deaths']    += todays_deaths
+                global['total_confirmed']  += total_confirmed
+                global['total_recovered']  += total_recovered
+                global['total_deaths']     += total_deaths
+                global['total_active']     += total_active
+
+                row = {
+                    'Country'         => country['name'],
+                    'Population'      => get_hash_value(country, 'population', 'unknown'),
+                    'ConfirmedToday'  => todays_confirmed,
+                    'RecoveredToday'  => todays_recovered,
+                    'DeathsToday'     => todays_deaths,
+                    'ConfirmedTotal'  => total_confirmed,
+                    'RecoveredTotal'  => total_recovered,
+                    'DeathsTotal'     => total_deaths,
+                    'ActiveTotal'     => total_active,
+                    'DeathRate'       => get_hash_value(calculated_data, 'death_rate').to_f,
+                    'RecoveryRate'    => get_hash_value(calculated_data, 'recovery_rate').to_f,
+                    'CasesPerMillion' => get_hash_value(calculated_data, 'cases_per_million_population').to_f
+                }
+
+                country_list << row
+            end
+
+            global = {
+                'ConfirmedToday' => global['todays_confirmed'],
+                'RecoveredToday' => global['todays_recovered'],
+                'DeathsToday'    => global['todays_deaths'],
+                'ConfirmedTotal' => global['total_confirmed'],
+                'RecoveredTotal' => global['total_recovered'],
+                'DeathsTotal'    => global['total_deaths'],
+                'ActiveTotal'    => global['total_active']
+            }
+
+            results = { 'Global' => global, 'Countries' => country_list }
+
+            return results
+        end
 
+        def retrieve_api_data
             begin
-                response = Net::HTTP.get(url)
-                return JSON.parse(response)
+                # encoded_url = URI.encode(API_URL)
+                uri = URI.parse(API_URL)
+                response = Net::HTTP.get_response(uri)
+                return JSON.parse(response.body)
             rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
                 raise StandardError.new(e.to_s)
             end

data/lib/covid19/version.rb

@@ -1,3 +1,3 @@
 class Covid19
-    VERSION = '0.1.3'.freeze
+    VERSION = '1.0.0'.freeze
 end

data/testing/covid19

@@ -3,83 +3,188 @@
 $LOAD_PATH.unshift('./lib')
 
 require 'bundler/setup'
+
+require 'colorize'
 require 'optparse'
 require 'covid19'
 require 'terminal-table'
 
 # -------------------------------------------------------------------------------- #
-# Format Global Stats                                                              #
+# Global Variables                                                                 #
 # -------------------------------------------------------------------------------- #
-# Create a nice table view of the latest global stats.                             #
+# A simple set of global variables to avoid having to do multiple string compares  #
+# as one typo can cause weird things to happen.                                    #
 # -------------------------------------------------------------------------------- #
 
-def format_latest_stats(results)
-    formatted = []
-    results['latest'].each do |key, value|
-        formatted << [key, value]
-    end
+$_confirmed = 1
+$_recovered = 2
+$_deaths = 3
+$_active = 4
+$_death_rate = 5
+$_recovery_rate = 6
+$_cases_pm = 7
 
-    confirmed = results['latest']['confirmed']
-    deaths = results['latest']['deaths']
+# -------------------------------------------------------------------------------- #
+# Get Hash Value                                                                   #
+# -------------------------------------------------------------------------------- #
+# Simple wrapper to locate a value from a hash and handle error states.            #
+# -------------------------------------------------------------------------------- #
 
-    percentage = ((deaths.to_f / confirmed) * 100)
+def get_hash_value(hash, name, default_val = 0)
+    return default_val unless hash.is_a?(Hash)
 
-    formatted << ['death rate', "%.2f%%" % percentage]
+    return hash.fetch(name, default_val)
+end
 
-    puts Terminal::Table.new :title => 'Latest Global Statistics', :rows => formatted, :style => { :width => 80 }
+# -------------------------------------------------------------------------------- #
+# Commify                                                                          #
+# -------------------------------------------------------------------------------- #
+# Simple wrapper to make numbers a little more human readable.                     #
+# -------------------------------------------------------------------------------- #
+
+def commify(number)
+    return number.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(',').reverse
 end
 
 # -------------------------------------------------------------------------------- #
-# Format Country Stats                                                             #
+# Add Heading                                                                      #
 # -------------------------------------------------------------------------------- #
-# Create a nice table view of the latest country stats.                            #
+# Simple wrapper to generate a heading entry with optional alignment override.     #
 # -------------------------------------------------------------------------------- #
-def format_latest_country_stats(results, options = {})
-    processed = {}
 
-    results['locations'].each do |item|
-        country_code = item['country_code'].to_s
+def add_heading(name, alignment = :center)
+    return { :value => name, :alignment => alignment }
+end
 
-        if processed[country_code]
-            confirmed = processed[country_code]['confirmed'] + item['latest']['confirmed']
-            deaths = processed[country_code]['deaths'] + item['latest']['deaths']
-            recovered = processed[country_code]['recovered'] + item['latest']['recovered']
-        else
-            confirmed = item['latest']['confirmed']
-            deaths = item['latest']['deaths']
-            recovered = item['latest']['recovered']
-        end
-        percentage = ((deaths.to_f / confirmed) * 100)
+# -------------------------------------------------------------------------------- #
+# Show Summary Data                                                                #
+# -------------------------------------------------------------------------------- #
+# Create a nice table view of the latest global statistics.                        #
+# -------------------------------------------------------------------------------- #
 
-        percentage = 0 if percentage.nil?
+def show_summary_data(results)
+    title = 'Global Statistics Summary'
+    headings = []
+    rows = []
 
-        processed[country_code] = { 'country' => item['country'], 'country_code' => country_code, 'id' => item['id'], 'confirmed' => confirmed, 'deaths' => deaths, 'recovered' => recovered, 'death_rate' => percentage }
-    end
+    headings << ''
+    headings << add_heading('Today')
+    headings << add_heading('Total')
+
+    rows << [ 'Confirmed Cases', commify(get_hash_value(results, 'ConfirmedToday')), commify(get_hash_value(results, 'ConfirmedTotal')) ]
+    rows << [ 'Recovered', commify(get_hash_value(results, 'RecoveredToday')), commify(get_hash_value(results, 'RecoveredTotal')) ]
+    rows << [ 'Deaths', commify(get_hash_value(results, 'DeathsToday')), commify(get_hash_value(results, 'DeathsTotal')) ]
+    rows << [ 'Active', '', commify(get_hash_value(results, 'ActiveTotal')) ]
+
+    table = Terminal::Table.new :title => title.colorize(:light_green), :headings => headings, :rows => rows, :style => { :padding_left => 2, :padding_right => 2 }
+    table.align_column(1, :right)
+    table.align_column(2, :right)
+    puts table
+end
+
+# -------------------------------------------------------------------------------- #
+# Show Todays Totals By Country                                                    #
+# -------------------------------------------------------------------------------- #
+# Create a nice table view of todays totals available per country.                 #
+# -------------------------------------------------------------------------------- #
+
+def show_todays_totals_by_country(results, options = {})
+    title = 'Latest Totals by Country'
+    headings = []
+    rows = []
+
+    headings << add_heading('Country', :left)
+    headings << add_heading('Confirmed')
+    headings << add_heading('Recovered')
+    headings << add_heading('Deaths')
+
+    unless results.nil? && results.length.positive?
+        case options[:order]
+            when $_confirmed
+                results = results.sort_by { |k| k['ConfirmedToday'] }.reverse
+                title += ' Ordered by \'Confirmed\''
+            when $_recovered
+                results = results.sort_by { |k| k['RecoveredToday'] }.reverse
+                title += ' Ordered by \'Recovered\''
+            when $_deaths
+                results = results.sort_by { |k| k['DeathsToday'] }.reverse
+                title += ' Ordered by \'Deaths\''
+            else
+                results = results.sort_by { |k| k['Country'] }
+        end
 
-    sorted = []
-    processed.each do |_key, value|
-        sorted << value
+        results.each do |value|
+            rows << [ value['Country'], commify(value['ConfirmedToday']), commify(value['RecoveredToday']), commify(value['DeathsToday']) ]
+        end
     end
 
-    sorted = sorted.sort_by { |k| k['country'] }
-    sorted = sorted.sort_by { |k| k['confirmed'] }.reverse if options[:confirmed]
-    sorted = sorted.sort_by { |k| k['deaths'] }.reverse if options[:deaths]
-    sorted = sorted.sort_by { |k| k['recovered'] }.reverse if options[:recovered]
-    sorted = sorted.sort_by { |k| k['death_rate'] }.reverse if options[:percentage]
+    table = Terminal::Table.new :title => title.colorize(:light_green), :headings => headings, :rows => rows, :style => { :padding_left => 2, :padding_right => 2 }
+    table.align_column(1, :right)
+    table.align_column(2, :right)
+    table.align_column(3, :right)
+    puts table
+end
 
-    formatted = []
-    sorted.each do |item|
-        formatted << [item['country'], item['country_code'], item['id'], item['confirmed'], item['deaths'], item['recovered'], "%.2f" % item['death_rate']]
+# -------------------------------------------------------------------------------- #
+# Show Grand Totals By Country                                                     #
+# -------------------------------------------------------------------------------- #
+# Create a nice table view of the grand totals available per country.              #
+# -------------------------------------------------------------------------------- #
+
+def show_grand_totals_by_country(results, options = {})
+    title = 'Grand Totals by Country'
+    headings = []
+    rows = []
+
+    headings << add_heading('Country', :left)
+    headings << add_heading('Confirmed')
+    headings << add_heading('Recovered')
+    headings << add_heading('Deaths')
+    headings << add_heading('Active')
+    headings << add_heading('Death Rate')
+    headings << add_heading('Recovery Rate')
+    headings << add_heading('Cases P/M')
+
+    unless results.nil? && results.length.positive?
+        case options[:order]
+            when $_confirmed
+                results = results.sort_by { |k| k['ConfirmedTotal'] }.reverse
+                title += ' Ordered by \'Confirmed\''
+            when $_recovered
+                results = results.sort_by { |k| k['RecoveredTotal'] }.reverse
+                title += ' Ordered by \'Recovered\''
+            when $_deaths
+                results = results.sort_by { |k| k['DeathsTotal'] }.reverse
+                title += ' Ordered by \'Deaths\''
+            when $_active
+                results = results.sort_by { |k| k['ActiveTotal'] }.reverse
+                title += ' Ordered by \'Active\''
+            when $_death_rate
+                results = results.sort_by { |k| k['DeathRate'] }.reverse
+                title += ' Ordered by \'Death Rate\''
+            when $_recovery_rate
+                results = results.sort_by { |k| k['RecoveryRate'] }.reverse
+                title += ' Ordered by \'Recovery Rate\''
+            when $_cases_pm
+                results = results.sort_by { |k| k['CasesPerMillion'] }.reverse
+                title += ' Ordered by \'Cases Per Million\''
+            else
+                results = results.sort_by { |k| k['Country'] }
+        end
+
+        results.each do |value|
+            rows << [ value['Country'], commify(value['ConfirmedTotal']), commify(value['RecoveredTotal']), commify(value['DeathsTotal']), commify(value['ActiveTotal']), "%.2f %%" % value['DeathRate'], "%.2f %%" % value['RecoveryRate'], commify(value['CasesPerMillion']) ]
+        end
     end
 
-    table = Terminal::Table.new :title => 'Latest Statistics by Country', :headings => ['Country', 'Code', 'ID', 'Confirmed', 'Deaths', 'Recovered', 'Death Rate (%)'], :rows => formatted, :style => { :padding_left => 2, :padding_right => 2 }
-    table.align_column(1, :center)
+    table = Terminal::Table.new :title => title.colorize(:light_green), :headings => headings, :rows => rows, :style => { :padding_left => 2, :padding_right => 2 }
+    table.align_column(1, :right)
     table.align_column(2, :right)
     table.align_column(3, :right)
     table.align_column(4, :right)
     table.align_column(5, :right)
     table.align_column(6, :right)
-
+    table.align_column(7, :right)
     puts table
 end
 
@@ -91,8 +196,9 @@ end
 
 def get_covid19_stats(options)
     begin
-        format_latest_stats(Covid19.latest_stats) if options[:latest]
-        format_latest_country_stats(Covid19.latest_stats_split_by_country, options) unless options[:latest]
+        show_summary_data(Covid19.latest_stats_global) if options[:summary]
+        show_todays_totals_by_country(Covid19.latest_stats_split_by_country, options) if options[:latest]
+        show_grand_totals_by_country(Covid19.latest_stats_split_by_country, options) if options[:totals]
     rescue StandardError => e
         puts "Error: #{e}"
         puts e.backtrace
@@ -110,7 +216,7 @@ end
 # -------------------------------------------------------------------------------- #
 
 def process_arguments
-    options = { :latest => true }
+    options = { :summary => true }
     # Enforce the presence of
     mandatory = %I[]
 
@@ -121,37 +227,50 @@ def process_arguments
             puts opts
             exit(1)
         end
-
-        opts.on('-s', '--split', 'View the latestest information for all locations') do
+        opts.on('-s', '--summary', 'Show a summary of the totals [Default]') do
+            options[:summary] = true
             options[:latest] = false
+            options[:totals] = false
         end
-
-        opts.on('-c', '--confirmed', 'Order results by confirmed cases') do
-            options[:confirmed] = true
-            options[:deaths] = false
-            options[:percentage] = false
-            options[:recovered] = false
+        opts.on('-l', '--latest', 'Show the latest (todays) totals split by country (same as -t)') do
+            options[:summary] = false
+            options[:latest] = true
+            options[:totals] = false
         end
-
-        opts.on('-d', '--deaths', 'Order results by deaths') do
-            options[:confirmed] = false
-            options[:deaths] = true
-            options[:percentage] = false
-            options[:recovered] = false
+        opts.on('-t', '--today', 'Show the latest (todays) totals split by country (same as -l)') do
+            options[:summary] = false
+            options[:latest] = true
+            options[:totals] = false
         end
-
-        opts.on('-p', '--death-rate', 'Order results by percentage of deaths (death rate)') do
-            options[:confirmed] = false
-            options[:deaths] = false
-            options[:percentage] = true
-            options[:recovered] = false
+        opts.on('-T', '--totals', 'Show the full totals split by country') do
+            options[:summary] = false
+            options[:latest] = false
+            options[:totals] = true
         end
 
-        opts.on('-r', '--recovered', 'Order results by recovered numbers') do
-            options[:confirmed] = false
-            options[:deaths] = false
-            options[:percentage] = false
-            options[:recovered] = true
+        opts.separator('')
+        opts.separator('Coloumn Sorting Options:')
+
+        opts.on('-c', '--confirmed', 'Order the output based on \'Confirmed\' column') do
+            options[:order] = $_confirmed
+        end
+        opts.on('-r', '--recovered', 'Order the output based on \'Recovered\' column') do
+            options[:order] = $_recovered
+        end
+        opts.on('-d', '--deaths', 'Order the output based on \'Deaths\' column') do
+            options[:order] = $_deaths
+        end
+        opts.on('-a', '--active', 'Order the output based on \'Active\' column') do
+            options[:order] = $_active
+        end
+        opts.on('-D', '--death-rate', 'Order the output based on \'Death Rate\' column') do
+            options[:order] = $_death_rate
+        end
+        opts.on('-R', '--recovery-rate', 'Order the output based on \'Recovery Rate\' column') do
+            options[:order] = $_recovery_rate
+        end
+        opts.on('-C', '--cases-per-million', 'Order the output based on \'Cases P/M\' column') do
+            options[:order] = $_cases_pm
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: covid19
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Tim Gurney aka Wolf
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +142,7 @@ homepage: https://github.com/WolfAtheneum/covid19
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A wrapper for the coronavirus API at https://github.com/ExpDev07/coronavirus-tracker-api.
 test_files: []