kovid 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7111caf7871b70f2fc2e35c29013e1d3d24b5c130950a82c90786693af22a4c9
-  data.tar.gz: 24f9e8bee7b3040a4c181169aa77b8956015db94139d435e95be3339f94facc8
+  metadata.gz: 46e28cf1cf2a687ba9844a2a167d64921b7751028b15953db0fa4af9bbfb6942
+  data.tar.gz: 373975e720f8c411d3c9232d7c7f8f1c124328c3afc3eb91af5561a7e710f3bb
 SHA512:
-  metadata.gz: e27a7c550b05e358f7b2250d98d8a9e129aee40acac585a1e31fe41f7a910e1fc1d590b241ed7febe00162dd67a12d27969e810bc3bd7e0b2ab032914174a4a5
-  data.tar.gz: 1714bf0e2ab7cd4c928d0700fa146cee5011c4a1858c0b8999f0af206060fb2b73dcb9cb9685d22d7a4389ba10bd574f5dedbb5de7aa34769ad0e160408d4b14
+  metadata.gz: 8a9d7ef9d7ce72a11cbef9ed79b741d9018a4be5de76fc471eb3355a70fb2df1e55f80f36cd3363f2b56820b2f4f5e66784c56894d377fb47cbb730c01a04fbb
+  data.tar.gz: be354f88e26a00de9924b9c3e719d6ef227d4b5679341c4bc747c2e8134dd85688d0cc767b796a45c5018e7e9d3434dbc1a8d170d3e78e1ae1b871e263151f33

data/Gemfile.lock

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

data/kovid.gemspec

@@ -52,6 +52,10 @@ Gem::Specification.new do |spec|
 
       Stay safe!
       Emmanuel Hayford.
+
+      Data sources:
+      https://www.worldometers.info/coronavirus/
+      JHU CSSE GISand Data
     ============================================================================
     }
 end

data/lib/kovid/cli.rb

@@ -3,33 +3,34 @@
 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 'check EU', 'Returns aggregated data on the EU.'
+    desc 'eu', 'Returns aggregated data on the EU.'
     def eu
       puts Kovid.eu_aggregate
+      data_source
     end
 
     desc 'check COUNTRY or check "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid check "hong kong".'
     method_option :full, aliases: '-f'
     def check(name)
       fetch_country_stats(name)
+      data_source
     end
 
     desc 'country COUNTRY or country "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid country "hong kong".'
     method_option :full, aliases: '-f'
     def country(name)
       fetch_country_stats(name)
+      data_source
     end
 
     desc 'state STATE', 'Return reported data on provided state.'
     def state(state)
       puts Kovid.state(state)
+      data_source
     end
 
     desc 'compare COUNTRY COUNTRY', 'Returns full comparison table for given countries. Accepts multiple countries.'
@@ -39,11 +40,13 @@ module Kovid
       else
         puts Kovid.country_comparison(name)
       end
+      data_source
     end
 
     desc 'cases', 'Returns total number of cases, deaths and recoveries.'
     def cases
       puts Kovid.cases
+      data_source
     end
 
     desc 'history COUNTRY or history COUNTRY N', 'Return history of incidents of COUNTRY (in the last N days)'
@@ -53,6 +56,7 @@ module Kovid
       else
         puts Kovid.history(params.first, nil)
       end
+      data_source
     end
 
     private
@@ -64,5 +68,15 @@ module Kovid
         puts Kovid.country(country)
       end
     end
+
+    def data_source
+      source = <<~TEXT
+        Sources:
+        https://www.worldometers.info/coronavirus/
+        JHU CSSE GISand Data
+      TEXT
+      puts source
+      puts
+    end
   end
 end

data/lib/kovid/request.rb

@@ -67,7 +67,7 @@ module Kovid
       end
 
       def history(country, last)
-        history_path = UriBuilder.new('/historical').url
+        history_path = UriBuilder.new('/v2/historical').url
         response ||= JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
 
         Kovid::Tablelize.history(response, last)

data/lib/kovid/tablelize.rb

@@ -13,14 +13,13 @@ module Kovid
         'Recovered'.paint_green
       ].freeze
 
-      DATE_CASES_DEATHS_RECOVERED = [
+      DATE_CASES_DEATHS = [
         'Date'.paint_white,
         'Cases'.paint_white,
-        'Deaths'.paint_red,
-        'Recovered'.paint_green
+        'Deaths'.paint_red
       ].freeze
 
-      FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
+      FOOTER_LINE = ['------------', '------------', '------------'].freeze
       COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
       def country_table(data)
@@ -146,7 +145,7 @@ module Kovid
       end
 
       def history(country, last)
-        headings = DATE_CASES_DEATHS_RECOVERED
+        headings = DATE_CASES_DEATHS
         rows = []
 
         stats = if last
@@ -173,10 +172,10 @@ module Kovid
 
         if stats.size > 10
           rows << FOOTER_LINE
-          rows << DATE_CASES_DEATHS_RECOVERED
+          rows << DATE_CASES_DEATHS
         end
 
-        Terminal::Table.new(title: country['standardizedCountryName'].upcase, headings: headings, rows: rows)
+        Terminal::Table.new(title: country['country'].upcase, headings: headings, rows: rows)
       end
 
       def eu_aggregate(eu_data)

data/lib/kovid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Emmanuel Hayford
@@ -167,7 +167,9 @@ post_install_message: "\n    ===================================================
   isn't much we can do now aside:\n\n      * Washing our hands with soap frequently.\n
   \     * Limiting our movements, how much we touch our faces & social distancing.\n
   \     * Disinfecting our phones, keys, doorknobs, keyboards, etc.\n      * Being
-  there for each other.\n\n      Stay safe!\n      Emmanuel Hayford.\n    ============================================================================\n
+  there for each other.\n\n      Stay safe!\n      Emmanuel Hayford.\n\n      Data
+  sources:\n      https://www.worldometers.info/coronavirus/\n      JHU CSSE GISand
+  Data\n    ============================================================================\n
   \   "
 rdoc_options: []
 require_paths: