espn_pub 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9825c4b3b3277d1addc0d50c01683144de143366bfb394bccceee46f3b043d2c
-  data.tar.gz: 6fc6a99c1285f4523cdd60696e340e868c4a48c49c9e9b7f6a6188fcad9b28e6
+  metadata.gz: 8b3eef8ac8d68e39e8b6a71bf2d710c7a23201942ae3bc9a36295860bea269e6
+  data.tar.gz: 5511f7625ee3536feb3a99a916bdac63e0f7b3e1f386a3508432661e4b28302c
 SHA512:
-  metadata.gz: b7c63799f4d0bdb87601e31a89bbadce8b3ce77dd14ac93dfff521d4a3cd1586b483b0490f86814d29e10093b52839bcb0ea5aec84e11831f794915f3149d316
-  data.tar.gz: 23f0d9d8af7f36469fa15734aeea9c02162133f92c48ff67b46737d98eec811c0cac01c4f4b37c465ae1b333f39e5af78007872c3e9b30ead77c5d77669194a4
+  metadata.gz: 3a38ba745e476818d6c54041768770cab08ec743f04b5f77100b5df547b082a72398a2f19e40bc5785703388c6da00112bd9e1cd8db8a978a60f2403366449e8
+  data.tar.gz: bc39cc00273050649458bb76a26c3652e26be7958db8d2da5332609171771c189708e860d61cefd3e085195ddd475179774142ce066016ba0f33698c4c01de2a

data/lib/espn_pub/entities/base.rb

@@ -24,6 +24,10 @@ module EspnPub
           version: Client::API_VERSION
         )
       end
+
+      def normalize_name(name)
+        name.gsub(/[^a-zA-Z0-9]/i, '_').downcase
+      end
     end
   end
 end

data/lib/espn_pub/entities/game.rb

@@ -16,7 +16,7 @@ module EspnPub
         3 => Type::POSTSEASON
       }.freeze
 
-      attr_reader :id, :home_team, :away_team, :date, :type
+      attr_reader :id, :home_team, :away_team, :date, :type, :venue
 
       # Initialize a Game entity.
       #
@@ -25,12 +25,14 @@ module EspnPub
       # @param away_team [EspnPub::Entities::Team] The away team.
       # @param date [DateTime] The scheduled game date.
       # @param type [String] The type of the game.
-      def initialize(id:, home_team:, away_team:, date:, type: nil)
+      # @param venue [EspnPub::Entities::Venue] The venue of the game.
+      def initialize(id:, home_team:, away_team:, date:, type: nil, venue: nil)
         @id = id
         @home_team = home_team
         @away_team = away_team
         @date = date
         @type = type
+        @venue = venue
         super()
       end
     end

data/lib/espn_pub/entities/league.rb

@@ -20,13 +20,13 @@ module EspnPub
         'nfl' => 'football'
       }.freeze
 
-      attr_reader :name
+      attr_reader :league_name
 
-      def self.fetch_season_details(name, season_year)
-        raise ArgumentError, "Unknown league name: #{name}" unless NAME_TO_SPORT.key?(name)
+      def self.fetch_season_details(league_name, season_year)
+        raise ArgumentError, "Unknown league name: #{league_name}" unless NAME_TO_SPORT.key?(league_name)
         raise ArgumentError, 'Season year must be an integer' unless season_year.to_i.positive?
 
-        path = format GAMES_PATH, EspnPub::Client::API_VERSION, NAME_TO_SPORT[name], name
+        path = format GAMES_PATH, EspnPub::Client::API_VERSION, NAME_TO_SPORT[league_name], league_name
         path += "?dates=#{Time.new(season_year).strftime('%Y%m%d')}"
         resp = EspnPub::Client.new.send_request(path)
         season = resp.dig('leagues', 0, 'season')
@@ -42,9 +42,9 @@ module EspnPub
 
       # Initialize a League instance.
       #
-      # @param name [String] The league identifier string.
-      def initialize(name)
-        @name = name
+      # @param league_name [String] The league identifier string.
+      def initialize(league_name)
+        @league_name = normalize_name(league_name)
         super()
       end
 
@@ -54,7 +54,7 @@ module EspnPub
       def teams
         unless defined?(@teams)
           begin
-            path = format TEAMS_PATH, client.version, sport, name
+            path = format TEAMS_PATH, client.version, sport, league_name
             teams_resp = client.send_request(path)
             @teams = (teams_resp.dig('sports', 0, 'leagues', 0, 'teams') || []).map do |team_data|
               EspnPub::Entities::Team.new(
@@ -63,11 +63,11 @@ module EspnPub
                 location: team_data.dig('team', 'location'),
                 abbreviation: team_data.dig('team', 'abbreviation'),
                 sport: sport,
-                league: name
+                league_name: league_name
               )
             end
           rescue Client::UnexpectedResponseCodeError => e
-            warn "Failed to fetch teams for league #{name}: #{e.message}"
+            warn "Failed to fetch teams for league #{league_name}: #{e.message}"
             return []
           end
         end
