sportradar-api 0.1.38 → 0.9.0

data/lib/sportradar/api/images/asset_list.rb

@@ -7,18 +7,7 @@ module Sportradar
         @response = data
         @type = data["type"]
         @sport = data["sport"]
-        set_assets
-      end
-
-      private
-      def set_assets
-        if response["asset"]
-          if response["asset"].is_a?(Array)
-            @assets = response["asset"].map {|x| Sportradar::Api::Images::Asset.new x }
-          elsif response["asset"].is_a?(Hash)
-            @assets = [ Sportradar::Api::Images::Asset.new(response["asset"]) ]
-          end
-        end
+        @assets = parse_into_array(selector: response["asset"], klass: Sportradar::Api::Images::Asset)  if response["asset"]
       end
 
     end

data/lib/sportradar/api/live_images.rb

@@ -12,7 +12,11 @@ module Sportradar
 
       def daily_manifest(date = Date.today )
         response = get request_url("#{image_type }/#{date.to_s}/manifests/all_assets")
-        Sportradar::Api::Images::AssetList.new response["assetlist"]  if response.success? && response["assetlist"]
+        if response.success? && response["assetlist"]
+          Sportradar::Api::Images::AssetList.new response["assetlist"]
+        else
+          response
+        end
       end
       alias_method :all_images, :daily_manifest
 

data/lib/sportradar/api/nfl.rb

@@ -12,22 +12,38 @@ module Sportradar
       def schedule(year = Date.today.year, season = "reg")
         raise Sportradar::Api::Error::InvalidSeason unless allowed_seasons.include? season
         response = get request_url("games/#{ year }/#{ season }/schedule")
-        Sportradar::Api::Nfl::Season.new response["season"] if response.success? && response["season"]
+        if response.success? && response["season"]
+          Sportradar::Api::Nfl::Season.new response["season"]
+        else
+          response
+        end
       end
 
       def weekly_schedule(week = 1, year = Date.today.year, season = "reg")
         response = get request_url("games/#{ week_path(year, season, week) }/schedule")
-        Sportradar::Api::Nfl::Season.new response["season"]  if response.success? && response["season"]
+        if response.success? && response["season"]
+          Sportradar::Api::Nfl::Season.new response["season"]
+        else
+          response
+        end
       end
 
       def weekly_depth_charts(week = 1, year = Date.today.year, season = "reg" )
         response = get request_url("seasontd/#{ week_path(year, season, week) }/depth_charts")
-        Sportradar::Api::Nfl::LeagueDepthChart.new response
+        if response.success?
+          Sportradar::Api::Nfl::LeagueDepthChart.new response
+        else
+          response
+        end
       end
 
       def weekly_injuries(week = 1, year = Date.today.year, season = "reg")
         response = get request_url("seasontd/#{ week_path(year, season, week) }/injuries")
-        Sportradar::Api::Nfl::Season.new response["season"]  if response.success? && response["season"]
+        if response.success? && response["season"]
+          Sportradar::Api::Nfl::Season.new response["season"]
+        else
+          response
+        end
       end
 
       # past_game_id = "0141a0a5-13e5-4b28-b19f-0c3923aaef6e"
@@ -35,62 +51,102 @@ module Sportradar
       def game_boxscore(game_id)
         check_simulation(game_id)
         response = get request_url("games/#{ game_id }/boxscore")
-        Sportradar::Api::Nfl::Game.new response["game"]   if response.success? && response["game"] # mostly done, just missing play statistics
+        if response.success? && response["game"] # mostly done, just missing play statistics
+          Sportradar::Api::Nfl::Game.new response["game"]
+        else
+          response
+        end
       end
 
       def game_roster(game_id)
         check_simulation(game_id)
         response = get request_url("games/#{ game_id }/roster")
-        Sportradar::Api::Nfl::Game.new response["game"]  if response.success? && response["game"]
+        if response.success? && response["game"]
+          Sportradar::Api::Nfl::Game.new response["game"]
+        else
+          response
+        end
       end
 
       def game_statistics(game_id)
         check_simulation(game_id)
         response = get request_url("games/#{ game_id }/statistics")
