kovid 0.3.16 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844f3d8e6bb4b6c30e705931dacfdc3467d51d208bdcc97bed77f73c49c19dc3
-  data.tar.gz: f3e5efa028566253ae1b9ad62dc156ed6d0830720546496990cef3e975398f5e
+  metadata.gz: e2bcf9cae235b902baf6388bd509cf8bb7b9445b2bac741713c6f1d60ca830fc
+  data.tar.gz: 91d40e2882577373c5336057dd3a235364b924e276550662bd806075f90e90cc
 SHA512:
-  metadata.gz: dd4ca0b31ae864ddc9ed40029af2b3645e6bae7f3481fd88db07d1079708b26b4c9c2b89e73b4d63097c36d1274c7d1c9d033a896beeaf9811f43b19de55ba72
-  data.tar.gz: 278aa54bed7b47537e278d85528bb12c1c73e1b7c1f8e991f647b03a033f5b7609add08e56e02bfd824f763c6e562649c86c5ce725fcec1be1fb41953993fb21
+  metadata.gz: be7fe0fe2d21b477994aa531636b0dde19b350ca3a53e3c985cbe13d9dee5285c32e580bc893877c05599290471aeb7835b5d8a520f1fd8f3ceb0cfae5f3eed6
+  data.tar.gz: 45d45c55e305c76a2393580965cecb39e5227e1d2a8bba8a1ac335524f5535eddd099e13096d2d58e204ee84b40933b27bc5c6fdcbd316154940349bfca5e335

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+
+

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    kovid (0.3.15)
+    kovid (0.4.3)
+      ascii_charts (~> 0.9.1)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
@@ -10,6 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ascii_charts (0.9.1)
     diff-lcs (1.3)
     docile (1.3.2)
     ethon (0.12.0)

data/README.md

