kovid 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2bcf9cae235b902baf6388bd509cf8bb7b9445b2bac741713c6f1d60ca830fc
-  data.tar.gz: 91d40e2882577373c5336057dd3a235364b924e276550662bd806075f90e90cc
+  metadata.gz: 96bc2442058a29c4830dbebb1baedc428f220b2b20762b150fa1ccd658648d4e
+  data.tar.gz: 11454ce4ed1f2c48778141e886cc8f9a86d8d1a3efb66caaa302f86586a17ec1
 SHA512:
-  metadata.gz: be7fe0fe2d21b477994aa531636b0dde19b350ca3a53e3c985cbe13d9dee5285c32e580bc893877c05599290471aeb7835b5d8a520f1fd8f3ceb0cfae5f3eed6
-  data.tar.gz: 45d45c55e305c76a2393580965cecb39e5227e1d2a8bba8a1ac335524f5535eddd099e13096d2d58e204ee84b40933b27bc5c6fdcbd316154940349bfca5e335
+  metadata.gz: 45f3d74148f5807f9ef03ec5a4405d9aa337ddb98e7c54e8180fab64c31ce1ff9bc92ed4840f3287514046c926d1ffb5e6982a5048a7ea16e13fe15e3b210a64
+  data.tar.gz: 29654bae42cd1c257b2705554e7b7effd1fdde060bbd31bf3a413a4a120f4ef6187117af84bdba6d16c19b361cfcaa02d0e8013911a8d31922c99b6f0bc427ba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.4.3)
+    kovid (0.4.4)
       ascii_charts (~> 0.9.1)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)

data/README.md

@@ -29,6 +29,12 @@ You can run `kovid --help` to see the full list of available commands.
 * `kovid check COUNTRY` OR `kovid country COUNTRY`.
 * `kovid check COUNTRY -f` OR `kovid check COUNTRY --full`.
 
+🦁🦁🦁
+
+You can fetch aggregated data on Africa:
+* `kovid africa`.
+
+
 🇪🇺🇪🇺🇪🇺
 
 You can fetch aggregated EU (all 27 countries combined) data:
@@ -42,7 +48,6 @@ You can fetch US state-specific data:
 ##### 🔜 Upcoming Fetch Features 👷‍♀️
 
 * `kovid europe` Aggrated stats on Europe
-* `kovid africa` Aggrated stats on Africa
 * `kovid asia` Aggrated stats on Asia
 * `kovid south_america` Aggrated stats on South America
 ___
@@ -75,19 +80,19 @@ To fetch basic data on a country run:
 
 `kovid check ghana`. If the location contains spaces: `kovid check "Diamond Princess"`
 
-![kovid](https://i.gyazo.com/ee88b41c05da3be0295dd3a158e7ba70.png "Covid data.")
+![kovid](https://i.gyazo.com/1d86ba2cd05f215b16c8d1fd13085c6e.png "Covid data.")
 
 For full table info on a country:
 
 `kovid check italy -f` OR `kovid check italy --full`
 
-![kovid](https://i.gyazo.com/7e5afce548d8a01b9bdf3f8bdb529cd1.png "Covid data.")
+![kovid](https://i.gyazo.com/1d9720b9fa2c08fb801f5361fba359bb.png "Covid data.")
 
 To compare country stats:
 
-`kovid compare germany poland`
+`kovid compare germany poland spain`
 
-![kovid](https://i.gyazo.com/876b19988da4cd7b375cde3e23376ba7.png "Covid data.")
+![kovid](https://i.gyazo.com/4100e845fea6936f5c8d21d78617110d.png "Covid data.")
 
 To compare a countries stats with a full table:
 
@@ -107,6 +112,12 @@ To fetch EU data run:
 
 ![kovid](https://i.gyazo.com/0a78afae2a5b9d2beb9f2c61dc1d3ac7.png "Covid data.")
 
+To fetch data on Africa:
+
+`kovid africa`
+
+![kovid](https://i.gyazo.com/bc45fa53e2ff688e8a1f759f1bd1b972.png "Covid data.")
+
 You can check historical statistics by running
 
 `kovid history italy 7` eg:

data/lib/kovid.rb

@@ -14,6 +14,10 @@ module Kovid
     Kovid::Request.eu_aggregate
   end
 
+  def africa_aggregate
+    Kovid::Request.africa_aggregate
+  end
+
   def country(name)
     Kovid::Request.by_country(name)
   end

data/lib/kovid/cli.rb

@@ -59,6 +59,13 @@ module Kovid
       data_source
     end
 
+
+    desc 'africa', 'Returns aggregated data on Africa.'
+    def africa
+      puts Kovid.africa_aggregate
+      data_source
+    end
+
     desc 'version', 'Returns version of kovid'
     def version
       puts Kovid::VERSION

data/lib/kovid/request.rb

@@ -10,6 +10,7 @@ module Kovid
     COUNTRIES_PATH = UriBuilder.new('/countries').url
     STATES_URL = UriBuilder.new('/states').url
     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
+    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
     SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
     class << self
@@ -33,6 +34,26 @@ module Kovid
         puts SERVER_DOWN
       end
 
+      def africa_aggregate
+        countries_array = JSON.parse(Typhoeus.get(UriBuilder.new('/countries').url, cache_ttl: 900).response_body)
+
+        africa_arry = countries_array.select do |hash|
+          AFRICA_ISOS.include?(hash['countryInfo']['iso2'])
+        end
+
+        head, *tail = africa_arry
+        africa_data = head.merge(*tail) do |key, left, right|
+          left ||= 0
+          right ||= 0
+
+          left + right unless %w[country countryInfo].include?(key)
+        end.compact
+
+        Kovid::Tablelize.africa_aggregate(africa_data)
+      rescue JSON::ParserError
+        puts SERVER_DOWN
+      end
+
       def by_country(country_name)
         response = fetch_country(country_name)
 

data/lib/kovid/tablelize.rb

@@ -28,7 +28,7 @@ module Kovid
         'Deaths'.paint_red
       ].freeze
 
-      EU_AGGREGATE_HEADINGS = [
+      CONTINENTAL_AGGREGATE_HEADINGS = [
         'Cases'.paint_white,
         'Cases Today'.paint_white,
         'Deaths'.paint_red,
@@ -162,7 +162,6 @@ module Kovid
             check_if_positve(country.fetch('todayDeaths')),
             comma_delimit(country.fetch('critical')),
             comma_delimit(country.fetch('casesPerOneMillion'))
-
           ]
         end
 
@@ -285,7 +284,26 @@ module Kovid
 
         Terminal::Table.new(
           title: '🇪🇺' + 8203.chr(Encoding::UTF_8) + ' Aggregated EU (27 States) Data'.upcase,
-          headings: EU_AGGREGATE_HEADINGS,
+          headings: CONTINENTAL_AGGREGATE_HEADINGS,
+          rows: rows
+        )
+      end
+
+      def africa_aggregate(africa_data)
+        rows = []
+        rows << [
+          comma_delimit(africa_data['cases']),
+          check_if_positve(africa_data['todayCases']),
+          comma_delimit(africa_data['deaths']),
+          check_if_positve(africa_data['todayDeaths']),
+          comma_delimit(africa_data['recovered']),
+          comma_delimit(africa_data['active']),
+          comma_delimit(africa_data['critical'])
+        ]
+
+        Terminal::Table.new(
+          title: 'Aggregated Data of Africa (55 States)'.upcase,
+          headings: CONTINENTAL_AGGREGATE_HEADINGS,
           rows: rows
         )
       end

data/lib/kovid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Emmanuel Hayford