kovid 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26d90f05df4a479c2865ce9e3bff414453680fa72f37dd841ce149410a144bb5
-  data.tar.gz: 8f69a755906441b1b81df5786e1594e17ee9cccd11f293f555c9c047cf470b00
+  metadata.gz: 4c0bc9550073aaff0f2e6fb4a4175b4147bacf6c43d4d47d0177771845d30f01
+  data.tar.gz: 5e960a7772a01ad8c67c77284eaebc46cb55827522e6890f62b935b87d6e3494
 SHA512:
-  metadata.gz: baa1784856b2544065f1883f19dddb3f3b4269da62c8a727f372f41e245c6646a8221dfd187eb804fd3919effa9dc3e0a29ba39f9d838635072b463920bc7535
-  data.tar.gz: c74e0235df9d9511d241c9d0f162a691222ce8abbad6065ffe4cf670ca5238dd7fc497306445bedebe94365f850060a37524413a8b7322fee200a20da2215ff8
+  metadata.gz: 7f65a6ea777bde11958ab2c3d43f73b63d83d23b18f5c21757be1e46e8ebda407b762714b32d1cab819cde75a41344735799670e41b17bd9e5a175d2e52892a0
+  data.tar.gz: d542e777ce15d0d0236faf62264d7fd2679b4655295e51be4871ba2f1c4990fb658f9d02fc6824357a73cb94e8cd54013b8a5106819e21ded1ad6d9c07b0dbcd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.11)
+    kovid (0.6.12)
       carmen (~> 1.1.3)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)

data/README.md

@@ -76,6 +76,12 @@ ___
 * `kovid history COUNTRY N` (history in the last N days).
 * `kovid history STATE --usa`
 ___
+😷 **Top N (by cases/deaths for countries and US States)**
+* `kovid top N` (top N countries in number of cases).
+* `kovid top N -d` OR `kovid top N --deaths` (top N countries in number of deaths).
+* `kovid top N --states` (top N US states in number of cases).
+* `kovid top N --states -d` (top N countries in number of deaths).
+___
 
 **NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.
 
