kovid 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68cf72c0e99add59625ce1a9763db32b5eeecb69220d78b236e929f08adb1dec
-  data.tar.gz: 84d95391d43e67b62f865f6e0ab585700aae3790e1f968793d11a99bf02e6ce8
+  metadata.gz: aa46d5f734b53509d084570bc4a0abc2527d02320ea67c9a85120389492a0d64
+  data.tar.gz: 72c0dd54efb153df1996c238a74f42bec0c46062876669051e346f4906feba38
 SHA512:
-  metadata.gz: daf6517f2d15ab2670bb9ad1124faa683db07eb3308a37d057b6af08b0d5a3f2ada1a4f76f54048556878df14435a71a82632a2995c28a6c830755aff7263338
-  data.tar.gz: 77862be6a1adf08d40568326bcf24a4aa1ae0c60ad5f0b462b7ef3e5e1b64292c812e0c96b47d70702dad2635ee3640739883a5afbd28b2e2411b2488a23c279
+  metadata.gz: d61d1956c6f309ad70beeb8fe1289bb9e7c15c0b8b26c7ddd72304e888803681f529bdb1c091be603351271b981d8e4b2e0f033972996bed4580aa077d8b4c4a
+  data.tar.gz: 82d702ef83e0307424191235d239cc27aad835e0191677e0540cecf359a3756e427fa6c427036e70d2550ef0c08679966d7d21b33bc2b7e691f603e33077bec4

data/Gemfile

@@ -6,4 +6,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'
+gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     kovid (0.6.8)
-      ascii_charts (~> 0.9.1)
       carmen (~> 1.1.3)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
@@ -18,7 +17,6 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
-    ascii_charts (0.9.1)
     carmen (1.1.3)
       activesupport (>= 3.0.0)
     concurrent-ruby (1.1.6)

data/README.md

@@ -74,6 +74,7 @@ ___
 😷 **History**
 * `kovid history COUNTRY` (full history).
 * `kovid history COUNTRY N` (history in the last N days).
+* `kovid history STATE --usa`
 ___
 
 **NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.

data/kovid.gemspec

@@ -22,12 +22,11 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/siaw23/kovid'
   spec.metadata['changelog_uri'] = 'https://github.com/siaw23/kovid'
 
-  spec.add_dependency 'ascii_charts', '~> 0.9.1'
+  spec.add_dependency 'carmen', '~> 1.1.3'
   spec.add_dependency 'rainbow', '~> 3.0'
   spec.add_dependency 'terminal-table', '~> 1.8'
   spec.add_dependency 'thor', '~> 1.0'
   spec.add_dependency 'typhoeus', '~> 1.3'
-  spec.add_dependency 'carmen', '~> 1.1.3'
   spec.add_development_dependency 'simplecov', '~>  0.18'
 
   # Specify which files should be added to the gem when it is released.

data/lib/kovid.rb

@@ -68,8 +68,12 @@ module Kovid
     Kovid::Request.cases
   end
 
-  def history(country, last)
-    Kovid::Request.history(country, last)
+  def history(country, days=30)
+    Kovid::Request.history(country, days)
+  end
+
+  def history_us_state(state, days=30)
+    Kovid::Request.history_us_state(state, days)
   end
 
   def histogram(country, date)

data/lib/kovid/ascii_charts.rb

@@ -0,0 +1,276 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2011 Ben Lund
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Kovid
+  module AsciiCharts
+    VERSION = '0.9.1'
+
+    class Chart
+      attr_reader :options, :data
+
+      DEFAULT_MAX_Y_VALS = 20
+      DEFAULT_MIN_Y_VALS = 10
+
+      # data is a sorted array of [x, y] pairs
+
+      def initialize(data, options = {})
+        @data = data
+        @options = options
+      end
+
+      def rounded_data
+        @rounded_data ||= data.map { |pair| [pair[0], round_value(pair[1])] }
+      end
+
+      def step_size
+        unless defined? @step_size
+          if options[:y_step_size]
+            @step_size = options[:y_step_size]
+          else
+            max_y_vals = options[:max_y_vals] || DEFAULT_MAX_Y_VALS
+            min_y_vals = options[:max_y_vals] || DEFAULT_MIN_Y_VALS
+            y_span = (max_yval - min_yval).to_f
+
+            step_size = nearest_step(y_span.to_f / (data.size + 1))
+
+            if @all_ints && (step_size < 1)
+              step_size = 1
+            else
+              while (y_span / step_size) < min_y_vals
+                candidate_step_size = next_step_down(step_size)
+                if @all_ints && (candidate_step_size < 1)
+                  break
+                  end ## don't go below one
+
+                step_size = candidate_step_size
+              end
+            end
+
+            # go up if we undershot, or were never over
+            while (y_span / step_size) > max_y_vals
+              step_size = next_step_up(step_size)
+            end
+            @step_size = step_size
+          end
+          if !@all_ints && @step_size.is_a?(Integer)
+            @step_size = @step_size.to_f
+          end
+        end
+        @step_size
+      end
+
+      STEPS = [1, 2, 5].freeze
+
+      def from_step(val)
+        if val == 0
+          [0, 0]
+        else
+          order = Math.log10(val).floor.to_i
+          num = (val / (10**order))
+          [num, order]
+        end
+      end
+
+      def to_step(num, order)
+        s = num * (10**order)
+        if order < 0
+          s.to_f
+        else
+          s
+        end
+      end
+
+      def nearest_step(val)
+        num, order = from_step(val)
+        to_step(2, order) # #@@
+      end
+
+      def next_step_up(val)
+        num, order = from_step(val)
+        next_index = STEPS.index(num.to_i) + 1
+        if STEPS.size == next_index
+          next_index = 0
+          order += 1
+        end
+        to_step(STEPS[next_index], order)
+      end
+
+      def next_step_down(val)
+        num, order = from_step(val)
+        next_index = STEPS.index(num.to_i) - 1
+        if next_index == -1
+          STEPS.size - 1
+          order -= 1
+        end
+        to_step(STEPS[next_index], order)
+      end
+
+      # round to nearest step size, making sure we curtail precision to same order of magnitude as the step size to avoid 0.4 + 0.2 = 0.6000000000000001
+      def round_value(val)
+        remainder = val % step_size
+        unprecised = if (remainder * 2) >= step_size
+                       (val - remainder) + step_size
+                     else
+                       val - remainder
+                      end
+        if step_size < 1
+          precision = -Math.log10(step_size).floor
+          (unprecised * (10**precision)).to_i.to_f / (10**precision)
+        else
+          unprecised
+        end
+      end
+
+      def max_yval
+        scan_data unless defined? @max_yval
+        @max_yval
+      end
+
+      def min_yval
+        scan_data unless defined? @min_yval
+        @min_yval
+      end
+
+      def all_ints
+        scan_data unless defined? @all_ints
+        @all_ints
+      end
+
+      def scan_data
+        @max_yval = 0
+        @min_yval = 0
+        @all_ints = true
+
+        @max_xval_width = 1
+
+        data.each do |pair|
+          @max_yval = pair[1] if pair[1] > @max_yval
+          @min_yval = pair[1] if pair[1] < @min_yval
+          @all_ints = false if @all_ints && !pair[1].is_a?(Integer)
+
+          if (xw = pair[0].to_s.length) > @max_xval_width
+            @max_xval_width = xw
+          end
+        end
+      end
+
+      def max_xval_width
+        scan_data unless defined? @max_xval_width
+        @max_xval_width
+      end
+
+      def max_yval_width
+        scan_y_range unless defined? @max_yval_width
+        @max_yval_width
+      end
+
+      def scan_y_range
+        @max_yval_width = 1
+
+        y_range.each do |yval|
+          if (yw = yval.to_s.length) > @max_yval_width
+            @max_yval_width = yw
+          end
+        end
+      end
+
+      def y_range
+        unless defined? @y_range
+          @y_range = []
+          first_y = round_value(min_yval)
+          first_y -= step_size if first_y > min_yval
+          last_y = round_value(max_yval)
+          last_y += step_size if last_y < max_yval
+          current_y = first_y
+          while current_y <= last_y
+            @y_range << current_y
+            current_y = round_value(current_y + step_size) ## to avoid fp arithmetic oddness
+          end
+        end
+        @y_range
+      end
+
+      def lines
+        raise 'lines must be overridden'
+      end
+
+      def draw
+        lines.join("\n")
+      end
+
+      def to_string
+        draw
+      end
+    end
+
+    class Cartesian < Chart
+      def lines
+        return [[' ', options[:title], ' ', '|', '+-', ' ']] if data.empty?
+
+        lines = [' ']
+
+        bar_width = max_xval_width + 1
+
+        lines << (' ' * max_yval_width) + ' ' + rounded_data.map { |pair| pair[0].to_s.center(bar_width) }.join('')
+
+        y_range.each_with_index do |current_y, i|
+          yval = current_y.to_s
+          bar = if i == 0
+                  '+'
+                else
+                  '|'
+                end
+          current_line = [(' ' * (max_yval_width - yval.length)) + "#{current_y}#{bar}"]
+
+          rounded_data.each do |pair|
+            marker = if (i == 0) && options[:hide_zero]
+                       '-'
+                     else
+                       '*'
+                     end
+            filler = if i == 0
+                       '-'
+                     else
+                       ' '
+                     end
+            comparison = if options[:bar]
+                           current_y <= pair[1]
+                         else
+                           current_y == pair[1]
+                         end
+            current_line << if comparison
+                              marker.center(bar_width, filler)
+                            else
+                              filler * bar_width
+                            end
+          end
+          lines << current_line.join('')
+          current_y += step_size
+        end
+        lines << ' '
+        lines << options[:title].center(lines[1].length) if options[:title]
+        lines << ' '
+        lines.reverse
+      end
+    end
+    end
+end