-        Sportradar::Api::Nfl::Game.new response["game"]  if response.success? && response["game"]
+        if response.success? && response["game"]
+          Sportradar::Api::Nfl::Game.new response["game"]
+        else
+          response
+        end
         ## Need to properly implement statistics
       end
 
       def play_by_play(game_id)
         check_simulation(game_id)
         response = get request_url("games/#{ game_id }/pbp")
-        Sportradar::Api::Nfl::Game.new response["game"]  if response.success? && response["game"]
+        if response.success? && response["game"]
+          Sportradar::Api::Nfl::Game.new response["game"]
+        else
+          response
+        end
         # need to get into quarters, drives, plays, stats more still
       end
 
       # player_id = "ede260be-5ae6-4a06-887b-e4a130932705"
       def player_profile(player_id)
         response = get request_url("players/#{ player_id }/profile")
-        Sportradar::Api::Nfl::Player.new response["player"] if response.success? && response["player"]
+        if response.success? && response["player"]
+          Sportradar::Api::Nfl::Player.new response["player"]
+        else
+          response
+        end
       end
 
       # team_id = "97354895-8c77-4fd4-a860-32e62ea7382a"
       def seasonal_statistics(team_id, year = Date.today.year, season = "reg")
          raise Sportradar::Api::Error::InvalidLeague unless allowed_seasons.include? season
         response = get request_url("seasontd/#{ year }/#{ season }/teams/#{ team_id }/statistics")
-        Sportradar::Api::Nfl::Season.new response["season"]  if response.success? && response["season"]
+        if response.success? && response["season"]
+          Sportradar::Api::Nfl::Season.new response["season"]
+        else
+          response
+        end
         # TODO: Object map team & player records - statistics
       end
 
       def team_profile(team_id)
         response = get request_url("teams/#{ team_id }/profile")
-        Sportradar::Api::Nfl::Team.new response["team"]  if response.success? && response["team"]
+        if response.success? && response["team"]
+          Sportradar::Api::Nfl::Team.new response["team"]
+        else
+          response
+        end
       end
 
       def league_hierarchy
         response = get request_url("league/hierarchy")
-        Sportradar::Api::Nfl::Hierarchy.new response["league"]  if response.success? && response["league"]
+        if response.success? && response["league"]
+          Sportradar::Api::Nfl::Hierarchy.new response["league"]
+        else
+          response
+        end
       end
 
       def standings(year = Date.today.year)
         response = get request_url("seasontd/#{ year }/standings")
-        Sportradar::Api::Nfl::Season.new  response["season"] if response.success? && response["season"]
+        if response.success? && response["season"]
+          Sportradar::Api::Nfl::Season.new  response["season"]
+        else
+          response
+        end
         # TODO Needs implement rankings/records/stats on team
       end
 
-      def daily_change_log(date = Date.today)
+      def daily_changelog(date = Date.today)
         response = get request_url("league/#{date_path(date)}/changes")
-        Sportradar::Api::Nfl::Changelog.new response["league"]["changelog"] if response.success? && response["league"] && response["league"]["changelog"]
+       if response.success? && response["league"] && response["league"]["changelog"]
+         Sportradar::Api::Nfl::Changelog.new response["league"]["changelog"]
+        else
+          response
+        end
       end
 
       def simulation_games
@@ -102,12 +158,12 @@ module Sportradar
       end
 
       def active_simulation
-        game = simulation_games.lazy.map {|game_id| game_boxscore game_id }.find{ |game| game.status == 'inprogress'}
+        game = simulation_games.lazy.map {|game_id| game_boxscore game_id }.find{ |g| g.status == 'inprogress' if g.is_a?(Sportradar::Api::Nfl::Game) }
         if game
           puts "Live Game: #{game.summary.home.full_name} vs #{game.summary.away.full_name}. Q#{game.quarter} #{game.clock}.  game_id='#{game.id}'"
           game
         else
-          puts "No active simulation"
+          "No active simulation"
         end
       end
 

data/lib/sportradar/api/nfl/changelog.rb

@@ -7,32 +7,10 @@ module Sportradar
         @response = data
         @start_time = data["start_time"]
         @end_time = data["end_time"]
-        set_players
-        set_games
+        @games = parse_into_array(selector: response["game"], klass: Sportradar::Api::Nfl::Game) if response["game"]
+        @players = parse_into_array(selector: response["profiles"]["players"]["player"], klass: Sportradar::Api::Nfl::Player) if response["profiles"] && response["profiles"]["players"] && response["profiles"]["players"]["player"]
       end
 
