sportradar-api 0.13.0 → 0.13.21

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

@@ -10,6 +10,8 @@ module Sportradar
           @response     = data
           @id           = data['id'] if data['id']
           @api          = opts[:api]
+          @team         = opts[:team]
+
           @league_group = league_group || data['league_group'] || @api&.league_group
 
           update(data, **opts)
@@ -34,16 +36,28 @@ module Sportradar
           @jersey_number  = data['jersey_number']  if data['jersey_number']
           @preferred_foot = data['preferred_foot'] if data['preferred_foot']
           @matches_played = data['matches_played'] if data['matches_played']
-
           @stats          = data['statistics']     if data['statistics']
-
           @date_of_birth  = Date.parse(data['date_of_birth']) if data['date_of_birth']
+
+          @team.update_player_stats(self, data['statistics']) if data['statistics'] && @team
+          if opts[:match]
+            @team.update_player_stats(self, data, opts[:match])
+          end
+
         end
 
         def display_name
           @name || [@first_name, @last_name].join(' ')
         end
 
+        def first_name
+          @name.split()[1]
+        end
+
+        def last_name
+          @name.split()[0].delete(',')
+        end
+
         def api
           @api || Sportradar::Api::Soccer::Api.new(league_group: @league_group)
         end
@@ -67,9 +81,7 @@ module Sportradar
           url, headers, options, timeout = api.get_request_info(path_profile)
           {url: url, headers: headers, params: options, timeout: timeout, callback: method(:ingest_profile)}
         end
-
       end
-
     end
   end
 end

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

@@ -0,0 +1,71 @@
+module Sportradar
+  module Api
+    module Soccer
+      class Scoring < Data
+        attr_accessor :response, :api, :id, :home, :away, :scores
+
+        def initialize(data, **opts)
+          @api      = opts[:api]
+          @match    = opts[:match]
+          
+          @scores = {}
+          @id = data['id']
+          
+          update(data, **opts)
+        end
+
+        def update(data, source: nil, **opts)
+          # new_scores = case source
+          # when :box
+          #   parse_from_box(data)
+          # when :timeline
+          #   parse_from_timeline(data)
+          # when :summary
+          #   parse_from_box(data)
+          # else
+          #   if data['period'] || data['half']
+          #     parse_from_timeline(data)
+          #   elsif data['team']
+          #     parse_from_box(data)
+          #   else # schedule requests
+          #     {}
+          #   end
+          # end
+          new_scores = parse_from_timeline(data)
+          # parse data structure
+          # handle data from team (all periods)
+          # handle data from period (both teams)
+          # handle data from match?
+          @scores.each { |k, v| v.merge!(new_scores.delete(k) || {} ) }
+          new_scores.each { |k, v| @scores.merge!(k => v) }
+        end
+
+        def goals(team_id)
+          @score[team_id].to_i
+        end
+
+
+        private
+
+        def parse_from_timeline(data)
+          if data['period_scores']
+            data['period_scores'].map do |hash|
+              [hash["number"], {"home"=>hash['home_score'], "away"=>hash['away_score']}]
+            end.to_h
+          else
+            {}
+          end
+        end
+
+        # def period_name
+        #   'period'
+        # end
+
+        def parse_from_summary(data)
+          # 
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,10 +2,13 @@ module Sportradar
   module Api
     module Soccer
       class Team < Data
-        attr_accessor :tournament_id
-        attr_reader :id, :league_group, :name, :country, :country_code, :abbreviation, :qualifier, :venue
+        attr_accessor :tournament_id, :venue, :player_stats
+        attr_reader :id, :league_group, :name, :country, :country_code, :abbreviation, :qualifier
         alias :alias :abbreviation
-        attr_reader :team_statistics, :jerseys, :manager, :statistics
+        alias :market :name
+        alias :display_name :name
+        alias :full_name :name
+        attr_reader :team_stats, :jerseys, :manager, :statistics
 
         def initialize(data = {}, league_group: nil, **opts)
           @response     = data
