ahl_scraper 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285012122b98f5d30bb129fb94766a02405f10217340001caea0627be4422075
-  data.tar.gz: f52ca819c0d8c6c7882639aa143695f54cd8d4c8c3f8baac9f1ccf58796e0a6e
+  metadata.gz: b20a1f72dc69a61ddd7568c5ef2eeca67f133bbcdd22f0e94d941ada6ee1e479
+  data.tar.gz: f3d310aee075a7cd08f3a8d329c359e974816287c4f768e231c4e50643dabc35
 SHA512:
-  metadata.gz: 2daa503ec4b26ce5f50979394ca64de5a8b9be4fdb1c9df792ef5746abfcae38fd58613132bdb8de2336643844d8624e12aec70f1b703b5ad9f1dbb5416d8496
-  data.tar.gz: 8419279fb2c98a65d54b5103052ee54eb9dfc2a7570db1e29decfac10a635af820fbe2ca369664a3bc0585afb221ec8b92dfafd1130892fc066249f228debd5a
+  metadata.gz: e4b5912e8c6819fd3f45ff7a6f9919fe307ebdf7d554c27d2cebe6bd59452bb5a7f708f86b02bcee4fe1d2be33305264ef39a794d7d7ae5a8f8152b7a6bc4147
+  data.tar.gz: e99c4087b80330d517b2f73027e82a31b32941b1b5d36741c4be0f969fa2ce7bf9d1dbc7bf0beb12d0507a0f7bd3b01138d4df99c8b2186d06b2732d58ee5499

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.3

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # CHANGELOG
 
+## 0.3.4
+
+## PlayoffBrackets::Series
+
+- Add new series wins required for current playoffs (2022 with id `76`)
+
+## 0.3.3
+
+## Developer
+
+- Added `.tool-versions` file for `asdf` package manager use
+
+## PlayoffBrackets::Round
+
+- Add `active?` attribute which checks if any series is active, if so it returns truthy, else falsey
+
+## PlayoffBrackets::Series
+
+- Add check for existance of team ids for `active?` attribute to be truthy
+
+## 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ahl_scraper (0.3.1)
+    ahl_scraper (0.3.3)
       json (~> 2.5.1)
       nokogiri (~> 1.12.4)
       rake (~> 13.0.0)
@@ -13,25 +13,25 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     backport (1.2.0)
-    benchmark (0.1.1)
+    benchmark (0.2.0)
     byebug (11.1.3)
     coderay (1.1.3)
     crack (0.4.5)
       rexml
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     e2mmap (0.1.0)
     hashdiff (1.0.1)
     jaro_winkler (1.5.4)
     json (2.5.1)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     method_source (1.0.0)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.12.5-arm64-darwin)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -39,27 +39,27 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rainbow (3.0.0)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
-    reverse_markdown (2.0.0)
+    regexp_parser (2.3.1)
+    reverse_markdown (2.1.1)
       nokogiri
     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.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (0.89.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
@@ -90,7 +90,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     unicode-display_width (1.8.0)
     vcr (6.0.0)
@@ -98,10 +98,12 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.26)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
-  x86_64-darwin-19
+  arm64-darwin-21
 
 DEPENDENCIES
   ahl_scraper!
@@ -116,4 +118,4 @@ DEPENDENCIES
   webmock (>= 3.8.0)
 
 BUNDLED WITH
-   2.2.17
+   2.3.12

data/lib/ahl_scraper/helpers/ice_time_helper.rb

@@ -9,7 +9,9 @@ module AhlScraper
     end
 
     def to_seconds
-      ice_time = time.split(":")
+      return unless time
+
+      ice_time = time&.split(":")
       ice_time[0].to_i * 60 + ice_time[1].to_i
     end
 

data/lib/ahl_scraper/helpers/period_time_helper.rb

@@ -10,12 +10,16 @@ module AhlScraper
     end
 
     def to_period_seconds
