kovid 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb8dfafa7894028f398f20f933b498c405d56bfc3ef4a5d7a339a83276a7d6d
-  data.tar.gz: 30eb0c8ce98ee989185cf81f8bba72f5c993bdc6a44a229b7ba2a9131e31b1ae
+  metadata.gz: 5c76d29e21beeda2615b7b70e435dbe253674a539fc8be8a30f6cd68eb7d3cf8
+  data.tar.gz: 5a94f5237aaaf71800fbaf186bfc0d3a7ffdeb86d4448f2c8b15fb37126f0d2d
 SHA512:
-  metadata.gz: bdf67215185377506876eb06937b1e9592c4e29d984b1f8458296acc3d23f1ff6162f64864ebb430906a1e70e3005d80ff226fc51c7eb8ecb9a07164dd9019f1
-  data.tar.gz: d7d350545f13bd7ebee3987e0af9a3d23968f229ef7c87d70da5536bdcb5064525093988ab1f5ee16b7bf3b07d25c164368e742b5bcc075b71768d2a98b08b47
+  metadata.gz: ab21f119d7485688ecf81346c0efb070a0fd12c4caf4a7a90881a2266296e7135e131c72f1978eac7d79ba487760ee7c1ffb4a8d1ce94e485f4baa87c21b87b1
+  data.tar.gz: 427582de7610751e7eb0eea746ec01fd33d4a6d3386711c515203d5d653279babf156cc259f4217fe6939db321de25c8cc155312c3902c9ebb4d26a8cbf169ab

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    kovid (0.2.5)
-      colorize (~> 0.8)
+    kovid (0.2.6)
+      rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
       typhoeus (~> 1.3)
@@ -21,7 +21,6 @@ GEM
     builder (3.2.4)
     childprocess (3.0.0)
     coderay (1.1.2)
-    colorize (0.8.1)
     contracts (0.16.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)
@@ -51,6 +50,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -89,4 +89,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/README.md

@@ -15,6 +15,8 @@ Before installing:
 
 ✌️ Run `gem install kovid`
 
+UPDATE often with `gem update kovid`
+
 
 
 ## ⚒️ Usage

data/kovid.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 1.0"
   spec.add_dependency "terminal-table", "~> 1.8"
   spec.add_dependency "typhoeus", "~> 1.3"
-  spec.add_dependency "colorize", "~> 0.8"
+  spec.add_dependency "rainbow", "~> 3.0"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "cucumber"

data/lib/kovid/painter.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require 'colorize'
+require 'rainbow'
 
 class String
   def paint_white
-    colorize(:white).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).white.bg(:black).bold
   end
 
   def paint_red
-    colorize(:red).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).red.bg(:black).bold
   end
 
   def paint_green
-    colorize(:green).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).green.bg(:black).bold
   end
 
   def paint_yellow
-    colorize(:yellow).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).yellow.bg(:black).bold
   end
 end

data/lib/kovid/request.rb

@@ -8,6 +8,7 @@ require_relative 'uri_builder'
 module Kovid
   class Request
     COUNTRIES_PATH = UriBuilder.new('/countries').url
+    STATES_URL = UriBuilder.new('/states').url
 
     class << self
       def by_country(country_name)
@@ -73,21 +74,17 @@ module Kovid
       end
 
       def fetch_country(country_name)
-        url = COUNTRIES_PATH + "/#{country_name}"
+        country_url = COUNTRIES_PATH + "/#{country_name}"
 
-        JSON.parse(Typhoeus.get(url, cache_ttl: 900).response_body)
+        JSON.parse(Typhoeus.get(country_url, cache_ttl: 900).response_body)
       end
 
       def fetch_state(state)
-        url = UriBuilder.new('/states').url
-
-        states_array = JSON.parse(Typhoeus.get(url, cache_ttl: 900).response_body)
+        states_array = JSON.parse(Typhoeus.get(STATES_URL, cache_ttl: 900).response_body)
 
         states_array.select { |state_name| state_name['state'] == capitalize_words(state) }.first
       end
 
-      private
-
       def capitalize_words(string)
         string.split.map(&:capitalize).join(' ')
       end

data/lib/kovid/tablelize.rb

@@ -21,12 +21,18 @@ module Kovid
       ].freeze
 
       FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
+      COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
       def country_table(data)
         headings = CASES_DEATHS_RECOVERED
         rows = [[data['cases'], data['deaths'], data['recovered']]]
 
-        Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
+        if iso = data['countryInfo']['iso2']
+          Terminal::Table.new(title: "#{data['country'].upcase} #{country_emoji(iso)}", headings: headings, rows: rows)
+        else
+          Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
+        end
+        # TODO: Rafactor this
       end
 
       def full_country_table(data)
@@ -45,14 +51,22 @@ module Kovid
           data['cases'],
           data['deaths'],
           data['recovered'],
-          data['todayCases'],
-          data['todayDeaths'],
+          check_if_positve(data['todayCases']),
+          check_if_positve(data['todayDeaths']),
           data['critical'],
           data['casesPerOneMillion']
         ]
-        Terminal::Table.new(title: data['country'].upcase,
-                            headings: headings,
-                            rows: rows)
+
+        if iso = data['countryInfo']['iso2']
+          Terminal::Table.new(title: "#{data['country'].upcase} #{country_emoji(iso)}",
+                              headings: headings,
+                              rows: rows)
+        else
+          Terminal::Table.new(title: data['country'].upcase,
+                              headings: headings,
+                              rows: rows)
+        end
+        # TODO: Rafactor this
       end
 
       def full_state_table(state)
@@ -61,12 +75,11 @@ module Kovid
           'Cases Today'.paint_white,
           'Deaths'.paint_red,
           'Deaths Today'.paint_red,
-          'Recovered'.paint_green,
           'Active'.paint_yellow
         ]
 
         rows = []
-        rows << [state['cases'], state['todayCases'], state['deaths'], state['todayDeaths'], state['recovered'], state['active']]
+        rows << [state['cases'], check_if_positve(state['todayCases']), state['deaths'], check_if_positve(state['todayDeaths']), state['active']]
 
         Terminal::Table.new(title: state['state'].upcase, headings: headings, rows: rows)
       end
@@ -108,8 +121,8 @@ module Kovid
             country['cases'],
             country['deaths'],
             country['recovered'],
-            country['todayCases'],
-            country['todayDeaths'],
+            check_if_positve(country['todayCases']),
+            check_if_positve(country['todayDeaths']),
             country['critical'],
             country['casesPerOneMillion']
           ]
@@ -164,6 +177,14 @@ module Kovid
       def comma_delimit(number)
         number.to_s.chars.to_a.reverse.each_slice(3).map(&:join).join(',').reverse
       end
+
+      def check_if_positve(num)
+        num.to_i.positive? ? "+#{num}" : num.to_s
+      end
+
+      def country_emoji(iso)
+        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*')
+      end
     end
   end
 end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement