kovid 0.6.5 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 620426fc962e25e54afb7805dcf98131c1e58865ff477ffb9102e0d2ca90217d
-  data.tar.gz: 59daeb1837a6afaa795bed6479fde7c20c696a9f21a6a0f444ed1f63150e9ce1
+  metadata.gz: 490171e0140b632b2cb19c40e781194aa02fb77cd5b2dd97026d761ab6a1820e
+  data.tar.gz: e317576c9f36bd7ba3f138e03548e6115d789182c97bcf0b2db7018f482b0663
 SHA512:
-  metadata.gz: 4741653673978adcaeadf3b22bfa8b2db1b3bae467ffca9fbca4c010b1c30b677ebcf6ced77dcda6ae4e90782678bd162f85ac913f70658fce6d7ad4beb05547
-  data.tar.gz: aac2306ed42a441c9673ad10ea47f2f3bde83a4dcb99de043cd63a3a352af6e4f3b42409e11de72f6a23f9e5630eb343dae5cec327c62f57fbcb5737071f6f15
+  metadata.gz: 6d51a7f12226e122b242f341b9e3d3ee55b5bd90132f0d78bdae5f0730f67166fb099a878c8e591c9f7d04eafebbb7ecb184394a05cd8baf12ee8b9562962449
+  data.tar.gz: f0f310b2f6441f6c69662bcf9b6bd3287983b9d07173f60b119b719d0595ab804041415f962fffb4f7c6fff12bd847e7e31ce0a2109f7789695b5c6629533aae

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,59 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-04-07 20:38:28 -0300 using RuboCop version 0.67.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 54
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 2
+Metrics/BlockLength:
+  Exclude:
+    - 'kovid.gemspec'
+    - 'spec/kovid_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 220
+  Exclude:
+    - 'lib/kovid/cli.rb'
+    - 'lib/kovid/request.rb'
+    - 'lib/kovid/tablelize.rb'
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 44
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 1
+Style/CaseEquality:
+  Exclude:
+    - 'lib/kovid/request.rb'
+
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/kovid.rb'
+    - 'lib/kovid/helpers.rb'
+
+# Offense count: 5
+Style/MultilineBlockChain:
+  Exclude:
+    - 'lib/kovid/historians.rb'
+    - 'lib/kovid/request.rb'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.4)
-      ascii_charts (~> 0.9.1)
+    kovid (0.6.9)
+      carmen (~> 1.1.3)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
@@ -11,12 +11,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ascii_charts (0.9.1)
+    activesupport (6.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    carmen (1.1.3)
+      activesupport (>= 3.0.0)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.2)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.12.2)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.0)
     rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
@@ -39,9 +50,13 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
+    thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -46,6 +46,8 @@ You can fetch US state-specific data:
 * `kovid state STATE` OR `kovid state "STATE NAME"`.
 * `kovid states --all` or `kovid states -a` for data on all US states.
 
+You can also use USPS abbreviations.  Example: `kovid state me`
+
 Provinces
 
 You can fetch province specific data:
@@ -64,7 +66,7 @@ You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `k
 🇺🇸🇺🇸🇺🇸
 
 You can compare US states with:
-* `kovid states STATE STATE` Example: `kovid states illinois "new york" california`
+* `kovid states STATE STATE` Example: `kovid states illinois "new york" california` OR `kovid states il ny ca`
 
 You can compare provicnes with:
 * `kovid provinces PROVINCE PROVINCE` Example: `kovid provinces ontario manitoba`
@@ -72,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/Rakefile

@@ -7,3 +7,4 @@ RSpec::Core::RakeTask.new(:spec)
 
 # rubocop:disable Style/HashSyntax
 task :default => :spec
+# rubocop:enable Style/HashSyntax

data/kovid.gemspec

@@ -8,8 +8,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Emmanuel Hayford']
   spec.email         = ['siawmensah@gmail.com']
 
-  spec.summary       = 'A CLI to fetch and compare the 2019 coronavirus pandemic statistics.'
-  spec.description   = 'A CLI to fetch and compare the 2019 coronavirus pandemic statistics.'
+  summary = 'A CLI to fetch and compare the 2019 ' \
+            'coronavirus pandemic statistics.'
+  spec.summary       = summary
+  spec.description   = summary
   spec.homepage      = 'https://github.com/siaw23/kovid'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
@@ -20,18 +22,20 @@ 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_development_dependency 'simplecov', '~>  0.18'
 
   # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  # The `git ls-files -z` loads the files in the RubyGem
+  #   that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/kovid.rb

@@ -6,8 +6,6 @@ require 'kovid/request'
 module Kovid
   require 'kovid/helpers'
 
-  class Error < StandardError; end
-
   module_function
 
   def eu_aggregate
@@ -70,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