data/lib/kovid/cli.rb

@@ -75,13 +75,15 @@ module Kovid
       data_source
     end
 
-    desc 'history COUNTRY or history COUNTRY N',
-         'Return history of incidents of COUNTRY (in the last N days)'
-    def history(*params)
-      if params.size == 2
-        puts Kovid.history(params.first, params.last)
+    desc 'history COUNTRY or history COUNTRY N or' \
+         'history STATE --usa',
+         'Return history of incidents of COUNTRY|STATE (in the last N days)'
+    option :usa, :type => :boolean
+    def history(location, days=30)
+      if options[:usa]
+        puts Kovid.history_us_state(location, days)
       else
-        puts Kovid.history(params.first, nil)
+        puts Kovid.history(location, days)
       end
       data_source
     end
@@ -145,8 +147,8 @@ module Kovid
       source = <<~TEXT
         #{Time.now}
         Sources:
-         * JHU CSSE GISand Data
-         * https://www.worldometers.info/coronavirus/
+         * Johns Hopkins University
+         * https://www.worldometers.info/coronavirus
       TEXT
       puts source
     end

data/lib/kovid/constants.rb

@@ -23,6 +23,12 @@ module Kovid
       'Recovered'.paint_green
     ].freeze
 
+    DATE_CASES_DEATHS = [
+      'Date'.paint_white,
+      'Cases'.paint_white,
+      'Deaths'.paint_red
+    ].freeze
+
     CONTINENTAL_AGGREGATE_HEADINGS = [
       'Cases'.paint_white,
       'Cases Today'.paint_white,
@@ -93,7 +99,13 @@ module Kovid
       'Recovered'.paint_green
     ].freeze
 