-      private
-
-      def set_games
-        if response["game"]
-          if response["game"].is_a?(Array)
-            @games = response["game"].map {|game| Sportradar::Api::Nfl::Game.new game }
-          elsif response["game"].is_a?(Hash)
-            @games = [ Sportradar::Api::Nfl::Game.new(response["game"]) ]
-          end
-        end
-      end
-
-
-      def set_players
-        if response["profiles"] && response["profiles"]["players"] && response["profiles"]["players"]["player"]
-          if response["profiles"]["players"]["player"].is_a?(Array)
-            @players = response["profiles"]["players"]["player"].map {|player| Sportradar::Api::Nfl::Player.new player }
-          elsif response["profiles"]["players"]["player"].is_a?(Hash)
-            @players = [ Sportradar::Api::Nfl::Player.new(response["profiles"]["players"]["player"]) ]
-          end
-        end
-      end
 
     end
   end

data/lib/sportradar/api/nfl/conference.rb

@@ -8,19 +8,7 @@ module Sportradar
         @id = data["id"]
         @name = data["name"]
         @alias = data["alias"]
-        set_divisions
-      end
-
-      private
-
-      def set_divisions
-        if response["division"]
-          if response["division"].is_a?(Array)
-            @divisions = response["division"].map {|division| Sportradar::Api::Nfl::Division.new division }
-          elsif response["division"].is_a?(Hash)
-            @divisions = [ Sportradar::Api::Nfl::Division.new(response["division"]) ]
-          end
-        end
+        @divisions = parse_into_array(selector: response["division"], klass: Sportradar::Api::Nfl::Division) if response["division"]
       end
 
     end

data/lib/sportradar/api/nfl/depth_chart.rb

@@ -11,6 +11,7 @@ module Sportradar
       def team(number)
         teams[number]
       end
+
       def each
         populate_teams
         teams.each { |team| yield team }

data/lib/sportradar/api/nfl/division.rb

@@ -8,19 +8,7 @@ module Sportradar
         @id = data["id"]
         @name = data["name"]
         @alias = data["alias"]
-        set_teams
-      end
-
-      private
-
-      def set_teams
-        if response["team"]
-          if response["team"].is_a?(Array)
-            @teams = response["team"].map {|team| Sportradar::Api::Nfl::Team.new team }
-          elsif response["team"].is_a?(Hash)
-            @teams = [ Sportradar::Api::Nfl::Team.new(response["team"]) ]
-          end
-        end
+        @teams = parse_into_array(selector: response["team"], klass: Sportradar::Api::Nfl::Team) if response["team"]
       end
 
     end

data/lib/sportradar/api/nfl/drive.rb

@@ -17,26 +17,8 @@ module Sportradar
         @scoring_drive = data["scoring_drive"]
         @quarter = Sportradar::Api::Nfl::Quarter.new data["quarter"] if data["quarter"]
         @team = Sportradar::Api::Nfl::Team.new data["team"] if data["team"]
-        set_plays
-
-      end
-
-      private
-
-      def set_plays
-        if response["plays"] && response["plays"]["play"]
-          if response["plays"]["play"].is_a?(Array)
-            @plays = response["plays"]["play"].map {|play| Sportradar::Api::Nfl::Play.new play }
-          elsif response["plays"]["play"].is_a?(Hash)
-            @plays = [ Sportradar::Api::Nfl::Play.new(response["plays"]["play"]) ]
-          end
-        elsif response["play"]
-          if response["play"].is_a?(Array)
-            @plays = response["play"].map {|play| Sportradar::Api::Nfl::Play.new play }
-          elsif response["play"].is_a?(Hash)
-            @plays = [ Sportradar::Api::Nfl::Play.new(response["play"]) ]
-          end
-        end
+        @plays = parse_into_array(selector: response["play"], klass: Sportradar::Api::Nfl::Play) if response["play"]
+        @plays ||= parse_into_array(selector: response["plays"]["play"], klass: Sportradar::Api::Nfl::Play) if response["plays"] && response["plays"]["play"]
       end
 
     end

data/lib/sportradar/api/nfl/franchise.rb

@@ -3,7 +3,6 @@ module Sportradar
     class Nfl::Franchise < Data
       attr_accessor :response, :name, :alias
 