@@ -14,6 +17,7 @@ module Sportradar
           @league_group = league_group || data['league_group'] || @api&.league_group
 
           @players_hash = {}
+          @player_stats = {}
           @matches_hash = {}
 
           update(data, **opts)
@@ -28,7 +32,6 @@ module Sportradar
             update(data["team"])
           end
 
-
           @name         = data['name']              if data['name']
           @country      = data['country']           if data['country']
           @country_code = data['country_code']      if data['country_code']
@@ -36,11 +39,15 @@ module Sportradar
           @qualifier    = data['qualifier']         if data['qualifier']
           @venue        = Venue.new(data['venue'])  if data['venue']
 
-          create_data(@players_hash, data['players'], klass: Player, api: api, team: self) if data['players']
-          create_data(@players_hash, data['player_statistics'], klass: Player, api: api, team: self) if data['player_statistics']
+          create_data(@players_hash, data['players'], klass: Player, api: api, team: self, **opts) if data['players']
+          create_data(@players_hash, data['player_statistics'], klass: Player, api: api, team: self, **opts) if data['player_statistics']
+
+          @team_stats    = data['team_statistics']   if data['team_statistics']
 
-          # TODO team statistics
-          @team_statistics    = data['team_statistics']   if data['team_statistics']
+          # parse_players(data.dig('players'), opts[:match])   if data.dig('players')
+          if opts[:match]
+            opts[:match].update_stats(self, data['statistics']) if data['statistics']
+          end
 
           create_data(@matches_hash, Soccer.parse_results(data['results']), klass: Match, api: api, team: self) if data['results']
           create_data(@matches_hash, data['schedule'],  klass: Match, api: api, team: self) if data['schedule']
@@ -54,10 +61,12 @@ module Sportradar
         def get_tournament_id(data, **opts)
           @tournament_id ||= if opts[:tournament]
             opts[:tournament].id
-          elsif opts[:season]
-            opts[:season].tournament_id
-          elsif opts[:match]
-            opts[:match].tournament_id
+          elsif opts[:season]&.tournament_id
+            opts[:season]&.tournament_id
+          elsif opts[:match]&.tournament_id
+            opts[:match]&.tournament_id
+          elsif data['tournament_id']
+            data['tournament_id']
           elsif data['tournament']
             data.dig('tournament', 'id')
           elsif data['season']
@@ -65,6 +74,10 @@ module Sportradar
           end
         end
 
+        def update_player_stats(player, stats, game = nil)
+          game ? game.update_player_stats(player, stats) : @player_stats.merge(player.id => stats.to_h.merge(player: player))
+        end
+
         def players
           @players_hash.values
         end

data/lib/sportradar/api/soccer/tournament.rb

@@ -2,7 +2,9 @@ module Sportradar
   module Api
     module Soccer
       class Tournament < Data
-        attr_reader :id, :league_group, :name, :category
+        attr_reader :id, :league_group, :name, :category, :coverage_info, :live_coverage, :season_coverage_info
+        alias :display_name :name
+        alias :alias :name
 
         def initialize(data = {}, league_group: nil, **opts)
           @response     = data
@@ -24,8 +26,10 @@ module Sportradar
             update(data['tournament'])
           end
 
-          @name     = data["name"]
-          @category = data['category'] || @category
+          @name           = data["name"]          || @name
+          @category       = data['category']      || @category
+          @coverage_info  = data['coverage_info'] || @coverage_info
+          @live_coverage  = data.dig('coverage_info', 'live_coverage') || @live_coverage
 
           parse_info(data)
           parse_season(data)
@@ -38,6 +42,22 @@ module Sportradar
           @seasons_hash.values
         end
 
+        def schedule
+          return self if @schedule_retrieved
+          get_schedule
+          self
+        end
+
+        def year
+          if current_season&.year&.split('/')&.last
+            2000 + current_season.year.split('/').last.to_i
+          end
+        end
+
+        def current_season
+          seasons.detect(&:current?)
+        end
+
         def standings(type = nil)
           if type
             @standings_hash[type]
