kovid 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ca9cfffdcd5f3a9f1fefe000e304ebed0fb015ac6ecca7f1e0740f658d2706
-  data.tar.gz: aab2c25abd4c5dbc35b0cd020d210dd8e7ed9057545dd9dd11bae77c751cc891
+  metadata.gz: af922cf964393c54e9e754d0e292e28b273d8879f6d01a26098036dfaf833028
+  data.tar.gz: 0f13b97fc89501ba2e874c7812dbe2b0b5f7c3a5002a8ee428ee4c645f551dac
 SHA512:
-  metadata.gz: c0ab48dd5eab1558eb352062d6b9f4351e92402741b641114dbf9928ccc35f0f04c965da6d53401fa05041cc75b8aa4cc65cd8dafeffc1d1fb1f7c9a1db79702
-  data.tar.gz: 54caa7825986c4b5f42d93b22e2201d4690cd3a9cb3059ded43c16fb12649c6c77c5ec59f7ea87d931329d286f14da9056756412d9d4a068a9c43908d2a96abb
+  metadata.gz: bd75365e81cfe99be195117bc8f0c5d9babac43896f80929922bbe255f4c0052753d6fb078a71c8b7c428877297f3fd6e4997d74d17c525d2657a58112e3acc7
+  data.tar.gz: 580ca440ce3a0fddd3d3e3879ffa5b6617304a1036bd3cfada69e7de952bf543ea02cf7deb8af810065a883ea2256736191e8ecec8453acbc8c3a47ca58dc439

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    kovid (0.1.4)
+    kovid (0.1.13)
+      colorize
       terminal-table
       thor
       typhoeus
@@ -20,6 +21,7 @@ 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)
@@ -38,6 +40,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     diff-lcs (1.3)
+    docile (1.3.2)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.12.2)
@@ -62,6 +65,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
@@ -79,6 +86,7 @@ DEPENDENCIES
   pry
   rake (~> 12.0)
   rspec (~> 3.0)
+  simplecov
 
 BUNDLED WITH
    2.1.2

data/README.md

@@ -19,26 +19,31 @@ After installing:
 
 ☝️ Avoid touching your eyes, nose and mouth with unwashed hands later.
 
-✌️ Disinfect your phones, keys, doorknobs and anything you touch often than you should.
+✌️ Disinfect your phones, keys, doorknobs and anything you touch more often than you should.
 
 
 
 ## ⚒️ Usage
 
-You can run `kovid --help` to see full list of available commands.
+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.
 
 #### Commands Overview
- **Fetching**
+😷 **Fetching**
 * `kovid check ghana`
 * `kovid check ghana -f` OR `kovid check ghana --full`
 
-**Comparing**
+🇺🇸You can fetch US state-specific data 🇺🇸
+* `kovid state colorado` OR `kovid state "north carolina"`
+
+😷 **Comparing**
 * `kovid compare ghana poland` (sorts by cases DESC)
-* `kovid compare ghana poland -f` OR `kovid compare ghana poland --full` (sorts by cases DESC)
+* `kovid compare germany poland -f` OR `kovid compare germany poland --full` (sorts by cases DESC)
 
 You can compare as many countries as you want.
 
-**Total figures**
+😷 **Total figures**
 * `kovid cases`
 
 
@@ -50,41 +55,52 @@ To fetch basic data on a country run:
 
 If the location contains spaces: `kovid check "Diamond Princess"`
 
