kovid 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6abc6282e6ec84a393eee2b5383d70f88643d7633f8bd7537c207dae341ead1b
-  data.tar.gz: a93e83c437e3b1f740fe7471cca72ad2e83c837d0a637c5fe8c71636bdd545dd
+  metadata.gz: a77d1ad2686877dfe810f0df3cbc817b46c287f2a6025ce999108213ad0e54c8
+  data.tar.gz: 888dab7db56dc55241512e24bef98fb9f9117abd9e09790a19894630d691e0c2
 SHA512:
-  metadata.gz: dbc95ba0e85745d9369e15b0e81b6f5d36a7199b1227aaaec56eb57b8aac067750e4e2c71f937a97b333fdf57693547d6f98a09e70d214a5300b5b09cd5eeb25
-  data.tar.gz: a2a458068aefa1f001ad85426ef5eba0317ba23a0320fab970eed818a9009186cc966f757c0a4f1b693a85cf668098ffa477acc3587849ed5864dcfc53a3b5fe
+  metadata.gz: 6394d6904a073fef5c4fa1d6429c3789a84dfc329a519346dd90e53b082b22284405a044a13c984cf231f7cdd02fb790c49450c47c1d6c0fecb124fbc67783e5
+  data.tar.gz: 7c45571d9683f723068c6d17a97427348c5d3f8ed64db76e2bd71db72af322f3611bd0d66af8dc3732d4a251f1253d2ea0d49c0db34f8c905739f7cc7dd885cc

data/.rubocop.yml

@@ -2,3 +2,6 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   TargetRubyVersion: 2.6
+
+Style/Documentation:
+  Enabled: false

data/Gemfile

@@ -7,3 +7,6 @@ gemspec
 
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.0'
+
+# Repo of geogrpahic locations
+gem 'carmen', '~> 1.1.3'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.5)
+    kovid (0.6.6)
       ascii_charts (~> 0.9.1)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
@@ -11,12 +11,24 @@ 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)
     ascii_charts (0.9.1)
+    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)
     rake (12.3.3)
     rspec (3.9.0)
@@ -39,14 +51,19 @@ GEM
     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)
       ethon (>= 0.9.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  carmen (~> 1.1.3)
   kovid!
   rake (~> 12.0)
   rspec (~> 3.0)

data/README.md

@@ -46,6 +46,8 @@ You can fetch US state-specific data:
 * `kovid state STATE` OR `kovid state "STATE NAME"`.
 * `kovid states --all` or `kovid states -a` for data on all US states.
 
+You can also use USPS abbreviations.  Example: `kovid state me`
+
 Provinces
 
 You can fetch province specific data:
@@ -64,7 +66,7 @@ You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `k
 🇺🇸🇺🇸🇺🇸
 
 You can compare US states with:
-* `kovid states STATE STATE` Example: `kovid states illinois "new york" california`
+* `kovid states STATE STATE` Example: `kovid states illinois "new york" california` OR `kovid states il ny ca`
 
 You can compare provicnes with:
 * `kovid provinces PROVINCE PROVINCE` Example: `kovid provinces ontario manitoba`

data/lib/kovid.rb

@@ -6,8 +6,6 @@ require 'kovid/request'
 module Kovid
   require 'kovid/helpers'
 
-  class Error < StandardError; end
-
   module_function
 
   def eu_aggregate

data/lib/kovid/aggregators.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Kovid
-  # Sends info about continents to Tablelize
   module Aggregators
     def eu_aggregate(eu_data)
       aggregated_table(eu_data, 'The EU', Kovid::Request::EU_ISOS, '🇪🇺')

data/lib/kovid/cache.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 require 'typhoeus'
-
-# rubocop:disable Style/Documentation
 module Kovid
-  # rubocop:enable Style/Documentation
-  # Caches HTTP requests
   class Cache
     def initialize
       @memory = {}

data/lib/kovid/cli.rb

@@ -4,8 +4,6 @@ require 'thor'
 require 'kovid'
 
 module Kovid
-  # Describes the commands that can be run by the user
-  # Descriptions are returned to STDOUT
   class CLI < Thor
     def self.exit_on_failure?
       true

data/lib/kovid/helpers.rb

@@ -30,4 +30,10 @@ module Kovid
       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
+  end
 end

data/lib/kovid/historians.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 module Kovid
-  # Constructs history data for specified country
   module Historians
     include Constants
 
     def history(country, last)
-      # Write checks for when country is spelt wrong.
-      headings = DATE_CASES_DEATHS_RECOVERED
+      # TODO: Write checks for when country is spelt wrong.
       rows = []
 
       stats = if last
@@ -40,7 +38,7 @@ module Kovid
 
       Terminal::Table.new(
         title: country['country'].upcase,
-        headings: headings,
+        headings: DATE_CASES_DEATHS_RECOVERED,
         rows: rows
       )
     end

data/lib/kovid/painter.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'rainbow'
-
-# Adds text color functionalities to String class
 class String
   def paint_white
     Rainbow(self).white.bg(:black).bold

data/lib/kovid/request.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'carmen'
 require_relative 'tablelize'
 require_relative 'cache'
 require_relative 'uri_builder'
 
 module Kovid
-  # Makes requests to external source to collect cases data
   class Request
     COUNTRIES_PATH = UriBuilder.new('/countries').url
     STATES_URL = UriBuilder.new('/states').url
@@ -110,7 +110,7 @@ module Kovid
       end
 
       def state(state)
-        response = fetch_state(state)
+        response = fetch_state(Kovid.lookup_us_state(state))
         if response.nil?
           not_found(state)
         else
@@ -122,7 +122,6 @@ module Kovid
 
       def states(states)
         compared_states = fetch_compared_states(states)
-
         Kovid::Tablelize.compare_us_states(compared_states)
       rescue JSON::ParserError
         puts SERVER_DOWN
@@ -205,10 +204,10 @@ module Kovid
       end
 
       def fetch_compared_states(submitted_states)
-        state_data = fetch_state_data
+        submitted_states.map! { |s| Kovid.lookup_us_state(s) }
 
-        state_data.select do |state|
-          submitted_states.include?(state['state'].downcase)
+        fetch_state_data.select do |state|
+          submitted_states.include?(state['state'])
         end
       end
 
@@ -218,9 +217,7 @@ module Kovid
 
       def fetch_country(country_name)
         # TODO: Match ISOs to full country names
-        if country_name == "netherlands"
-          country_name = "nl"
-        end
+        country_name = 'nl' if country_name == 'netherlands'
         country_url = COUNTRIES_PATH + "/#{country_name}"
 
         JSON.parse(Typhoeus.get(country_url, cache_ttl: 900).response_body)

data/lib/kovid/tablelize.rb

@@ -9,7 +9,6 @@ require_relative 'aggregators'
 require_relative 'historians'
 
 module Kovid
-  # Constructs the tables according to specified input
   class Tablelize
     extend Kovid::Constants
     extend Kovid::Aggregators

data/lib/kovid/uri_builder.rb

@@ -3,7 +3,6 @@
 require 'uri'
 
 module Kovid
-  # Prepares base URI before requests
   class UriBuilder
     attr_reader :path
 

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ascii_charts