@@ -80,7 +80,7 @@ module EspnPub
       # @param date [Date, DateTime, nil] An optional date to filter games.
       # @return [Array<EspnPub::Entities::Game>]
       def games(date: nil)
-        path = format GAMES_PATH, client.version, sport, name
+        path = format GAMES_PATH, client.version, sport, league_name
         path += "?dates=#{date.strftime('%Y%m%d')}" if date
         games_resp = client.send_request(path)
         (games_resp['events'] || []).map do |game_data|
@@ -90,18 +90,19 @@ module EspnPub
             home_team: EspnPub::Entities::Team.fetch_by_id(
               id: game_data.dig('competitions', 0, 'competitors', 0, 'id'),
               sport: sport,
-              league: name
+              league_name: league_name
             ),
             away_team: EspnPub::Entities::Team.fetch_by_id(
               id: game_data.dig('competitions', 0, 'competitors', 1, 'id'),
               sport: sport,
-              league: name
+              league_name: league_name
             ),
-            date: DateTime.parse(game_data['date'])
+            date: DateTime.parse(game_data['date']),
+            venue: EspnPub::Entities::Venue.from_api(game_data.dig('competitions', 0, 'venue'))
           )
         end
       rescue Client::UnexpectedResponseCodeError => e
-        warn "Failed to fetch games for league #{name}: #{e.message}"
+        warn "Failed to fetch games for league #{league_name}: #{e.message}"
         []
       end
 
@@ -109,7 +110,7 @@ module EspnPub
       #
       # @return [String, nil] The sport name or nil when unknown.
       def sport
-        NAME_TO_SPORT[name]
+        NAME_TO_SPORT[league_name]
       end
     end
   end

data/lib/espn_pub/entities/player.rb

@@ -10,7 +10,7 @@ module EspnPub
 
       attr_reader :id,
                   :sport,
-                  :league,
+                  :league_name,
                   :first_name,
                   :last_name,
                   :position,
@@ -27,31 +27,30 @@ module EspnPub
       #
       # @param id [String] The player identifier.
       # @param sport [String] The sport name.
-      # @param league [String] The league identifier.
+      # @param league_name [String] The league identifier.
       # @param first_name [String, nil] The player's first name.
       # @param last_name [String, nil] The player's last name.
       # @param position [String, nil] The player's position abbreviation.
       # @param team_id [String, nil] The identifier of the player's team.
       # @param date_of_birth [Date, nil] The player's date of birth.
-      # @param birth_city [String, nil] The player's birth city.
-      # @param birth_state [String, nil] The player's birth state.
-      # @param birth_country [String, nil] The player's birth country.
+      # @param birth_place_data [Hash, nil] The player's birth place data.
       # @param height [String, nil] The player's listed height.
       # @param weight [String, nil] The player's listed weight.
       # @param debut_year [Integer, nil] The year the player made their debut.
-      def initialize(id:, sport:, league:, first_name: nil, last_name: nil, position: nil, team_id: nil,
-                     date_of_birth: nil, birth_city: nil, birth_state: nil, birth_country: nil, height: nil, weight: nil, debut_year: nil)
+      def initialize(id:, sport:, league_name:, first_name: nil, last_name: nil, position: nil, team_id: nil,
+                     date_of_birth: nil, height: nil, weight: nil, debut_year: nil,
+                     birth_place_data: {})
         @id = id
         @sport = sport
-        @league = league
+        @league_name = league_name
         @first_name = first_name
         @last_name = last_name
         @position = position
         @team_id = team_id
         @date_of_birth = self.class.parse_date_of_birth(date_of_birth)
-        @birth_city = birth_city
-        @birth_state = birth_state
-        @birth_country = birth_country
+        @birth_city = birth_place_data['city']
+        @birth_state = birth_place_data['state']
+        @birth_country = birth_place_data['country']
         @height = height
         @weight = weight
         @debut_year = debut_year
@@ -64,9 +63,9 @@ module EspnPub
       # @param sport [String] The sport name.
       # @param league [String] The league identifier.
       # @return [Player, nil] The player, or nil when the request fails or data is missing.
-      def self.fetch_by_id(id:, sport:, league:)
+      def self.fetch_by_id(id:, sport:, league_name:)
         client = EspnPub::Client.new
-        path = format ATHLETE_PATH, sport, league, id
+        path = format ATHLETE_PATH, sport, league_name, id
         begin
           athlete_data = client.send_request(path)['athlete']
         rescue Client::UnexpectedResponseCodeError => e
@@ -79,15 +78,13 @@ module EspnPub
         new(
           id: athlete_data['id'],
           sport: sport,
-          league: league,
+          league_name: league_name,
           first_name: athlete_data['firstName'],
           last_name: athlete_data['lastName'],
           position: athlete_data.dig('position', 'abbreviation'),
           team_id: athlete_data.dig('team', 'id'),
           date_of_birth: parse_date_of_birth(athlete_data['dateOfBirth']),
-          birth_city: athlete_data.dig('birthPlace', 'city'),
-          birth_state: athlete_data.dig('birthPlace', 'state'),
-          birth_country: athlete_data.dig('birthPlace', 'country'),
+          birth_place_data: athlete_data['birthPlace'],
           height: athlete_data['displayHeight'],
           weight: athlete_data['displayWeight'],
           debut_year: athlete_data['debutYear']

data/lib/espn_pub/entities/team.rb

@@ -12,7 +12,7 @@ module EspnPub
                   :location,
                   :abbreviation,
                   :sport,
-                  :league,
+                  :league_name,
                   :venue
 
       # Initialize a Team entity.
@@ -22,24 +22,24 @@ module EspnPub
       # @param location [String] The team location.
       # @param abbreviation [String] The team abbreviation.
       # @param sport [String] The sport name.
-      # @param league [String] The league identifier.
+      # @param league_name [String] The league identifier.
       # @param venue [EspnPub::Entities::Venue, nil] The team's home venue.
-      def initialize(id:, name:, location:, abbreviation:, sport:, league:, venue: nil)
+      def initialize(id:, name:, location:, abbreviation:, sport:, league_name:, venue: nil)
         @id = id
         @name = name
         @location = location
         @abbreviation = abbreviation
         @sport = sport
-        @league = league
+        @league_name = league_name
         @venue = venue
         super()
       end
 
-      def self.fetch_by_id(id:, sport:, league:, user_agent: nil)
+      def self.fetch_by_id(id:, sport:, league_name:, user_agent: nil)
         client = EspnPub::Client.new
         client.user_agent = user_agent if user_agent
 
-        path = format TEAM_PATH, client.version, sport, league, id
+        path = format TEAM_PATH, client.version, sport, league_name, id
         begin
           team_data = client.send_request(path)['team']
         rescue Client::UnexpectedResponseCodeError => e
@@ -55,7 +55,7 @@ module EspnPub
           location: team_data['location'],
           abbreviation: team_data['abbreviation'],
           sport: sport,
-          league: league,
+          league_name: league_name,
           venue: EspnPub::Entities::Venue.from_api(team_data.dig('franchise', 'venue'))
         )
       end
@@ -66,20 +66,18 @@ module EspnPub
       def players
         unless defined?(@roster)
           begin
-            path = format ROSTER_PATH, client.version, sport, league, id
+            path = format ROSTER_PATH, client.version, sport, league_name, id
             roster_resp = client.send_request(path)
             @roster = (roster_resp['athletes'] || []).map do |athlete_data|
               EspnPub::Entities::Player.new(
                 id: athlete_data['id'],
                 sport: sport,
-                league: league,
+                league_name: league_name,
                 first_name: athlete_data['firstName'],
                 last_name: athlete_data['lastName'],
                 position: athlete_data['position']['abbreviation'],
                 team_id: id,
-                birth_city: athlete_data.dig('birthPlace', 'city'),
-                birth_state: athlete_data.dig('birthPlace', 'state'),
-                birth_country: athlete_data.dig('birthPlace', 'country'),
+                birth_place_data: athlete_data&.fetch('birthPlace', {}),
                 date_of_birth: athlete_data['dateOfBirth'],
                 height: athlete_data['height'],
                 weight: athlete_data['weight'],

data/lib/espn_pub/entities/venue.rb

@@ -7,10 +7,7 @@ module EspnPub
       attr_reader :id,
                   :full_name,
                   :short_name,
-                  :city,
-                  :state,
-                  :zip_code,
-                  :country,
+                  :address_data,
                   :indoor,
                   :grass
 
@@ -19,21 +16,14 @@ module EspnPub
       # @param id [String] The venue identifier.
       # @param full_name [String, nil] The venue's full name.
       # @param short_name [String, nil] The venue's short name.
-      # @param city [String, nil] The venue's city.
-      # @param state [String, nil] The venue's state or province.
-      # @param zip_code [String, nil] The venue's postal code.
-      # @param country [String, nil] The venue's country.
+      # @param address_data [Hash, nil] The venue's address data.
       # @param indoor [Boolean, nil] Whether the venue is indoors.
       # @param grass [Boolean, nil] Whether the venue has a grass surface.
-      def initialize(id:, full_name: nil, short_name: nil, city: nil, state: nil, zip_code: nil, country: nil,
-                     indoor: nil, grass: nil)
+      def initialize(id:, full_name: nil, short_name: nil, indoor: nil, grass: nil, address_data: {})
         @id = id
         @full_name = full_name
         @short_name = short_name
-        @city = city
-        @state = state
-        @zip_code = zip_code
-        @country = country
+        @address_data = address_data
         @indoor = indoor
         @grass = grass
         super()
@@ -50,10 +40,7 @@ module EspnPub
           id: data['id'],
           full_name: data['fullName'],
           short_name: data['shortName'],
-          city: data.dig('address', 'city'),
-          state: data.dig('address', 'state'),
-          zip_code: data.dig('address', 'zipCode'),
-          country: data.dig('address', 'country'),
+          address_data: data['address'],
           indoor: data['indoor'],
           grass: data['grass']
         )

data/lib/espn_pub/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EspnPub
-  VERSION = '0.1.7'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: espn_pub
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Jeffrey Bowman