sportradar-api 0.1.38 → 0.9.0

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

@@ -8,36 +8,9 @@ module Sportradar
         @id = data["id"]
         @name = data["name"]
         @alias = data["alias"]
-        set_conferences
-        set_divisions
-        set_teams
-      end
-
-      private
-
-      def set_conferences
-        if response["conference"]
-          if response["conference"].is_a?(Array)
-            @conferences = response["conference"].map {|conference| Sportradar::Api::Nfl::Conference.new conference }
-          elsif response["conference"].is_a?(Hash)
-            @conferences = [ Sportradar::Api::Nfl::Conference.new(response["conference"]) ]
-          end
-        end
-      end
-
-      def set_divisions
-        if conferences&.all? { |conference| conference.divisions }
-          @divisions = conferences.flat_map(&:divisions)
-        elsif 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
-      end
-
-      def set_teams
+        @conferences = parse_into_array(selector: data["conference"], klass: Sportradar::Api::Nfl::Conference)  if data["conference"]
+        @divisions = conferences.flat_map(&:divisions) if conferences&.all? { |conference| conference.divisions }
+        @divisions ||= parse_into_array(selector: data["division"], klass: Sportradar::Api::Nfl::Division)  if data["division"]
         @teams = @divisions.flat_map(&:teams) if divisions&.all? {|division| division.teams }
       end
 

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

@@ -6,13 +6,10 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        depth_chart_data = data["season"].delete('depth_charts')
+        depth_chart_data = data["season"]['depth_charts']
         @season = Sportradar::Api::Nfl::Season.new data["season"] if data["season"]
         # @teams = depth_chart_data["team"].map {|team| Sportradar::Api::Nfl::Team.new team } if depth_chart_data["team"]
         @charts = depth_chart_data["team"].map {|team| Sportradar::Api::Nfl::TeamDepthChart.new(team, season) } if depth_chart_data["team"]
-      rescue => e
-        puts e.message
-        # binding.pry
       end
 
       # id is preferred search, but we allow for team abbreviation too

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

@@ -19,15 +19,21 @@ module Sportradar
         @scoring_play = data["scoring_play"]
         @sequence = data["sequence"]
         @start_situation = Sportradar::Api::Nfl::Situation.new data["start_situation"] if data["start_situation"]
-        @statistics = OpenStruct.new data["statistics"] if data["statistics"] # TODO Implement statistics?
-        if @statistics
-          play_stats = @statistics.penalty || @statistics.rush || @statistics.return || @statistics.receive
-          @player_id = play_stats.dig('player', 'id') if play_stats
-        end
+        @statistics = OpenStruct.new data["statistics"] if data["statistics"] # TODO Implement statistics!
+        parse_player if @statistics
         @type = data["type"]
         @wall_clock = data["wall_clock"]
       end
 
+      def parse_player
+        # TODO: Currently there is an issue where we are only mapping one player_id to a play, but there are plays with multiple players involved.
+        play_stats = @statistics.penalty || @statistics.rush || @statistics.return || @statistics.receive
+        if play_stats.is_a?(Array)
+          play_stats = play_stats.first
+        end
+        @player_id = play_stats.dig('player', 'id') if play_stats
+      end
+
     end
   end
 end

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

@@ -33,18 +33,14 @@ module Sportradar
         @team = Sportradar::Api::Nfl::Team.new data["team"] if data["team"]
         @injury = Sportradar::Api::Nfl::Injury.new data["injury"] if data["injury"]
         @draft = Sportradar::Api::Nfl::Draft.new data["draft"] if data["draft"]
-        set_seasons
+        @seasons = parse_into_array(selector: response["season"], klass: Sportradar::Api::Nfl::Season)  if response["season"]
       end
 