@@ -68,6 +88,7 @@ module Sportradar
 
         def parse_season(data)
           if data['season_coverage_info']
+            @season_coverage_info = data['season_coverage_info'] if data['season_coverage_info']
             data['season_coverage_info']['id'] ||= data['season_coverage_info'].delete('season_id')
             create_data(@seasons_hash, data['season_coverage_info'], klass: Season, api: api, tournament: self)
           end
@@ -150,6 +171,7 @@ module Sportradar
           ingest_schedule(data)
         end
         def ingest_schedule(data)
+          @schedule_retrieved = true
           update(data)
           # TODO parse the rest of the data. keys: ["tournament", "sport_events"]
           data
@@ -216,6 +238,7 @@ module Sportradar
             'eu.uefa_champions_league'  => "sr:tournament:7",
             'eu.la_liga'                => "sr:tournament:8",
             'eu.eng_premier_league'     => "sr:tournament:17",
+            'eu.premier_league'         => "sr:tournament:17",
             'eu.serie_a'                => "sr:tournament:23",
             'eu.ligue_1'                => "sr:tournament:34",
             'eu.bundesliga'             => "sr:tournament:35",

data/lib/sportradar/api/soccer.rb

@@ -11,6 +11,7 @@ require_relative 'soccer/team'
 require_relative 'soccer/player'
 require_relative 'soccer/venue'
 require_relative 'soccer/fact'
+require_relative 'soccer/scoring'
 
 module Sportradar
   module Api

data/lib/sportradar/api/version.rb

@@ -1,5 +1,5 @@
 module Sportradar
   module Api
-    VERSION = "0.13.0"
+    VERSION = "0.13.21"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportradar-api
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.21
 platform: ruby
 authors:
 - Ben Eggett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -314,6 +314,7 @@ files:
 - lib/sportradar/api/basketball/plays/free_throw_made.rb
 - lib/sportradar/api/basketball/plays/free_throw_miss.rb
 - lib/sportradar/api/basketball/plays/jumpball.rb
+- lib/sportradar/api/basketball/plays/jumpball_violation.rb
 - lib/sportradar/api/basketball/plays/kickball.rb
 - lib/sportradar/api/basketball/plays/lane.rb
 - lib/sportradar/api/basketball/plays/lineup_change.rb
@@ -432,24 +433,8 @@ files:
 - lib/sportradar/api/odds.rb
 - lib/sportradar/api/poll.rb
 - lib/sportradar/api/request.rb
-- lib/sportradar/api/soccer-old.rb
-- lib/sportradar/api/soccer-old/boxscore.rb
-- lib/sportradar/api/soccer-old/category.rb
-- lib/sportradar/api/soccer-old/fact.rb
-- lib/sportradar/api/soccer-old/hierarchy.rb
-- lib/sportradar/api/soccer-old/match.rb
-- lib/sportradar/api/soccer-old/player.rb
-- lib/sportradar/api/soccer-old/ranking.rb
-- lib/sportradar/api/soccer-old/schedule.rb
-- lib/sportradar/api/soccer-old/season.rb
-- lib/sportradar/api/soccer-old/standing.rb
-- lib/sportradar/api/soccer-old/statistic.rb
-- lib/sportradar/api/soccer-old/summary.rb
-- lib/sportradar/api/soccer-old/team.rb
-- lib/sportradar/api/soccer-old/tournament.rb
-- lib/sportradar/api/soccer-old/tournament_group.rb
-- lib/sportradar/api/soccer-old/venue.rb
 - lib/sportradar/api/soccer.rb
+- lib/sportradar/api/soccer/README.md
 - lib/sportradar/api/soccer/api.rb
 - lib/sportradar/api/soccer/event.rb
 - lib/sportradar/api/soccer/fact.rb
@@ -457,6 +442,7 @@ files:
 - lib/sportradar/api/soccer/lineup.rb
 - lib/sportradar/api/soccer/match.rb
 - lib/sportradar/api/soccer/player.rb
+- lib/sportradar/api/soccer/scoring.rb
 - lib/sportradar/api/soccer/season.rb
 - lib/sportradar/api/soccer/standing.rb
 - lib/sportradar/api/soccer/team.rb
@@ -464,16 +450,6 @@ files:
 - lib/sportradar/api/soccer/tournament.rb
 - lib/sportradar/api/soccer/venue.rb
 - lib/sportradar/api/version.rb
-- soccer-old/boxscore_test.rb
-- soccer-old/hierarchy_test.rb
-- soccer-old/match_test.rb
-- soccer-old/player_test.rb
-- soccer-old/ranking_test.rb
-- soccer-old/schedule_test.rb
-- soccer-old/standing_test.rb
-- soccer-old/summary_test.rb
-- soccer-old/team_test.rb
-- soccer-old_test.rb
 - sportradar-api.gemspec
 homepage: https://github.com/beneggett/sportradar-api
 licenses: []

data/lib/sportradar/api/soccer-old/boxscore.rb

@@ -1,13 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Boxscore < Data
-      attr_accessor :response, :matches
-
-      def initialize(data)
-        @response = data
-        @matches = parse_into_array(selector: response["boxscore"]["matches"]["match"], klass: Sportradar::Api::Soccer::Match)  if response['boxscore'] && response['boxscore']['matches'] && response["boxscore"]["matches"]["match"]
-      end
-
-    end
-  end
-end

data/lib/sportradar/api/soccer-old/category.rb

@@ -1,17 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Category < Data
-      attr_accessor :response, :id, :name, :country_code, :country, :tournament_groups
-
-      def initialize(data)
-        @response = data
-        @id = data["id"]
-        @name = data["name"]
-        @country_code = data["country_code"]
-        @country = data["country"]
-        @tournament_groups = parse_into_array(selector: response["tournament_group"], klass: Sportradar::Api::Soccer::TournamentGroup)  if response["tournament_group"]
-      end
-
-    end
-  end
-end

data/lib/sportradar/api/soccer-old/fact.rb

@@ -1,61 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Fact < Data
-
-      attr_accessor :id, :type, :time, :updated_time, :scratch, :reference_id, :clock, :team_id, :description, :period, :x, :y, :player_id, :card, :injury_time, :home_score, :away_score, :player_out_id, :player_in_id, :penalty, :owngoal, :header, :assist1_id, :winner_id, :draw, :response
-
-      def initialize(data)
-        @response = data
-        @id = data["id"]
-        @type = data["type"]
-        @time = data["time"]
-        @updated_time = data["updated_time"]
-        @scratch = data["scratch"]
-        @reference_id = data["reference_id"]
-        @clock = data["clock"]
-        @team_id = data["team_id"]
-        @description = data["description"]
-        @period = data["period"]
-        @x = data["x"]
-        @y = data["y"]
-        @player_id = data["player_id"]
-        @card = data["card"]
-        @injury_time = data["injury_time"]
-        @home_score = data["home_score"]
-        @away_score = data["away_score"]
-        @player_out_id = data["player_out_id"]
-        @player_in_id = data["player_in_id"]
-        @penalty = data["penalty"]
-        @owngoal = data["owngoal"]
-        @header = data["header"]
-        @assist1_id = data["assist1_id"]
-        @winner_id = data["winner_id"]
-        @draw = data["draw"]
-      end
-
-      ## Fact Types
-      # card
-      # corner_kick
-      # free_kick
-      # game_resumed
-      # goal
-      # goal_kick
-      # injury
-      # injury_return
-      # injury_time
-      # keeper_save
-      # match_ended
-      # match_started
-      # offside
-      # penalty_awarded
-      # penalty_missed
-      # period_over
-      # period_started
-      # shot_blocked
-      # shot_off_target
-      # shot_on_target
-      # substitution
-      # throwin
-    end
-  end
-end

data/lib/sportradar/api/soccer-old/hierarchy.rb

