Merge branch 'master' into master

Author: sagarkarira

.editorconfig

@@ -0,0 +1,11 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

.eslintrc.json

@@ -1,29 +1,29 @@
 {
-    "env": {
-        "browser": true,
-        "commonjs": true,
-        "es6": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "sourceType": "module"
-    },
-    "rules": {
-        "indent": [
-            "error",
-            2
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
-    }
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaVersion": 2019,
+    "sourceType": "module"
+  },
+  "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "quotes": [
+      "error",
+      "single"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ]
+  }
 }

.gitattributes

@@ -0,0 +1,2 @@
+# Enforce Unix newlines
+* text=auto eol=lf

.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: Tests
+on: [push, pull_request]
+env:
+  CI: true
+
+jobs:
+  run:
+    name: Node ${{ matrix.node }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Set Node.js version
+        uses: actions/setup-node@v1
+        with:
+          node-version: "12.x"
+
+      - run: node --version
+      - run: npm --version
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run tests
+        run: npm test

app.js

@@ -1,84 +1,128 @@
 const express = require('express');
-const app = express();
-const lookup = require('country-code-lookup');
 const morgan = require('morgan');
 
-const port = process.env.PORT || 3001;
-
 const { getCountryTable, getJSONData, getJSONDataForCountry } = require('./lib/byCountry');
 const { getCompleteTable } = require('./lib/corona');
-const { countryUpperCase, lookupCountry } = require('./lib/helpers');
+const { lookupCountry } = require('./lib/helpers');
+const { getLiveUpdates } = require('./lib/reddit.js');
+const { getWorldoMetersTable } = require('./lib/worldoMeters.js');
 
+const app = express();
+const port = process.env.PORT || 3001;
+const IS_CURL_RE = /\bcurl\b/im;
 
 function errorHandler(error, res) {
   console.error(error);
-  return res.send('I am sorry. Something went wrong. Please report it');
+  return res.send(`
+    I am sorry. Something went wrong. Please report it\n
+    ${error.message}
+  `);
 }
 
+app.set('json escape', true);
+
 app.use(morgan(':remote-addr :remote-user :method :url :status :res[content-length] - :response-time ms'));
+app.use((req, res, next) => {
+  res.setHeader('Cache-Control', 'no-cache');
+  next();
+});
 
 app.get('/', (req, res) => {
+  const isCurl = IS_CURL_RE.test(req.headers['user-agent']);
   const format = req.query.format ? req.query.format : '';
+  const minimal = req.query.minimal === 'true';
+  const emojis = req.query.emojis === 'true';
+  const top = req.query.top ? Number(req.query.top) : 1000;
+  const source = req.query.source ? Number(req.query.source) : 1;
+
+  if (source === 2) {
+    return getWorldoMetersTable({ isCurl, emojis, minimal, top, format})
+      .then(result => {
+        return res.send(result);
+      }).catch(error => errorHandler(error, res));
+  }
 
   if (format.toLowerCase() === 'json') {
     return getJSONData().then(result => {
-      res.setHeader('Cache-Control', 's-maxage=900');
       return res.json(result);
     }).catch(error => errorHandler(error, res));
   }
 
-  return getCompleteTable().then(result => {
-    res.setHeader('Cache-Control', 's-maxage=900');
+  return getCompleteTable({ isCurl, emojis, minimal, top })
+    .then(result => {
+      return res.send(result);
+    }).catch(error => errorHandler(error, res));
+});
+
+app.get('/updates', (req, res) => {
+  const isCurl = IS_CURL_RE.test(req.headers['user-agent']);
+  const format = req.query.format ? req.query.format : '';
+
+  if (format.toLowerCase() === 'json') {
+    return getLiveUpdates({ json: true, isCurl }).then(result => {
+      return res.json(result);
+    }).catch(error => errorHandler(error, res));
+  }
+
+  return getLiveUpdates({ json: false, isCurl }).then(result => {
     return res.send(result);
   }).catch(error => errorHandler(error, res));
 });
 
 app.get('/:country', (req, res) => {
   const { country } = req.params;
+  const isCurl = IS_CURL_RE.test(req.headers['user-agent']);
   const format = req.query.format ? req.query.format : '';
+  const minimal = req.query.minimal === 'true';
+  const emojis = req.query.emojis === 'true';
+  const source = req.query.source ? Number(req.query.source) : 1;
 
-  if (!country || 'ALL' === country.toUpperCase()) {
+  if (!country || country.toUpperCase() === 'ALL') {
     if (format.toLowerCase() === 'json') {
       return getJSONData().then(result => {
-        res.setHeader('Cache-Control', 's-maxage=900');
         return res.json(result);
       }).catch(error => errorHandler(error, res));
     }
 
-
-    return getCompleteTable().then(result => {
-      res.setHeader('Cache-Control', 's-maxage=900');
-      return res.send(result);
-    }).catch(error => errorHandler(error, res));
+    return getCompleteTable({ isCurl, emojis, minimal })
+      .then(result => {
+        return res.send(result);
+      }).catch(error => errorHandler(error, res));
   }
 
-  let lookupObj = lookupCountry(country);
+  const lookupObj = lookupCountry(country);
 
   if (!lookupObj) {
     return res.send(`
     Country not found.
-    Try full country name or country code.
-    Ex:
+    Try the full country name or country code.
+    Example:
       - /UK: for United Kingdom
       - /US: for United States of America.
-      - /India: for India.
+      - /Italy: for Italy.
     `);
   }
 
+
   const { iso2 } = lookupObj;
 
+  if (source === 2) {
+    return getWorldoMetersTable({ countryCode: iso2, isCurl, emojis, minimal, format })
+      .then(result => {
+        return res.send(result);
+      }).catch(error => errorHandler(error, res));
+  }
+
   if (format.toLowerCase() === 'json') {
     return getJSONDataForCountry(iso2).then(result => {
-      res.setHeader('Cache-Control', 's-maxage=900');
       return res.json(result);
     }).catch(error => errorHandler(error, res));
   }
 
-  return getCountryTable(iso2).then(result => {
-    res.setHeader('Cache-Control', 's-maxage=900');
-    return res.send(result);
-  }).catch(error => errorHandler(error, res));
+  return getCountryTable({ countryCode: iso2, isCurl, emojis, minimal })
+    .then(result => {
+      return res.send(result);
+    }).catch(error => errorHandler(error, res));
 });
 
-
-app.listen(port, () => console.log(`Running on ${port}`));
+app.listen(port, () => console.log(`Running on ${port}`));

bin/index.js

@@ -1,19 +1,21 @@
 #!/usr/bin/env node
-const yargonaut = require('yargonaut')
-  .style('green');
+
+require('yargonaut').style('green');
 const yargs = require('yargs');
 const chalk = require('chalk');
 const { getCompleteTable } = require('../lib/corona');
 const { getCountryTable } = require('../lib/byCountry');
+const { getWorldoMetersTable } = require('../lib/worldoMeters');
 const { lookupCountry } = require('../lib/helpers');
 
 const { argv } = yargs
-  .command('$0 [country]','Tool to COVID-19 statistics for the world or the given country', yargs =>
+  .command('$0 [country]', 'Tool to track COVID-19 statistics from terminal', yargs =>
     yargs.positional('country', {
       coerce(arg) {
-        if ('ALL' === arg.toUpperCase()) {
+        if (arg.toUpperCase() === 'ALL') {
           return 'ALL';
         }
+
         const country = lookupCountry(arg);
         if (!country) {
           let error = `Country '${arg}' not found.\n`;
@@ -24,6 +26,7 @@ const { argv } = yargs
           error += '- Italy: for Italy.\n';
           throw new Error(chalk.red.bold(error));
         }
+
         return country.iso2;
       },
       describe: 'Filter table by country',
@@ -32,6 +35,12 @@ const { argv } = yargs
     })
   )
   .options({
+    s: {
+      alias: 'source',
+      describe: 'fetch data from other source',
+      default: 1,
+      type: 'int'
+    },
     e: {
       alias: 'emojis',
       describe: 'Show emojis in table',
@@ -42,16 +51,33 @@ const { argv } = yargs
       alias: 'color',
       describe: 'Show colors formatted output',
       type: 'boolean'
+    },
+    m: {
+      alias: 'minimal',
+      describe: 'Remove borders & padding from table',
+      type: 'boolean',
+      default: false,
+    },
+    t: {
+      alias: 'top',
+      describe: 'Filter table by rank',
+      type: 'int'
     }
   })
   .strict()
   .help('help');
 
-const { emojis, country } = argv;
-(
-  country === 'ALL'
-    ? getCompleteTable(emojis)
-    : getCountryTable(country, emojis)
-)
-  .then(console.log)
-  .catch(console.error);
+argv.countryCode = argv.country;
+if (argv.source === 2) {
+  getWorldoMetersTable(argv)
+    .then(console.log)
+    .catch(console.error);
+} else {
+  (
+    argv.country === 'ALL'
+      ? getCompleteTable(argv)
+      : getCountryTable(argv)
+  )
+    .then(console.log)
+    .catch(console.error);
+}

changelog.md

@@ -0,0 +1,31 @@
+# Changelog
+
+## Version 0.7.0
+
+* Added new source to fetch realtime data. ``corona --source=2``
+* Code refactored and some bug fixes.
+
+## Version 0.6.0
+
+* Added filter to show top N countries. ``corona --top=20``
+
+## Version 0.5.0
+
+* Added minimal / comapct table command. ``corona --minimal``
+* Added world total stats at the bottom of the table too.
+* Refactor: moved table formatting functions to helpers.
+* Added total stats object when using `?format=json`
+
+## Version 0.4.0
+
+* Added country filter. Ex:  ``corona Italy``
+* Added command to show emojis. Ex: ``corona --emojis``
+* Added command to disable colors using. Ex: ``corona --color=false``
+
+## Version 0.2.0
+
+* Added daily and weekly column.
+
+## Version 0.1.0
+
+* Lauched command `corona`