kovid 0.4.11 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d27663428f061e75f69ae9d3110bae2a421550683a98757b7500b2813cb8f65
-  data.tar.gz: 27c9ce9b8697d468edf40cb869ecba3a85768559626bcdad685707938a0e00a7
+  metadata.gz: e6ef7ae7570fd2c03a726d7874bfaca26c60c2e3f218e362bbb43c7db52fe609
+  data.tar.gz: 3365f9615ffb792ca0ad959ec251240943e3ae73f1cb71f3b8c847f1e25f2dba
 SHA512:
-  metadata.gz: f5d11f328ec94cce0e3a13cad8668bb3a6a71a19140d4f8a1ea87d981922195370a4bd8e52562ae3a67cb16903a8f46ef70afbf218bf2a7d20180a348e0580d7
-  data.tar.gz: 29f3629879ea3aed120c91ae16eb1366f853ef604398f17fd05e59fb4521dcd0d77aeae5f28db4d09e96b9418be93f7a0d3aa20d7bfcd391d1788565e13f81f1
+  metadata.gz: 9f51fca509d8e54dc62b5cf971e4900c3f97a026d9c8b6a3237c934ad340cf9db63ff0f41e90b5c9bee49be90b35f1b2a9d63bb4e83f9b1bcf2249bd18da73df
+  data.tar.gz: 6faafaa2c3ddf39bfe1c3bc938cdfb93e313b5b998eacf8fd95278a44ecbc5148d4712e4601bae66bbabb7a4fa76760f6014ea6be42506b21911eff76b756e26

data/Gemfile.lock

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

data/README.md

@@ -26,8 +26,8 @@ You can run `kovid --help` to see the full list of available commands.
 #### Commands Overview
 
 😷 **Fetching**
-* `kovid check COUNTRY` OR `kovid country COUNTRY`.
-* `kovid check COUNTRY -f` OR `kovid check COUNTRY --full`.
+* `kovid check COUNTRY` aliased as `kovid country COUNTRY`.
+* `kovid check COUNTRY -f` aliased as `kovid country COUNTRY --full`.
 
 You can get continental information with the following commands:
 
@@ -52,8 +52,10 @@ Where `FOO` and `BAR` are different countries.
 
 You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `kovid compare FOO BAR BAZ -f`
 
-##### 🔜 Upcoming Compare Features 👷‍♂️
-* `kovid compare US_STATE1 US_STATE ...` Side-by-side stats on two/more US states.
+🇺🇸🇺🇸🇺🇸
+
+You can compare US states with:
+* `kovid compare STATE STATE` Example: `kovid states illinois "new york" california`
 ___
 😷 **History**
 * `kovid history COUNTRY` (full history).

data/lib/kovid/cli.rb

@@ -41,6 +41,11 @@ module Kovid
       data_source
     end
 
+    desc 'states STATE STATE', 'Returns full comparison table for the given states. Accepts multiple states.'
+    def states(*states)
+      puts Kovid.states(states)
+    end
+
     desc 'world', 'Returns total number of cases, deaths and recoveries.'
     def world
       puts Kovid.cases

data/lib/kovid/request.rb

@@ -9,14 +9,15 @@ module Kovid
   class Request
     COUNTRIES_PATH = UriBuilder.new('/countries').url
     STATES_URL = UriBuilder.new('/states').url
+
+    SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
+
     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
     EUROPE_ISOS = EU_ISOS + %w[GB IS NO CH MC AD SM VA BA RS ME MK AL BY UA RU MD]
     AFRICA_ISOS = %w[DZ AO BJ BW BF BI CM CV CF TD KM CD CG CI DJ EG GQ ER SZ ET GA GM GH GN GW KE LS LR LY MG MW ML MR MU MA MZ NA NE NG RW ST SN SC SL SO ZA SS SD TZ TG TN UG ZM ZW EH].freeze
     SOUTH_AMERICA_ISOS = ['AR' 'BO', 'BV', 'BR', 'CL', 'CO', 'EC', 'FK', 'GF', 'GY', 'PY', 'PE', 'GS', 'SR', 'UY', 'VE'].freeze
     ASIA_ISOS = %w[AE AF AM AZ BD BH BN BT CC CN CX GE HK ID IL IN IQ IR JO JP KG KH KP KR KW KZ LA LB LK MM MN MO MY NP OM PH PK PS QA SA SG SY TH TJ TL TM TR TW UZ VN YE].freeze
 
-    SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
-
     class << self
       def eu_aggregate
         eu_proc = proc do |data|
@@ -161,10 +162,11 @@ module Kovid
       end
 
       def fetch_states(list)
-        array = []
+        states_json = JSON.parse(Typhoeus.get(STATES_URL, cache_ttl: 900).response_body)
+        states_array = []
 
