kovid 0.4.3 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc2e30c94c8148c8849241849c6b0340429f0a271ade0927091098972e4fc914
-  data.tar.gz: 54197f1917738844f1c36e3c1f513deb254d5e47ecb97e8b62db198fded53935
+  metadata.gz: bb4f2a55aae94609d2348161b6228065372705e980e4d3e35209a5e1d259371f
+  data.tar.gz: 45d8b57b5270fd21831cdb6153914a32a4c8d1dfbca65b922ca84b4443286ee9
 SHA512:
-  metadata.gz: 2ebeeeccb550b36ecd7376ba78894434eb2b980c2dbd57e6552e8037400694cf548926e8eea642c0929f974522220804c0a4092344f9f5122df8a5ff257a3695
-  data.tar.gz: 4f423a115a7c06d937960085e795bb77196f4513434951f1cdf01a3b41ad7892ea561eea73e8046a67a84ff47c4d497b530b08c607af783ddd4e421708091d18
+  metadata.gz: 75aa05406a1e3aa47a2f50dd92828c60f559a029e23d6dd155993d8a58c229b0bb90639378b7f5551410cfe9835c6e2bf4f0ea69dc039ab8b69b78f34272a5e1
+  data.tar.gz: a3aef9a944a811784c2c1b9503d3f958f76e130ce9698020ed74bcaad9383bcaee76a57fadf0671c4a0fc71a28bd5e6be1f3a14bd9547857159da5b9c48f8627

data/Gemfile.lock

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

data/README.md

@@ -29,22 +29,20 @@ 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 get continental information with the following commands:
 
-You can fetch aggregated EU (all 27 countries combined) data:
-* `kovid eu`.
+* `kovid africa`.
+* `kovid europe`.
+* `kovid eu`. (The European Union)
+* `kovid sa`. (South America)
+* `kovid asia`.
+* `kovid world`. (Worldwide Statistics)
 
 🇺🇸🇺🇸🇺🇸
 
 You can fetch US state-specific data:
 * `kovid state STATE` OR `kovid state "STATE NAME"`.
 
-##### 🔜 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
 ___
 😷 **Comparing**
 * `kovid compare FOO BAR` (sorts by cases DESC).
@@ -61,8 +59,6 @@ ___
 * `kovid history COUNTRY` (full history).
 * `kovid history COUNTRY N` (history in the last N days).
 ___
-😷 **Total figures**
-* `kovid world` (summary of reported incidents globally).
 
 **NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.
 
@@ -75,19 +71,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 +103,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,22 @@ module Kovid
     Kovid::Request.eu_aggregate
   end
 
+  def europe_aggregate
+    Kovid::Request.europe_aggregate
+  end
+
+  def africa_aggregate
+    Kovid::Request.africa_aggregate
+  end
+
+  def south_america_aggregate
+    Kovid::Request.south_america_aggregate
+  end
+
+  def asia_aggregate
+    Kovid::Request.asia_aggregate
+  end
+
   def country(name)
     Kovid::Request.by_country(name)
   end

data/lib/kovid/cli.rb

@@ -59,6 +59,30 @@ module Kovid
       data_source
     end
 
+    desc 'europe', 'Returns aggregated data on Europe.'
+    def europe
+      puts Kovid.europe_aggregate
+      data_source
+    end
+
+    desc 'africa', 'Returns aggregated data on Africa.'
+    def africa
+      puts Kovid.africa_aggregate
+      data_source
+    end
+
+    desc 'sa', 'Returns aggregated data on South America.'
+    def sa
+      puts Kovid.south_america_aggregate
+      data_source
+    end
+
+    desc 'asia', 'Returns aggregated data on Asia.'
+    def asia
+      puts Kovid.asia_aggregate
+      data_source
+    end
+
     desc 'version', 'Returns version of kovid'
     def version
       puts Kovid::VERSION

data/lib/kovid/request.rb

@@ -10,27 +10,52 @@ 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
+    EUROPE_ISOS = EU_ISOS + %w[GB IS NO CH MC AD SM VA BA RS ME MK AL BY UA RU MD]
+    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
+    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
+
     SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
     class << self
       def eu_aggregate
-        countries_array = JSON.parse(Typhoeus.get(UriBuilder.new('/countries').url, cache_ttl: 900).response_body)
+        eu_proc = proc do |data|
+          Kovid::Tablelize.eu_aggregate(data)
+        end
+
+        aggregator(EU_ISOS, eu_proc)
+      end
 
-        eu_array = countries_array.select do |hash|
-          EU_ISOS.include?(hash['countryInfo']['iso2'])
+      def europe_aggregate
+        europe_proc = proc do |data|
+          Kovid::Tablelize.europe_aggregate(data)
         end
 
-        head, *tail = eu_array
-        eu_data = head.merge(*tail) do |key, left, right|
-          left ||= 0
-          right ||= 0
+        aggregator(EUROPE_ISOS, europe_proc)
+      end
 
-          left + right unless %w[country countryInfo].include?(key)
-        end.compact
+      def africa_aggregate
+        africa_proc = proc do |data|
+          Kovid::Tablelize.africa_aggregate(data)
+        end
 
