kovid 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5b928695ed30eef22a377df09509cb817b0db67723b452934d4d9d7ef928e9
-  data.tar.gz: 550215c5eaa911ac354bfe5d14027ce272061b70e7c364b92c8a846c632298d7
+  metadata.gz: b7ae0b899f1e91e81fde1171491b4dd933eb022f1936f96686ca3ead29f4fca1
+  data.tar.gz: 145b553fca0604fc0c055f7402df0f4e5040a10153ae77a73d0dee0e4c3b4888
 SHA512:
-  metadata.gz: 587bb5f88a9e2c5af493f4d1e6ad49e77bd580f1cbf72f629a42890d3a218b5406bd4a4123d401a5f8a1694b70f717dccf03851dfaaff7014121adcd35a9f088
-  data.tar.gz: 95542b8fe35f9e06aeeffab5233d7de059e96a14fb95283fa4081459c56b5fd3de84b98e18f77d0de5de539d4a84e23fd4900e34f5701552301b5c2ddd53434b
+  metadata.gz: f4810dd236e8fce6ac8866349b881c30b8627bfc77e59d259603d157d1bf26a582d27a305df350aef259231fd48cde98a5d43dfdc20de990dacfa75283f53408
+  data.tar.gz: 6d7892a076c769e90ed0ead3fddfe4d639c2d3cd41d05bc038094d864c4cd97268cda3cd0bf388d17bf50bf595bce80983a8d54e93d7fed8827e1df83348f8e3

data/Gemfile.lock

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

data/README.md

@@ -43,6 +43,12 @@ You can get continental information with the following commands:
 You can fetch US state-specific data:
 * `kovid state STATE` OR `kovid state "STATE NAME"`.
 
+Provinces
+
+You can fetch province specific data:
+
+* `kovid province PROVINCE` or `kovid province "PROVINCE NAME"`.
+
 ___
 😷 **Comparing**
 * `kovid compare FOO BAR` (sorts by cases DESC).
@@ -56,6 +62,9 @@ You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `k
 
 You can compare US states with:
 * `kovid compare STATE STATE` Example: `kovid states illinois "new york" california`
+
+You can compare provicnes with:
+* `kovid provinces PROVINCE PROVINCE` Example: `kovid provinces ontario manitoba`
 ___
 😷 **History**
 * `kovid history COUNTRY` (full history).

data/lib/kovid.rb

@@ -38,6 +38,14 @@ module Kovid
     Kovid::Request.by_country_full(name)
   end
 
+  def province(name)
+    Kovid::Request.province(name)
+  end
+  
+  def provinces(names)
+    Kovid::Request.provinces(names)
+  end
+
   def state(state)
     Kovid::Request.state(state)
   end

data/lib/kovid/cli.rb

@@ -11,6 +11,18 @@ module Kovid
       true
     end
 
+    desc 'province PROVINCE or province "PROVINCE NAME"', 'Returns reported data on provided province. eg "kovid check "new brunswick".'
+    method_option :full, aliases: '-p'
+    def province(name)
+      puts Kovid.province(name)
+      data_source
+    end
+
+    desc 'provinces PROVINCE PROVINCE', 'Returns full comparison table for the given provinces. Accepts multiple provinces.'
+    def provinces(*names)
+      puts Kovid.provinces(names)
+    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)

data/lib/kovid/request.rb

@@ -9,6 +9,7 @@ module Kovid
   class Request
     COUNTRIES_PATH = UriBuilder.new('/countries').url
     STATES_URL = UriBuilder.new('/states').url
+    JHUCSSE_URL = UriBuilder.new('/v2/jhucsse').url
 
     SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
@@ -83,6 +84,21 @@ module Kovid
         puts SERVER_DOWN
       end
 
+      def province(province)
+        response = fetch_province(province)
+        if response.nil?
+          not_found(province)
+        else
+          Kovid::Tablelize.full_province_table(response)
+        end
+      end
+
+      def provinces(names)
+        array = fetch_provinces(names)
+
+        Kovid::Tablelize.compare_provinces(array)
+      end
+
       def state(state)
         response = fetch_state(state)
         if response.nil?
@@ -176,6 +192,21 @@ module Kovid
         JSON.parse(Typhoeus.get(country_url, cache_ttl: 900).response_body)
       end
 
+      def fetch_jhucsse
+        JSON.parse(Typhoeus.get(JHUCSSE_URL, cache_ttl: 900).response_body)
+      end
+
+      def fetch_province(province)
+        response = fetch_jhucsse
+        response.select { |datum| datum['province'] == capitalize_words(province) }.first
+      end
+
+      def fetch_provinces(provinces)
+        provinces.map!(&method(:capitalize_words))
+        response = fetch_jhucsse
+        response.select { |datum| provinces.include? datum['province'] }
+      end
+
       def fetch_state(state)
         states_array = JSON.parse(Typhoeus.get(STATES_URL, cache_ttl: 900).response_body)
 
@@ -189,16 +220,6 @@ module Kovid
           isos.include?(hash['countryInfo']['iso2'])
         end
 
-        # You can't do this for Ruby veresion < 2.6.0
-        # #merge behaviour was changed in Ruby 2.6.0
-        # head, *tail = country_array
-        # data = head.merge(*tail) do |key, left, right|
-        #   left ||= 0
-        #   right ||= 0
-
-        #   left + right unless %w[country countryInfo].include?(key)
-        # end.compact
-
         data = country_array.inject do |base, other|
           base.merge(other) do |key, left, right|
             left ||= 0

data/lib/kovid/tablelize.rb

@@ -78,6 +78,13 @@ module Kovid
         'Active'.paint_yellow
       ].freeze
 
+      COMPARE_PROVINCES_HEADINGS = [
+        'Province'.paint_white,
+        'Confirmed'.paint_white,
+        'Deaths'.paint_red,
+        'Recovered'.paint_green
+      ].freeze
+
       FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
       COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
@@ -126,6 +133,18 @@ module Kovid
         end
       end
 
+      def full_province_table(province)
+        headings = [
+          'Confirmed'.paint_white,
+          'Deaths'.paint_red,
+          'Recovered'.paint_green
+        ]
+        rows = []
+        rows << [province['stats']['confirmed'], province['stats']['deaths'], province['stats']['recovered']]
+
+        Terminal::Table.new(title: province['province'].upcase, headings: headings, rows: rows)
+      end
+
       def full_state_table(state)
         headings = [
           'Cases'.paint_white,
@@ -195,6 +214,19 @@ module Kovid
         Terminal::Table.new(headings: COMPARE_STATES_HEADINGS, rows: rows)
       end
 
+      def compare_provinces(data)
+        rows = data.map do |province|
+          [
+            province['province'].upcase,
+            province['stats']['confirmed'],
+            province['stats']['deaths'],
+            province['stats']['recovered']
+          ]
+        end
+
+        Terminal::Table.new(headings: COMPARE_PROVINCES_HEADINGS, rows: rows)
+      end
+
       def cases(cases)
         headings = CASES_DEATHS_RECOVERED
         rows = [

data/lib/kovid/version.rb

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

metadata

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