-      private
-
-      def set_seasons
-        if response["season"]
-          if response["season"].is_a?(Array)
-            @seasons = response["season"].map {|season| Sportradar::Api::Nfl::Season.new season }
-          elsif response["season"].is_a?(Hash)
-            @seasons = [ Sportradar::Api::Nfl::Season.new(response["season"]) ]
-          end
+      def age
+        if birth_date.present?
+          now = Time.now.utc.to_date
+          dob = birth_date.to_date
+          now.year - dob.year - ((now.month > dob.month || (now.month == dob.month && now.day >= dob.day)) ? 0 : 1)
         end
       end
 

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

@@ -6,19 +6,7 @@ module Sportradar
       def initialize(data)
         @response = data
         @name = data["name"]
-        set_players
-      end
-
-      private
-
-      def set_players
-        if response["player"]
-          if response["player"].is_a?(Array)
-            @players = response["player"].map {|player| Sportradar::Api::Nfl::Player.new player }
-          elsif response["player"].is_a?(Hash)
-            @players = [ Sportradar::Api::Nfl::Player.new(response["player"]) ]
-          end
-        end
+        @players = parse_into_array(selector: response["player"], klass: Sportradar::Api::Nfl::Player) if response["player"]
       end
 
     end

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

@@ -12,12 +12,7 @@ module Sportradar
         # @home_points = response['scoring']['home']['points'] # from play_by_play
         @away_points = data["away_points"]
         # @away_points = response['scoring']['away']['points'] # from play_by_play
-        @drives = if (raw_drives = data.dig("play_by_play", 'drive'))
-          raw_drives = raw_drives.is_a?(Hash) ? [ raw_drives ] : raw_drives
-          raw_drives.map{ |drive| Sportradar::Api::Nfl::Drive.new drive }
-        else
-          []
-        end
+        @drives = parse_into_array(selector: response["play_by_play"]["drive"], klass: Sportradar::Api::Nfl::Drive) if response["play_by_play"] && response["play_by_play"]["drive"]
       end
 
     end

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

@@ -5,8 +5,8 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        # @quarters = data['quarter'].map { |quarter| Sportradar::Api::Nfl::Quarter.new quarter} if data['quarter']
-        # this is causing a problem in some scenarios, receiving ['1', 'id-hash']
+        response['quarter'] = response['quarter'].select {|x| x.is_a? Hash } if response['quarter'].is_a?(Array) && response['quarter'].map(&:class).uniq.count > 1
+        @quarters = parse_into_array(selector: response["quarter"], klass: Sportradar::Api::Nfl::Quarter) if response["quarter"]
       end
 
       def final
@@ -14,11 +14,11 @@ module Sportradar
       end
 
       def home
-        quarters.map {|quarter| quarter['home_points'].to_i }.reduce(:+)
+        quarters.map {|quarter| quarter.home_points.to_i }.reduce(:+)
       end
 
       def away
-        quarters.map {|quarter| quarter['away_points'].to_i }.reduce(:+)
+        quarters.map {|quarter| quarter.away_points.to_i }.reduce(:+)
       end
     end
   end

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

@@ -11,50 +11,10 @@ module Sportradar
         @name = data["name"]
         @team = Sportradar::Api::Nfl::Team.new(data["team"]) if data["team"].is_a?(Hash)
         @injuries = data["injuries"]["team"].map {|team| Sportradar::Api::Nfl::Team.new team } if data["injuries"] && data["injuries"]["team"]
-        set_weeks
-        set_conferences
-        set_divisions
-        set_teams
-      end
-
-      private
-
-      def set_weeks
-        if response["week"]
-          if response["week"].is_a?(Array)
-            @weeks = response["week"].map {|week| Sportradar::Api::Nfl::Week.new week }
-          elsif response["week"].is_a?(Hash)
-            @weeks = [ Sportradar::Api::Nfl::Week.new(response["week"]) ]
-          end
-        end
-      end
-
-      # set_(conferences|divisions|teams) are all identical to the same methods in Hierarchy
-      # There is likely more overlap between Sportradar's NFL standings and NFL hierarchy APIs
-      # Eventually, these should be shared between classes
-      def set_conferences
-        if response["conference"]
-          if response["conference"].is_a?(Array)
-            @conferences = response["conference"].map {|conference| Sportradar::Api::Nfl::Conference.new conference }
-          elsif response["conference"].is_a?(Hash)
-            @conferences = [ Sportradar::Api::Nfl::Conference.new(response["conference"]) ]
-          end
-        end
-      end
-
-      def set_divisions
-        if conferences&.all? { |conference| conference.divisions }
-          @divisions = conferences.flat_map(&:divisions)
-        elsif 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
-      end
-
-      def set_teams
+        @weeks = parse_into_array(selector: response["week"], klass: Sportradar::Api::Nfl::Week)  if response["week"]
+        @conferences = parse_into_array(selector: response["conference"], klass: Sportradar::Api::Nfl::Conference)  if response["conference"]
+        @divisions = conferences.flat_map(&:divisions) if conferences&.all? { |conference| conference.divisions }
+        @divisions ||= parse_into_array(selector: response["division"], klass: Sportradar::Api::Nfl::Division)  if response["division"]
         @teams = @divisions.flat_map(&:teams) if divisions&.all? {|division| division.teams }
       end
 

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

@@ -29,15 +29,16 @@ module Sportradar
         @win_pct = data["win_pct"].to_f if data["win_pct"]
         @rank = data["rank"]
 
-        @defense = data["defense"]["position"].map {|position| Sportradar::Api::Nfl::Position.new position } if data["defense"] && data["defense"]["position"]
-        @offense = data["offense"]["position"].map {|position| Sportradar::Api::Nfl::Position.new position } if data["offense"] && data["offense"]["position"]
-        @special_teams = data["special_teams"]["position"].map {|position| Sportradar::Api::Nfl::Position.new position } if data["special_teams"] && data["special_teams"]["position"]
         @statistics = OpenStruct.new data["statistics"] if data["statistics"] # TODO Implement better?
         @team_records = OpenStruct.new data["team_records"] if data["team_records"] # TODO Implement better?
         @player_records = OpenStruct.new data["player_records"] if data["player_records"] # TODO Implement better?
 
-        set_players
-        set_coaches
+        @defense = parse_into_array(selector: data["defense"]["position"], klass: Sportradar::Api::Nfl::Position)  if data["defense"] && data["defense"]["position"]
+        @offense = parse_into_array(selector: data["offense"]["position"], klass: Sportradar::Api::Nfl::Position)  if data["offense"] && data["offense"]["position"]
+        @special_teams = parse_into_array(selector: data["special_teams"]["position"], klass: Sportradar::Api::Nfl::Position)  if data["special_teams"] && data["special_teams"]["position"]
+        @coaches = parse_into_array(selector: response["coaches"]["coach"], klass: Sportradar::Api::Nfl::Coach)  if response["coaches"] && response["coaches"]["coach"]
+        @players = parse_into_array(selector: response["player"], klass: Sportradar::Api::Nfl::Player)  if response["player"]
+        @players ||= parse_into_array(selector: response["players"]["player"], klass: Sportradar::Api::Nfl::Player)  if response["players"] && response["players"]["player"]
       end
 
       def full_name
@@ -50,36 +51,6 @@ module Sportradar
         end
       end
 
-      private
-
-      def set_players
-        if response["player"]
-          if response["player"].is_a?(Array)
-            @players = response["player"].map {|player| Sportradar::Api::Nfl::Player.new player }
-          elsif response["player"].is_a?(Hash)
-            @players = [ Sportradar::Api::Nfl::Player.new(response["player"]) ]
-          end
-        elsif response["players"] && response["players"]["player"]
-          if response["players"]["player"].is_a?(Array)
-            @players = response["players"]["player"].map {|player| Sportradar::Api::Nfl::Player.new player }
-          elsif response["players"]["player"].is_a?(Hash)
-            @players = [ Sportradar::Api::Nfl::Player.new(response["players"]["player"]) ]
-          end
-        else
-          @players = []
-        end
-      end
-
-      def set_coaches
-        if response["coaches"] && response["coaches"]["coach"]
-          if response["coaches"]["coach"].is_a?(Array)
-            @coaches = response["coaches"]["coach"].map {|coach| Sportradar::Api::Nfl::Coach.new coach }
-          elsif response["coaches"]["coach"].is_a?(Hash)
-            @coaches = [ Sportradar::Api::Nfl::Coach.new(response["coaches"]["coach"]) ]
-          end
-        end
-      end
-
     end
   end
 end

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