-
       def initialize(data)
         @response = data
         @name = data["name"]

data/lib/sportradar/api/nfl/game.rb

@@ -21,51 +21,51 @@ module Sportradar
         @utc_offset = data["utc_offset"]
         @weather = data["weather"]
         @clock = data["clock"]
+
         if data["quarter"]
           @quarter = data["quarter"][0]
           quarter_data = data["quarter"][1].is_a?(Hash) ? [ data["quarter"][1] ] : data["quarter"][1]
           @quarters = quarter_data&.map { |hash| Sportradar::Api::Nfl::Quarter.new(hash) }
         end
+
         @summary = Sportradar::Api::Nfl::Summary.new data["summary"] if data["summary"]
         @situation = Sportradar::Api::Nfl::Situation.new data["situation"] if data["situation"]
         @last_event = Sportradar::Api::Nfl::Event.new data["last_event"]["event"] if data["last_event"] && data["last_event"]["event"]
         @scoring = Sportradar::Api::Nfl::Scoring.new data["scoring"] if data["scoring"]
-        set_scoring_drives
+
+        @scoring_drives = parse_into_array(selector: response["scoring_drives"]["drive"], klass: Sportradar::Api::Nfl::Drive)  if response["scoring_drives"] && response["scoring_drives"]["drive"]
 
         location = data["summary"] || data
         @venue = Sportradar::Api::Nfl::Venue.new data["venue"] || location["venue"] if data["venue"] || location["venue"]
         @home = Sportradar::Api::Nfl::Team.new   data["home"]  || location["home"]  if data["home"]  || location["home"]
         @away = Sportradar::Api::Nfl::Team.new   data["away"]  || location["away"]  if data["away"]  || location["away"]
+
         @broadcast = Sportradar::Api::Nfl::Broadcast.new data["broadcast"] if data["broadcast"]
+
         if data["team"]
-          @stats = data["team"].map { |hash| [hash["id"], Sportradar::Api::Nfl::GameStatistic.new(hash)] }.to_h
+          @stats = data["team"].map { |team_stat| [team_stat["id"], Sportradar::Api::Nfl::GameStatistic.new(team_stat)] }.to_h
           @home.stats = @stats[@home.id]
           @away.stats = @stats[@away.id]
         end
+
+      end
+
+      def sport_league
+        'NFL'.freeze
       end
 
       def current_score
         "#{summary.home.points}-#{summary.away.points}" if summary
       end
+
       def drives
         quarters&.flat_map(&:drives)
       end
+
       def plays
         drives&.flat_map(&:plays)
       end
 
-      private
-
-      def set_scoring_drives
-        if response["scoring_drives"] && response["scoring_drives"]["drive"]
-          if response["scoring_drives"]["drive"].is_a?(Array)
-            @scoring_drives = response["scoring_drives"]["drive"].map {|scoring_drive| Sportradar::Api::Nfl::Drive.new scoring_drive }
-          elsif response["scoring_drives"]["drive"].is_a?(Hash)
-            @scoring_drives = [ Sportradar::Api::Nfl::Drive.new(response["scoring_drives"]["drive"]) ]
-          end
-        end
-      end
-
     end
   end
 end

data/lib/sportradar/api/nfl/game_statistic.rb

@@ -27,49 +27,107 @@ module Sportradar
         @penalty_yards   = data["penalty_yards"]
         @return_yards    = data["return_yards"]
       end
+
+      # :skip_test_coverage:
+      # These are in methods rather than attributes to use them lazily. Each one is tested in it's respective class
       def rushing
-        @rushing       ||= Sportradar::Api::Football::StatPack::Rushing.new(response["rushing"])
+        if response["rushing"]
+          response["rushing"] = parse_out_hashes response["rushing"]
+          @rushing       ||= Sportradar::Api::Football::StatPack::Rushing.new(response["rushing"])
+        end
       end
+
       def receiving
-        @receiving     ||= Sportradar::Api::Football::StatPack::Receiving.new(response["receiving"])
+        if response["receiving"]
+          response["receiving"] = parse_out_hashes response["receiving"]
+          @receiving     ||= Sportradar::Api::Football::StatPack::Receiving.new(response["receiving"])
+        end
       end
+
       def punts
