covid19-cli 0.2.0 → 0.3.0

data/covid19-cli.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = ["covid19-cli"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
   spec.add_dependency "httparty"
+  spec.add_dependency "thor"
+  spec.add_dependency "text-table"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/covid19/client.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require_relative 'services/covid19_data'
+require_relative 'decorators/table'
 
 module Covid19
   class Client < Thor
@@ -8,23 +9,41 @@ module Covid19
     end
 
     desc 'all_continents', 'List all continents data'
+    option :table, required: false
     def all_continents
-      puts Covid19::Services::Covid19Data.all_continents
+      locality  = Covid19::Decorators::Table::LOCALITY[:continent]
+      result = Covid19::Services::Covid19Data.all_continents
+
+      puts options[:table] ?
+        Covid19::Decorators::Table.create(data: result, locality: locality) :
+        result
     end
 
     desc 'all countries', 'List all countries data'
+    option :table, required: false
     def all_countries
-      puts Covid19::Services::Covid19Data.all_countries
+      locality  = Covid19::Decorators::Table::LOCALITY[:country]
+      result = Covid19::Services::Covid19Data.all_countries
+
+      puts options[:table] ?
+        Covid19::Decorators::Table.create(data: result, locality: locality):
+        result
     end
 
     desc 'continent CONTINENT_NAME', 'List continent data'
+    option :table, required: false
     def continent(continent_name)
-      puts Covid19::Services::Covid19Data.continent(continent_name)
+      result = Covid19::Services::Covid19Data.continent(continent_name)
+
+      puts options[:table] ? Covid19::Decorators::Table.create(data: result) : result
     end
 
     desc 'country COUNTRY_NAME', 'List country data'
+    option :table, required: false
     def country(country_name)
-      puts Covid19::Services::Covid19Data.country(country_name)
+      result = Covid19::Services::Covid19Data.country(country_name)
+
+      puts options[:table] ? Covid19::Decorators::Table.create(data: result) : result
     end
   end
 end

data/lib/covid19/decorators/table.rb

@@ -0,0 +1,64 @@
+require 'text-table'
+
+module Covid19
+  module Decorators
+    class Table
+      LOCALITY = { country: 'country', continent: 'continent' }
+      DEFAULT_HEADER = %w(cases
+                          todayCases
+                          deaths
+                          todayDeaths
+                          recovered
+                          todayRecovered
+                          active
+                          critical
+                          tests
+                          testsPerOneMillion
+                          population)
+
+      def self.create(data:, locality: nil)
+        table = Text::Table.new
+
+        # Specific data
+        if data.is_a?(Hash)
+          table.head = DEFAULT_HEADER
+          table.rows = [align_fields(filter_data(data).values)]
+        end
+
+        # Data lists
+        if data.is_a?(Array) && !locality.empty?
+          table.head = DEFAULT_HEADER.unshift(locality)
+
+          data.each { |line| table.rows << align_fields(filter_data(line).values) }
+        end
+
+        table.to_s
+      end
+
+      def self.align_fields(data)
+        data.map { |field| { value: format_number(field), align: :right } }
+      end
+
+      def self.filter_data(data)
+        organize_fields(data).select { |key, value| DEFAULT_HEADER.include?(key) }
+      end
+
+      def self.format_number(number)
+        number.to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1 ")
+      end
+
+      def self.organize_fields(data)
+        if DEFAULT_HEADER.include?(LOCALITY[:continent])
+          continent = data.slice(LOCALITY[:continent])
+          data.delete(LOCALITY[:continent])
+
+          return continent.merge(data)
+        end
+
+        data
+      end
+
+      private_class_method :align_fields, :filter_data, :format_number, :organize_fields
+    end
+  end
+end

data/lib/covid19/version.rb

@@ -1,3 +1,3 @@
 module Covid19
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/lib/covid19/decorators/table_spec.rb

@@ -0,0 +1,25 @@
+require_relative '../../../../lib/covid19/decorators/table'
+
+RSpec.describe 'Covid19::Decorators::Table' do
+  describe '.create' do
+    it 'returns specific data in table format' do
+      data = {"updated"=>1594706997629, "country"=>"Brazil", "countryInfo"=>{"_id"=>76, "iso2"=>"BR", "iso3"=>"BRA", "lat"=>-10, "long"=>-55, "flag"=>"https://disease.sh/assets/img/flags/br.png"}, "cases"=>1887959, "todayCases"=>0, "deaths"=>72921, "todayDeaths"=>0, "recovered"=>1213512, "todayRecovered"=>0, "active"=>601526, "critical"=>8318, "casesPerOneMillion"=>8880, "deathsPerOneMillion"=>343, "tests"=>4572796, "testsPerOneMillion"=>21508, "population"=>212611764, "continent"=>"South America", "oneCasePerPeople"=>113, "oneDeathPerPeople"=>2916, "oneTestPerPeople"=>46, "activePerOneMillion"=>2829.22, "recoveredPerOneMillion"=>5707.64, "criticalPerOneMillion"=>39.12}
+
+      expected_result = "+-----------+------------+--------+-------------+-----------+----------------+---------+----------+-----------+--------------------+-------------+\n|   cases   | todayCases | deaths | todayDeaths | recovered | todayRecovered | active  | critical |   tests   | testsPerOneMillion | population  |\n+-----------+------------+--------+-------------+-----------+----------------+---------+----------+-----------+--------------------+-------------+\n| 1 887 959 |          0 | 72 921 |           0 | 1 213 512 |              0 | 601 526 |    8 318 | 4 572 796 |             21 508 | 212 611 764 |\n+-----------+------------+--------+-------------+-----------+----------------+---------+----------+-----------+--------------------+-------------+\n"
+
+      result = Covid19::Decorators::Table.create(data: data)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it 'returns general list in table format' do
+      data = [{"updated"=>1594779763760, "cases"=>4152507, "todayCases"=>7057, "deaths"=>188977, "todayDeaths"=>837, "recovered"=>1939661, "todayRecovered"=>4932, "active"=>2023869, "critical"=>19737, "casesPerOneMillion"=>7046.81, "deathsPerOneMillion"=>320.69, "tests"=>49174748, "testsPerOneMillion"=>83449.65, "population"=>589274482, "continent"=>"North America", "activePerOneMillion"=>3434.51, "recoveredPerOneMillion"=>3291.61, "criticalPerOneMillion"=>33.49, "continentInfo"=>{"lat"=>31.6768272, "long"=>-146.4707474}, "countries"=>["Anguilla", "Antigua and Barbuda", "Aruba", "Bahamas", "Barbados", "Belize", "Bermuda", "British Virgin Islands", "Canada", "Caribbean Netherlands", "Cayman Islands", "Costa Rica", "Cuba", "Curaçao", "Dominica", "Dominican Republic", "El Salvador", "Greenland", "Grenada", "Guadeloupe", "Guatemala", "Haiti", "Honduras", "Jamaica", "Martinique", "Mexico", "Montserrat", "Nicaragua", "Panama", "Saint Kitts and Nevis", "Saint Lucia", "Saint Martin", "Saint Pierre Miquelon", "Saint Vincent and the Grenadines", "Sint Maarten", "St. Barth", "Trinidad and Tobago", "Turks and Caicos Islands", "USA"]}]
+
+      expected_result = "+---------------+-----------+------------+---------+-------------+-----------+----------------+-----------+----------+------------+--------------------+-------------+\n|   continent   |   cases   | todayCases | deaths  | todayDeaths | recovered | todayRecovered |  active   | critical |   tests    | testsPerOneMillion | population  |\n+---------------+-----------+------------+---------+-------------+-----------+----------------+-----------+----------+------------+--------------------+-------------+\n| North America | 4 152 507 |      7 057 | 188 977 |         837 | 1 939 661 |          4 932 | 2 023 869 |   19 737 | 49 174 748 |          83 449.65 | 589 274 482 |\n+---------------+-----------+------------+---------+-------------+-----------+----------------+-----------+----------+------------+--------------------+-------------+\n"
+
+      result = Covid19::Decorators::Table.create(data: data, locality: 'continent')
+
+      expect(result).to eq(expected_result)
+    end
+  end
+end

data/spec/lib/covid19/version_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Covid19::Client do
   it "has version latest number" do
-    expect(Covid19::VERSION).to eq('0.2.0')
+    expect(Covid19::VERSION).to eq('0.3.0')
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: covid19-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexandre Carlos Martins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httparty
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: text-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,8 +117,10 @@ files:
 - covid19-cli.gemspec
 - exe/covid19-cli
 - lib/covid19/client.rb
+- lib/covid19/decorators/table.rb
 - lib/covid19/services/covid19_data.rb
 - lib/covid19/version.rb
+- spec/lib/covid19/decorators/table_spec.rb
 - spec/lib/covid19/services/covid19_data_spec.rb
 - spec/lib/covid19/version_spec.rb
 - spec/spec_helper.rb
@@ -127,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: COVID-19 Stats