@@ -13,15 +13,15 @@ module Sportradar
       end
 
       def offense
-        @offense ||= Sportradar::Api::Nfl::DepthChart.new(response['offense'])
+        @offense ||= Sportradar::Api::Nfl::DepthChart.new(response['offense']) if response['offense']
       end
 
       def defense
-        @defense ||= Sportradar::Api::Nfl::DepthChart.new(response['defense'])
+        @defense ||= Sportradar::Api::Nfl::DepthChart.new(response['defense']) if response['defense']
       end
 
       def special_teams
-        @special_teams ||= Sportradar::Api::Nfl::DepthChart.new(response['special_teams'])
+        @special_teams ||= Sportradar::Api::Nfl::DepthChart.new(response['special_teams']) if response['special_teams']
       end
 
       def team
@@ -32,11 +32,12 @@ module Sportradar
         [:offense, :defense, :special_teams].each { |type| yield type, send(type) }
       end
 
-      private
+      # These aren't ever used, but handy if you need to invoke for testing
+      # private
 
-      def set_charts
-        [offense, defense, special_teams]
-      end
+      # def set_charts
+      #   [offense, defense, special_teams]
+      # end
 
     end
   end

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

@@ -3,25 +3,12 @@ module Sportradar
     class Nfl::Week < Data
       attr_accessor :response, :id, :sequence, :title, :games
 
-
       def initialize(data)
         @response = data
         @id = data["id"]
         @sequence = data["sequence"]
         @title = data["title"]
-        set_games
-      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
+        @games = parse_into_array(selector: response["game"], klass: Sportradar::Api::Nfl::Game) if response["game"]
       end
 
     end

data/lib/sportradar/api/request.rb

@@ -6,31 +6,28 @@ module Sportradar
 
       attr_reader :url, :headers, :timeout, :api_key
 
-      def base_setup(path, options={})
-        @url = set_base(path)
-        @url += format unless options[:format] == 'none'
-        @headers = set_headers unless options[:format] == 'none'
-        @api_key = options[:api_key]
-        @timeout = options.delete(:api_timeout) || Sportradar::Api.config.api_timeout
-      end
-
       def get(path, options={})
         base_setup(path, options)
-        puts url
-        response = self.class.get(url, headers: headers, query: options.merge(api_key), timeout: timeout)
-        rescue Net::ReadTimeout, Net::OpenTimeout
-          raise Sportradar::Api::Error::Timeout
-        rescue EOFError
-          raise Sportradar::Api::Error::NoData
-        if response.success?
-          response
-        else
-          Sportradar::Api::Error.new(response.code, response.message, response)
+        begin
+          response = self.class.get(url, headers: headers, query: options.merge(api_key), timeout: timeout)
+          rescue Net::ReadTimeout, Net::OpenTimeout
+            raise Sportradar::Api::Error::Timeout
+          rescue EOFError
+            raise Sportradar::Api::Error::NoData
         end
+        return Sportradar::Api::Error.new(response.code, response.message, response) unless response.success?
+        response
       end
 
       private
 
+      def base_setup(path, options={})
+        @url = set_base(path)
+        @url += format unless options[:format] == 'none'
+        @headers = set_headers unless options[:format] == 'none'
+        @timeout = options.delete(:api_timeout) || Sportradar::Api.config.api_timeout
+      end
+
       def set_base(path)
         protocol = !!Sportradar::Api.config.use_ssl ? "https://" : "http://"
         url = "#{protocol}api.sportradar.us"

data/lib/sportradar/api/soccer.rb

