kovid 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9550f7e2c21e089e88674eaa7be67f06afe3a10d3a3c06d4afa25c5bd694c5f
-  data.tar.gz: 910479f761ce923dbce855a4e466cf2d9b8d653bac427be77807357fccbb4a91
+  metadata.gz: b453d783796a94766fee3d796a41070ae4a1708c8a306a8b77ae60a912293a78
+  data.tar.gz: 85ff2d518cd223ab521f6c1221151745a75269605288fcd5882f569871bbc0eb
 SHA512:
-  metadata.gz: 0f5109a811d7f3986ced3b55ac1794a26e2e4abe8f13f7b9bf228f184bb9c6e66cac1be7d28426c40e58c3d231a220994eedb33061f1f013bae0fc39db27f5d7
-  data.tar.gz: cdaa6de69ccc6c13a56749c15bf0a5c19ac2b25e4cb5db73e1ed2257f51c0e2695a9885636575e491eabc3f38a7655725b3fba3412d46e4dbd34ca038e7a6d4a
+  metadata.gz: 9d4d98b52a3eea164950abbb4639c97aacd95f3a3cce00f8d211c558ec5fc3f97bbb26bf2b97aab69ad95bbc897c77c9a65bd66a97e5f3021bb48adc23e007af
+  data.tar.gz: 19f9ce8011ecf1383c71787fd9bc853d4fef3d3df2bbb6d63010e0a4bffa6708d895ed05547c4db6629f9fe84028dc614e0b9de5951b603f8fd2e162b7de6473

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    kovid (0.2.2)
-      colorize
-      terminal-table
-      thor
-      typhoeus
+    kovid (0.2.4)
+      colorize (~> 0.8)
+      terminal-table (~> 1.8)
+      thor (~> 1.0)
+      typhoeus (~> 1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -20,24 +20,25 @@ Before installing:
 
 You can run `kovid --help` to see the full list of available commands.
 
-**NOTE:** If you find it irritating to have to type `kovid state michigan`, `covid state michigan` works as well.
+**NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.
 
 #### Commands Overview
 😷 **Fetching**
-* `kovid check ghana`
-* `kovid check italy -f` OR `kovid check italy --full`
+* `kovid check COUNTRY`
+* `kovid check COUNTRY -f` OR `kovid check COUNTRY --full`
 
 🇺🇸You can fetch US state-specific data 🇺🇸
-* `kovid state colorado` OR `kovid state "north carolina"`
+* `kovid state STATE` OR `kovid state "STATE WITH SPACES"`
 
 😷 **Comparing**
-* `kovid compare ghana poland` (sorts by cases DESC)
-* `kovid compare germany poland -f` OR `kovid compare germany poland --full` (sorts by cases DESC)
+* `kovid compare COUNTRYA COUNTRYB` (sorts by cases DESC)
+* `kovid compare COUNTRYA COUNTRYB -f` OR `kovid compare COUNTRYA COUNTRYB --full` (sorts by cases DESC)
 
 You can compare as many countries as you want.
 
 😷 **History**
-* `kovid history italy`
+* `kovid history COUNTRY` (Full history)
+* `kovid history COUNTRY N` (History in the last N days)
 
 😷 **Total figures**
 * `kovid cases`
@@ -73,15 +74,15 @@ To compare a countries stats with a full table:
 
 To fetch state-specific data run:
 
-`kovid state colorado`
+`kovid state colorado` OR `kovid state "north carolina"`
 
 ![kovid](https://i.gyazo.com/d00b1c5bbb6251cbd517f801c856ba66.png "Covid data.")
 
 You can check historical statistics by running
 
-`kovid history COUNTRY` eg:
+`kovid history italy 7` eg:
 
-![kovid](https://i.gyazo.com/45d306694cbf793f2e4f7646854cbac8.png "Covid data.")
+![kovid](https://i.gyazo.com/e4872b5047eeaebbd354847a943de268.png "Covid data.")
 
 To check for total figures:
 

data/kovid.gemspec

@@ -45,10 +45,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
-  spec.add_dependency "terminal-table"
-  spec.add_dependency "typhoeus"
-  spec.add_dependency "colorize"
+  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_development_dependency "pry"
   spec.add_development_dependency "cucumber"

data/lib/kovid/cli.rb

@@ -44,8 +44,12 @@ module Kovid
     end
 
     desc 'history COUNTRY', 'Return history of incidents of COUNTRY'
-    def history(country)
-      puts Kovid.history(country)
+    def history(*params)
+      if params.size == 2
+        puts Kovid.history(params.first, params.last)
+      else
+        puts Kovid.history(params.first, nil)
+      end
     end
   end
 end

data/lib/kovid/request.rb

@@ -48,11 +48,11 @@ module Kovid
         Kovid::Tablelize.cases(response)
       end
 
-      def history(country)
+      def history(country, last)
         history_path = UriBuilder.new('/historical').url
         response ||= JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
 
-        Kovid::Tablelize.history(response)
+        Kovid::Tablelize.history(response, last)
       end
 
       private
@@ -80,6 +80,7 @@ module Kovid
 
       def fetch_state(state)
         url = UriBuilder.new('/states').url
+
         states_array = JSON.parse(Typhoeus.get(url, cache_ttl: 900).response_body)
 
         states_array.select { |state_name| state_name['state'] == capitalize_words(state) }.first

data/lib/kovid/tablelize.rb

@@ -26,7 +26,7 @@ module Kovid
         headings = CASES_DEATHS_RECOVERED
         rows = [[data['cases'], data['deaths'], data['recovered']]]
 
-        Terminal::Table.new(title: data['country'], headings: headings, rows: rows)
+        Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
       end
 
       def full_country_table(data)
@@ -50,7 +50,7 @@ module Kovid
           data['critical'],
           data['casesPerOneMillion']
         ]
-        Terminal::Table.new(title: data['country'],
+        Terminal::Table.new(title: data['country'].upcase,
                             headings: headings,
                             rows: rows)
       end
@@ -67,12 +67,12 @@ 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."
         puts "‼️  So 'Active' is #{state['recovered']} and not #{state['active']}."
 
-        Terminal::Table.new(title: state['state'], headings: headings, rows: rows)
+        Terminal::Table.new(title: state['state'].upcase, headings: headings, rows: rows)
       end
 
       def compare_countries_table(data)
@@ -126,17 +126,28 @@ module Kovid
         headings = CASES_DEATHS_RECOVERED
         rows = [[cases['cases'], cases['deaths'], cases['recovered']]]
 
-        Terminal::Table.new(title: 'Total Number of Incidents Worldwide', headings: headings, rows: rows)
+        Terminal::Table.new(title: 'Total Number of Incidents Worldwide'.upcase, headings: headings, rows: rows)
       end
 
-      def history(country)
+      def history(country, last)
         headings = DATE_CASES_DEATHS_RECOVERED
         rows = []
-        stats = country['timeline'].values.map(&:values).transpose.each do |data|
-          data.map! { |number| comma_delimit(number) }
-        end
 
-        dates = country['timeline']['cases'].keys
+        stats = if last
+                  country['timeline'].values.map(&:values).transpose.each do |data|
+                    data.map! { |number| comma_delimit(number) }
+                  end.last(last.to_i)
+                else
+                  country['timeline'].values.map(&:values).transpose.each do |data|
+                    data.map! { |number| comma_delimit(number) }
+                  end
+                end
+
+        dates = if last
+                  country['timeline']['cases'].keys.last(last.to_i)
+                else
+                  country['timeline']['cases'].keys
+                end
 
         stats.each_with_index do |val, index|
           val.unshift(Date.parse(Date.strptime(dates[index], '%m/%d/%y').to_s).strftime('%d %b, %y'))
@@ -144,10 +155,12 @@ module Kovid
           rows << row
         end
 
-        rows << FOOTER_LINE
-        rows << DATE_CASES_DEATHS_RECOVERED
+        if stats.size > 10
+          rows << FOOTER_LINE
+          rows << DATE_CASES_DEATHS_RECOVERED
+        end
 
-        Terminal::Table.new(title: country['standardizedCountryName'].split.map(&:capitalize).join(' '), headings: headings, rows: rows)
+        Terminal::Table.new(title: country['standardizedCountryName'].upcase, headings: headings, rows: rows)
       end
 
       private

data/lib/kovid/version.rb

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

data/lib/kovid.rb

@@ -36,7 +36,7 @@ module Kovid
     Kovid::Request.cases
   end
 
-  def history(country)
-    Kovid::Request.history(country)
+  def history(country, last)
+    Kovid::Request.history(country, last)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Emmanuel Hayford
@@ -14,58 +14,58 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement