ahl_scraper 0.2.0 → 0.3.2

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module AhlScraper
+  module Scoreboards
+    class Team < Resource
+      def id
+        @id ||= @raw_data[:id].to_i
+      end
+
+      def abbreviation
+        @abbreviation ||= @raw_data[:abbreviation]
+      end
+
+      def city
+        @city ||= @raw_data[:city]
+      end
+
+      def name
+        @name ||= @raw_data[:name]
+      end
+
+      def full_name
+        @full_name ||= @raw_data[:full_name]
+      end
+
+      def division
+        @division ||= @raw_data[:division]
+      end
+
+      def score
+        @score ||= @raw_data[:score].to_i
+      end
+
+      def audio_url
+        @audio_url ||= @raw_data[:audio_url]
+      end
+
+      def video_url
+        @video_url ||= @raw_data[:video_url]
+      end
+
+      def webcasts_url
+        @webcasts_url ||= @raw_data[:webcasts_url]
+      end
+
+      def wins
+        @wins ||= @raw_data[:wins].to_i
+      end
+
+      def regulation_losses
+        @regulation_losses ||= @raw_data[:regulation_losses].to_i
+      end
+
+      def ot_losses
+        @ot_losses ||= @raw_data[:ot_losses].to_i
+      end
+
+      def shootout_losses
+        @shootout_losses ||= @raw_data[:shootout_losses].to_i
+      end
+
+      def logo
+        @logo ||= @raw_data[:logo]
+      end
+    end
+  end
+end

data/lib/ahl_scraper/resources/season.rb

@@ -4,7 +4,8 @@ module AhlScraper
   class Season < Resource
     attr_reader :id, :name, :season_type
 
-    def initialize(raw_data)
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
       @id = raw_data[:id].to_i
       @name = raw_data[:name]
       @season_type = set_season_type
@@ -15,13 +16,15 @@ module AhlScraper
       @abbreviation ||=
         case season_type
         when :regular
-          "#{start_year.to_s[-2..-1]}-#{end_year.to_s[-2..-1]}"
+          "#{start_year.to_s[-2..]}-#{end_year.to_s[-2..]}"
         when :playoffs
-          "#{start_year.to_s[-2..-1]}PO"
+          "#{start_year.to_s[-2..]}PO"
         when :all_star_game
-          "#{start_year.to_s[-2..-1]}ASG"
+          "#{start_year.to_s[-2..]}ASG"
         when :exhibition
-          "#{start_year.to_s[-2..-1]}-#{end_year.to_s[-2..-1]}EX"
+          "#{start_year.to_s[-2..]}-#{end_year.to_s[-2..]}EX"
+        when :preseason
+          "#{start_year.to_s[-2..]}PS"
         end
     end
 
@@ -29,8 +32,8 @@ module AhlScraper
       @start_year ||=
         case season_type
         when :regular, :exhibition
-          name[/(.*?)\-/].to_i
-        when :playoffs, :all_star_game
+          name[/(.*?)-/].to_i
+        when :playoffs, :all_star_game, :preseason
           name[/(.*?) /].to_i
         end
     end
@@ -48,7 +51,7 @@ module AhlScraper
         case season_type
         when :regular, :exhibition
           start_year + 1
-        when :playoffs, :all_star_game
+        when :playoffs, :all_star_game, :preseason
           start_year
         end
     end
@@ -73,6 +76,8 @@ module AhlScraper
         :playoffs
       when /Regular/
         :regular
+      when /Preseason/
+        :preseason
       end
     end
 

data/lib/ahl_scraper/resources/season_list_item.rb

@@ -2,8 +2,8 @@
 
 module AhlScraper
   class SeasonListItem < Resource
-    def initialize(raw_data)
-      @raw_data = raw_data
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def id

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

@@ -28,8 +28,8 @@ module AhlScraper
         "henderson-silver-knights" => { city: "Henderson", name: "Silver Knights" },
       }.freeze
 
-      def initialize(raw_data, division)
-        @raw_data = raw_data
+      def initialize(raw_data, division, opts = {})
+        super(raw_data, opts)
         @division = division
       end
 
@@ -42,7 +42,8 @@ module AhlScraper
       end
 
       def abbreviation
-        @abbreviation ||= EXCEPTIONS[parameterized_name]&.dig(:abbreviation) || @raw_data.dig(:row, :team_code)&.delete_prefix("y -")&.delete_prefix("x -")&.delete_prefix("xy -")&.strip
+        @abbreviation ||= EXCEPTIONS[parameterized_name]&.dig(:abbreviation) || @raw_data.dig(:row,
+          :team_code)&.delete_prefix("y -")&.delete_prefix("x -")&.delete_prefix("xy -")&.strip
       end
 
       def parameterized_name
@@ -50,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/resources/skater_game_list_item.rb

@@ -2,8 +2,8 @@
 
 module AhlScraper
   class SkaterGameListItem < Resource
-    def initialize(raw_data)
-      @raw_data = raw_data
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def game_id

data/lib/ahl_scraper/resources/team_game_list_item.rb

@@ -2,9 +2,8 @@
 
 module AhlScraper
   class TeamGameListItem < Resource
-    def initialize(raw_data, opts)
-      @raw_data = raw_data
-      @opts = opts
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def game_id

data/lib/ahl_scraper/resources/team_list_item.rb

@@ -5,7 +5,7 @@ module AhlScraper
     attr_reader :season_id
 
     def initialize(raw_data, season_id)
-      @raw_data = raw_data
+      super(raw_data, {})
       @season_id = season_id
     end
 

data/lib/ahl_scraper/scoreboards.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "ahl_scraper/fetchers/scoreboards/data_fetcher"
+
+require "ahl_scraper/resources/scoreboards/team"
+
+module AhlScraper
+  module Scoreboards
+    class << self
+      def list(start_date, end_date)
+        DataFetcher.new(start_date: start_date, end_date: end_date).call&.map { |game| Scoreboard.new(game) }
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module AhlScraper
   module Games
     class CreateSkatersService
-      def initialize(skater_data, goal_data, penalty_data, shootout_data, penalty_shot_data, opts)
+      def initialize(skater_data, goal_data, penalty_data, shootout_data, penalty_shot_data, opts = {})
         @skater_data = skater_data
         @goal_data = goal_data
         @penalty_data = penalty_data

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

@@ -45,7 +45,7 @@ module AhlScraper
         on_scoring_team ? "#{skater_ids.length}v#{opposing_skater_ids.length}" : "#{opposing_skater_ids.length}v#{skater_ids.length}"
       end
 
-      def find_goal_situation(goal, on_scoring_team)
+      def find_goal_situation(goal, on_scoring_team) # rubocop:disable Metrics/CyclomaticComplexity
         return "pp" if (goal[:properties][:isPowerPlay] == "1" && on_scoring_team) || (goal[:properties][:isShortHanded] == "1" && !on_scoring_team)
 
         return "sh" if goal[:properties][:isShortHanded] == "1" && on_scoring_team || (goal[:properties][:isPowerPlay] == "1" && !on_scoring_team)

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/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.2"
 end

data/lib/ahl_scraper.rb

@@ -39,6 +39,7 @@ require "ahl_scraper/resources/goalie_game_list_item"
 require "ahl_scraper/resources/season_list_item"
 require "ahl_scraper/resources/skater_game_list_item"
 require "ahl_scraper/resources/roster_player"
+require "ahl_scraper/resources/scoreboard"
 require "ahl_scraper/resources/player"
 
 require "ahl_scraper/games"
@@ -49,6 +50,7 @@ require "ahl_scraper/player_games"
 require "ahl_scraper/players"
 require "ahl_scraper/playoff_brackets"
 require "ahl_scraper/roster_players"
+require "ahl_scraper/scoreboards"
 
 module AhlScraper
   class Error < StandardError; end

metadata

@@ -1,15 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: ahl_scraper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - jefftcraig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
-dependencies: []
+date: 2022-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 11.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 11.1.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.89.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.89.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.43.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.43.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
 description: Allows users to gather game, season, and player data from the AHL website
 email:
 - jeffcraig35@gmail.com
@@ -41,6 +209,7 @@ files:
 - lib/ahl_scraper/fetchers/player_data_fetcher.rb
 - lib/ahl_scraper/fetchers/player_games/data_fetcher.rb
 - lib/ahl_scraper/fetchers/playoff_bracket_data_fetcher.rb
+- lib/ahl_scraper/fetchers/scoreboards/data_fetcher.rb
 - lib/ahl_scraper/fetchers/season_data_fetcher.rb
 - lib/ahl_scraper/fetchers/season_end_date_fetcher.rb
 - lib/ahl_scraper/fetchers/season_game_ids_fetcher.rb
@@ -50,6 +219,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
@@ -89,6 +259,8 @@ files:
 - lib/ahl_scraper/resources/playoff_brackets/series.rb
 - lib/ahl_scraper/resources/playoff_brackets/team.rb
 - lib/ahl_scraper/resources/roster_player.rb
+- lib/ahl_scraper/resources/scoreboard.rb
+- lib/ahl_scraper/resources/scoreboards/team.rb
 - lib/ahl_scraper/resources/season.rb
 - lib/ahl_scraper/resources/season_list_item.rb
 - lib/ahl_scraper/resources/seasons/team.rb
@@ -96,6 +268,7 @@ files:
 - lib/ahl_scraper/resources/team_game_list_item.rb
 - lib/ahl_scraper/resources/team_list_item.rb
 - lib/ahl_scraper/roster_players.rb
+- lib/ahl_scraper/scoreboards.rb
 - lib/ahl_scraper/seasons.rb
 - lib/ahl_scraper/services/games/create_skaters_service.rb
 - lib/ahl_scraper/services/games/on_ice_statlines_service.rb
@@ -125,14 +298,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