kovid 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96bc2442058a29c4830dbebb1baedc428f220b2b20762b150fa1ccd658648d4e
-  data.tar.gz: 11454ce4ed1f2c48778141e886cc8f9a86d8d1a3efb66caaa302f86586a17ec1
+  metadata.gz: 851facd4cdf0be330b04c5e0f81c91d8a5c5fdaea314751540d224e108c4464d
+  data.tar.gz: b36ce66c70a12df6930ca30d78ccf7628b06d6a4c70563e6382a8db584d96e6a
 SHA512:
-  metadata.gz: 45f3d74148f5807f9ef03ec5a4405d9aa337ddb98e7c54e8180fab64c31ce1ff9bc92ed4840f3287514046c926d1ffb5e6982a5048a7ea16e13fe15e3b210a64
-  data.tar.gz: 29654bae42cd1c257b2705554e7b7effd1fdde060bbd31bf3a413a4a120f4ef6187117af84bdba6d16c19b361cfcaa02d0e8013911a8d31922c99b6f0bc427ba
+  metadata.gz: 7ef46bb27fef43b9e032dfc81cb05389b22cd199a46f5d0c354794f892552aefb9bc765cc0fde64145e75961086622e29a06de057cc6acb66c192b46c9438890
+  data.tar.gz: f0e2aad02999132f9505586886545116c915d98b90701b6a8f98410b0c27ca64c8990cfe841c75c2096c5023cc11bd0922eafa0ac0258f5e7de3f8e0dd31ede1

data/Gemfile.lock

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

data/README.md

@@ -34,6 +34,10 @@ You can run `kovid --help` to see the full list of available commands.
 You can fetch aggregated data on Africa:
 * `kovid africa`.
 
+🏰🏰🏰
+
+You can fetch aggregated Europe (all 44 countries combined) data:
+* `kovid europe`.
 
 🇪🇺🇪🇺🇪🇺
 
@@ -47,7 +51,6 @@ You can fetch US state-specific data:
 
 ##### 🔜 Upcoming Fetch Features 👷‍♀️
 
-* `kovid europe` Aggrated stats on Europe
 * `kovid asia` Aggrated stats on Asia
 * `kovid south_america` Aggrated stats on South America
 ___

data/lib/kovid.rb

@@ -13,6 +13,9 @@ module Kovid
   def eu_aggregate
     Kovid::Request.eu_aggregate
   end
+  def europe_aggregate
+    Kovid::Request.europe_aggregate
+  end
 
   def africa_aggregate
     Kovid::Request.africa_aggregate

data/lib/kovid/cli.rb

@@ -59,6 +59,11 @@ 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

data/lib/kovid/request.rb

@@ -10,48 +10,34 @@ 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
+
     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_array = countries_array.select do |hash|
-          EU_ISOS.include?(hash['countryInfo']['iso2'])
+        eu_proc = proc do |data|
+          Kovid::Tablelize.eu_aggregate(data)
         end
 
-        head, *tail = eu_array
-        eu_data = head.merge(*tail) do |key, left, right|
-          left ||= 0
-          right ||= 0
+        aggregator(EU_ISOS, eu_proc)
+      end
 
-          left + right unless %w[country countryInfo].include?(key)
-        end.compact
+      def europe_aggregate
+        europe_proc = proc do |data|
+          Kovid::Tablelize.europe_aggregate(data)
+        end
 
-        Kovid::Tablelize.eu_aggregate(eu_data)
-      rescue JSON::ParserError
-        puts SERVER_DOWN
+        aggregator(EUROPE_ISOS, europe_proc)
       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'])
+        africa_proc = proc do |data|
+          Kovid::Tablelize.africa_aggregate(data)
         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
+        aggregator(AFRICA_ISOS, africa_proc)
       end
 
       def by_country(country_name)
@@ -172,6 +158,27 @@ 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
+
+        # Kovid::Tablelize.eu_aggregate(data)
+        meth.call(data)
+      rescue JSON::ParserError
+        puts SERVER_DOWN
+      end
     end
   end
 end

data/lib/kovid/tablelize.rb

@@ -271,41 +271,15 @@ 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: CONTINENTAL_AGGREGATE_HEADINGS,
-          rows: rows
-        )
+      def europe_aggregate(europe_data)
+        aggregated_table(europe_data, 'Europe', Kovid::Request::EUROPE_ISOS, "🏰")
       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
-        )
+        aggregated_table(africa_data, 'Africa', Kovid::Request::AFRICA_ISOS, '🌍')
       end
 
       private
@@ -335,6 +309,31 @@ 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 of #{continent} (#{iso.size} States)".upcase
+                else
+                  emoji + " Aggregated Data of #{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.5'
+  VERSION = '0.4.6'
 end

metadata

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