-        @punts         ||= Sportradar::Api::Football::StatPack::Punts.new(response["punts"])
+        if response["punts"]
+          response["punts"] = parse_out_hashes response["punts"]
+          @punts         ||= Sportradar::Api::Football::StatPack::Punts.new(response["punts"])
+        end
       end
+
       def punt_returns
-        @punt_returns  ||= Sportradar::Api::Football::StatPack::PuntReturns.new(response["punt_returns"])
+        if response["punt_returns"]
+          response["punt_returns"] = parse_out_hashes response["punt_returns"]
+          @punt_returns  ||= Sportradar::Api::Football::StatPack::PuntReturns.new(response["punt_returns"])
+        end
       end
+
       def penalties
-        @penalties     ||= Sportradar::Api::Football::StatPack::Penalties.new(response["penalties"])
+        if response["penalties"]
+          response["penalties"] = parse_out_hashes response["penalties"]
+          @penalties     ||= Sportradar::Api::Football::StatPack::Penalties.new(response["penalties"])
+        end
       end
+
       def passing
-        @passing       ||= Sportradar::Api::Football::StatPack::Passing.new(response["passing"])
+        if response["passing"]
+          response["passing"] = parse_out_hashes response["passing"]
+          @passing       ||= Sportradar::Api::Football::StatPack::Passing.new(response["passing"])
+        end
       end
+
       def misc_returns
-        @misc_returns  ||= Sportradar::Api::Football::StatPack::MiscReturns.new(response["misc_returns"])
+        if response["misc_returns"]
+          response["misc_returns"] = parse_out_hashes response["misc_returns"]
+          @misc_returns  ||= Sportradar::Api::Football::StatPack::MiscReturns.new(response["misc_returns"])
+        end
       end
+
       def kickoffs
-        @kickoffs      ||= Sportradar::Api::Football::StatPack::Kickoffs.new(response["kickoffs"])
+        if response["kickoffs"]
+          response["kickoffs"] = parse_out_hashes response["kickoffs"]
+          @kickoffs      ||= Sportradar::Api::Football::StatPack::Kickoffs.new(response["kickoffs"])
+        end
       end
+
       def kick_returns
-        @kick_returns  ||= Sportradar::Api::Football::StatPack::KickReturns.new(response["kick_returns"])
+        if response["kick_returns"]
+          response["kick_returns"] = parse_out_hashes response["kick_returns"]
+          @kick_returns  ||= Sportradar::Api::Football::StatPack::KickReturns.new(response["kick_returns"])
+        end
       end
+
       def int_returns
-        @int_returns   ||= Sportradar::Api::Football::StatPack::IntReturns.new(response["int_returns"])
+        if response["int_returns"]
+          response["int_returns"] = parse_out_hashes response["int_returns"]
+          @int_returns   ||= Sportradar::Api::Football::StatPack::IntReturns.new(response["int_returns"])
+        end
       end
+
       def fumbles
-        @fumbles       ||= Sportradar::Api::Football::StatPack::Fumbles.new(response["fumbles"])
+        if response["fumbles"]
+          response["fumbles"] = parse_out_hashes response["fumbles"]
+          @fumbles       ||= Sportradar::Api::Football::StatPack::Fumbles.new(response["fumbles"])
+        end
       end
+
       def field_goals
-        @field_goals   ||= Sportradar::Api::Football::StatPack::FieldGoals.new(response["field_goals"])
+        if response["field_goals"]
+          response["field_goals"] = parse_out_hashes response["field_goals"]
+          @field_goals   ||= Sportradar::Api::Football::StatPack::FieldGoals.new(response["field_goals"])
+        end
       end
+
       def extra_points
-        @extra_points  ||= Sportradar::Api::Football::StatPack::ExtraPoints.new(response["extra_points"])
+        if response["extra_points"]
+          response["extra_points"] = parse_out_hashes response["extra_points"]
+          @extra_points  ||= Sportradar::Api::Football::StatPack::ExtraPoints.new(response["extra_points"])
+        end
       end
+
       def defense
-        @defense       ||= Sportradar::Api::Football::StatPack::Defense.new(response["defense"])
+        if response["defense"]
+          response["defense"] = parse_out_hashes response["defense"]
+          @defense       ||= Sportradar::Api::Football::StatPack::Defense.new(response["defense"])
+        end
       end
-        
+      # :skip_test_coverage:
     end
   end
 end