covid 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35923fa3834ae014ca0219955ff2dc0e2ddb7bc0c655893bac3119ffd5dec718
-  data.tar.gz: b0f6390ab836cc3ea7a8043e2e6fb24072d1e19e76b298074d6aa835d76966e8
+  metadata.gz: 45031ff90f434962a6dcbadd4637e70aa37d6d71887a2c4853a1264431b2d85f
+  data.tar.gz: 180e814b23cdf9741db5c18350b9cde087c633d57f0aa43fcb749e153145858c
 SHA512:
-  metadata.gz: a6c619fe85383eb53c8a5e6d52440ed47789d17349753a9c3a118f7f43e28a053d355d1cb49b346bcef93e244f03a507be9e202cc9cb1dcdc13e8c787451f3c7
-  data.tar.gz: 76c93830dfc16a39fdd332176c93f26de6fb7d9ec36e07e6786487f4352ca941c45d2c24640e08d7f81972b2c9bea104bf39a489c52fa7cb4fbebd5a7b2702a9
+  metadata.gz: ddbf567e6cd6f1a776b79c9c399760616b7afa7c57f569c2a9cc84a08879919e29b68974a68ecb77d016f644960c9f05cc96c44a5d7f8d6b52d81e55dc77006b
+  data.tar.gz: b891a1c3b7850c4edca62df515fcd987619c8db6aa325aaa070a65239e93411bc4b97135a39ad5ecaf7ae3bf62e9d49bc7349cff6d4abcd22c5fd546b9bc85f0

data/.github/workflows/gempush.yml

@@ -0,0 +1,21 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ master ]
+  schedule:
+    - cron: '0 16 * * Sat'
+jobs:
+  build:
+    name: Smoke Test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Install dependencies
+      run: bundle install
+    - name: Run smoke test
+      run: rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    covid (0.1.1)
+    covid (0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -26,10 +26,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (>= 2.3.5)
   covid!
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.2
+   2.3.5

data/README.md

@@ -1,13 +1,13 @@
 # Covid
 
-JSON wrapper around [Johns Hopkins dataset](https://github.com/CSSEGISandData/COVID-19) for COVID-19.
+Ruby wrapper around [Johns Hopkins dataset](https://github.com/CSSEGISandData/COVID-19) for COVID-19.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'covid'
+gem "covid"
 ```
 
 And then execute:
@@ -21,18 +21,38 @@ Or install it yourself as:
 ## Usage
 
 ```
-$ puts Covid::Nineteen.confirmed
+$ Covid::Nineteen.confirmed
+$ Covid::Nineteen.deaths
+$ Covid::Nineteen.recovered
 ```
 
+Any result can be filtered by country/region and/or state/province like so:
 ```
-$ puts Covid::Nineteen.deaths
+$ confirmed = Covid::Nineteen.confirmed
+$ confirmed.country("Australia")
+$ confirmed.region("Australia")
+$ confirmed.state("Victoria")
+$ confirmed.province("Victoria")
+$ confirmed.country("Australia").province("Victoria")
 ```
 
+The data is structured as such:
 ```
-$ puts Covid::Nineteen.recovered
+$ pp Covid::Nineteen.confirmed
+[
+  {
+    "Province/State"=>nil,
+    "Country/Region"=>"Thailand",
+    "Lat"=>"15",
+    "Long"=>"101",
+    "1/22/20"=>"2",
+    "1/23/20"=>"3",
+    "1/24/20"=>"5"
+  },
+  { ... }
+]
 ```
 
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/covid.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", ">= 2.3.5"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/covid/version.rb

@@ -1,3 +1,3 @@
 module Covid
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/covid.rb

@@ -7,18 +7,37 @@ require "net/http"
 
 module Covid
   class Error < StandardError; end
+  class Result < Array
+    def country(name)
+      filter("Country/Region", name)
+    end
+
+    def state(name)
+      filter("Province/State", name)
+    end
+
+    alias_method :region, :country
+    alias_method :province, :state
+
+    private
+
+    def filter(key, name)
+      self.class.new(select { |result| result[key] == name })
+    end
+  end
+
   class Nineteen
     BASE_URI = "https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/"
-    CONFIRMED = "time_series_19-covid-Confirmed.csv"
-    DEATHS = "time_series_19-covid-Deaths.csv"
-    RECOVERED = "time_series_19-covid-Recovered.csv"
+    CONFIRMED = "time_series_covid19_confirmed_global.csv"
+    DEATHS = "time_series_covid19_deaths_global.csv"
+    RECOVERED = "time_series_covid19_recovered_global.csv"
 
     def initialize(path)
       @path = path
     end
 
     def run
-      csv.map(&:to_h).to_json
+      Result.new(parsed_json)
     end
 
     def self.confirmed
@@ -39,10 +58,18 @@ module Covid
       CSV.parse(response, headers: true)
     end
 
+    def raw
+      csv.map(&:to_h).to_json
+    end
+
     def response
       Net::HTTP.get(uri)
     end
 
+    def parsed_json
+      JSON.parse(raw)
+    end
+
     def uri
       URI(BASE_URI + @path)
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: covid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Jonathan Thom
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,13 +52,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - jonathan.thom1990@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -79,7 +80,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/jonathanwthom/covid
   source_code_uri: https://github.com/jonathanwthom/covid
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: JSON wrapper around Johns Hopkins COVID-19 dataset
 test_files: []