kovid 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62b08f268f6500bd01a16f58e6f723f6cb38c993a462a1c5df7ac3d81bb92124
-  data.tar.gz: 7ce4bf26fc74ef311e456ec9d5e75e0fc8b2f149643153d2afa95a018383a319
+  metadata.gz: 97ca9cfffdcd5f3a9f1fefe000e304ebed0fb015ac6ecca7f1e0740f658d2706
+  data.tar.gz: aab2c25abd4c5dbc35b0cd020d210dd8e7ed9057545dd9dd11bae77c751cc891
 SHA512:
-  metadata.gz: 23e2acc82bc376fc649469c901b155b81672000ac07debb5c4ad04f51271871528fe320e24b71710165f76d2dd3adde89417011a3e361643a67a9991fc19afb5
-  data.tar.gz: 5b16bbf5ea2cbba4cf2c6eb2944a8dccef026872479c5a14e086e0b6fbe0ca7e0c45d2188b406fa357c7927adc7b69bc7619292e77ca33b590ad37e1fff1f013
+  metadata.gz: c0ab48dd5eab1558eb352062d6b9f4351e92402741b641114dbf9928ccc35f0f04c965da6d53401fa05041cc75b8aa4cc65cd8dafeffc1d1fb1f7c9a1db79702
+  data.tar.gz: 54caa7825986c4b5f42d93b22e2201d4690cd3a9cb3059ded43c16fb12649c6c77c5ec59f7ea87d931329d286f14da9056756412d9d4a068a9c43908d2a96abb

data/lib/kovid/request.rb

@@ -11,51 +11,28 @@ module Kovid
     class << self
       require 'pry'
       def by_country(country_name)
-        path = "/countries/#{country_name}"
-        fetch_url = BASE_URL + path
+        response = fetch_country(country_name)
 
-        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
         Kovid::Tablelize.country_table(response)
       rescue JSON::ParserError
         no_case_in(country_name)
       end
 
       def by_country_full(country_name)
-        path = "/countries/#{country_name}"
-        fetch_url = BASE_URL + path
+        response = fetch_country(country_name)
 
-        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
         Kovid::Tablelize.full_country_table(response)
       rescue JSON::ParserError
         no_case_in(country_name)
       end
 
       def by_country_comparison(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: 3600).response_body)
-        end
-
-        array = array.sort_by { |json| -json['cases'] }
-
+        array = fetch_countries(list)
         Kovid::Tablelize.compare_countries_table(array)
       end
 
       def by_country_comparison_full(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: 3600).response_body)
-        end
-        array = array.sort_by { |json| -json['cases'] }
-
+        array = fetch_countries(list)
         Kovid::Tablelize.compare_countries_table_full(array)
       end
 
@@ -75,6 +52,26 @@ module Kovid
         table = Terminal::Table.new headings: [country.capitalize.to_s], rows: rows
         puts table
       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: 3600).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
+
+        JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
+      end
     end
   end
 end

data/lib/kovid/tablelize.rb

@@ -50,11 +50,29 @@ module Kovid
       end
 
       def compare_countries_table_full(data)
-        headings = ['Country', 'Cases', 'Deaths', 'Recovered', 'Cases Today', 'Deaths Today', 'Critical', 'Cases/Million']
+        headings = [
+          'Country',
+          'Cases',
+          'Deaths',
+          'Recovered',
+          'Cases Today',
+          'Deaths Today',
+          'Critical',
+          'Cases/Million'
+        ]
         rows = []
 
         data.each do |country|
-          rows << [country['country'], country['cases'], country['deaths'], country['recovered'], country['todayCases'], country['todayDeaths'], country['critical'], country['casesPerOneMillion']]
+          rows << [
+            country['country'],
+            country['cases'],
+            country['deaths'],
+            country['recovered'],
+            country['todayCases'],
+            country['todayDeaths'],
+            country['critical'],
+            country['casesPerOneMillion']
+          ]
         end
 
         puts Terminal::Table.new(headings: headings, rows: rows)

data/lib/kovid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Emmanuel Hayford