ahl_scraper 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 878af541d3e623e6e74955e4edb4fcb713b1ea05b6c536eac092508fce031914
-  data.tar.gz: bf55cecdad52ef86b8a133ae920cbd1c40d0fd95beffe75a804f03e3163091bc
+  metadata.gz: 8fc138bb02a9563b2b9a4940a15dd9bd6e56f56d5b7352bddbb09fb2a63a7c0d
+  data.tar.gz: 4292c6ed3cd9c4da7f92aa6b861fa2d40a7cc1c933962c8c55610e34819317f0
 SHA512:
-  metadata.gz: 7d0270faf84de38e464e30aebc1e8db595f2310b3bf2a950573c538acee01cf766b3e06b4293f3aacfe2db1177a4f08164bc610a13a6e4406ca3dac3351f69fa
-  data.tar.gz: e603bcb1f39ff49d68968a325aaa044d8287d9e0b40c1c72d9e61d79033d83d2cc03ca31717e28096516f9b05700922042a3679342a64b59c71ad9cdda5b6e24
+  metadata.gz: cc5998864a75a5a351c2f42eb97066340e681024af5da5d766077dc80d581a5c767340aa9b5125d06da1e40cd615e1c7805d86a831b28f5174d3632dd6d6f14f
+  data.tar.gz: 8cb1e8fa0b79e50bacf1b4755120f3e41382b8f1b0fb542352af6ea744e62719b2c0b9cb821631c3efa3ffdef1491828742a519023b7eb9d300689f947a526ec

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-2.7.3

data/CHANGELOG.md

@@ -1,5 +1,75 @@
 # CHANGELOG
 
+## 0.3.2
+
+## General
+
+- Changed `.split` to `&.split` and use `.dig` more to not fail when fields don't exist (often on games that have not finished)
+
+### Game::Goalie
+
+- Fix penalty minutes not being copied to the object because of a typo
+
+## 0.3.1
+
+### Scoreboards
+
+- Add new module for getting the scores seen at the top of the AHL website
+  - Retrieve Scoreboards based on a passed in date range
+
+### Game
+
+- Add postponed status to possible game statuses
+
+## 0.3.0
+
+### General
+
+- Upgrade project Ruby version to `2.7.3`
+- Update gem minimum version to `2.7.0`
+- Use JSON override for game `1003351` where goalie boxscore stats don't match goal records (see wiki)
+- Use term `handedness` for players
+- Added penalty ids to JSON override games
+
+### GameInfo
+
+- If game has not started set status to reflect that and include start time
+
+### Game
+
+- Current time will check for whether a game has started so that games that haven't been played yet will return nil
+
+### GameListItem
+
+- Use `dig` to be less error prone
+- Set status to `Not Started` if game status still shows start time
+
+### Games::Penalty
+
+- Add `id` field
+- Add `bench?` attribute for when bench minor penalty
+- Add `:penalty_shot` penalty type
+
+### PlayoffBracket
+
+- Hardcode wins needed for series to allow for accurate series statuses
+- Revamp `active?` logic to work even for finals (which remained set to active by AHL)
+- Stick with `home` and `away` teams instead of `team1` and `team2` for:
+  - `feeder_series1` to `home_feeder_series`
+  - `feeder_series2` to `away_feeder_series`
+  - `team1` to `home_team_id`
+  - `team2` to `away_team_id`
+- Change `winning_team` to `winning_team_id`
+- Add `wins_needed` attribute
+
+### Game::Skater
+
+- Use `p1_` for primary point short form instead of full words for `scoring_statline`
+
+### Season
+
+- Add `preseason` season type with appropriate abbreviations
+
 ## 0.2.0
 
 ### RosterPlayers

data/Gemfile

@@ -4,22 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in ahl_scraper.gemspec
 gemspec
-
-gem "json"
-gem "nokogiri"
-gem "rake", "~> 12.0"
-
-group :development do
-  gem "rubocop", "~> 0.89.0", require: false
-  gem "rubocop-performance", "~> 1.8.1", require: false
-  gem "solargraph"
-end
-
-group :development, :test do
-  gem "byebug"
-  gem "pry"
-  gem "pry-byebug"
-  gem "rspec", "~> 3.0"
-  gem "vcr"
-  gem "webmock", ">= 3.8.0"
-end