-        Kovid::Tablelize.eu_aggregate(eu_data)
-      rescue JSON::ParserError
-        puts SERVER_DOWN
+        aggregator(AFRICA_ISOS, africa_proc)
+      end
+
+      def south_america_aggregate
+        south_america_proc = proc do |data|
+          Kovid::Tablelize.south_america_aggregate(data)
+        end
+
+        aggregator(SOUTH_AMERICA_ISOS, south_america_proc)
+      end
+
+      def asia_aggregate
+        asia_proc = proc do |data|
+          Kovid::Tablelize.asia_aggregate(data)
+        end
+
+        aggregator(ASIA_ISOS, asia_proc)
       end
 
       def by_country(country_name)
@@ -151,6 +176,26 @@ module Kovid
 
         states_array.select { |state_name| state_name['state'] == capitalize_words(state) }.first
       end
+
+      def aggregator(isos, meth)
+        countries_array = JSON.parse(Typhoeus.get(UriBuilder.new('/countries').url, cache_ttl: 900).response_body)
+
+        country_array = countries_array.select do |hash|
+          isos.include?(hash['countryInfo']['iso2'])
+        end
+
+        head, *tail = country_array
+        data = head.merge(*tail) do |key, left, right|
+          left ||= 0
+          right ||= 0
+
+          left + right unless %w[country countryInfo].include?(key)
+        end.compact
+
+        meth === data
+      rescue JSON::ParserError
+        puts SERVER_DOWN
+      end
     end
   end
 end

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,
@@ -49,6 +49,15 @@ module Kovid
         'Cases/Million'.paint_white
       ].freeze
 
+      COMPARE_COUNTRIES_TABLE_HEADINGS = [
+        'Country'.paint_white,
+        'Cases'.paint_white,
+        'Cases Today'.paint_white,
+        'Deaths'.paint_red,
+        'Deaths Today'.paint_red,
+        'Recovered'.paint_green
+      ].freeze
+
       FOOTER_LINE = ['------------', '------------', '------------'].freeze
       COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
@@ -69,8 +78,6 @@ module Kovid
         else
           Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
         end
-        # TODO: Rafactor this
-        # TODO: Fix emoji
       end
 
       def full_country_table(data)
@@ -123,29 +130,25 @@ module Kovid
       end
 
       def compare_countries_table(data)
-        headings = [
-          'Country'.paint_white,
-          'Cases'.paint_white,
-          'Deaths'.paint_red,
-          'Recovered'.paint_green,
-          'Cases Today'.paint_white,
-          'Deaths Today'.paint_red
-        ]
-
         rows = []
 
         data.each do |country|
-          rows << [
-            country['country'].upcase,
+          base_rows = [
             comma_delimit(country['cases']),
-            comma_delimit(country['deaths']),
-            comma_delimit(country['recovered']),
             check_if_positve(country['todayCases']),
-            check_if_positve(country['todayDeaths'])
+            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
         end
 
-        Terminal::Table.new(headings: headings, rows: rows)
+        Terminal::Table.new(headings: COMPARE_COUNTRIES_TABLE_HEADINGS, rows: rows)
       end
 
       def compare_countries_table_full(data)
@@ -159,7 +162,6 @@ module Kovid
             check_if_positve(country.fetch('todayDeaths')),
             comma_delimit(country.fetch('critical')),
             comma_delimit(country.fetch('casesPerOneMillion'))
-
           ]
         end
 
@@ -269,22 +271,25 @@ module Kovid
       end
 
       def eu_aggregate(eu_data)
-        rows = []
-        rows << [
-          comma_delimit(eu_data['cases']),
-          check_if_positve(eu_data['todayCases']),
-          comma_delimit(eu_data['deaths']),
-          check_if_positve(eu_data['todayDeaths']),
-          comma_delimit(eu_data['recovered']),
-          comma_delimit(eu_data['active']),
-          comma_delimit(eu_data['critical'])
-        ]
+        aggregated_table(eu_data, 'The EU', Kovid::Request::EU_ISOS, '🇪🇺')
+      end
 
-        Terminal::Table.new(
-          title: '🇪🇺' + 8203.chr(Encoding::UTF_8) + ' Aggregated EU (27 States) Data'.upcase,
-          headings: EU_AGGREGATE_HEADINGS,
-          rows: rows
-        )
+      def europe_aggregate(europe_data)
+        aggregated_table(europe_data, 'Europe', Kovid::Request::EUROPE_ISOS, '🏰')
+      end
+
+      def africa_aggregate(africa_data)
+        aggregated_table(africa_data, 'Africa', Kovid::Request::AFRICA_ISOS, '🌍')
+      end
+
+      def south_america_aggregate(south_america_data)
+        aggregated_table(south_america_data,
+                         'South America',
+                         Kovid::Request::SOUTH_AMERICA_ISOS, '🌎')
+      end
+
+      def asia_aggregate(asia_data)
+        aggregated_table(asia_data, 'Asia', Kovid::Request::ASIA_ISOS, '🌏')
       end
 
       private
@@ -301,7 +306,8 @@ module Kovid
       end
 
       def country_emoji(iso)
-        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*') + 8203.chr(Encoding::UTF_8)
+        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*') + \
+          8203.chr(Encoding::UTF_8)
       end
 
       def transpose(load)
@@ -314,6 +320,33 @@ module Kovid
         rows = [[msg]]
         puts Terminal::Table.new title: 'SCALE', rows: rows
       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'])
+        ]
+
+        Terminal::Table.new(
+          title: title,
+          headings: CONTINENTAL_AGGREGATE_HEADINGS,
+          rows: rows
+        )
+      end
     end
   end
 end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.8
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor