kovid 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc2e30c94c8148c8849241849c6b0340429f0a271ade0927091098972e4fc914
-  data.tar.gz: 54197f1917738844f1c36e3c1f513deb254d5e47ecb97e8b62db198fded53935
+  metadata.gz: e2bcf9cae235b902baf6388bd509cf8bb7b9445b2bac741713c6f1d60ca830fc
+  data.tar.gz: 91d40e2882577373c5336057dd3a235364b924e276550662bd806075f90e90cc
 SHA512:
-  metadata.gz: 2ebeeeccb550b36ecd7376ba78894434eb2b980c2dbd57e6552e8037400694cf548926e8eea642c0929f974522220804c0a4092344f9f5122df8a5ff257a3695
-  data.tar.gz: 4f423a115a7c06d937960085e795bb77196f4513434951f1cdf01a3b41ad7892ea561eea73e8046a67a84ff47c4d497b530b08c607af783ddd4e421708091d18
+  metadata.gz: be7fe0fe2d21b477994aa531636b0dde19b350ca3a53e3c985cbe13d9dee5285c32e580bc893877c05599290471aeb7835b5d8a520f1fd8f3ceb0cfae5f3eed6
+  data.tar.gz: 45d45c55e305c76a2393580965cecb39e5227e1d2a8bba8a1ac335524f5535eddd099e13096d2d58e204ee84b40933b27bc5c6fdcbd316154940349bfca5e335

data/Gemfile.lock

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

data/lib/kovid/tablelize.rb

@@ -49,6 +49,15 @@ module Kovid
         'Cases/Million'.paint_white
       ].freeze
 
+      COMPARE_COUNTRIES_TABLE_HEADINGS = [
+        'Country'.paint_white,
+        'Cases'.paint_white,
+        'Cases Today'.paint_white,
+        'Deaths'.paint_red,
+        'Deaths Today'.paint_red,
+        'Recovered'.paint_green
+      ].freeze
+
       FOOTER_LINE = ['------------', '------------', '------------'].freeze
       COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
@@ -69,8 +78,6 @@ module Kovid
         else
           Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
         end
-        # TODO: Rafactor this
-        # TODO: Fix emoji
       end
 
       def full_country_table(data)
@@ -123,29 +130,25 @@ module Kovid
       end
 
       def compare_countries_table(data)
-        headings = [
-          'Country'.paint_white,
-          'Cases'.paint_white,
-          'Deaths'.paint_red,
-          'Recovered'.paint_green,
-          'Cases Today'.paint_white,
-          'Deaths Today'.paint_red
-        ]
-
         rows = []
 
         data.each do |country|
-          rows << [
-            country['country'].upcase,
+          base_rows = [
             comma_delimit(country['cases']),
-            comma_delimit(country['deaths']),
-            comma_delimit(country['recovered']),
             check_if_positve(country['todayCases']),
-            check_if_positve(country['todayDeaths'])
+            comma_delimit(country['deaths']),
+            check_if_positve(country['todayDeaths']),
+            comma_delimit(country['recovered'])
           ]
+
+          rows << if iso = country['countryInfo']['iso2']
+                    base_rows.unshift("#{country_emoji(iso)} #{country['country'].upcase}")
+                  else
+                    base_rows.unshift(country['country'].upcase.to_s)
+                  end
         end
 
-        Terminal::Table.new(headings: headings, rows: rows)
+        Terminal::Table.new(headings: COMPARE_COUNTRIES_TABLE_HEADINGS, rows: rows)
       end
 
       def compare_countries_table_full(data)

data/lib/kovid/version.rb

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

metadata

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