@@ -139,6 +145,32 @@ To check for total figures:
 
 ![kovid](https://i.gyazo.com/e01f4769a2b9e31ce50cec212e55810c.png "Covid data.")
 
+To fetch top 5 countries in number of cases or deaths:
+
+`kovid top`
+
+![kovid](https://i.gyazo.com/79443079a6c834094fc21c90dd02b78c.png "Covid data.")
+
+`kovid top --deaths` OR `kovid top -d`
+
+![kovid](https://i.gyazo.com/8136a7acc2cb67d1621b3db0df822cd5.png "Covid data.")
+
+It is also possible to fetch top US states in number of cases or deaths:
+
+`kovid top --states`
+
+![kovid](https://i.gyazo.com/7ee5a1e6affdec838783183024c4604d.png "Covid data.")
+
+`kovid top --states --deaths` OR `kovid top --states -d`
+
+![kovid](https://i.gyazo.com/2c3cb7e1218deff44c9d440dab93a3b1.png "Covid data.")
+
+To fetch more number of countries or US states you can pass N. eg:
+
+`kovid top 10`
+
+![kovid](https://i.gyazo.com/64663ff25c1ff61701e84871948640f4.png "Covid data.")
+
 ## 👩🏾‍🔬 Experimental Feature
 
 `kovid histogram italy 3.20` tries to build a histogram on number of cases. In the example here `3.20` is date in the format of `M.YY`. If you can please play with it and report issues on how this could be improved.

data/lib/kovid.rb

@@ -79,4 +79,8 @@ module Kovid
   def histogram(country, date)
     Kovid::Request.histogram(country, date)
   end
+
+  def top(count, options = { location: :countries, incident: :cases })
+    Kovid::Request.top(count, options)
+  end
 end

data/lib/kovid/cli.rb

@@ -133,6 +133,20 @@ module Kovid
       end
     end
 
+    desc 'top N',
+         'Returns top N countries or states in an incident (number of cases or
+    deaths).'
+    method_option :countries
+    method_option :states
+    method_option :cases, aliases: '-c'
+    method_option :deaths, aliases: '-d'
+    def top(count = 5)
+      count = count.to_i
+      count = 5 if count.zero?
+      puts Kovid.top(count, prepare_top_params(options))
+      data_source
+    end
+
     private
 
     def fetch_country_stats(country)
@@ -147,10 +161,26 @@ module Kovid
       source = <<~TEXT
         #{Time.now}
         Sources:
+         * worldometers.info/coronavirus
          * Johns Hopkins University
-         * https://www.worldometers.info/coronavirus
       TEXT
       puts source
     end
+
+    def prepare_top_params(options)
+      params = {
+        location: :countries,
+        incident: :cases
+      }
+
+      if !options[:states].nil? && options[:countries].nil?
+        params[:location] = :states
+      end
+
+      if !options[:deaths].nil? && options[:cases].nil?
+        params[:incident] = :deaths
+      end
+      params
+    end
   end
 end

data/lib/kovid/constants.rb

@@ -102,18 +102,13 @@ module Kovid
       'Recovered'.paint_green
     ].freeze
 
-    FOOTER_LINE_THREE_COLUMNS = [
-      '------------',
-      '------------',
+    FOOTER_LINE_COLUMN = [
       '------------'
     ].freeze
 
-    FOOTER_LINE_FOUR_COLUMNS = [
-      '------------',
-      '------------',
-      '------------',
-      '------------'
-    ].freeze
+    FOOTER_LINE_THREE_COLUMNS = FOOTER_LINE_COLUMN * 3
+
+    FOOTER_LINE_FOUR_COLUMNS = FOOTER_LINE_COLUMN * 4
 
     COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 

data/lib/kovid/request.rb

@@ -223,6 +223,19 @@ module Kovid
         Kovid::Tablelize.histogram(response, date)
       end
 
+      def top(count, options)
+        response = JSON.parse(
+          Typhoeus.get(
+            top_url(options[:location]) +
+            "?sort=#{options[:incident]}",
+            cache_ttl: 900
+          ).response_body
+        )
+
+        Kovid::Tablelize.top(response.first(count),
+                             options.merge({ count: count }))
+      end
+
       def capitalize_words(string)
         string.split.map(&:capitalize).join(' ')
       end
@@ -332,11 +345,15 @@ module Kovid
         data.inject({}) do |base, other|
           base.merge(other['timeline'][key]) do |_k, l, r|
             l ||= 0
-            l ||= 0
+            r ||= 0
             l + r
           end
         end.compact
       end
+
+      def top_url(location)
+        location == :countries ? COUNTRIES_PATH : STATES_URL
+      end
     end
   end
 end

data/lib/kovid/tablelize.rb

@@ -96,6 +96,22 @@ module Kovid
         )
       end
 
+      def top(data, options)
+        headings = top_heading(options)
+        rows = data.map { |location| top_row(location, options) }
+
+        if options[:count] > 10
+          rows << FOOTER_LINE_COLUMN * headings.count
+          rows << headings
+        end
+
+        Terminal::Table.new(
+          title: top_title(options),
+          headings: headings,
+          rows: rows
+        )
+      end
+
       private
 
       def country_title(data)
@@ -223,6 +239,34 @@ module Kovid
         end
         table
       end
+
+      def top_row(data, options)
+        if options[:location] == :countries
+          return [
+            country_title(data),
+            full_country_row(data)
+          ].flatten
+        end
+
+        [
+          data['state'].upcase,
+          country_row(data)
+        ].flatten
+      end
+
+      def top_heading(options)
+        if options[:location] == :countries
+          return ['Country'.paint_white] + FULL_COUNTRY_TABLE_HEADINGS
+        end
+
+        ['State'.paint_white] + FULL_STATE_TABLE_HEADINGS
+      end
+
+      def top_title(options)
+        incident = options[:incident].to_s
+        location = options[:location].to_s
+        "🌍 Top #{options[:count]} #{location} in #{incident}".upcase
+      end
     end
   end
 end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carmen