-      period_time = time.split(":")
+      return unless time
+
+      period_time = time&.split(":")
       period_time[0].to_i * 60 + period_time[1].to_i
     end
 
     def to_time_elapsed
-      period_time = time.split(":")
+      return unless time
+
+      period_time = time&.split(":")
       period_time[0].to_i * 60 + period_time[1].to_i + ((period - 1) * 1200)
     end
 

data/lib/ahl_scraper/resources/game.rb

@@ -344,12 +344,12 @@ module AhlScraper
       irregular_game_status = IRREGULAR_GAMES.dig(game_id.to_s, :status)
       return irregular_game_status if irregular_game_status
 
-      return "postponed" if @raw_data[:details][:status] == "Postponed"
+      return "postponed" if @raw_data.dig(:details, :status) == "Postponed"
       # return "forfeited" if game is a forfeit, need to figure this out if it happens
 
-      return "finished" if @raw_data[:details][:final] == "1"
+      return "finished" if @raw_data.dig(:details, :final) == "1"
 
-      return "in_progress" if @raw_data[:details][:started] == "1"
+      return "in_progress" if @raw_data.dig(:details, :started) == "1"
 
       "not_started"
     end

data/lib/ahl_scraper/resources/games/goalie.rb

@@ -44,7 +44,7 @@ module AhlScraper
           goals: @raw_data[:stats][:goals],
           assists: @raw_data[:stats][:assists],
           points: @raw_data[:stats][:points],
-          penalty_minutes: @raw_data[:stats][:penaltyMinute],
+          penalty_minutes: @raw_data[:stats][:penaltyMinutes],
           toi: @raw_data[:stats][:timeOnIce],
           toi_in_seconds: set_time_on_ice_in_seconds,
           shots_against: @raw_data[:stats][:shotsAgainst],

data/lib/ahl_scraper/resources/games/penalty_shot.rb

@@ -72,11 +72,6 @@ module AhlScraper
       def period_time
         @period_time ||= PeriodTimeHelper.new(time, period)
       end
-
-      def convert_time(game_time)
-        time = game_time.split(":")
-        time[0].to_i * 60 + time[1].to_i
-      end
     end
   end
 end

data/lib/ahl_scraper/resources/playoff_bracket.rb

@@ -11,7 +11,7 @@ module AhlScraper
     end
 
     def rounds
-      @rounds ||= @raw_data[:rounds].map { |round| PlayoffBrackets::Round.new(round, { raw_data: @raw_data }) }
+      @rounds ||= @raw_data[:rounds].map { |round| PlayoffBrackets::Round.new(round, { bracket_data: @raw_data }) }
     end
 
     def logo_url

data/lib/ahl_scraper/resources/playoff_brackets/round.rb

@@ -23,6 +23,11 @@ module AhlScraper
         @round_type_name ||= @raw_data[:round_type_name]
       end
 
+      def active?
+        @active = series.filter(&:active?).any? if @active.nil?
+        @active
+      end
+
       def series
         @series ||= @raw_data[:matchups].map { |series| Series.new(series, { bracket_data: @opts[:bracket_data] }) }
       end

data/lib/ahl_scraper/resources/playoff_brackets/series.rb

@@ -13,6 +13,7 @@ module AhlScraper
         "7" => { "1" => 4 },
         "69" => { "1" => 4 },
         "72" => { "1" => 1, "2" => 1, "3" => 2, "4" => 2 },
+        "76" => { "1" => 3, "2" => 3, "3" => 4, "4" => 4, "5" => 4 },
       }.freeze
 
       def id
@@ -32,7 +33,7 @@ module AhlScraper
       end
 
       def active?
-        @active ||= @raw_data[:active] == "1" && team1_wins < wins_needed && team2_wins < wins_needed
+        @active ||= @raw_data[:active] == "1" && team_ids_present? && team1_wins < wins_needed && team2_wins < wins_needed
       end
 
       def home_feeder_series
