kovid 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490171e0140b632b2cb19c40e781194aa02fb77cd5b2dd97026d761ab6a1820e
-  data.tar.gz: e317576c9f36bd7ba3f138e03548e6115d789182c97bcf0b2db7018f482b0663
+  metadata.gz: 14f3598372d551bf07a3acd856b1eaa965aa6802794d8e7020fd9a234bb14df9
+  data.tar.gz: 5717fd5599aa8b3a6521c2dda5ccbe4e74580df794a0613d30e4bb09071abd9e
 SHA512:
-  metadata.gz: 6d51a7f12226e122b242f341b9e3d3ee55b5bd90132f0d78bdae5f0730f67166fb099a878c8e591c9f7d04eafebbb7ecb184394a05cd8baf12ee8b9562962449
-  data.tar.gz: f0f310b2f6441f6c69662bcf9b6bd3287983b9d07173f60b119b719d0595ab804041415f962fffb4f7c6fff12bd847e7e31ce0a2109f7789695b5c6629533aae
+  metadata.gz: 355d8fcc18cc07dd0e080722aa8d45a034b5da18c0ade97d2b052fb7603f4e2463d98447ea3dc985ec5bfb8682b12b88e7e74c0b26d2a55c99bad2f1fbaf04b0
+  data.tar.gz: d80ec1720c3b47b6906fe4be773e696a494b2f3877dc851b60ce8b6d8d8a00653b39cda43682082bbee3afd76a2bf08f1028d18d35056332b8d7ed71513939ae

data/Gemfile.lock

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

data/lib/kovid.rb

@@ -68,11 +68,11 @@ module Kovid
     Kovid::Request.cases
   end
 
-  def history(country, days=30)
+  def history(country, days = 30)
     Kovid::Request.history(country, days)
   end
 
-  def history_us_state(state, days=30)
+  def history_us_state(state, days = 30)
     Kovid::Request.history_us_state(state, days)
   end
 

data/lib/kovid/cli.rb

@@ -78,8 +78,8 @@ module Kovid
     desc 'history COUNTRY or history COUNTRY N or' \
          'history STATE --usa',
          'Return history of incidents of COUNTRY|STATE (in the last N days)'
-    option :usa, :type => :boolean
-    def history(location, days=30)
+    option :usa, type: :boolean
+    def history(location, days = 30)
       if options[:usa]
         puts Kovid.history_us_state(location, days)
       else

data/lib/kovid/constants.rb

@@ -13,7 +13,8 @@ module Kovid
       'Cases Today'.paint_white,
       'Deaths'.paint_red,
       'Deaths Today'.paint_red,
-      'Recovered'.paint_green
+      'Recovered'.paint_green,
+      'Tests'.paint_white,
     ].freeze
 
     DATE_CASES_DEATHS_RECOVERED = [

data/lib/kovid/request.rb

@@ -8,28 +8,28 @@ require_relative 'uri_builder'
 
 module Kovid
   class Request
-    COUNTRIES_PATH    = UriBuilder.new('/v2/countries').url
-    STATES_URL        = UriBuilder.new('/v2/states').url
-    JHUCSSE_URL       = UriBuilder.new('/v2/jhucsse').url
-    HISTORICAL_URL    = UriBuilder.new('/v2/historical').url
-    HISTORICAL_US_URL = UriBuilder.new('/v2/historical/usacounties').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].freeze
-    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 = %w[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
+    COUNTRIES_PATH      = UriBuilder.new('/v2/countries').url
+    STATES_URL          = UriBuilder.new('/v2/states').url
+    JHUCSSE_URL         = UriBuilder.new('/v2/jhucsse').url
+    HISTORICAL_URL      = UriBuilder.new('/v2/historical').url
+    HISTORICAL_US_URL   = UriBuilder.new('/v2/historical/usacounties').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].freeze
+    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  = %w[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
 
     class << self
       def eu_aggregate
@@ -172,7 +172,7 @@ module Kovid
 
         if response.key?('message')
           not_found(country) do |c|
-            "Could not find cases for #{c}.\nIf searching United States, add --usa option" 
+            "Could not find cases for #{c}.\nIf searching United States, add --usa option"
           end
         else
           Kovid::Tablelize.history(response, days)
@@ -183,7 +183,7 @@ module Kovid
 
       def history_us_state(state, days)
         history_path = UriBuilder.new('/v2/historical/usacounties').url
-        state        = Kovid.lookup_us_state(state).downcase()
+        state        = Kovid.lookup_us_state(state).downcase
 
         response = JSON.parse(
           Typhoeus.get(
@@ -191,7 +191,7 @@ module Kovid
           ).response_body
         )
 
-        if response.respond_to?(:key?) and response.key?('message')
+        if response.respond_to?(:key?) && response.key?('message')
           return not_found(state)
         end
 
@@ -203,13 +203,13 @@ module Kovid
 
         # normalize data so we can call Kovid::Tablelize.history on US State data
         response = {
-          "state"    => state,
-          "timeline" => { "cases" => cases, "deaths" => deaths }
+          'state' => state,
+          'timeline' => { 'cases' => cases, 'deaths' => deaths }
         }
 
         Kovid::Tablelize.history(response, days)
       rescue JSON::ParserError
-          puts SERVER_DOWN
+        puts SERVER_DOWN
       end
 
       def histogram(country, date)
@@ -233,11 +233,11 @@ module Kovid
         rows = []
         default_warning = "Wrong spelling/No reported cases on #{location.upcase}."
 
-        if block_given?
-          rows << [ yield(location) ]
-        else
-          rows << [ default_warning ]
-        end
+        rows << if block_given?
+                  [yield(location)]
+                else
+                  [default_warning]
+                end
 
         Terminal::Table.new title: "You checked: #{location.upcase}", rows: rows
       end
@@ -328,9 +328,9 @@ module Kovid
         end.compact
       end
 
-      def usacounties_aggregator(data, key=nil)
-        data.inject({}) do |base,other|
-          base.merge(other['timeline'][key]) do |k,l,r|
+      def usacounties_aggregator(data, key = nil)
+        data.inject({}) do |base, other|
+          base.merge(other['timeline'][key]) do |_k, l, r|
             l ||= 0
             l ||= 0
             l + r

data/lib/kovid/version.rb

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

metadata

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