-![kovid](https://i.gyazo.com/ca57d9250c7523a921d0d7e1104716be.png "Covid data.")
+![kovid](https://i.gyazo.com/ab779c3fc838ac279bae5b9d6d10d617.png "Covid data.")
 
 For full table info on a country:
 
 `kovid check ghana -f` OR `kovid check ghana --full`
 
-![kovid](https://i.gyazo.com/628f07faf8e3c1c2a0b6ab05e4a86404.png "Covid data.")
+![kovid](https://i.gyazo.com/151c8e7ac55a7b4efd27b734720863f1.png "Covid data.")
 
 To compare country stats:
 
-`kovid compare ghana poland`
+`kovid compare germany poland`
 
-![kovid](https://i.gyazo.com/a15922e13e9e6c1ba804ccf5beeb863b.png "Covid data.")
+![kovid](https://i.gyazo.com/be3bcba3d2943c60618b59ae82a3c586.png "Covid data.")
 
 To compare a countries stats with a full table:
 
 `kovid compare poland italy usa china -f` OR `kovid compare poland italy usa china --full`
 
-![kovid](https://i.gyazo.com/7ce86c5e93d549e1412fb6104a1d7877.png "Covid data.")
+![kovid](https://i.gyazo.com/79ad61c33114a0bee0a9e2ab94a3d46e.png "Covid data.")
+
+To fetch state-specific data run:
+
+`kovid state colorado`
+
+![kovid](https://i.gyazo.com/d00b1c5bbb6251cbd517f801c856ba66.png "Covid data.")
 
 To check for total figures:
 
 `kovid cases`
 
-![kovid](https://i.gyazo.com/f8a21ae54152cd945fbb124b72d12ff7.png "Covid data.")
+![kovid](https://i.gyazo.com/323f0f10d444e2ee629d05a90488adba.png "Covid data.")
+
+## Information Source
+> https://www.worldometers.info/coronavirus/ via [NovelCOVID/API](https://github.com/novelcovid/api)
+
 
 ## 👨‍💻 Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
 
 ## 🤲 Contributing
 
-There are multiple areas in this repo that can be improved  or use some refactoring and for thats why bug reports and pull requests are welcome here on GitHub. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/siaw23/kovid/blob/master/CODE_OF_CONDUCT.md).
+There are multiple areas in this repo that can be improved or use some refactoring(there's a lot to be refactorted in fact!). For that reason, bug reports and pull requests are welcome! This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/siaw23/kovid/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## 🔖 License

data/exe/kovid

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'kovid/cli'
+
+Kovid::CLI.start

data/kovid.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Emmanuel Hayford"]
   spec.email         = ["siawmensah@gmail.com"]
 
-  spec.summary       = %q{🦠 A CLI tool to fetch and compare the 2019 coronavirus pandemic numbers.}
-  spec.description   = %q{A CLI tool to fetch and compare the 2019 coronavirus pandemic numbers.}
+  spec.summary       = %q{A CLI to fetch and compare the 2019 coronavirus pandemic statistics.}
+  spec.description   = %q{A CLI to fetch and compare the 2019 coronavirus pandemic statistics.}
   spec.homepage      = "https://github.com/siaw23/kovid"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
@@ -23,15 +23,17 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  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_development_dependency "pry"
   spec.add_development_dependency "cucumber"
   spec.add_development_dependency "aruba"
+  spec.add_development_dependency "simplecov"
 end

data/lib/kovid.rb

@@ -1,8 +1,38 @@
 # frozen_string_literal: true
 
 require 'kovid/version'
-require 'kovid/nineteen'
+require 'kovid/request'
 
 module Kovid
   class Error < StandardError; end
+
+  module_function
+
+  def whatis
+    'Coronavirus disease 2019 (COVID-19) is an infectious disease caused by severe acute respiratory syndrome coronavirus 2 (SARS-CoV-2).'
+  end
+
+  def country(name)
+    Kovid::Request.by_country(name)
+  end
+
+  def country_full(name)
+    Kovid::Request.by_country_full(name)
+  end
+
+  def state(state)
+    Kovid::Request.state(state)
+  end
+
+  def country_comparison(names_array)
+    Kovid::Request.by_country_comparison(names_array)
+  end
+
+  def country_comparison_full(names_array)
+    Kovid::Request.by_country_comparison_full(names_array)
+  end
+
+  def cases
+    Kovid::Request.cases
+  end
 end

data/lib/kovid/cache.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'typhoeus'
+
+module Kovid
+  class Cache
+    def initialize
+      @memory = {}
+    end
+
+    def get(request)
+      @memory[request]
+    end
+
+    def set(request, response)
+      @memory[request] = response
+    end
+  end
+
+  Typhoeus::Config.cache = Cache.new
+end

data/lib/kovid/cli.rb

@@ -5,34 +5,43 @@ require 'kovid'
 
 module Kovid
   class CLI < Thor
+    FULL_FLAG = %w[-f --full].freeze
+
     desc 'define', 'Defines COVID-19'
     def define
-      Kovid::Nineteen.whatis
+      puts Kovid.whatis
     end
 
-    desc 'check COUNTRY', 'Returns reported data on provided country'
+    desc 'check COUNTRY or check "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid check "hong kong".'
     method_option :full, aliases: '-f'
     def check(name)
       if options[:full]
-        Kovid::Nineteen.country_full(name)
+        puts Kovid.country_full(name)
       else
-        Kovid::Nineteen.country(name)
+        puts Kovid.country(name)
       end
     end
+    desc 'country COUNTRY or country "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid country "hong kong".'
+    alias country check
+
+    desc 'state STATE', 'Return reported data on provided state.'
+    def state(state)
+      puts Kovid.state(state)
+    end
 
-    desc 'compare COUNTRY COUNTRY', 'Returns full comparison table for given countries. Accepts multiple countries'
+    desc 'compare COUNTRY COUNTRY', 'Returns full comparison table for given countries. Accepts multiple countries.'
     def compare(*name)
-      if name[-1] == '-f' || name[-1] == '--full'
+      if FULL_FLAG.include?(name.fetch(-1))
         name = name.reverse.drop(1).reverse
-        Kovid::Nineteen.country_comparison_full(name)
+        puts Kovid.country_comparison_full(name)
       else
-        Kovid::Nineteen.country_comparison(name)
+        puts Kovid.country_comparison(name)
       end
     end
 
-    desc 'cases', 'Returns total number of cases, deaths and recoveries'
+    desc 'cases', 'Returns total number of cases, deaths and recoveries.'
     def cases
-      Kovid::Nineteen.cases
+      puts Kovid.cases
     end
   end
 end

data/lib/kovid/painter.rb

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

data/lib/kovid/request.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'typhoeus'
 require 'json'
 require_relative 'tablelize'
+require_relative 'cache'
 
 module Kovid
   class Request
     BASE_URL = 'https://corona.lmao.ninja'
 
     class << self
-      require 'pry'
       def by_country(country_name)
         response = fetch_country(country_name)
 
@@ -26,6 +25,12 @@ module Kovid
         no_case_in(country_name)
       end
 
+      def state(state)
+        response = fetch_state(state)
+
+        Kovid::Tablelize.full_state_table(response)
+      end
+
       def by_country_comparison(list)
         array = fetch_countries(list)
         Kovid::Tablelize.compare_countries_table(array)
@@ -40,17 +45,16 @@ module Kovid
         path = '/all'
         fetch_url = BASE_URL + path
 
-        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
+        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
+
         Kovid::Tablelize.cases(response)
       end
 
       private
 
       def no_case_in(country)
-        rows = []
-        rows << ["Thankfully, there are no reported cases in #{country.capitalize}!"]
-        table = Terminal::Table.new headings: [country.capitalize.to_s], rows: rows
-        puts table
+        rows = [["Thankfully, there are no reported cases in #{country.capitalize}!"]]
+        Terminal::Table.new headings: [country.capitalize.to_s], rows: rows
       end
 
       def fetch_countries(list)
@@ -60,7 +64,7 @@ module Kovid
           path = "/countries/#{country}"
           fetch_url = BASE_URL + path
 
-          array << JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
+          array << JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
         end
 
         array = array.sort_by { |json| -json['cases'] }
@@ -70,7 +74,16 @@ module Kovid
         path = "/countries/#{country_name}"
         fetch_url = BASE_URL + path
 
-        JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
+        JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
+      end
+
+      def fetch_state(state)
+        path = '/states'
+        fetch_url = BASE_URL + path
+
+        states_array = JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 900).response_body)
+
+        states_array.select { |state_name| state_name['state'] == state.split.map(&:capitalize).join(' ') }.first
       end
     end
   end

data/lib/kovid/tablelize.rb

@@ -1,26 +1,33 @@
 # frozen_string_literal: true
 
 require 'terminal-table'
+require_relative 'painter'
 
 module Kovid
   class Tablelize
     class << self
+      CASES_DEATHS_RECOVERED = [
+        'Cases'.paint_white,
+        'Deaths'.paint_red,
+        'Recovered'.paint_green
+      ].freeze
+
       def country_table(data)
-        headings = %w[Cases Deaths Recovered]
-        rows = []
-        rows << [data['cases'], data['deaths'], data['recovered']]
-        puts Terminal::Table.new(title: data['country'], headings: headings, rows: rows)
+        headings = CASES_DEATHS_RECOVERED
+        rows = [[data['cases'], data['deaths'], data['recovered']]]
+
+        Terminal::Table.new(title: data['country'], headings: headings, rows: rows)
       end
 
       def full_country_table(data)
         headings = [
-          'Cases',
-          'Deaths',
-          'Recovered',
-          'Cases Today',
-          'Deaths Today',
-          'Critical',
-          'Cases/Million'
+          'Cases'.paint_white,
+          'Deaths'.paint_red,
+          'Recovered'.paint_green,
+          'Cases Today'.paint_white,
+          'Deaths Today'.paint_red,
+          'Critical'.paint_yellow,
+          'Cases/Million'.paint_white
         ]
 
         rows = []
@@ -33,33 +40,55 @@ module Kovid
           data['critical'],
           data['casesPerOneMillion']
         ]
-        puts Terminal::Table.new(title: data['country'],
-                                 headings: headings,
-                                 rows: rows)
+        Terminal::Table.new(title: data['country'],
+                            headings: headings,
+                            rows: rows)
+      end
+
+      def full_state_table(state)
+        headings = [
+          'Cases'.paint_white,
+          'Cases Today',
+          'Deaths'.paint_red,
+          'Deaths Today'.paint_red,
+          'Reovered'.paint_green,
+          'Active'.paint_yellow
+        ]
+
+        rows = []
+        rows << [state['cases'], state['todayCases'], state['deaths'], state['todayDeaths'], state['recovered'], state['active']]
+        Terminal::Table.new(title: state['state'], headings: headings, rows: rows)
       end
 
       def compare_countries_table(data)
-        headings = %w[Country Cases Deaths Recovered]
+        headings = [
+          'Country'.paint_white,
+          'Cases'.paint_white,
+          'Deaths'.paint_red,
+          'Recovered'.paint_green
+        ]
+
         rows = []
 
         data.each do |country|
           rows << [country['country'], country['cases'], country['deaths'], country['recovered']]
         end
 
-        puts Terminal::Table.new(headings: headings, rows: rows)
+        Terminal::Table.new(headings: headings, rows: rows)
       end
 
       def compare_countries_table_full(data)
         headings = [
-          'Country',
-          'Cases',
-          'Deaths',
-          'Recovered',
-          'Cases Today',
-          'Deaths Today',
-          'Critical',
-          'Cases/Million'
+          'Country'.paint_white,
+          'Cases'.paint_white,
+          'Deaths'.paint_red,
+          'Recovered'.paint_green,
+          'Cases Today'.paint_white,
+          'Deaths Today'.paint_red,
+          'Critical'.paint_yellow,
+          'Cases/Million'.paint_white
         ]
+
         rows = []
 
         data.each do |country|
@@ -75,16 +104,14 @@ module Kovid
           ]
         end
 
-        puts Terminal::Table.new(headings: headings, rows: rows)
+        Terminal::Table.new(headings: headings, rows: rows)
       end
 
       def cases(cases)
-        headings = %w[Cases Deaths Recoveries]
-
-        rows = []
+        headings = CASES_DEATHS_RECOVERED
+        rows = [[cases['cases'], cases['deaths'], cases['recovered']]]
 
-        rows << [cases['cases'], cases['deaths'], cases['recovered']]
-        puts Terminal::Table.new(title: 'Total # of incidents', headings: headings, rows: rows)
+        Terminal::Table.new(title: 'Total # of incidents', headings: headings, rows: rows)
       end
     end
   end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,13 +108,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A CLI tool to fetch and compare the 2019 coronavirus pandemic numbers.
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A CLI to fetch and compare the 2019 coronavirus pandemic statistics.
 email:
 - siawmensah@gmail.com
 executables:
-- console
+- covid
 - kovid
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -114,12 +141,14 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/kovid
 - bin/setup
+- exe/covid
+- exe/kovid
 - kovid.gemspec
 - lib/kovid.rb
+- lib/kovid/cache.rb
 - lib/kovid/cli.rb
-- lib/kovid/nineteen.rb
+- lib/kovid/painter.rb
 - lib/kovid/request.rb
 - lib/kovid/tablelize.rb
 - lib/kovid/version.rb
@@ -149,6 +178,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: "\U0001F9A0 A CLI tool to fetch and compare the 2019 coronavirus pandemic
-  numbers."
+summary: A CLI to fetch and compare the 2019 coronavirus pandemic statistics.
 test_files: []

data/lib/kovid/nineteen.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'request'
-
-module Kovid
-  class Nineteen
-    class << self
-      def whatis
-        definition = <<-TEXT
-        Coronavirus disease 2019 (COVID-19) is an infectious disease caused by severe acute
-        respiratory syndrome coronavirus 2 (SARS-CoV-2).
-        The disease was first identified in 2019 in Wuhan, China, and has since spread globally,
-        resulting in the 2019–20 coronavirus pandemic.
-        TEXT
-        puts definition
-      end
-
-      def country(name)
-        puts Kovid::Request.by_country(name)
-      end
-
-      def country_full(name)
-        puts Kovid::Request.by_country_full(name)
-      end
-
-      def country_comparison(name)
-        puts Kovid::Request.by_country_comparison(name)
-      end
-
-      def country_comparison_full(name)
-        puts Kovid::Request.by_country_comparison_full(name)
-      end
-
-      def cases
-        puts Kovid::Request.cases
-      end
-    end
-  end
-end