data/Gemfile.lock

@@ -1,31 +1,37 @@
 PATH
   remote: .
   specs:
-    ahl_scraper (0.2.0)
+    ahl_scraper (0.3.1)
+      json (~> 2.5.1)
+      nokogiri (~> 1.12.4)
+      rake (~> 13.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
-    backport (1.1.2)
-    benchmark (0.1.0)
+    ast (2.4.2)
+    backport (1.2.0)
+    benchmark (0.1.1)
     byebug (11.1.3)
     coderay (1.1.3)
-    crack (0.4.4)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
     e2mmap (0.1.0)
     hashdiff (1.0.1)
     jaro_winkler (1.5.4)
-    json (2.3.1)
-    maruku (0.7.3)
+    json (2.5.1)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.20.1)
-    parser (2.7.2.0)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -34,25 +40,26 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rainbow (3.0.0)
-    rake (12.3.3)
-    regexp_parser (2.0.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
     reverse_markdown (2.0.0)
       nokogiri
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
+    rspec-support (3.10.2)
     rubocop (0.89.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
@@ -67,47 +74,45 @@ GEM
     rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.10.1)
-    solargraph (0.39.17)
-      backport (~> 1.1)
+    ruby-progressbar (1.11.0)
+    solargraph (0.43.3)
+      backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
+      diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
-      maruku (~> 0.7, >= 0.7.3)
-      nokogiri (~> 1.9, >= 1.9.1)
-      parser (~> 2.3)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
       reverse_markdown (>= 1.0.5, < 3)
-      rubocop (~> 0.52)
+      rubocop (>= 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
     vcr (6.0.0)
-    webmock (3.10.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.25)
+    yard (0.9.26)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   ahl_scraper!
-  byebug
-  json
-  nokogiri
-  pry
-  pry-byebug
-  rake (~> 12.0)
+  byebug (~> 11.1.3)
+  pry (~> 0.13.1)
+  pry-byebug (~> 3.9.0)
   rspec (~> 3.0)
   rubocop (~> 0.89.0)
   rubocop-performance (~> 1.8.1)
-  solargraph
-  vcr
+  solargraph (~> 0.43.0)
+  vcr (~> 6.0.0)
   webmock (>= 3.8.0)
 
 BUNDLED WITH

data/ahl_scraper.gemspec

@@ -12,12 +12,26 @@ Gem::Specification.new do |spec|
   spec.description   = "Allows users to gather game, season, and player data from the AHL website"
   spec.homepage      = "http://www.ahltracker.com"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = "https://github.com/notnotjeff/ahl_scraper"
   spec.metadata["source_code_uri"] = "https://github.com/notnotjeff/ahl_scraper"
   spec.metadata["changelog_uri"] = "https://github.com/notnotjeff/ahl_scraper"
 
+  spec.add_dependency "json", "~> 2.5.1"
+  spec.add_dependency "nokogiri", "~> 1.12.4"
+  spec.add_dependency "rake", "~> 13.0.0"
+
+  spec.add_development_dependency "byebug", "~> 11.1.3"
+  spec.add_development_dependency "pry", "~> 0.13.1"
+  spec.add_development_dependency "pry-byebug", "~> 3.9.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop", "~> 0.89.0"
+  spec.add_development_dependency "rubocop-performance", "~> 1.8.1"
+  spec.add_development_dependency "solargraph", "~> 0.43.0"
+  spec.add_development_dependency "vcr", "~> 6.0.0"
+  spec.add_development_dependency "webmock", ">= 3.8.0"
+
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end

data/lib/ahl_scraper/fetchers/game_data_fetcher.rb

@@ -2,7 +2,7 @@
 
 module AhlScraper
   class GameDataFetcher
-    BROKEN_GAMES = [1_018_774, 1_001_050, 1_020_527].freeze
+    BROKEN_GAMES = [1_018_774, 1_001_050, 1_020_527, 1_003_351].freeze
 
     def initialize(game_id)
       @game_id = game_id

data/lib/ahl_scraper/fetchers/player_data_fetcher.rb

@@ -18,7 +18,7 @@ module AhlScraper
 
     def player_data_without_bio
       data = Nokogiri::HTML(URI.parse(url).open).text[5..-2]
-      bio = data[/\"bio"\:(.*?)\,\"teamName/m, 1]
+      bio = data[/"bio":(.*?),"teamName/m, 1]
       data.gsub(bio, "\"\"")
     end
   end

data/lib/ahl_scraper/fetchers/player_games/data_fetcher.rb

@@ -22,7 +22,7 @@ module AhlScraper
 
       def player_data_without_bio
         data = Nokogiri::HTML(URI.parse(url).open).text[5..-2]
-        bio = data[/\"bio"\:(.*?)\,\"teamName/m, 1]
+        bio = data[/"bio":(.*?),"teamName/m, 1]
         data.gsub(bio, "\"\"")
       end
     end

data/lib/ahl_scraper/fetchers/scoreboards/data_fetcher.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module AhlScraper
+  module Scoreboards
+    class DataFetcher
+      def initialize(start_date:, end_date:)
+        @start_date = start_date
+        @end_date = end_date
+      end
+
+      def call
+        JSON.parse(Nokogiri::HTML(URI.parse(url).open).text[5..-2], symbolize_names: true)&.dig(:SiteKit, :Scorebar)&.filter do |game|
+          game_date = Date.parse(game[:Date])
+          game_date >= @start_date && game_date <= @end_date
+        end
+      end
+
+      private
+
+      def url
+        "https://lscluster.hockeytech.com/feed/index.php?feed=modulekit&key=ccb91f29d6744675&client_code=ahl&view=scorebar&numberofdaysahead=#{days_ahead}&numberofdaysback=#{days_back}&fmt=json&site_id=3&lang=en&league_id=4&division_id=undefined&callback=json" # rubocop:disable Layout/LineLength
+      end
+
+      def days_back
+        date_today > @start_date ? (date_today - @start_date).to_i : 0
+      end
+
+      def days_ahead
+        date_today < @end_date ? (@end_date - date_today).to_i : 0
+      end
+
+      def date_today
+        @date_today ||= Date.today
+      end
+    end
+  end
+end

data/lib/ahl_scraper/fetchers/season_type_fetcher.rb

@@ -7,8 +7,7 @@ module AhlScraper
     end
 
     def call
-      season = JSON.parse(Nokogiri::HTML(URI.parse(url).open).text[5..-2], symbolize_names: true)
-        .dig(:seasons)
+      season = JSON.parse(Nokogiri::HTML(URI.parse(url).open).text[5..-2], symbolize_names: true)[:seasons]
         &.find { |s| s[:id].to_i == @season_id.to_i }
       return nil unless season
 

data/lib/ahl_scraper/fixed_games/1001050.json

@@ -1224,7 +1224,7 @@
       ],
       "penalties": [
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 202,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "0:40",
           "againstTeam": {
@@ -1259,7 +1259,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 203,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "3:00",
           "againstTeam": {
@@ -1294,7 +1294,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 204,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "6:29",
           "againstTeam": {
@@ -1329,7 +1329,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 207,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "8:19",
           "againstTeam": {
@@ -1364,7 +1364,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 211,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "8:59",
           "againstTeam": {
@@ -1399,7 +1399,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 227,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "17:54",
           "againstTeam": {
@@ -1446,7 +1446,7 @@
       "goals": [],
       "penalties": [
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 243,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "2:52",
           "againstTeam": {
@@ -1481,7 +1481,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 252,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "5:31",
           "againstTeam": {
@@ -1516,7 +1516,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 254,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "8:05",
           "againstTeam": {
@@ -1551,7 +1551,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 255,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "13:02",
           "againstTeam": {
@@ -1586,7 +1586,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 260,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "14:16",
           "againstTeam": {
@@ -1894,7 +1894,7 @@
       ],
       "penalties": [
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 261,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "1:32",
           "againstTeam": {
@@ -1929,7 +1929,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 278,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "5:51",
           "againstTeam": {
@@ -1964,7 +1964,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 281,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "10:22",
           "againstTeam": {
@@ -1999,7 +1999,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 332,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "12:05",
           "againstTeam": {
@@ -2034,7 +2034,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 340,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "15:53",
           "againstTeam": {
@@ -2069,7 +2069,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 355,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "15:53",
           "againstTeam": {
@@ -2104,7 +2104,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 363,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "17:11",
           "againstTeam": {