@@ -1,14 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Hierarchy < Data
-      attr_accessor :response, :categories
-
-      def initialize(data)
-        @response = data
-        @categories = parse_into_array(selector: response["category"], klass: Sportradar::Api::Soccer::Category)  if response["category"]
-      end
-
-    end
-  end
-end
-

data/lib/sportradar/api/soccer-old/match.rb

@@ -1,55 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Match < Data
-
-      attr_accessor :id, :status, :scheduled, :scratched, :season_id, :reference_id, :category, :tournament_group, :tournament, :home, :away, :venue, :round, :coverage, :period, :clock, :referee, :facts, :response, :future_game, :winner
-
-      def initialize(data)
-        @response = data
-        @id = data["id"]
-        @reference_id = data["reference_id"]
-        @scheduled = Time.parse(data["scheduled"]) if data["scheduled"]
-        @scratched = data["scratched"] == "true"
-        @season_id = data["season_id"]
-        @status = data["status"]
-        @category = Sportradar::Api::Soccer::Category.new data["category"] if data["category"]
-        @coverage = OpenStruct.new data["coverage"]
-        @round = OpenStruct.new data["round"]
-        @tournament = Sportradar::Api::Soccer::Tournament.new data["tournament"] if data["tournament"]
-        @tournament_group = Sportradar::Api::Soccer::TournamentGroup.new data["tournament_group"] if data["tournament_group"]
-
-        @away = Sportradar::Api::Soccer::Team.new data["away"] if data["away"]
-        @home = Sportradar::Api::Soccer::Team.new data["home"] if data["home"]
-        @venue = Sportradar::Api::Soccer::Venue.new data["venue"] if data["venue"]
-
-        @future_game = @scheduled > Time.now.utc
-        @winner = find_winner if @home && @away && !future_game
-
-        # Actual stats from match summary
-        @period = data["period"]
-        @clock = data["clock"]
-        @referee = OpenStruct.new data["referee"] if data["referee"]
-        @facts = data["facts"]["fact"].map {|fact| Sportradar::Api::Soccer::Fact.new  fact } if data["facts"]
-      end
-
-      def find_winner
-        if @home.winner == 'draw'
-          'draw'
-        else
-          [@home, @away].find {|team| team.winner == "true" }
-        end
-
-      end
-
-      def period_name
-        period_names = {"P1" => "Period one", "H" => "Halftime", "P2" => "Period two", "PX1" => "Pre-extra time one", "X1" => "Extra time one", "PX2" => "Pre-extra time two", "X2" => "Extra time two", "PP" => "Pre-penalty", "P" => "Penalty"}
-        period_names[period] if period
-      end
-
-      def status_description
-        status_descriptions = {"scheduled" =>  "The match is scheduled to be played", "inprogress" =>  "The match is currently in progress", "postponed" =>  "The match has been postponed to a future date", "delayed" =>  "The match has been temporarily delayed and will be continued", "canceled" =>  "The match has been canceled and will not be played", "closed" =>  "The match is over"}
-        status_descriptions[status] if status
-      end
-    end
-  end
-end

data/lib/sportradar/api/soccer-old/player.rb