@@ -48,11 +49,13 @@ module AhlScraper
       end
 
       def home_team_id
-        @home_team_id ||= first_game[:home_team].to_i
+        @home_team_id = first_game&.dig(:home_team)&.to_i if @home_team_id.nil?
+        @home_team_id
       end
 
       def away_team_id
-        @away_team_id ||= first_game[:visiting_team].to_i
+        @away_team_id = first_game&.dig(:visiting_team)&.to_i if @away_team_id.nil?
+        @away_team_id
       end
 
       def home_team_wins
@@ -78,7 +81,7 @@ module AhlScraper
       private
 
       def first_game
-        @first_game ||= @raw_data[:games][0]
+        @first_game ||= @raw_data.dig(:games, 0)
       end
 
       def find_winner
@@ -90,23 +93,27 @@ module AhlScraper
       end
 
       def season_id
-        @opts[:bracket_data]&.dig(:rounds, round - 1, :season_id)
+        @opts.dig(:bracket_data, :rounds, round - 1, :season_id)
       end
 
       def team1
-        @team1 ||= @raw_data[:team1].to_i
+        @team1 ||= @raw_data[:team1].to_i.zero? ? nil : @raw_data[:team1].to_i
       end
 
       def team2
-        @team2 ||= @raw_data[:team2].to_i
+        @team2 ||= @raw_data[:team2].to_i.zero? ? nil : @raw_data[:team2].to_i
+      end
+
+      def team_ids_present?
+        team1 && team2
       end
 
       def team1_wins
-        @team1_wins ||= @raw_data[:team1_wins]
+        @team1_wins ||= @raw_data[:team1_wins].to_i
       end
 
       def team2_wins
-        @team2_wins ||= @raw_data[:team2_wins]
+        @team2_wins ||= @raw_data[:team2_wins].to_i
       end
     end
   end

data/lib/ahl_scraper/resources/seasons/team.rb

@@ -51,11 +51,11 @@ module AhlScraper
       end
 
       def city
-        @city ||= full_name.split.length > 2 ? exception_split_object&.dig(:city) : full_name.split[0]
+        @city ||= full_name&.split.length > 2 ? exception_split_object&.dig(:city) : full_name&.split[0]
       end
 
       def name
-        @name ||= full_name.split.length > 2 ? exception_split_object&.dig(:name) : full_name.split[1]
+        @name ||= full_name&.split.length > 2 ? exception_split_object&.dig(:name) : full_name&.split[1]
       end
 
       def game_file_city

data/lib/ahl_scraper/services/games/penalty_shots_service.rb

@@ -17,14 +17,9 @@ module AhlScraper
 
       def ordered_penalty_shots
         @ordered_penalty_shots ||= penalty_shot_data.sort do |a, b|
-          [a[:period][:id].to_i, convert_time(a[:time])] <=> [b[:period][:id].to_i, convert_time(b[:time])]
+          [a[:period][:id].to_i, IceTimeHelper.new(a[:time]).to_sec] <=> [b[:period][:id].to_i, IceTimeHelper.new(b[:time]).to_sec]
         end
       end
-
-      def convert_time(game_time)
-        time = game_time.split(":")
-        time[0].to_i * 60 + time[1].to_i
-      end
     end
   end
 end

data/lib/ahl_scraper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AhlScraper
-  VERSION = "0.3.1"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahl_scraper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - jefftcraig
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -190,6 +190,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".solargraph.yml"
+- ".tool-versions"
 - ".travis.yml"
 - ".vscode/settings.json"
 - CHANGELOG.md
@@ -290,7 +291,7 @@ metadata:
   homepage_uri: https://github.com/notnotjeff/ahl_scraper
   source_code_uri: https://github.com/notnotjeff/ahl_scraper
   changelog_uri: https://github.com/notnotjeff/ahl_scraper
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -306,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Scrape data from the AHL website
 test_files: []