@@ -1,3 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/kovid.svg)](https://badge.fury.io/rb/kovid)
+[![Open Source Helpers](https://www.codetriage.com/siaw23/kovid/badges/users.svg)](https://www.codetriage.com/siaw23/kovid)
+
+
 # 🦠 Kovid
 
 Kovid is a small CLI app to fetch data surrounding the coronavirus pandemic of 2019. I found myself checking [Wikipedia](https://en.wikipedia.org/wiki/2019%E2%80%9320_coronavirus_pandemic) constantly for information so I thought I'd build this to provide info directly in the terminal. It's where some of us spend time more.
@@ -58,10 +62,14 @@ ___
 * `kovid history COUNTRY N` (history in the last N days).
 ___
 😷 **Total figures**
-* `kovid cases` (summary of reported incidents globally).
+* `kovid world` (summary of reported incidents globally).
 
 **NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.
 
+#### Histogram (Experimental) 🧪
+
+`kovid histogram COUNTRY M.YY` (draws a histogram of cases in the given month `M` and years `YY`)
+
 #### Commands Details
 To fetch basic data on a country run:
 
@@ -107,11 +115,18 @@ You can check historical statistics by running
 
 To check for total figures:
 
-`kovid cases`
+`kovid world`
 
 ![kovid](https://i.gyazo.com/e01f4769a2b9e31ce50cec212e55810c.png "Covid data.")
 
-## Information Source
+## 👩🏾‍🔬 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.
+
+![kovid](https://i.gyazo.com/35833cba37be8ca10830fad066b85bb3.png "Covid data.")
+
+
+## Data Source
 > [JHU CSSE GISand Data](https://gisanddata.maps.arcgis.com/apps/opsdashboard/index.html#/bda7594740fd40299423467b48e9ecf6) and https://www.worldometers.info/coronavirus/ via [NovelCOVID/API](https://github.com/novelcovid/api)
 
 

data/kovid.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "terminal-table", "~> 1.8"
   spec.add_dependency "typhoeus", "~> 1.3"
   spec.add_dependency "rainbow", "~> 3.0"
+  spec.add_dependency "ascii_charts", "~> 0.9.1"
+
 
   spec.add_development_dependency "simplecov", "~>  0.18"
 

data/lib/kovid.rb

@@ -4,6 +4,8 @@ require 'kovid/version'
 require 'kovid/request'
 
 module Kovid
+  require 'kovid/helpers'
+
   class Error < StandardError; end
 
   module_function
@@ -24,8 +26,8 @@ module Kovid
     Kovid::Request.state(state)
   end
 
-  def states(*_states)
-    Kovid::Request.states(state)
+  def states(*states)
+    Kovid::Request.states(states)
   end
 
   def country_comparison(names_array)
@@ -43,4 +45,8 @@ module Kovid
   def history(country, last)
     Kovid::Request.history(country, last)
   end
+
+  def histogram(country, date)
+    Kovid::Request.histogram(country, date)
+  end
 end

data/lib/kovid/cli.rb

@@ -37,8 +37,8 @@ module Kovid
       data_source
     end
 
-    desc 'cases', 'Returns total number of cases, deaths and recoveries.'
-    def cases
+    desc 'world', 'Returns total number of cases, deaths and recoveries.'
+    def world
       puts Kovid.cases
       data_source
     end
@@ -59,6 +59,21 @@ module Kovid
       data_source
     end
 
+    desc 'version', 'Returns version of kovid'
+    def version
+      puts Kovid::VERSION
+    end
+
+    desc 'histogram', 'Returns a histogram of incidents.'
+    def histogram(country, date = nil)
+      if date.nil?
+        Kovid.info_table("Please add a month and year in the form 'M.YY'")
+      else
+        puts Kovid.histogram(country, date)
+        data_source
+      end
+    end
+
     private
 
     def fetch_country_stats(country)

data/lib/kovid/helpers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'terminal-table'
+module Kovid
+  module_function
+
+  def info_table(message)
+    rows = [[message.to_s]]
+    puts Terminal::Table.new title: '❗️', rows: rows
+  end
+end

data/lib/kovid/request.rb

@@ -10,17 +10,18 @@ module Kovid
     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
+    SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
     class << self
       def eu_aggregate
         countries_array = JSON.parse(Typhoeus.get(UriBuilder.new('/countries').url, cache_ttl: 900).response_body)
 
-        🇪🇺 = countries_array.select do |hash|
+        eu_array = countries_array.select do |hash|
           EU_ISOS.include?(hash['countryInfo']['iso2'])
         end
 
-        👤, *👥 = 🇪🇺
-        eu_data = 👤.merge(*👥) do |key, left, right|
+        head, *tail = eu_array
+        eu_data = head.merge(*tail) do |key, left, right|
           left ||= 0
           right ||= 0
 
@@ -29,7 +30,7 @@ module Kovid
 
         Kovid::Tablelize.eu_aggregate(eu_data)
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def by_country(country_name)
@@ -41,7 +42,7 @@ module Kovid
           Kovid::Tablelize.country_table(response)
         end
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def by_country_full(country_name)
@@ -53,7 +54,7 @@ module Kovid
           Kovid::Tablelize.full_country_table(response)
         end
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def state(state)
@@ -61,7 +62,7 @@ module Kovid
 
         Kovid::Tablelize.full_state_table(response)
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def states(list)
@@ -69,38 +70,49 @@ module Kovid
 
         Kovid::Tablelize.compare_us_states(array)
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def by_country_comparison(list)
         array = fetch_countries(list)
         Kovid::Tablelize.compare_countries_table(array)
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def by_country_comparison_full(list)
         array = fetch_countries(list)
         Kovid::Tablelize.compare_countries_table_full(array)
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def cases
-        response ||= JSON.parse(Typhoeus.get(UriBuilder.new('/all').url, cache_ttl: 900).response_body)
+        response = JSON.parse(Typhoeus.get(UriBuilder.new('/all').url, cache_ttl: 900).response_body)
 
         Kovid::Tablelize.cases(response)
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
       end
 
       def history(country, last)
         history_path = UriBuilder.new('/v2/historical').url
-        response ||= JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
+        response = JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
 
         Kovid::Tablelize.history(response, last)
       rescue JSON::ParserError
-        puts 'Server overwhelmed. Try again in a moment.'
+        puts SERVER_DOWN
+      end
+
+      def histogram(country, date)
+        history_path = UriBuilder.new('/v2/historical').url
+        response = JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
+
+        Kovid::Tablelize.histogram(response, date)
+      end
+
+      def capitalize_words(string)
+        string.split.map(&:capitalize).join(' ')
       end
 
       private
@@ -139,10 +151,6 @@ module Kovid
 
         states_array.select { |state_name| state_name['state'] == capitalize_words(state) }.first
       end
-
-      def capitalize_words(string)
-        string.split.map(&:capitalize).join(' ')
-      end
     end
   end
 end

data/lib/kovid/tablelize.rb

@@ -3,11 +3,18 @@
 require 'terminal-table'
 require 'date'
 require_relative 'painter'
+require 'ascii_charts'
 
 module Kovid
   class Tablelize
     class << self
       CASES_DEATHS_RECOVERED = [
+        'Cases'.paint_white,
+        'Deaths'.paint_red,
+        'Recovered'.paint_green
+      ].freeze
+
+      CASES_DEATHS_RECOVERED_CTODAY_DTODAY = [
         'Cases'.paint_white,
         'Deaths'.paint_red,
         'Recovered'.paint_green,
@@ -31,30 +38,46 @@ module Kovid
         'Critical'.paint_red
       ].freeze
 
+      COMPARE_COUNTRY_TABLE_FULL = [
+        'Country'.paint_white,
+        'Cases'.paint_white,
+        'Deaths'.paint_red,
+        'Recovered'.paint_green,
+        'Cases Today'.paint_white,
+        'Deaths Today'.paint_red,
+        'Critical'.paint_yellow,
+        '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
 
       def country_table(data)
-        headings = CASES_DEATHS_RECOVERED
+        headings = CASES_DEATHS_RECOVERED_CTODAY_DTODAY
         rows = [
           [
-            data['cases'],
-            data['deaths'],
-            data['recovered'],
+            comma_delimit(data['cases']),
+            comma_delimit(data['deaths']),
+            comma_delimit(data['recovered']),
             check_if_positve(data['todayCases']),
             check_if_positve(data['todayDeaths'])
           ]
         ]
 
-        # binding.irb
-
         if iso = data['countryInfo']['iso2']
-          Terminal::Table.new(title: data['country'].upcase.to_s, headings: headings, rows: rows)
+          Terminal::Table.new(title: "#{country_emoji(iso)} #{data['country'].upcase}", headings: headings, rows: rows)
         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)
@@ -79,15 +102,15 @@ module Kovid
           comma_delimit(data['casesPerOneMillion'])
         ]
 
-        # if iso = data['countryInfo']['iso2']
-        #   Terminal::Table.new(title: "#{data['country'].upcase} #{country_emoji(iso)}",
-        #                       headings: headings,
-        #                       rows: rows)
-        # else
-        Terminal::Table.new(title: data['country'].upcase,
-                            headings: headings,
-                            rows: rows)
-        # end
+        if iso = data['countryInfo']['iso2']
+          Terminal::Table.new(title: "#{country_emoji(iso)} #{data['country'].upcase}",
+                              headings: headings,
+                              rows: rows)
+        else
+          Terminal::Table.new(title: data['country'].upcase,
+                              headings: headings,
+                              rows: rows)
+        end
         # TODO: Rafactor this
       end
 
@@ -107,59 +130,43 @@ 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)
-        headings = [
-          'Country'.paint_white,
-          'Cases'.paint_white,
-          'Deaths'.paint_red,
-          'Recovered'.paint_green,
-          'Cases Today'.paint_white,
-          'Deaths Today'.paint_red,
-          'Critical'.paint_yellow,
-          'Cases/Million'.paint_white
-        ]
-
-        rows = []
+        rows = data.map do |country|
+          [
+            country.fetch('country'),
+            comma_delimit(country.fetch('cases')),
+            comma_delimit(country.fetch('deaths')),
+            comma_delimit(country.fetch('recovered')),
+            check_if_positve(country.fetch('todayCases')),
+            check_if_positve(country.fetch('todayDeaths')),
+            comma_delimit(country.fetch('critical')),
+            comma_delimit(country.fetch('casesPerOneMillion'))
 
-        data.each do |country|
-          rows << [
-            country['country'],
-            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['critical']),
-            comma_delimit(country['casesPerOneMillion'])
           ]
         end
 
-        Terminal::Table.new(headings: headings, rows: rows)
+        Terminal::Table.new(headings: COMPARE_COUNTRY_TABLE_FULL, rows: rows)
       end
 
       def cases(cases)
@@ -172,7 +179,7 @@ module Kovid
           ]
         ]
 
-        Terminal::Table.new(title: 'Total Number of Incidents Worldwide'.upcase, headings: headings, rows: rows)
+        Terminal::Table.new(title: '🌍 Total Number of Incidents Worldwide'.upcase, headings: headings, rows: rows)
       end
 
       def history(country, last)
@@ -215,6 +222,55 @@ module Kovid
         )
       end
 
+      def histogram(country, date_string)
+        @date = date_string.split('.')
+
+        if @date.last.to_i != 20
+          Kovid.info_table('Only 2020 histgrams are available.')
+          return
+        end
+
+        # From dates where number of !cases.zero?
+        positive_cases_figures = country['timeline']['cases'].values.reject!(&:zero?)
+        dates = country['timeline']['cases'].reject { |_k, v| v.zero? }.keys
+        data = []
+
+        # Improve this later, like everything else.
+        # Returns array of days.to_i from the date param
+        dates = dates.map do |date|
+          date.split('/')
+        end.select do |date|
+          date.last == @date.last
+        end.select do |date|
+          date.first == @date.first
+        end.map do |array|
+          array[1]
+        end.map(&:to_i).last(positive_cases_figures.count)
+
+        # Arranges dates and figures in [x,y] for histogram
+        # With x being day, y being number of cases
+        if dates.empty?
+          if @date.first.to_i > Time.now.month
+            Kovid.info_table('Seriously...??! 😏')
+          else
+            Kovid.info_table('No infections for this month.')
+          end
+
+        else
+          dates.each_with_index do |val, index|
+            data << [val, positive_cases_figures[index]]
+          end
+          y_range = AsciiCharts::Cartesian.new(data, bar: true, hide_zero: true).y_range
+
+          last_two_y = y_range.last 2
+          y_interval = last_two_y.last - last_two_y.first
+
+          scale("Scale on Y: #{y_interval}:#{(y_interval / last_two_y.last.to_f * positive_cases_figures.last).round(2) / y_interval}")
+
+          AsciiCharts::Cartesian.new(data, bar: true, hide_zero: true).draw
+        end
+      end
+
       def eu_aggregate(eu_data)
         rows = []
         rows << [
@@ -228,7 +284,7 @@ module Kovid
         ]
 
         Terminal::Table.new(
-          title: 'Aggregated EU (27 States) Data'.upcase,
+          title: '🇪🇺' + 8203.chr(Encoding::UTF_8) + ' Aggregated EU (27 States) Data'.upcase,
           headings: EU_AGGREGATE_HEADINGS,
           rows: rows
         )
@@ -248,7 +304,7 @@ module Kovid
       end
 
       def country_emoji(iso)
-        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*')
+        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*') + 8203.chr(Encoding::UTF_8)
       end
 
       def transpose(load)
@@ -256,6 +312,11 @@ module Kovid
           data.map! { |number| comma_delimit(number) }
         end
       end
+
+      def scale(msg)
+        rows = [[msg]]
+        puts Terminal::Table.new title: 'SCALE', rows: rows
+      end
     end
   end
 end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.4.4
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ascii_charts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +120,7 @@ files:
 - lib/kovid.rb
 - lib/kovid/cache.rb
 - lib/kovid/cli.rb
+- lib/kovid/helpers.rb
 - lib/kovid/painter.rb
 - lib/kovid/request.rb
 - lib/kovid/tablelize.rb