kovid 0.6.13 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0bc9550073aaff0f2e6fb4a4175b4147bacf6c43d4d47d0177771845d30f01
-  data.tar.gz: 5e960a7772a01ad8c67c77284eaebc46cb55827522e6890f62b935b87d6e3494
+  metadata.gz: acb8468524e33ff58574c2910dd1af5682b2e6bdd8d0fe61c4d497156fe4ff17
+  data.tar.gz: 58f2430edf6b6cc104c815761205fa2b0532e7fe133af7fe114b6d7608651b69
 SHA512:
-  metadata.gz: 7f65a6ea777bde11958ab2c3d43f73b63d83d23b18f5c21757be1e46e8ebda407b762714b32d1cab819cde75a41344735799670e41b17bd9e5a175d2e52892a0
-  data.tar.gz: d542e777ce15d0d0236faf62264d7fd2679b4655295e51be4871ba2f1c4990fb658f9d02fc6824357a73cb94e8cd54013b8a5106819e21ded1ad6d9c07b0dbcd
+  metadata.gz: d91ac4ad0e990714c8fdd5ac8ced650abdb6c22525c8a61a9b8b089d027c7991cf4629dc03aff77f934d412db561065ed8cdc2dff4b7b86b9b07b38e523e7c11
+  data.tar.gz: b60f261d152aa46784ee6eacafacd59aeae8906637ccf76721e166e49632680c23aed6d61642487037295f49ea02adb4c8189aa08bf7b919b277caec35016d55

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.12)
-      carmen (~> 1.1.3)
+    kovid (0.7.0)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
@@ -11,52 +10,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    carmen (1.1.3)
-      activesupport (>= 3.0.0)
-    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.2)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.12.2)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
-    rainbow (3.0.0)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    rainbow (3.1.1)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    thor (1.2.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    unicode-display_width (1.8.0)
 
 PLATFORMS
   ruby
@@ -68,4 +51,4 @@ DEPENDENCIES
   simplecov (~> 0.18)
 
 BUNDLED WITH
-   2.1.4
+   2.3.9

data/README.md

@@ -85,10 +85,6 @@ ___
 
 **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`)
-(If the histogram appears messy, you might want to resize your window.)
 
 #### Commands Details
 To fetch basic data on a country run:
@@ -171,12 +167,6 @@ To fetch more number of countries or US states you can pass N. eg:
 
 ![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.
-
-![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,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/siaw23/kovid'
   spec.metadata['changelog_uri'] = 'https://github.com/siaw23/kovid'
 
-  spec.add_dependency 'carmen', '~> 1.1.3'
   spec.add_dependency 'rainbow', '~> 3.0'
   spec.add_dependency 'terminal-table', '~> 1.8'
   spec.add_dependency 'thor', '~> 1.0'
@@ -40,23 +39,4 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-
-  spec.post_install_message = "
-    ============================================================================
-      COVID-19 has devasted the world. While we're fighting
-      with the novel coronavirus, I think stats on the issue should be
-      accessible.
-
-      There isn't much we can do now besides following procedures and hoping
-      for the best.
-
-      Stay safe!
-      Emmanuel Hayford.
-      https://emmanuelhayford.com
-
-      PS: I'm in search of a Rails/Ruby job.
-
-      You can hire me (siawmensah@gmail.com).
-    ============================================================================
-    "
 end

data/lib/kovid/constants.rb

@@ -13,8 +13,9 @@ module Kovid
       'Cases Today'.paint_white,
       'Deaths'.paint_red,
       'Deaths Today'.paint_red,
+      'Active'.paint_yellow,
       'Recovered'.paint_green,
-      'Tests'.paint_white,
+      'Tests'.paint_white
     ].freeze
 
     DATE_CASES_DEATHS_RECOVERED = [
@@ -43,11 +44,13 @@ module Kovid
     COMPARE_COUNTRY_TABLE_FULL = [
       'Country'.paint_white,
       'Cases'.paint_white,
-      'Deaths'.paint_red,
-      'Recovered'.paint_green,
       'Cases Today'.paint_white,
+      'Deaths'.paint_red,
       'Deaths Today'.paint_red,
+      'Active'.paint_yellow,
+      'Recovered'.paint_green,
       'Critical'.paint_yellow,
+      'Tests'.paint_white,
       'Cases/Million'.paint_white
     ].freeze
 
@@ -57,17 +60,20 @@ module Kovid
       'Cases Today'.paint_white,
       'Deaths'.paint_red,
       'Deaths Today'.paint_red,
+      'Active'.paint_yellow,
       'Recovered'.paint_green,
       'Tests'.paint_white
     ].freeze
 
     FULL_COUNTRY_TABLE_HEADINGS = [
       'Cases'.paint_white,
-      'Deaths'.paint_red,
-      'Recovered'.paint_green,
       'Cases Today'.paint_white,
+      'Deaths'.paint_red,
       'Deaths Today'.paint_red,
+      'Active'.paint_yellow,
+      'Recovered'.paint_green,
       'Critical'.paint_yellow,
+      'Tests'.paint_white,
       'Cases/Million'.paint_white
     ].freeze
 
@@ -110,6 +116,9 @@ module Kovid
 
     FOOTER_LINE_FOUR_COLUMNS = FOOTER_LINE_COLUMN * 4
 
+    # Add footer if rows exceed this number
+    ADD_FOOTER_SIZE = 10
+
     COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
     RIGHT_ALIGN_COLUMNS = {
@@ -118,5 +127,63 @@ module Kovid
       compare_us_states: [1, 2, 3, 4, 5],
       compare_provinces: [1, 2, 3]
     }.freeze
+
+    USA_ABBREVIATIONS = {
+      "al" => "Alabama",
+      "ak" => "Alaska",
+      "az" => "Arizona",
+      "ar" => "Arkansas",
+      "ca" => "California",
+      "cz" => "Canal Zone",
+      "co" => "Colorado",
+      "ct" => "Connecticut",
+      "de" => "Delaware",
+      "dc" => "District of Columbia",
+      "fl" => "Florida",
+      "ga" => "Georgia",
+      "gu" => "Guam",
+      "hi" => "Hawaii",
+      "id" => "Idaho",
+      "il" => "Illinois",
+      "in" => "Indiana",
+      "ia" => "Iowa",
+      "ks" => "Kansas",
+      "ky" => "Kentucky",
+      "la" => "Louisiana",
+      "me" => "Maine",
+      "md" => "Maryland",
+      "ma" => "Massachusetts",
+      "mi" => "Michigan",
+      "mn" => "Minnesota",
+      "ms" => "Mississippi",
+      "mo" => "Missouri",
+      "mt" => "Montana",
+      "ne" => "Nebraska",
+      "nv" => "Nevada",
+      "nh" => "New Hampshire",
+      "nj" => "New Jersey",
+      "nm" => "New Mexico",
+      "ny" => "New York",
+      "nc" => "North Carolina",
+      "nd" => "North Dakota",
+      "oh" => "Ohio",
+      "ok" => "Oklahoma",
+      "or" => "Oregon",
+      "pa" => "Pennsylvania",
+      "pr" => "Puerto Rico",
+      "ri" => "Rhode Island",
+      "sc" => "South Carolina",
+      "sd" => "South Dakota",
+      "tn" => "Tennessee",
+      "tx" => "Texas",
+      "ut" => "Utah",
+      "vt" => "Vermont",
+      "vi" => "Virgin Islands",
+      "va" => "Virginia",
+      "wa" => "Washington",
+      "wv" => "West Virginia",
+      "wi" => "Wisconsin",
+      "wy" => "Wyoming"
+    }
   end
 end

data/lib/kovid/helpers.rb

@@ -25,15 +25,7 @@ module Kovid
     num.to_i.positive? ? "+#{comma_delimit(num)}" : comma_delimit(num).to_s
   end
 
-  def format_country_history_numbers(load)
-    load['timeline'].values.map(&:values).transpose.each do |data|
-      data.map! { |number| Kovid.comma_delimit(number) }
-    end
-  end
-
   def lookup_us_state(state)
-    us = Carmen::Country.coded('USA')
-    lookup = us.subregions.coded(state) || us.subregions.named(state)
-    lookup ? lookup.name : state
+    Kovid::Constants::USA_ABBREVIATIONS.fetch(state.downcase, state)
   end
 end

data/lib/kovid/historians.rb

@@ -5,42 +5,32 @@ module Kovid
     include Constants
     include AsciiCharts
 
-    def history(location, days)
-      rows = []
+    def history(data, days)
+      rows = history_rows(data, days)
 
-      stats = Kovid.format_country_history_numbers(location).last(days.to_i)
-      dates = location['timeline']['cases'].keys.last(days.to_i)
-
-      if days.to_i >= 30
-        stats = stats.reject { |stat| stat[0].to_i.zero? && stat[1].to_i.zero? }
-        dates = dates.last(stats.count)
+      if rows.size > ADD_FOOTER_SIZE
+        rows << FOOTER_LINE_FOUR_COLUMNS
+        rows << DATE_CASES_DEATHS_RECOVERED
       end
 
-      stats.each_with_index do |val, index|
-        val.unshift(Kovid.dateman(dates[index]))
-      end.each do |row|
-        rows << row
-      end
+      Terminal::Table.new(
+        title: data['country']&.upcase,
+        headings: DATE_CASES_DEATHS_RECOVERED,
+        rows: rows
+      )
+    end
 
-      # Title and Column format if Country or US State
-      if location['country']
-        title      = location['country'].try(:upcase)
-        col_format = DATE_CASES_DEATHS_RECOVERED
-        footer     = FOOTER_LINE_FOUR_COLUMNS
-      else
-        title      = location['state'].try(:upcase)
-        col_format = DATE_CASES_DEATHS
-        footer     = FOOTER_LINE_THREE_COLUMNS
-      end
+    def history_us_state(data, days)
+      rows = history_rows(data, days)
 
-      if stats.size > 10
-        rows << footer
-        rows << col_format
+      if rows.size > ADD_FOOTER_SIZE
+        rows << FOOTER_LINE_THREE_COLUMNS
+        rows << DATE_CASES_DEATHS 
       end
 
       Terminal::Table.new(
-        title: title,
-        headings: col_format,
+        title: data['state']&.upcase,
+        headings:  DATE_CASES_DEATHS,
         rows: rows
       )
     end
@@ -106,5 +96,20 @@ module Kovid
         AsciiCharts::Cartesian.new(data, bar: true, hide_zero: true).draw
       end
     end
+
+    private
+
+      def history_rows(data, days)
+        data['timeline']['cases'].map do |date, cases|
+          formatted_date = Kovid.dateman(date)
+          cases          = Kovid.comma_delimit(cases)
+          deaths         = Kovid.comma_delimit(data['timeline']['deaths'][date])
+          recovered      = Kovid.comma_delimit(data['timeline']['recovered'][date]) if data['timeline'].has_key? 'recovered'
+
+          row = [formatted_date, cases, deaths]
+          row << recovered unless recovered.nil?
+          row
+        end.last(days.to_i)
+      end
   end
 end

data/lib/kovid/request.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'carmen'
+require 'erb'
 require_relative 'tablelize'
 require_relative 'cache'
 require_relative 'uri_builder'
@@ -162,13 +162,7 @@ module Kovid
       end
 
       def history(country, days)
-        history_path = UriBuilder.new('/v2/historical').url
-
-        response = JSON.parse(
-          Typhoeus.get(
-            history_path + "/#{country}", cache_ttl: 900
-          ).response_body
-        )
+        response = fetch_history(country)
 
         if response.key?('message')
           not_found(country) do |c|
@@ -182,14 +176,8 @@ module Kovid
       end
 
       def history_us_state(state, days)
-        history_path = UriBuilder.new('/v2/historical/usacounties').url
-        state        = Kovid.lookup_us_state(state).downcase
-
-        response = JSON.parse(
-          Typhoeus.get(
-            history_path + "/#{state}", cache_ttl: 900
-          ).response_body
-        )
+        state    = Kovid.lookup_us_state(state).downcase
+        response = fetch_us_history(state)
 
         if response.respond_to?(:key?) && response.key?('message')
           return not_found(state)
@@ -201,22 +189,20 @@ module Kovid
         cases  = usacounties_aggregator(response, 'cases')
         deaths = usacounties_aggregator(response, 'deaths')
 
-        # normalize data so we can call Kovid::Tablelize.history on US State data
         response = {
           'state' => state,
           'timeline' => { 'cases' => cases, 'deaths' => deaths }
         }
 
-        Kovid::Tablelize.history(response, days)
+        Kovid::Tablelize.history_us_state(response, days)
       rescue JSON::ParserError
         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
+            HISTORICAL_URL + "/#{country}", cache_ttl: 900
           ).response_body
         )
 
@@ -280,7 +266,7 @@ module Kovid
       def fetch_country(country_name)
         # TODO: Match ISOs to full country names
         country_name = 'nl' if country_name == 'netherlands'
-        country_url = COUNTRIES_PATH + "/#{country_name}"
+        country_url = COUNTRIES_PATH + "/#{ERB::Util.url_encode(country_name)}"
 
         JSON.parse(Typhoeus.get(country_url, cache_ttl: 900).response_body)
       end
@@ -312,6 +298,22 @@ module Kovid
         end.first
       end
 
+      def fetch_history(country)
+        JSON.parse(
+          Typhoeus.get(
+            HISTORICAL_URL + "/#{ERB::Util.url_encode(country)}", cache_ttl: 900
+          ).response_body
+        )
+      end
+
+      def fetch_us_history(state)
+        JSON.parse(
+          Typhoeus.get(
+            HISTORICAL_US_URL + "/#{ERB::Util.url_encode(state)}", cache_ttl: 900
+          ).response_body
+        )
+      end
+
       def aggregator(isos, meth)
         countries_array = JSON.parse(countries_request)
         country_array = countries_array.select do |hash|
@@ -325,9 +327,7 @@ module Kovid
       end
 
       def countries_request
-        Typhoeus.get(
-          UriBuilder.new('/v2/countries').url, cache_ttl: 900
-        ).response_body
+        Typhoeus.get(COUNTRIES_PATH, cache_ttl: 900).response_body
       end
 
       def countries_aggregator(country_array)

data/lib/kovid/tablelize.rb

@@ -39,7 +39,7 @@ module Kovid
         Terminal::Table.new(
           title: state['state'].upcase,
           headings: FULL_STATE_TABLE_HEADINGS,
-          rows: [country_row(state)]
+          rows: [state_row(state)]
         )
       end
 
@@ -136,7 +136,6 @@ module Kovid
         ]
       end
 
-      # Also works for state
       def country_row(data)
         [
           Kovid.comma_delimit(data['cases']),
@@ -144,6 +143,7 @@ module Kovid
           Kovid.comma_delimit(data['deaths']),
           Kovid.add_plus_sign(data['todayDeaths']),
           Kovid.comma_delimit(data['active']),
+          Kovid.comma_delimit(data['recovered']),
           Kovid.comma_delimit(data['tests'])
         ]
       end
@@ -151,15 +151,28 @@ module Kovid
       def full_country_row(data)
         [
           Kovid.comma_delimit(data['cases']),
-          Kovid.comma_delimit(data['deaths']),
-          Kovid.comma_delimit(data['recovered']),
           Kovid.add_plus_sign(data['todayCases']),
+          Kovid.comma_delimit(data['deaths']),
           Kovid.add_plus_sign(data['todayDeaths']),
+          Kovid.comma_delimit(data['active']),
+          Kovid.comma_delimit(data['recovered']),
           Kovid.comma_delimit(data['critical']),
+          Kovid.comma_delimit(data['tests']),
           Kovid.comma_delimit(data['casesPerOneMillion'])
         ]
       end
 
+      def state_row(data)
+        [
+          Kovid.comma_delimit(data['cases']),
+          Kovid.add_plus_sign(data['todayCases']),
+          Kovid.comma_delimit(data['deaths']),
+          Kovid.add_plus_sign(data['todayDeaths']),
+          Kovid.comma_delimit(data['active']),
+          Kovid.comma_delimit(data['tests'])
+        ]
+      end
+
       def province_row(data)
         [
           data['stats']['confirmed'],
@@ -255,17 +268,16 @@ module Kovid
       end
 
       def top_heading(options)
-        if options[:location] == :countries
-          return ['Country'.paint_white] + FULL_COUNTRY_TABLE_HEADINGS
-        end
+        full_country_table = ['Country'.paint_white] + FULL_COUNTRY_TABLE_HEADINGS
+        full_state_table = ['State'.paint_white] + FULL_STATE_TABLE_HEADINGS
 
-        ['State'.paint_white] + FULL_STATE_TABLE_HEADINGS
+        options[:location] == :countries ? full_country_table : full_state_table
       end
 
       def top_title(options)
         incident = options[:incident].to_s
         location = options[:location].to_s
-        "🌍 Top #{options[:count]} #{location} in #{incident}".upcase
+        "🌍 Top #{options[:count]} #{location} by #{incident}".upcase
       end
     end
   end

data/lib/kovid/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.7.0
 platform: ruby
 authors:
 - Emmanuel Hayford
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: carmen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +126,7 @@ metadata:
   homepage_uri: https://github.com/siaw23/kovid
   source_code_uri: https://github.com/siaw23/kovid
   changelog_uri: https://github.com/siaw23/kovid
-post_install_message: "\n    ============================================================================\n
-  \     COVID-19 has devasted the world. While we're fighting\n      with the novel
-  coronavirus, I think stats on the issue should be\n      accessible.\n\n      There
-  isn't much we can do now besides following procedures and hoping\n      for the
-  best.\n\n      Stay safe!\n      Emmanuel Hayford.\n      https://emmanuelhayford.com\n\n
-  \     PS: I'm in search of a Rails/Ruby job.\n\n      You can hire me (siawmensah@gmail.com).\n
-  \   ============================================================================\n
-  \   "
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A CLI to fetch and compare the 2019 coronavirus pandemic statistics.
 test_files: []