kovid 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f127f0794e9366aed44f6805cb4320aea9171e47ffbde5398bdef294eb05646c
-  data.tar.gz: 5acb7d663b8e2d6f64254b9717dbbabc9d821f841dd23cca69712c0450893908
+  metadata.gz: 56417d471dca89f7d9c72b044d0dea77f426f16e4d8b2607c90d8820a341fa52
+  data.tar.gz: 34731329a78b414e4387e862a17dd85f90a15eb65933d1ca42a0dc6324942ddc
 SHA512:
-  metadata.gz: 39b27bf1caaf89bcb8850f1176b0a27ea14d0ba5ea3d5226e4d144bb805b89e6cf3378d1212d7979cd743bae520b4eb5112dced1823b4402c0919ac32421e90a
-  data.tar.gz: 1ddb8bcc440f817d8a23c1f8b478dac024a8e013de15ba8013eb40a663495af291443224a0eb839e6757bf6138ee9ce0ffdb6269a3bd4939dba6fcca9d71de5a
+  metadata.gz: 344163a1a081fafa0a5e30085288981e737b98c2761864208b61e778c834771e312cfe5c36dc9456b1a53958ca28beb0d7ed1b63494f60781dab37df6e51b52c
+  data.tar.gz: fbacf84702f863a6c5256765a9a4d6dafaf851a0b2f735cf52f5818f070662bd7720f855a561fb2d962a53af4fd52a7415b662b788be05bacc49999d4455c14d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.2.1)
+    kovid (0.2.2)
       colorize
       terminal-table
       thor

data/kovid.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = %q{
     ============================================================================
-      COVID-19 has devasted the world! But while we're fighting
-      with the novel coronavirus, I think stats on the issue should be easily
-      reachable.
+      COVID-19 has devasted the world. But 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 aside:
 

data/lib/kovid/request.rb

@@ -3,10 +3,11 @@
 require 'json'
 require_relative 'tablelize'
 require_relative 'cache'
+require_relative 'uri_builder'
 
 module Kovid
   class Request
-    BASE_URL = 'https://corona.lmao.ninja'
+    COUNTRIES_PATH = UriBuilder.new('/countries').url
 
     class << self
       def by_country(country_name)
@@ -42,56 +43,52 @@ module Kovid
       end
 
       def cases
-        path = '/all'
-        fetch_url = BASE_URL + path
-
-        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
+        response ||= JSON.parse(Typhoeus.get(UriBuilder.new('/all').url, cache_ttl: 900).response_body)
 
         Kovid::Tablelize.cases(response)
       end
 
       def history(country)
-        path = '/historical'
-        fetch_url = BASE_URL + path + "/#{country}"
+        history_path = UriBuilder.new('/historical').url
+        response ||= JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
 
-        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
         Kovid::Tablelize.history(response)
       end
 
       private
 
       def no_case_in(country)
-        rows = [["No reported cases OR check your spelling!"]]
-        Terminal::Table.new headings: ["You checked: #{country.capitalize.to_s}"], rows: rows
+        rows = [['No reported cases OR check your spelling!']]
+        Terminal::Table.new headings: ["You checked: #{country.capitalize}"], rows: rows
       end
 
       def fetch_countries(list)
         array = []
 
         list.each do |country|
-          path = "/countries/#{country}"
-          fetch_url = BASE_URL + path
-
-          array << JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
+          array << JSON.parse(Typhoeus.get(COUNTRIES_PATH + "/#{country}", cache_ttl: 900).response_body)
         end
 
         array = array.sort_by { |json| -json['cases'] }
       end
 
       def fetch_country(country_name)
-        path = "/countries/#{country_name}"
-        fetch_url = BASE_URL + path
+        url = COUNTRIES_PATH + "/#{country_name}"
 
-        JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
+        JSON.parse(Typhoeus.get(url, cache_ttl: 900).response_body)
       end
 
       def fetch_state(state)
-        path = '/states'
-        fetch_url = BASE_URL + path
+        url = UriBuilder.new('/states').url
+        states_array = JSON.parse(Typhoeus.get(url, cache_ttl: 900).response_body)
 
-        states_array = JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
+        states_array.select { |state_name| state_name['state'] == capitalize_words(state) }.first
+      end
+
+      private
 
-        states_array.select { |state_name| state_name['state'] == state.split.map(&:capitalize).join(' ') }.first
+      def capitalize_words(string)
+        string.split.map(&:capitalize).join(' ')
       end
     end
   end

data/lib/kovid/tablelize.rb

@@ -20,6 +20,8 @@ module Kovid
         'Recovered'.paint_green
       ].freeze
 
+      FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
+
       def country_table(data)
         headings = CASES_DEATHS_RECOVERED
         rows = [[data['cases'], data['deaths'], data['recovered']]]
@@ -65,6 +67,8 @@ module Kovid
 
         rows = []
         rows << [state['cases'], state['todayCases'], state['deaths'], state['todayDeaths'], state['recovered'], state['active']]
+        puts
+        puts "‼️  Swap value of 'Recovered' for 'Active'. API scraper broke."
         Terminal::Table.new(title: state['state'], headings: headings, rows: rows)
       end
 
@@ -137,13 +141,15 @@ module Kovid
           rows << row
         end
 
-        rows << ['------------', '------------', '------------', '------------']
+        rows << FOOTER_LINE
         rows << DATE_CASES_DEATHS_RECOVERED
 
-        Terminal::Table.new(title: country['standardizedCountryName'].capitalize.to_s, headings: headings, rows: rows)
+        Terminal::Table.new(title: country['standardizedCountryName'].split.map(&:capitalize).join(' '), headings: headings, rows: rows)
       end
 
-      private def comma_delimit(number)
+      private
+
+      def comma_delimit(number)
         number.to_s.chars.to_a.reverse.each_slice(3).map(&:join).join(',').reverse
       end
     end

data/lib/kovid/uri_builder.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+module Kovid
+  class UriBuilder
+    attr_reader :path
+
+    BASE_URI = 'corona.lmao.ninja'
+
+    def initialize(path = '')
+      @path = path
+    end
+
+    def url
+      URI::HTTPS.build(host: BASE_URI, path: path).to_s
+    end
+  end
+end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -151,6 +151,7 @@ files:
 - lib/kovid/painter.rb
 - lib/kovid/request.rb
 - lib/kovid/tablelize.rb
+- lib/kovid/uri_builder.rb
 - lib/kovid/version.rb
 homepage: https://github.com/siaw23/kovid
 licenses:
@@ -161,13 +162,12 @@ metadata:
   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! But while we're fighting\n      with the
-  novel coronavirus, I think stats on the issue should be easily\n      reachable.\n\n
-  \     There isn't much we can do now aside:\n\n      * Washing our hands with soap
-  frequently.\n      * Limiting our movements, how much we touch our faces & social
-  distancing.\n      * Disinfecting our phones, keys, doorknobs, keyboards, etc.\n
-  \     * Being there for each other.\n\n      Stay safe!\n      Emmanuel Hayford.\n
-  \   ============================================================================\n
+  \     COVID-19 has devasted the world. But 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 aside:\n\n      * Washing our hands with soap frequently.\n
+  \     * Limiting our movements, how much we touch our faces & social distancing.\n
+  \     * Disinfecting our phones, keys, doorknobs, keyboards, etc.\n      * Being
+  there for each other.\n\n      Stay safe!\n      Emmanuel Hayford.\n    ============================================================================\n
   \   "
 rdoc_options: []
 require_paths: