kovid 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 851facd4cdf0be330b04c5e0f81c91d8a5c5fdaea314751540d224e108c4464d
-  data.tar.gz: b36ce66c70a12df6930ca30d78ccf7628b06d6a4c70563e6382a8db584d96e6a
+  metadata.gz: cb6de6563f95f22115b3e04efc65267d59fa949a5e68dee22063c9a58438ebc0
+  data.tar.gz: 87e2bf23684c8ca538fd68ae23d77e7daeff2b3fdba7a249442628e671a69675
 SHA512:
-  metadata.gz: 7ef46bb27fef43b9e032dfc81cb05389b22cd199a46f5d0c354794f892552aefb9bc765cc0fde64145e75961086622e29a06de057cc6acb66c192b46c9438890
-  data.tar.gz: f0e2aad02999132f9505586886545116c915d98b90701b6a8f98410b0c27ca64c8990cfe841c75c2096c5023cc11bd0922eafa0ac0258f5e7de3f8e0dd31ede1
+  metadata.gz: ff8f7e1afca67e4218d7d4491d86a34bc54cdcd49993aa515aaa0186d53a73f882ab2e6eabfcda0747ac0a0e5baefe95773982e6b786aeedb77f70f7ec696183
+  data.tar.gz: fcb797d8367ddf05ef080f3272522fd2b52761fab6a1e3b02ba8367230ff9eeb05b7f0bcbe03887a3cb6d6fdc6c10f7d7f94343a5baa329f2ea9a2956cf335fa

data/Gemfile.lock

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

data/README.md

@@ -31,7 +31,7 @@ You can run `kovid --help` to see the full list of available commands.
 
 🦁🦁🦁
 
-You can fetch aggregated data on Africa:
+You can fetch aggregated data on Africa (55 states):
 * `kovid africa`.
 
 🏰🏰🏰
@@ -44,6 +44,11 @@ You can fetch aggregated Europe (all 44 countries combined) data:
 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`.
+
 🇺🇸🇺🇸🇺🇸
 
 You can fetch US state-specific data:
@@ -52,7 +57,7 @@ You can fetch US state-specific data:
 ##### 🔜 Upcoming Fetch Features 👷‍♀️
 
 * `kovid asia` Aggrated stats on Asia
-* `kovid south_america` Aggrated stats on South America
+
 ___
 😷 **Comparing**
 * `kovid compare FOO BAR` (sorts by cases DESC).

data/lib/kovid.rb

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

data/lib/kovid/cli.rb

@@ -71,6 +71,12 @@ module Kovid
       data_source
     end
 
+    desc 'sa', 'Returns aggregated data on South America.'
+    def sa
+      puts Kovid.south_america_aggregate
+      data_source
+    end
+
     desc 'version', 'Returns version of kovid'
     def version
       puts Kovid::VERSION

data/lib/kovid/request.rb

@@ -12,6 +12,7 @@ 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"]
 
     SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
@@ -40,6 +41,14 @@ module Kovid
         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 by_country(country_name)
         response = fetch_country(country_name)
 
@@ -174,8 +183,7 @@ module Kovid
           left + right unless %w[country countryInfo].include?(key)
         end.compact
 
-        # Kovid::Tablelize.eu_aggregate(data)
-        meth.call(data)
+        meth === data
       rescue JSON::ParserError
         puts SERVER_DOWN
       end

data/lib/kovid/tablelize.rb

@@ -282,6 +282,10 @@ module Kovid
         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
+
       private
 
       def comma_delimit(number)
@@ -312,9 +316,9 @@ module Kovid
 
       def aggregated_table(collated_data, continent, iso, emoji)
         title = if emoji.codepoints.size > 1
-                  emoji + 8203.chr(Encoding::UTF_8) + " Aggregated Data of #{continent} (#{iso.size} States)".upcase
+                  emoji + 8203.chr(Encoding::UTF_8) + " Aggregated Data on #{continent} (#{iso.size} States)".upcase
                 else
-                  emoji + " Aggregated Data of #{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.6'
+  VERSION = '0.4.7'
 end

metadata

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