-        list.each do |state|
-          array << JSON.parse(Typhoeus.get(COUNTRIES_PATH + "/#{state}", cache_ttl: 900).response_body)
+        states_json.select do |state|
+          states_array << state if list.include?(state['state'].downcase)
         end
       end
 

data/lib/kovid/tablelize.rb

@@ -2,8 +2,8 @@
 
 require 'terminal-table'
 require 'date'
-require_relative 'painter'
 require 'ascii_charts'
+require_relative 'painter'
 
 module Kovid
   class Tablelize
@@ -58,11 +58,29 @@ module Kovid
         'Recovered'.paint_green
       ].freeze
 
+      FULL_COUNTRY_TABLE_HEADINGS = [
+        '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_STATES_HEADINGS = [
+        'State'.paint_white,
+        'Cases'.paint_white,
+        'Cases Today'.paint_white,
+        'Deaths'.paint_red,
+        'Deaths Today'.paint_red,
+        'Active'.paint_yellow
+      ].freeze
+
       FOOTER_LINE = ['------------', '------------', '------------'].freeze
       COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
       def country_table(data)
-        headings = CASES_DEATHS_RECOVERED_CTODAY_DTODAY
         rows = [
           [
             comma_delimit(data['cases']),
@@ -73,24 +91,18 @@ module Kovid
           ]
         ]
 
-        if iso = data['countryInfo']['iso2']
-          Terminal::Table.new(title: "#{country_emoji(iso)} #{data['country'].upcase}", headings: headings, rows: rows)
+        if (iso = data['countryInfo']['iso2'])
+          Terminal::Table.new(title: "#{country_emoji(iso)} #{data['country'].upcase}",
+                              headings: CASES_DEATHS_RECOVERED_CTODAY_DTODAY,
+                              rows: rows)
         else
-          Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
+          Terminal::Table.new(title: data['country'].upcase,
+                              headings: CASES_DEATHS_RECOVERED_CTODAY_DTODAY,
+                              rows: rows)
         end
       end
 
       def full_country_table(data)
-        headings = [
-          '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 << [
           comma_delimit(data['cases']),
@@ -104,14 +116,13 @@ module Kovid
 
         if iso = data['countryInfo']['iso2']
           Terminal::Table.new(title: "#{country_emoji(iso)} #{data['country'].upcase}",
-                              headings: headings,
+                              headings: FULL_COUNTRY_TABLE_HEADINGS,
                               rows: rows)
         else
           Terminal::Table.new(title: data['country'].upcase,
-                              headings: headings,
+                              headings: FULL_COUNTRY_TABLE_HEADINGS,
                               rows: rows)
         end
-        # TODO: Rafactor this
       end
 
       def full_state_table(state)
@@ -141,7 +152,7 @@ module Kovid
             comma_delimit(country['recovered'])
           ]
 
-          rows << if iso = country['countryInfo']['iso2']
+          rows << if (iso = country['countryInfo']['iso2'])
                     base_rows.unshift("#{country_emoji(iso)} #{country['country'].upcase}")
                   else
                     base_rows.unshift(country['country'].upcase.to_s)
@@ -168,6 +179,21 @@ module Kovid
         Terminal::Table.new(headings: COMPARE_COUNTRY_TABLE_FULL, rows: rows)
       end
 
+      def compare_us_states(data)
+        rows = data.map do |state|
+          [
+            state.fetch('state').upcase,
+            comma_delimit(state.fetch('cases')),
+            check_if_positve(state['todayCases']),
+            comma_delimit(state['deaths']),
+            check_if_positve(state['todayDeaths']),
+            comma_delimit(state.fetch('active'))
+          ]
+        end
+
+        Terminal::Table.new(headings: COMPARE_STATES_HEADINGS, rows: rows)
+      end
+
       def cases(cases)
         headings = CASES_DEATHS_RECOVERED
         rows = [
@@ -273,6 +299,8 @@ module Kovid
 
           scale("Scale on Y: #{y_interval}:#{(y_interval / last_two_y.last.to_f * positive_cases_figures.last).round(2) / y_interval}")
 
+          puts 'Experimental feature, please report issues.'
+
           AsciiCharts::Cartesian.new(data, bar: true, hide_zero: true).draw
         end
       end
@@ -286,7 +314,8 @@ module Kovid
       end
 
       def africa_aggregate(africa_data)
-        aggregated_table(africa_data, 'Africa', Kovid::Request::AFRICA_ISOS, '🌍')
+        aggregated_table(africa_data, 'Africa',
+                         Kovid::Request::AFRICA_ISOS, '🌍')
       end
 
       def south_america_aggregate(south_america_data)

data/lib/kovid/version.rb

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

data/lib/kovid.rb

@@ -42,7 +42,7 @@ module Kovid
     Kovid::Request.state(state)
   end
 
-  def states(*states)
+  def states(states)
     Kovid::Request.states(states)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.5.0
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-29 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor