kovid 0.6.14 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2896f04560ac519045555f79fc0d8cdcbcee7ed9069aecd1ebdbcba181584927
-  data.tar.gz: fe15af9091b1a03ae8ac6a78e712c5a7dc7dd1a7b433e45b9c6bdad05c709f22
+  metadata.gz: 4cfebd50118e5a9ef72a66b077d5a35308f346eef761d0cfc243f55ada7ca92c
+  data.tar.gz: 0f99a32311c5cb41dfddc89bbc2c1605d2de6a9e5a3e6d828f48bbecba9420ad
 SHA512:
-  metadata.gz: 9a4260377fa1d38f2b9dd9f7b94bdcf3527e437f2c89e15d15d1a0b87df11a09934baa56a6d8b13f1e1a588b0590b4a1646f7ca6f9c96a141f1b2178054bc358
-  data.tar.gz: c9c313cf8982980845c5d73d5da9e9d9cab82738825762bbceb3a07e511f7ccae1d12516cadd80bfb86fa88c8a2dd4b58615db396a0ba901d7fa94fbddcd21c7
+  metadata.gz: 605ae8aa65d02bcbef69b311642ef734da4f8671828e368893e756107a48ae3610dcb7bd323f83f8f9f5ab85123f8ef10ba0ab44ed5d2466640beab4acff0993
+  data.tar.gz: 35e5693621a1be4cd0f055e0a77a7071e26dc6dec0eb0860aeb278ae22d1d5ac2f200c6942e7628038236db1a84d1b22d46843e14060d4393ebf3839be2f5d67

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.13)
-      carmen (~> 1.1.3)
+    kovid (0.7.0)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
@@ -11,24 +10,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.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.13.0)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
-    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)
@@ -49,14 +36,10 @@ GEM
     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)
+    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

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = summary
   spec.homepage      = 'https://github.com/siaw23/kovid'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
 
@@ -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

@@ -44,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
 
@@ -58,6 +60,7 @@ module Kovid
       'Cases Today'.paint_white,
       'Deaths'.paint_red,
       'Deaths Today'.paint_red,
+      'Active'.paint_yellow,
       'Recovered'.paint_green,
       'Tests'.paint_white
     ].freeze
@@ -69,8 +72,8 @@ module Kovid
       'Deaths Today'.paint_red,
       'Active'.paint_yellow,
       'Recovered'.paint_green,
-      'Tests'.paint_white,
       'Critical'.paint_yellow,
+      'Tests'.paint_white,
       'Cases/Million'.paint_white
     ].freeze
 
@@ -124,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

@@ -26,8 +26,6 @@ module Kovid
   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

@@ -14,7 +14,7 @@ module Kovid
       end
 
       Terminal::Table.new(
-        title: data['country'].try(:upcase),
+        title: data['country']&.upcase,
         headings: DATE_CASES_DEATHS_RECOVERED,
         rows: rows
       )
@@ -29,7 +29,7 @@ module Kovid
       end
 
       Terminal::Table.new(
-        title: data['state'].try(:upcase),
+        title: data['state']&.upcase,
         headings:  DATE_CASES_DEATHS,
         rows: rows
       )

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'
@@ -266,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
@@ -301,7 +301,7 @@ module Kovid
       def fetch_history(country)
         JSON.parse(
           Typhoeus.get(
-            HISTORICAL_URL + "/#{country}", cache_ttl: 900
+            HISTORICAL_URL + "/#{ERB::Util.url_encode(country)}", cache_ttl: 900
           ).response_body
         )
       end
@@ -309,7 +309,7 @@ module Kovid
       def fetch_us_history(state)
         JSON.parse(
           Typhoeus.get(
-            HISTORICAL_US_URL + "/#{state}", cache_ttl: 900
+            HISTORICAL_US_URL + "/#{ERB::Util.url_encode(state)}", cache_ttl: 900
           ).response_body
         )
       end

data/lib/kovid/tablelize.rb

@@ -124,7 +124,8 @@ module Kovid
       end
 
       def country_emoji(iso)
-        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*') + \
+        #TODO: FIx ZWSP
+        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*') + " " + \
           8203.chr(Encoding::UTF_8)
       end
 
@@ -156,9 +157,8 @@ module Kovid
           Kovid.add_plus_sign(data['todayDeaths']),
           Kovid.comma_delimit(data['active']),
           Kovid.comma_delimit(data['recovered']),
-          Kovid.comma_delimit(data['tests']),
-
           Kovid.comma_delimit(data['critical']),
+          Kovid.comma_delimit(data['tests']),
           Kovid.comma_delimit(data['casesPerOneMillion'])
         ]
       end

data/lib/kovid/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.7.1
 platform: ruby
 authors:
 - Emmanuel Hayford
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-06 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
@@ -155,15 +134,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: A CLI to fetch and compare the 2019 coronavirus pandemic statistics.
 test_files: []