@@ -11,65 +11,109 @@ module Sportradar
 
       def schedule
         response = get request_url("matches/schedule")
-        Sportradar::Api::Soccer::Schedule.new response
+        if response.success?
+          Sportradar::Api::Soccer::Schedule.new response
+        else
+          response
+        end
       end
 
       # date =  Date.parse('2016-07-17')
       def daily_schedule(date = Date.today)
         response = get request_url("matches/#{date_path(date)}/schedule")
-        Sportradar::Api::Soccer::Schedule.new response
+        if response.success?
+          Sportradar::Api::Soccer::Schedule.new response
+        else
+          response
+        end
       end
 
 
       def daily_summary(date = Date.today)
         response = get request_url("matches/#{date_path(date)}/summary")
-        Sportradar::Api::Soccer::Summary.new response
+        if response.success?
+          Sportradar::Api::Soccer::Summary.new response
+        else
+          response
+        end
       end
 
       def daily_boxscore(date = Date.today)
         response = get request_url("matches/#{date_path(date)}/boxscore")
-        Sportradar::Api::Soccer::Boxscore.new response
+        if response.success?
+          Sportradar::Api::Soccer::Boxscore.new response
+        else
+          response
+        end
       end
 
       # match_id  = "357607e9-87cd-4848-b53e-0485d9c1a3bc"
       def match_summary(match_id)
         check_simulation(match_id)
         response = get request_url("matches/#{match_id}/summary")
-        Sportradar::Api::Soccer::Summary.new response
+        if response.success?
+          Sportradar::Api::Soccer::Summary.new response
+        else
+          response
+        end
       end
 
       # match_id  = "357607e9-87cd-4848-b53e-0485d9c1a3bc"
       def match_boxscore(match_id)
         check_simulation(match_id)
         response = get request_url("matches/#{match_id}/boxscore")
-        Sportradar::Api::Soccer::Boxscore.new response
+        if response.success?
+          Sportradar::Api::Soccer::Boxscore.new response
+        else
+          response
+        end
       end
 
       # team_id = "b78b9f61-0697-4347-a1b6-b7685a130eb1"
       def team_profile(team_id)
         response = get request_url("teams/#{team_id}/profile")
-        Sportradar::Api::Soccer::Team.new response["profile"]["team"] if response.success?
+        if response.success? && response["profile"] && response["profile"]["team"]
+          Sportradar::Api::Soccer::Team.new response["profile"]["team"]
+        else
+          response
+        end
       end
 
       # player_id = "2aeacd39-3f9c-42af-957e-9df8573973c4"
       def player_profile(player_id)
         response = get request_url("players/#{player_id}/profile")
-        Sportradar::Api::Soccer::Player.new response["profile"]["player"] if response.success? && response["profile"] && response["profile"]["player"]
+        if response.success? && response["profile"] && response["profile"]["player"]
+          Sportradar::Api::Soccer::Player.new response["profile"]["player"]
+        else
+          response
+        end
       end
 
       def player_rankings
         response = get request_url("players/leader")
-        Sportradar::Api::Soccer::Ranking.new response["leaders"] if response.success? && response["leaders"]
+        if response.success? && response["leaders"]
+          Sportradar::Api::Soccer::Ranking.new response["leaders"]
+        else
+          response
+        end
       end
 
       def team_hierarchy
         response = get request_url("teams/hierarchy")
-        Sportradar::Api::Soccer::Hierarchy.new response["hierarchy"] if response.success? && response["hierarchy"]
+        if response.success? && response["hierarchy"]
+          Sportradar::Api::Soccer::Hierarchy.new response["hierarchy"]
+        else
+          response
+        end
       end
 
       def team_standings
         response = get request_url("teams/standing")
-        Sportradar::Api::Soccer::Standing.new response["standings"] if response.success? && response["standings"]
+        if response.success?
+          Sportradar::Api::Soccer::Standing.new response["standings"]
+        else
+          response
+        end
       end
 
       def simulation_match