kovid 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d28ee705d66ffdbeb9b0733e67c6fc471fa00f0b691555013f9b42e280bdcb1
-  data.tar.gz: 656f2569c495450a23214ae87b3f14d4b6a5a046f00db4e7bcb22ff6606ed9f6
+  metadata.gz: 3c963533d7157df2e17e5f4fb35f50ff0366e37c5d61f7678bcf8ab51544d218
+  data.tar.gz: 8b2eceeffdac618d363316a0447ef676a17dc3e7e5971b01b2749ff487baef57
 SHA512:
-  metadata.gz: 36b65aa5753226416df10d4210a775aa3d67e50857e159a3bde59c7cf206f2ac0760b875dc61acb0d3d253c34e1e339278c9979d159dd02cc1df1b5b90c8dcf5
-  data.tar.gz: 76fadffe921789cea2215aaf76eb94ca80c895f5eff917f41cc26277422f4b4558b81518bcbaf91caebb32dd93be7a1702688e01e7316f8c652d47cd7a3225b1
+  metadata.gz: 5f2de3a8b27276df0f21ba75cc645dd60d889e59763919e52be2b31acab88f684b755b69bcd8344d6c46133c1fbfdb387aececb270c067e7cf25112cf89bb0d5
+  data.tar.gz: 8c107b6878b0b41fc4460c84e2a9aab8f07cf48a0e25b90946d62aaca92d1cfa68c9430a51d960735577d07f590e7ed52da6a403831536dd2bfa149922501977

data/Gemfile.lock

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

data/README.md

@@ -56,49 +56,49 @@ 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/ab779c3fc838ac279bae5b9d6d10d617.png "Covid data.")
+![kovid](https://i.gyazo.com/ee88b41c05da3be0295dd3a158e7ba70.png "Covid data.")
 
 For full table info on a country:
 
 `kovid check italy -f` OR `kovid check italy --full`
 
-![kovid](https://i.gyazo.com/789fa6795d06f529a9b5f37cb51fb516.png "Covid data.")
+![kovid](https://i.gyazo.com/7e5afce548d8a01b9bdf3f8bdb529cd1.png "Covid data.")
 
 To compare country stats:
 
 `kovid compare germany poland`
 
-![kovid](https://i.gyazo.com/be3bcba3d2943c60618b59ae82a3c586.png "Covid data.")
+![kovid](https://i.gyazo.com/876b19988da4cd7b375cde3e23376ba7.png "Covid data.")
 
 To compare a countries stats with a full table:
 
 `kovid compare poland italy usa china -f` OR `kovid compare poland italy usa china --full`
 
-![kovid](https://i.gyazo.com/79ad61c33114a0bee0a9e2ab94a3d46e.png "Covid data.")
+![kovid](https://i.gyazo.com/8b57865ae9b28f5afa895ebc49a2de31.png "Covid data.")
 
 To fetch state-specific data run:
 
 `kovid state colorado` OR `kovid state "north carolina"`
 
-![kovid](https://i.gyazo.com/d00b1c5bbb6251cbd517f801c856ba66.png "Covid data.")
+![kovid](https://i.gyazo.com/51509c3986f56bbc25068e0d541d9bdd.png "Covid data.")
 
 To fetch EU data run:
 
 `kovid eu`
 
-![kovid](https://i.gyazo.com/51d2adcb8e9feb0a0fbe38ff9cf4c550.png "Covid data.")
+![kovid](https://i.gyazo.com/0a78afae2a5b9d2beb9f2c61dc1d3ac7.png "Covid data.")
 
 You can check historical statistics by running
 
 `kovid history italy 7` eg:
 
-![kovid](https://i.gyazo.com/e4872b5047eeaebbd354847a943de268.png "Covid data.")
+![kovid](https://i.gyazo.com/bc18fdaf99cacf2c921086f189d542b4.png "Covid data.")
 
 To check for total figures:
 
 `kovid cases`
 
-![kovid](https://i.gyazo.com/323f0f10d444e2ee629d05a90488adba.png "Covid data.")
+![kovid](https://i.gyazo.com/e01f4769a2b9e31ce50cec212e55810c.png "Covid data.")
 
 ## Information Source
 > https://www.worldometers.info/coronavirus/ via [NovelCOVID/API](https://github.com/novelcovid/api)

data/kovid.gemspec

@@ -23,9 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "typhoeus", "~> 1.3"
   spec.add_dependency "rainbow", "~> 3.0"
 
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "cucumber"
-  spec.add_development_dependency "aruba"
   spec.add_development_dependency "simplecov"
 
   # Specify which files should be added to the gem when it is released.

data/lib/kovid/request.rb

@@ -15,13 +15,13 @@ module Kovid
       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|
+        🇪🇺 = 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|
+        👤, *👥 = 🇪🇺
+        eu_data = 👤.merge(*👥) do |key, left, right|
           left + right unless %w[country countryInfo].include?(key)
         end .compact
 

data/lib/kovid/tablelize.rb

@@ -19,6 +19,16 @@ module Kovid
         'Deaths'.paint_red
       ].freeze
 
+      EU_AGGREGATE_HEADINGS = [
+        'Cases'.paint_white,
+        'Cases Today'.paint_white,
+        'Deaths'.paint_red,
+        'Deaths Today'.paint_red,
+        'Recovered'.paint_green,
+        'Active'.paint_yellow,
+        'Critical'.paint_red
+      ]
+
       FOOTER_LINE = ['------------', '------------', '------------'].freeze
       COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
@@ -179,13 +189,18 @@ module Kovid
       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_red]
-
         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'])
+        ]
 
-        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: 'Aggregated EU Data'.upcase, headings: headings, rows: rows)
+        Terminal::Table.new(title: 'Aggregated EU Data'.upcase, headings: EU_AGGREGATE_HEADINGS, rows: rows)
       end
 
       private

data/lib/kovid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Emmanuel Hayford
@@ -66,48 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement