ahl_scraper 0.2.0 → 0.3.0

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

@@ -17,21 +17,7 @@ module AhlScraper
           a1_id = goal[:assists][0]&.dig(:id) && scoring_statlines[goal[:assists][0]&.dig(:id).to_s] ? goal[:assists][0]&.dig(:id).to_s : false # Make sure assist exists and does not belong to goalie
           a2_id = goal[:assists][1]&.dig(:id) && scoring_statlines[goal[:assists][1]&.dig(:id).to_s] ? goal[:assists][1]&.dig(:id).to_s : false # Make sure assist exists and does not belong to goalie
 
-          add_points(goalscorer_id, a1_id, a2_id, "as")
-          if goal[:properties][:isPenaltyShot].to_i.positive?
-            scoring_statlines[goalscorer_id][:goals_ps] += 1
-          elsif extra_skater?(goal, plus_player_count, minus_player_count)
-            add_points(goalscorer_id, a1_id, a2_id, "ex")
-          elsif goal[:properties][:isEmptyNet].to_i.positive?
-            add_points(goalscorer_id, a1_id, a2_id, "en")
-          elsif goal[:properties][:isPowerPlay].to_i.positive?
-            add_points(goalscorer_id, a1_id, a2_id, "pp")
-          elsif goal[:properties][:isShortHanded].to_i.positive?
-            add_points(goalscorer_id, a1_id, a2_id, "sh")
-          elsif plus_player_count == minus_player_count
-            add_points(goalscorer_id, a1_id, a2_id, "ev")
-            add_points(goalscorer_id, a1_id, a2_id, "5v5") if plus_player_count == 5 && minus_player_count == 5
-          end
+          add_to_statline(goal, plus_player_count, minus_player_count, goalscorer_id, a1_id, a2_id)
         end
 
         scoring_statlines
@@ -39,6 +25,24 @@ module AhlScraper
 
       private
 
+      def add_to_statline(goal, plus_player_count, minus_player_count, goalscorer_id, a1_id, a2_id)
+        add_points(goalscorer_id, a1_id, a2_id, "as")
+        if goal[:properties][:isPenaltyShot].to_i.positive?
+          scoring_statlines[goalscorer_id][:goals_ps] += 1
+        elsif extra_skater?(goal, plus_player_count, minus_player_count)
+          add_points(goalscorer_id, a1_id, a2_id, "ex")
+        elsif goal[:properties][:isEmptyNet].to_i.positive?
+          add_points(goalscorer_id, a1_id, a2_id, "en")
+        elsif goal[:properties][:isPowerPlay].to_i.positive?
+          add_points(goalscorer_id, a1_id, a2_id, "pp")
+        elsif goal[:properties][:isShortHanded].to_i.positive?
+          add_points(goalscorer_id, a1_id, a2_id, "sh")
+        elsif plus_player_count == minus_player_count
+          add_points(goalscorer_id, a1_id, a2_id, "ev")
+          add_points(goalscorer_id, a1_id, a2_id, "5v5") if plus_player_count == 5 && minus_player_count == 5
+        end
+      end
+
       def scoring_statlines
         @scoring_statlines ||= @skater_ids.map { |s_id| [s_id.to_s, blank_statline] }.to_h
       end
@@ -49,50 +53,50 @@ module AhlScraper
           a1_as: 0,
           a2_as: 0,
           points_as: 0,
-          primary_points_as: 0,
+          p1_as: 0,
           goals_ps: 0,
-          primary_points_ps: 0,
+          p1_ps: 0,
           goals_ev: 0,
           a1_ev: 0,
           a2_ev: 0,
           points_ev: 0,
-          primary_points_ev: 0,
+          p1_ev: 0,
           goals_5v5: 0,
           a1_5v5: 0,
           a2_5v5: 0,
           points_5v5: 0,
-          primary_points_5v5: 0,
+          p1_5v5: 0,
           goals_pp: 0,
           a1_pp: 0,
           a2_pp: 0,
           points_pp: 0,
-          primary_points_pp: 0,
+          p1_pp: 0,
           goals_sh: 0,
           a1_sh: 0,
           a2_sh: 0,
           points_sh: 0,
-          primary_points_sh: 0,
+          p1_sh: 0,
           goals_ex: 0,
           a1_ex: 0,
           a2_ex: 0,
           points_ex: 0,
-          primary_points_ex: 0,
+          p1_ex: 0,
           goals_en: 0,
           a1_en: 0,
           a2_en: 0,
           points_en: 0,
-          primary_points_en: 0,
+          p1_en: 0,
         }
       end
 
       def add_points(goalscorer_id, a1_id, a2_id, situation)
         if goalscorer_id
           scoring_statlines[goalscorer_id]["goals_#{situation}".to_sym] += 1
-          scoring_statlines[goalscorer_id]["primary_points_#{situation}".to_sym] += 1
+          scoring_statlines[goalscorer_id]["p1_#{situation}".to_sym] += 1
         end
         if a1_id
           scoring_statlines[a1_id]["a1_#{situation}".to_sym] += 1
-          scoring_statlines[a1_id]["primary_points_#{situation}".to_sym] += 1
+          scoring_statlines[a1_id]["p1_#{situation}".to_sym] += 1
         end
         scoring_statlines[a2_id]["a2_#{situation}".to_sym] += 1 if a2_id
 

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

@@ -70,7 +70,7 @@ module AhlScraper
         }
       end
 
-      def goal_against(goal)
+      def goal_against(goal) # rubocop:disable Metrics/AbcSize
         @on_ice_statline[:ga_as] += 1
         if goal[:plus_players].length >= 3 && goal[:minus_players].length >= 3 && goal[:plus_players].length <= 6 && goal[:minus_players].length <= 6
           @on_ice_statline["ga_#{goal[:minus_players].length}v#{goal[:plus_players].length}".to_sym] += 1

data/lib/ahl_scraper/team_games.rb

@@ -8,7 +8,9 @@ module AhlScraper
 
     class << self
       def list(team_id, season_id)
-        @season_games["#{team_id}-#{season_id}"] ||= DataFetcher.new(team_id, season_id).call&.map { |team_data| TeamGameListItem.new(team_data, { team_id: team_id }) }
+        @season_games["#{team_id}-#{season_id}"] ||= DataFetcher.new(team_id, season_id).call&.map do |team_data|
+          TeamGameListItem.new(team_data, { team_id: team_id })
+        end
 
         @season_games["#{team_id}-#{season_id}"]
       end

data/lib/ahl_scraper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahl_scraper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - jefftcraig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies: []
 description: Allows users to gather game, season, and player data from the AHL website
 email:
@@ -50,6 +50,7 @@ files:
 - lib/ahl_scraper/fetchers/team_games/data_fetcher.rb
 - lib/ahl_scraper/fetchers/team_roster_data_fetcher.rb
 - lib/ahl_scraper/fixed_games/1001050.json
+- lib/ahl_scraper/fixed_games/1003351.json
 - lib/ahl_scraper/fixed_games/1018774.json
 - lib/ahl_scraper/fixed_games/1020527.json
 - lib/ahl_scraper/games.rb
@@ -125,14 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Scrape data from the AHL website