kovid 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4205df6f2e487214f535dda994a132264a9966b6c7527dec22f908f7aad76ed
-  data.tar.gz: 24b98f27cddcff29ed2a75d02be4af8d81fb2078d138890d75c9fb3541207bdf
+  metadata.gz: 9f04b3f270cae0450368cdffa483d4968dfe6e260a19f4ff244dda25765fba32
+  data.tar.gz: f9381a8141630f18888ec65ced2c352eee1ddd7cd79c131e839fc77e1d4c9255
 SHA512:
-  metadata.gz: 2c5e2f6b14c57dc707d81f5711ea6d2004300d253f8ba7afb0d453d14bd2f73210de62d73d2457caf7ed221ad8d27b192db2e511e749903bb25cd31bbfe3be02
-  data.tar.gz: 7fc35f3888744cbadcfe131e080ef56a3d9b0055f8437316f5286f364ab71391a6322df951c86c707ab43d3669b839aaed58fa3108913c36d6d252ce3759dca5
+  metadata.gz: b09ebeaa677af45d87d3c37f347caaa9668d95e4c4d67c4462c68143b0dbe1c820faf1e50607acf0460d9acc88abc59958aa8390b1f88396c2ed127dac830fb9
+  data.tar.gz: 7c8a93f91fa8cc64e55cbb2ea055f2d5edc902dd7a5b1d984e0f5a76e967eaa3c239f63fc7f25d13cce4e22cb4e9e288c53ba8752a5bb5ebf41d39f5cdaca5fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.3.1)
+    kovid (0.3.2)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)

data/README.md

@@ -24,6 +24,11 @@ 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 EU (all 27 countries combined) data:
+* `kovid eu`.
+
 🇺🇸🇺🇸🇺🇸
 
 You can fetch US state-specific data:
@@ -77,6 +82,12 @@ To fetch state-specific data run:
 
 ![kovid](https://i.gyazo.com/d00b1c5bbb6251cbd517f801c856ba66.png "Covid data.")
 
+To fetch EU data run:
+
+`kovid eu`
+
+![kovid](https://i.gyazo.com/51d2adcb8e9feb0a0fbe38ff9cf4c550.png "Covid data.")
+
 You can check historical statistics by running
 
 `kovid history italy 7` eg:

data/lib/kovid.rb

@@ -8,8 +8,8 @@ module Kovid
 
   module_function
 
-  def whatis
-    'Coronavirus disease 2019 (COVID-19) is an infectious disease caused by severe acute respiratory syndrome coronavirus 2 (SARS-CoV-2).'
+  def eu_aggregate
+    Kovid::Request.eu_aggregate
   end
 
   def country(name)

data/lib/kovid/cli.rb

@@ -3,13 +3,16 @@
 require 'thor'
 require 'kovid'
 
+# ["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"]
+
+# Czechia has no code
 module Kovid
   class CLI < Thor
     FULL_FLAG = %w[-f --full].freeze
 
-    desc 'define', 'Defines COVID-19'
-    def define
-      puts Kovid.whatis
+    desc 'check EU', 'Returns aggregated data on the EU.'
+    def eu
+      puts Kovid.eu_aggregate
     end
 
     desc 'check COUNTRY or check "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid check "hong kong".'

data/lib/kovid/request.rb

@@ -9,8 +9,25 @@ module Kovid
   class Request
     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
 
     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']) || hash['country'] == 'Czechia'
+          # Check API later to see if ISO-Alpha-2 code has been added for Czechia
+        end
+
+        first, *rest = eu_array
+        eu_data = first.merge(*rest) do |key, left, right|
+          left + right unless %w[country countryInfo].include?(key)
+        end .compact
+
+        Kovid::Tablelize.eu_aggregate(eu_data)
+      end
+
       def by_country(country_name)
         response = fetch_country(country_name)
 

data/lib/kovid/tablelize.rb

@@ -179,6 +179,16 @@ module Kovid
         Terminal::Table.new(title: country['standardizedCountryName'].upcase, headings: headings, rows: rows)
       end
 
+      def eu_aggregate(eu_data)
+        headings = ['Cases'.paint_white, 'Cases Today'.paint_white, 'Deaths'.paint_red, 'Deaths Today'.paint_red, 'Recovered'.paint_green, 'Active'.paint_yellow, 'Critical'.paint_green]
+
+        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'])]
+
+        Terminal::Table.new(title: 'EU Aggragation'.upcase, headings: headings, rows: rows)
+      end
+
       private
 
       def comma_delimit(number)

data/lib/kovid/version.rb

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

metadata

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