kovid 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6de6563f95f22115b3e04efc65267d59fa949a5e68dee22063c9a58438ebc0
-  data.tar.gz: 87e2bf23684c8ca538fd68ae23d77e7daeff2b3fdba7a249442628e671a69675
+  metadata.gz: bb4f2a55aae94609d2348161b6228065372705e980e4d3e35209a5e1d259371f
+  data.tar.gz: 45d8b57b5270fd21831cdb6153914a32a4c8d1dfbca65b922ca84b4443286ee9
 SHA512:
-  metadata.gz: ff8f7e1afca67e4218d7d4491d86a34bc54cdcd49993aa515aaa0186d53a73f882ab2e6eabfcda0747ac0a0e5baefe95773982e6b786aeedb77f70f7ec696183
-  data.tar.gz: fcb797d8367ddf05ef080f3272522fd2b52761fab6a1e3b02ba8367230ff9eeb05b7f0bcbe03887a3cb6d6fdc6c10f7d7f94343a5baa329f2ea9a2956cf335fa
+  metadata.gz: 75aa05406a1e3aa47a2f50dd92828c60f559a029e23d6dd155993d8a58c229b0bb90639378b7f5551410cfe9835c6e2bf4f0ea69dc039ab8b69b78f34272a5e1
+  data.tar.gz: a3aef9a944a811784c2c1b9503d3f958f76e130ce9698020ed74bcaad9383bcaee76a57fadf0671c4a0fc71a28bd5e6be1f3a14bd9547857159da5b9c48f8627

data/Gemfile.lock

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

data/README.md

@@ -29,35 +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 data on Africa (55 states):
 * `kovid africa`.
-
-🏰🏰🏰
-
-You can fetch aggregated Europe (all 44 countries combined) data:
 * `kovid europe`.
-
-🇪🇺🇪🇺🇪🇺
-
-You can fetch aggregated EU (all 27 countries combined) data:
-* `kovid eu`.
-
-🌎🌎🌎
-
-You can fetch aggregated South America (all 15 countries combined) data:
-* `kovid sa`.
+* `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 asia` Aggrated stats on Asia
-
 ___
 😷 **Comparing**
 * `kovid compare FOO BAR` (sorts by cases DESC).
@@ -74,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.
 

data/lib/kovid.rb

@@ -13,6 +13,7 @@ module Kovid
   def eu_aggregate
     Kovid::Request.eu_aggregate
   end
+
   def europe_aggregate
     Kovid::Request.europe_aggregate
   end
@@ -25,6 +26,10 @@ module Kovid
     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

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

@@ -12,7 +12,8 @@ module Kovid
     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"]
+    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.'
 
@@ -49,6 +50,14 @@ module Kovid
         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)
         response = fetch_country(country_name)
 

data/lib/kovid/tablelize.rb

@@ -275,7 +275,7 @@ module Kovid
       end
 
       def europe_aggregate(europe_data)
-        aggregated_table(europe_data, 'Europe', Kovid::Request::EUROPE_ISOS, "🏰")
+        aggregated_table(europe_data, 'Europe', Kovid::Request::EUROPE_ISOS, '🏰')
       end
 
       def africa_aggregate(africa_data)
@@ -283,7 +283,13 @@ module Kovid
       end
 
       def south_america_aggregate(south_america_data)
-        aggregated_table(south_america_data, 'South America', Kovid::Request::SOUTH_AMERICA_ISOS, "🌎")
+        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
@@ -300,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)
@@ -316,9 +323,11 @@ module Kovid
 
       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
+                  emoji + 8203.chr(Encoding::UTF_8) + \
+                    " Aggregated Data on #{continent} (#{iso.size} States)".upcase
                 else
-                  emoji + " Aggregated Data on #{continent} (#{iso.size} States)".upcase
+                  emoji + \
+                    " Aggregated Data on #{continent} (#{iso.size} States)".upcase
                 end
 
         rows = []

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  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