@@ -1,88 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Player < Data
-
-      attr_accessor :id, :first_name, :last_name, :country_code, :country, :reference_id, :full_first_name, :full_last_name, :position, :started, :jersey_number, :tactical_position, :tactical_order, :statistics, :preferred_foot, :birthdate, :height_in, :weight_lb, :height_cm, :weight_kg, :teams, :response, :rank, :total, :statistics, :last_modified
-
-      def initialize(data)
-        @response = data
-        @teams = parse_into_array(selector: response["team"], klass: Sportradar::Api::Soccer::Team)  if response["team"]
-        @teams = parse_into_array(selector: response["teams"]["team"], klass: Sportradar::Api::Soccer::Team)  if response["teams"] && response["teams"]["team"]
-        @id = data["id"]
-        @first_name = data["first_name"]
-        @last_name = data["last_name"]
-        @country_code = data["country_code"]
-        @country = data["country"]
-        @reference_id = data["reference_id"]
-        @full_first_name = data["full_first_name"]
-        @full_last_name = data["full_last_name"]
-        @position = data["position"] || primary_team.try(:position)
-        @started = data["started"]
-        @jersey_number = data["jersey_number"] || primary_team.try(:jersey_number)
-        @tactical_position = data["tactical_position"]
-        @tactical_order = data["tactical_order"]
-        @last_modified = data["last_modified"]
-
-        # profile
-        @preferred_foot = data["preferred_foot"]
-        @birthdate = data["birthdate"]
-        @height_in = data["height_in"]
-        @weight_lb = data["weight_lb"]
-        @height_cm = data["height_cm"]
-        @weight_kg = data["weight_kg"]
-        @rank = data["rank"]
-        @total = OpenStruct.new data["total"] if data["total"]
-        @statistics = parse_into_array(selector:response["statistics"]["season"], klass: Sportradar::Api::Soccer::Season)  if response["statistics"] &&  response["statistics"]["season"]
-
-      end
-
-      def name
-        [first_name, last_name].join(' ')
-      end
-
-      def full_name
-        full = [full_first_name, full_last_name].join(' ')
-        full == " " ? name : full
-      end
-
-      def position_name
-        positions = {"G" => "Goalie", "D" => "Defender", "M" => "Midfielder", "F" => "Forward", "" => "N/A"}
-        if position
-          positions[position]
-        elsif primary_team.present?
-          positions[primary_team.position]
-        end
-      end
-
-      def primary_team
-        if teams.count == 1
-          teams.first
-        else
-          teams.find {|team| team.name != team.country_code}
-        end if teams
-      end
-
-
-      def tactical_position_name
-        tactical_positions = { "0" => "Unknown", "1" => "Goalkeeper", "2" => "Right Back", "3" => "Central Defender", "4" => "Left Back", "5" => "Right winger", "6" => "Central Midfielder", "7" => "Left Winger", "8" => "Forward" }
-        tactical_positions[tactical_position] if tactical_position
-      end
-
-      def age
-        if birthdate.present?
-          now = Time.now.utc.to_date
-          dob = birthdate.to_date
-          now.year - dob.year - ((now.month > dob.month || (now.month == dob.month && now.day >= dob.day)) ? 0 : 1)
-        end
-      end
-
-      def height_ft
-        if height_in.present?
-          feet, inches = height_in.to_i.divmod(12)
-          "#{feet}' #{inches}\""
-        end
-      end
-
-    end
-  end
-end

data/lib/sportradar/api/soccer-old/ranking.rb

@@ -1,13 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Ranking < Data
-      attr_accessor :response, :categories
-
-      def initialize(data)
-        @response = data
-        @categories = parse_into_array(selector: response["category"], klass: Sportradar::Api::Soccer::Category)  if response["category"]
-      end
-
-    end
-  end
-end

data/lib/sportradar/api/soccer-old/schedule.rb

@@ -1,22 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Schedule < Data
-      attr_accessor :response, :matches
-
-      def initialize(data)
-        @response = data
-        @matches = parse_into_array(selector: response["schedule"]["matches"]["match"], klass: Sportradar::Api::Soccer::Match)  if response['schedule'] && response['schedule']['matches'] && response["schedule"]["matches"]["match"]
-      end
-
-      def league(league_name)
-        # ActiveSupport
-        matches.select{ |match| match.tournament_group.name.parameterize == league_name.parameterize}
-      end
-
-      def available_leagues
-        matches.map {|match| match.tournament_group.name}.uniq
-      end
-
-    end
-  end
-end

data/lib/sportradar/api/soccer-old/season.rb

@@ -1,14 +0,0 @@
-module Sportradar
-  module Api
-    class Soccer::Season < Data
-      attr_accessor :response, :year, :statistics
-
-      def initialize(data)
-        @response = data
-        @year = data["year"]
-        @statistics = parse_into_array(selector: response["statistic"], klass: Sportradar::Api::Soccer::Statistic)  if response["statistic"]
-      end
-
-    end
-  end
-end