ahl_scraper 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fc138bb02a9563b2b9a4940a15dd9bd6e56f56d5b7352bddbb09fb2a63a7c0d
-  data.tar.gz: 4292c6ed3cd9c4da7f92aa6b861fa2d40a7cc1c933962c8c55610e34819317f0
+  metadata.gz: 96ea396818543dee6748d5ebd32b0db5d72c8901f1fb87b152302065392dd54c
+  data.tar.gz: f6885cf29578adc5600be0f126df73dd7ab22db7b5729035bcabaa14a15dc257
 SHA512:
-  metadata.gz: cc5998864a75a5a351c2f42eb97066340e681024af5da5d766077dc80d581a5c767340aa9b5125d06da1e40cd615e1c7805d86a831b28f5174d3632dd6d6f14f
-  data.tar.gz: 8cb1e8fa0b79e50bacf1b4755120f3e41382b8f1b0fb542352af6ea744e62719b2c0b9cb821631c3efa3ffdef1491828742a519023b7eb9d300689f947a526ec
+  metadata.gz: 228d84267c85f593994851af53395c878505fd540cea3a94a037ea904a38315f0b86c68404e9a6fb6f096c84a5fb62595b8ee09543e61aa24e502172b83ed4a2
+  data.tar.gz: 9bc8c692ee1b2e27df73087d244042a150717f0dd489b417593ecd8ec7e55148c35f00bb7096564f30c6cf6b7263bbb76169f559ce530404d9455f0c7a9d158d

data/.tool-versions

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

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 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

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/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

@@ -32,7 +32,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 +48,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 +80,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 +92,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahl_scraper
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - jefftcraig
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-05-14 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: []