ahl_scraper 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e4430a39581a934ebf5d3513e007736adb1b24b384468fe21a2db916ec44c8
-  data.tar.gz: 2a8ed5d74db57a07651f18e456c6f275d41801512f5c5a632e0630030af62d4f
+  metadata.gz: 19ac0b14d0b335af57c72d9a95ddbe1ed7c674990f56a52962e01ecd6112d4f5
+  data.tar.gz: 27eb465a69a64ee0c5171edbed58bea880901c5b9953dc91f6aacd75d01141b5
 SHA512:
-  metadata.gz: b02c8b0d834ea69ceaad08077e2d84a7fbe75ad327987a77ccce96500ae4f4b8f6a7ec9215e89e1221788ba0c0441c23200febb526cfd9bc6297ea7b71b5b9da
-  data.tar.gz: a773e783e8df81e10e2ce323cc3d53ca6e94a0f11fe1bc8d58d16b669fe701d1e32baf7be2e9f6cff80dc258a4005f15200c78f37b3199d6134dbc10d2391c2d
+  metadata.gz: 81e272f8523db112eabe3c4f1127b83e83593f8685eb567d851941f7f1d81411d5ffabd270a6afc86573af6426d247c83292dbd09e1e71f241d4d93ca3edfcff
+  data.tar.gz: '084d82bd3ca33d37aab4af2fd15a37508af4a67422069a5bed32466ee14bd9b28a194ec8e40dd39c37e42029bb5e55a6f6ba5aa4bf9e00c14eeb5881cc46209d'

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# GitHub recommends pinning actions to a commit SHA.
+# To get a newer version, you will need to update the SHA.
+# You can also reference a tag or branch, but the action may change without warning.
+
+name: Tests
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        with:
+          ruby-version: '2.7.3'
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## 0.3.7
+
+### PlayoffBrackets::Series
+
+- Add playoff season `80` to series wins needed dictionary
+- Add default wins needed to dictionary and use for future seasons
+
+## 0.3.6
+
+### Game
+- Add `suspended` game status
+
+### PlayoffBrackets::Round
+
+- Add `started?` for when round has started (even if it is finished)
+- Add `active?` for when round has active series
+- Add `finished?` for when round has started and has no active series
+
+### PlayoffBrackets::Series
+
+- Fix `active?` to properly assess `active: "1"` meaning has started but not necessarily currently active
+- Added `started?` which now uses `active: "1"` to determine if the series has started
+- Set round one series win count needed to `2` for season `76`
+
 ## 0.3.5
 
 ### Developer

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ahl_scraper (0.3.3)
+    ahl_scraper (0.3.7)
       json (~> 2.5.1)
       nokogiri (~> 1.12.4)
       rake (~> 13.0.0)
@@ -118,4 +118,4 @@ DEPENDENCIES
   webmock (>= 3.8.0)
 
 BUNDLED WITH
-   2.3.12
+   2.3.20

data/lib/ahl_scraper/resources/game.rb

@@ -344,7 +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.dig(:details, :status) == "Postponed"
+      game_status = @raw_data.dig(:details, :status)
+
+      return "suspended" unless game_status.match(/Suspended/).nil?
+
+      return "postponed" if game_status == "Postponed"
+
       # return "forfeited" if game is a forfeit, need to figure this out if it happens
 
       return "finished" if @raw_data.dig(:details, :final) == "1"

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

@@ -23,13 +23,23 @@ module AhlScraper
         @round_type_name ||= @raw_data[:round_type_name]
       end
 
+      def series
+        @series ||= @raw_data[:matchups].map { |series| Series.new(series, { bracket_data: @opts[:bracket_data] }) }
+      end
+
+      def started?
+        @started = active? || finished? if @started.nil?
+        @started
+      end
+
       def active?
-        @active = series.filter(&:active?).any? if @active.nil?
+        @active = series.map(&:active?).any?(true) if @active.nil?
         @active
       end
 
-      def series
-        @series ||= @raw_data[:matchups].map { |series| Series.new(series, { bracket_data: @opts[:bracket_data] }) }
+      def finished?
+        @finished = series.map(&:finished?).none?(false) && !active? if @finished.nil?
+        @finished
       end
     end
   end

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

@@ -13,7 +13,9 @@ 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 },
+        "76" => { "1" => 2, "2" => 3, "3" => 4, "4" => 4, "5" => 4 },
+        "80" => { "1" => 2, "2" => 3, "3" => 3, "4" => 4, "5" => 4 },
+        "default" => { "1" => 2, "2" => 3, "3" => 3, "4" => 4, "5" => 4 },
       }.freeze
 
       def id
@@ -24,6 +26,10 @@ module AhlScraper
         @name ||= @raw_data[:series_name]
       end
 
+      def season_id
+        @season_id ||= find_season_id
+      end
+
       def logo_url
         @logo_url ||= @raw_data[:series_logo]
       end
@@ -32,8 +38,14 @@ module AhlScraper
         @round ||= @raw_data[:round].to_i
       end
 
+      def started?
+        @started = @raw_data[:active] == "1" if @started.nil?
+        @started
+      end
+
       def active?
-        @active ||= @raw_data[:active] == "1" && team_ids_present? && team1_wins < wins_needed && team2_wins < wins_needed
+        @active ||= team_ids_present? && team1_wins < wins_needed && team2_wins < wins_needed if @active.nil?
+        @active
       end
 
       def home_feeder_series
@@ -75,11 +87,32 @@ module AhlScraper
       end
 
       def wins_needed
-        @wins_needed ||= OVERRIDE_WINS_NEEDED.dig(season_id, round.to_s) || (round == 1 ? 3 : 4)
+        @wins_needed ||= find_wins_needed
+      end
+
+      def finished?
+        @finished = winning_team_id.present? if @finished.nil?
+        @finished
       end
 
       private
 
+      def find_wins_needed
+        return OVERRIDE_WINS_NEEDED.dig(season_id.to_s, round.to_s) unless OVERRIDE_WINS_NEEDED.dig(season_id.to_s, round.to_s).nil?
+
+        return (round == 1 ? 3 : 4) if season_id.to_i < OVERRIDE_WINS_NEEDED.keys.map(&:to_i).max
+
+        OVERRIDE_WINS_NEEDED.dig("default", round.to_s)
+      end
+
+      def find_season_id
+        dig_season_id = @opts.dig(:bracket_data, :rounds, round - 1, :season_id)
+
+        return if dig_season_id.nil? || dig_season_id.empty?
+
+        dig_season_id.to_i
+      end
+
       def first_game
         @first_game ||= @raw_data.dig(:games, 0)
       end
@@ -92,10 +125,6 @@ module AhlScraper
         nil
       end
 
-      def season_id
-        @opts.dig(:bracket_data, :rounds, round - 1, :season_id)
-      end
-
       def team1
         @team1 ||= @raw_data[:team1].to_i.zero? ? nil : @raw_data[:team1].to_i
       end
@@ -105,7 +134,7 @@ module AhlScraper
       end
 
       def team_ids_present?
-        team1 && team2
+        !team1.nil? && !team2.nil?
       end
 
       def team1_wins

data/lib/ahl_scraper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahl_scraper
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - jefftcraig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -185,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"