-    FOOTER_LINE = [
+    FOOTER_LINE_THREE_COLUMNS = [
+      '------------',
+      '------------',
+      '------------'
+    ].freeze
+
+    FOOTER_LINE_FOUR_COLUMNS = [
       '------------',
       '------------',
       '------------',

data/lib/kovid/historians.rb

@@ -3,24 +3,15 @@
 module Kovid
   module Historians
     include Constants
+    include AsciiCharts
 
-    def history(country, last)
-      # TODO: Write checks for when country is spelt wrong.
+    def history(location, days)
       rows = []
 
-      stats = if last
-                Kovid.format_country_history_numbers(country).last(last.to_i)
-              else
-                Kovid.format_country_history_numbers(country)
-              end
+      stats = Kovid.format_country_history_numbers(location).last(days.to_i)
+      dates = location['timeline']['cases'].keys.last(days.to_i)
 
-      dates = if last
-                country['timeline']['cases'].keys.last(last.to_i)
-              else
-                country['timeline']['cases'].keys
-              end
-
-      unless last
+      if days.to_i >= 30
         stats = stats.reject { |stat| stat[0].to_i.zero? && stat[1].to_i.zero? }
         dates = dates.last(stats.count)
       end
@@ -31,14 +22,25 @@ module Kovid
         rows << row
       end
 
+      # Title and Column format if Country or US State
+      if location['country']
+        title      = location['country'].try(:upcase)
+        col_format = DATE_CASES_DEATHS_RECOVERED
+        footer     = FOOTER_LINE_FOUR_COLUMNS
+      else
+        title      = location['state'].try(:upcase)
+        col_format = DATE_CASES_DEATHS
+        footer     = FOOTER_LINE_THREE_COLUMNS
+      end
+
       if stats.size > 10
-        rows << FOOTER_LINE
-        rows << DATE_CASES_DEATHS_RECOVERED
+        rows << footer
+        rows << col_format
       end
 
       Terminal::Table.new(
-        title: country['country'].upcase,
-        headings: DATE_CASES_DEATHS_RECOVERED,
+        title: title,
+        headings: col_format,
         rows: rows
       )
     end
@@ -88,7 +90,7 @@ module Kovid
         dates.each_with_index do |val, index|
           data << [val, positive_cases_figures[index]]
         end
-        y_range = AsciiCharts::Cartesian.new(
+        y_range = Kovid::AsciiCharts::Cartesian.new(
           data, bar: true, hide_zero: true
         ).y_range
 

data/lib/kovid/request.rb

@@ -8,9 +8,11 @@ require_relative 'uri_builder'
 
 module Kovid
   class Request
-    COUNTRIES_PATH = UriBuilder.new('/v2/countries').url
-    STATES_URL = UriBuilder.new('/v2/states').url
-    JHUCSSE_URL = UriBuilder.new('/v2/jhucsse').url
+    COUNTRIES_PATH    = UriBuilder.new('/v2/countries').url
+    STATES_URL        = UriBuilder.new('/v2/states').url
+    JHUCSSE_URL       = UriBuilder.new('/v2/jhucsse').url
+    HISTORICAL_URL    = UriBuilder.new('/v2/historical').url
+    HISTORICAL_US_URL = UriBuilder.new('/v2/historical/usacounties').url
 
     SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
@@ -158,19 +160,57 @@ module Kovid
         puts SERVER_DOWN
       end
 
-      def history(country, last)
+      def history(country, days)
         history_path = UriBuilder.new('/v2/historical').url
+
         response = JSON.parse(
           Typhoeus.get(
             history_path + "/#{country}", cache_ttl: 900
           ).response_body
         )
 
-        Kovid::Tablelize.history(response, last)
+        if response.key?('message')
+          not_found(country) do |c|
+            "Could not find cases for #{c}.\nIf searching United States, add --usa option" 
+          end
+        else
+          Kovid::Tablelize.history(response, days)
+        end
       rescue JSON::ParserError
         puts SERVER_DOWN
       end
 
+      def history_us_state(state, days)
+        history_path = UriBuilder.new('/v2/historical/usacounties').url
+        state        = Kovid.lookup_us_state(state).downcase()
+
+        response = JSON.parse(
+          Typhoeus.get(
+            history_path + "/#{state}", cache_ttl: 900
+          ).response_body
+        )
+
+        if response.respond_to?(:key?) and response.key?('message')
+          return not_found(state)
+        end
+
+        # API Endpoint returns list of counties for given state, so
+        # we aggreage cases for all counties
+        # Note: no data for 'Recovered'
+        cases  = usacounties_aggregator(response, 'cases')
+        deaths = usacounties_aggregator(response, 'deaths')
+
+        # normalize data so we can call Kovid::Tablelize.history on US State data
+        response = {
+          "state"    => state,
+          "timeline" => { "cases" => cases, "deaths" => deaths }
+        }
+
+        Kovid::Tablelize.history(response, days)
+      rescue JSON::ParserError
+          puts SERVER_DOWN
+      end
+
       def histogram(country, date)
         history_path = UriBuilder.new('/v2/historical').url
         response = JSON.parse(
@@ -188,9 +228,17 @@ module Kovid
 
       private
 
-      def not_found(country)
-        rows = [["Wrong spelling/No reported cases on #{country.upcase}."]]
-        Terminal::Table.new title: "You checked: #{country.upcase}", rows: rows
+      def not_found(location)
+        rows = []
+        default_warning = "Wrong spelling/No reported cases on #{location.upcase}."
+
+        if block_given?
+          rows << [ yield(location) ]
+        else
+          rows << [ default_warning ]
+        end
+
+        Terminal::Table.new title: "You checked: #{location.upcase}", rows: rows
       end
 
       def fetch_countries(list)
@@ -278,6 +326,16 @@ module Kovid
           end
         end.compact
       end
+
+      def usacounties_aggregator(data, key=nil)
+        data.inject({}) do |base,other|
+          base.merge(other['timeline'][key]) do |k,l,r|
+            l ||= 0
+            l ||= 0
+            l + r
+          end
+        end.compact
+      end
     end
   end
 end

data/lib/kovid/tablelize.rb

@@ -2,7 +2,7 @@
 
 require 'terminal-table'
 require 'date'
-require 'ascii_charts'
+require_relative 'ascii_charts'
 require_relative 'painter'
 require_relative 'constants'
 require_relative 'aggregators'

data/lib/kovid/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ascii_charts
+  name: carmen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: carmen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +121,7 @@ files:
 - kovid.gemspec
 - lib/kovid.rb
 - lib/kovid/aggregators.rb
+- lib/kovid/ascii_charts.rb
 - lib/kovid/cache.rb
 - lib/kovid/cli.rb
 - lib/kovid/constants.rb