sportradar-api 0.13.10 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c504d4ea3607fc8ce44da28034d96c43f7fdf8f
-  data.tar.gz: 733a6947bcc47373b1e709cd0bb8a07faee871cf
+SHA256:
+  metadata.gz: 33784418fb807e49dedec710bc4d07e22165615929f5b379e5b75da16f7a474c
+  data.tar.gz: '09071e245846662f1f9f60297fdfac12690746040d8e93705be21bba543f583c'
 SHA512:
-  metadata.gz: bac07583b54cd5be2791e1dc291e09e61e45c4bc2e1d9157eb2080ec63bfe9dabe446cf26f602c6fda23b667d813d3895cd78c000dda806d6d491bf21666eb82
-  data.tar.gz: 446bba4593a67af26aba6639f9947d345371d1bad204ac939fa285c276db7adccc9d71dc719d4ea6bc9f908c211b83e661772040fd25d95a02ccb86450dc5f05
+  metadata.gz: b6aa4fc6699921922fc84be63de15569e658baac30506093fe7e250844f51908657e859e70404b55cfe0c8362d945ec19cc5b2c1df3a74711ded681efefea994
+  data.tar.gz: d882cba949755f62c7e3885ca8683866e19f59c3fc9c6fd4bf34e95cdd205f1323130f4b6c0d203c96e43ac3e74bf3b44bd2b439ba6753a431712ef151e9a1dd

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    sportradar-api (0.13.9)
+    sportradar-api (0.14.0)
       activesupport
       httparty (>= 0.14.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.4)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.1)
@@ -45,9 +45,10 @@ GEM
       guard-compat (~> 1.2)
       minitest (>= 3.0)
     hashdiff (0.3.4)
-    httparty (0.15.6)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (0.8.6)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -86,7 +87,7 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tins (1.14.0)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     vcr (3.0.3)
     webmock (3.0.1)
@@ -114,4 +115,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.3
+   1.16.3

data/lib/sportradar/api/baseball/mlb/api.rb

@@ -26,7 +26,7 @@ module Sportradar
             'reg'
           end
           def default_access_level
-            if (ENV['SPORTRADAR_ENV'] || ENV['SPORTRADAR_ENV_MLB'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']) == 'production'
+            if (ENV['SPORTRADAR_ENV_MLB'] || ENV['SPORTRADAR_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']) == 'production'
               'p'
             else
               't'

data/lib/sportradar/api/basketball/ncaamb/tournament.rb

@@ -91,7 +91,7 @@ module Sportradar
 
           # summary
           def get_summary
-            data = api.get_data(path_summary)
+            data = api.get_data(path_summary).to_h
             ingest_summary(data)
           end
           def queue_summary
@@ -105,7 +105,7 @@ module Sportradar
 
           # schedule
           def get_schedule
-            data = api.get_data(path_schedule)
+            data = api.get_data(path_schedule).to_h
             ingest_schedule(data)
           end
           def queue_schedule

data/lib/sportradar/api/basketball/ncaamb.rb

@@ -75,8 +75,8 @@ module Sportradar
         end
 
         def tournaments
-          get_tournaments if tournaments.empty?
-          self
+          get_tournaments if @tournaments_hash.empty?
+          @tournaments_hash.values
         end
 
         def games

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

@@ -115,7 +115,7 @@ module Sportradar
           {url: url, headers: headers, params: options, timeout: timeout, callback: method(:ingest_roster)}
         end
 
-        def get_season_stats(year = Date.today.year)
+        def get_season_stats(year = api.default_year)
           data = api.get_data(path_season_stats(year)).to_h
           ingest_season_stats(data)
         end

data/lib/sportradar/api/images.rb

@@ -23,7 +23,8 @@ module Sportradar
           else
             response = get request_url("#{league}/#{image_type}/players/manifest")
           end
-        elsif nfl_premium || usat_premium || sport == 'ncaafb'
+        elsif nfl_premium || usat_premium || sport == 'ncaafb' || sport == 'nba'
+          year = Date.today.month < 8 ? Date.today.year - 1 : Date.today
           response = get request_url("#{image_type}/players/#{year}/manifest")
         else
           response = get request_url("players/#{image_type}/manifests/all_assets")
@@ -39,7 +40,6 @@ module Sportradar
       # Coach Manifests
 
       def coach_manifests
-        raise Sportradar::Api::Error::InvalidLeague unless league.nil?
         response = get request_url("coaches/#{image_type}/manifests/all_assets")
         if response.success? && response["assetlist"]
           Sportradar::Api::Images::AssetList.new response["assetlist"]
@@ -50,7 +50,6 @@ module Sportradar
       alias_method :all_coaches, :coach_manifests
 
       def venue_manifests
-        raise Sportradar::Api::Error::InvalidLeague unless league.nil?
         if version == 3
           response = get request_url("venues/manifest")
         else
@@ -97,7 +96,7 @@ module Sportradar
       private
 
       def request_url(path)
-        "/#{sport}-images-#{access_level}#{version}/#{provider}/#{path}"
+        "/#{sport}-images-#{access_level}#{version}/#{provider}/#{( league + '/') if league}#{path}"
       end
 
       def api_key
@@ -138,6 +137,8 @@ module Sportradar
           'ap_premium'
         elsif usat_premium
           'usat_premium'
+        elsif sport == 'nba'
+          'getty_premium'
         else
           'usat'
           # REUTERS IS JUST FOR SOCCER sport == 'mlb' ? 'usat' : 'reuters'
@@ -145,11 +146,12 @@ module Sportradar
       end
 
       def version
-        if uses_v3_api? || nfl_premium || usat_premium
-          3
-        elsif uses_v2_api?
-          Sportradar::Api.version('images')
-        end
+        # if uses_v3_api? || nfl_premium || usat_premium || sport == 'nba'
+        #   3
+        # elsif uses_v2_api?
+        #   Sportradar::Api.version('images')
+        # end
+        3
       end
 
       def image_type
@@ -177,7 +179,7 @@ module Sportradar
       end
 
       def v3_api_sports
-        ['mlb', 'soccer', 'cricket', 'f1', 'rugby', 'tennis', 'ncaafb',  ]
+        ['mlb', 'soccer', 'cricket', 'f1', 'rugby', 'tennis', 'ncaafb', 'nba' ]
       end
 
       def soccer_leagues

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

@@ -19,7 +19,7 @@ module Sportradar
           'reg'
         end
         def default_access_level
-          if (ENV['SPORTRADAR_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']) == 'production'
+          if (ENV['SPORTRADAR_SOCCER_ENV'] || ENV['SPORTRADAR_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']) == 'production'
             'x'
           else
             'xt'

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

@@ -23,9 +23,12 @@ module Sportradar
           @lineups_hash  = {}
           get_tournament_id(data, **opts)
           @scoring_raw   = Scoring.new(data, game: self)
-          @home          = Team.new({}, api: api, match: self)
-          @away          = Team.new({}, api: api, match: self)
+          @home          = Team.new(data['home'].to_h, api: api, match: self)
+          @away          = Team.new(data['away'].to_h, api: api, match: self)
           @teams_hash    = { away: @away, home: @home }
+          @team_ids      = { away: @away.id, home: @home.id }
+          @team_stats    = {}
+          @player_stats  = {}
 
           update(data, **opts)
         end
@@ -67,7 +70,7 @@ module Sportradar
           @away_score       = data['away_score']                    if data['away_score']
           @period           = data['period']                        if data['period']
           @match_time       = data.dig('clock', 'match_time')       if data.dig('clock', 'match_time')
-          @stoppage_time    = data.dig('clock', 'stoppage_time')    if data.dig('clock', 'stoppage_time')
+          @stoppage_time    = data.dig('clock', 'stoppage_time')
           @ball_locations   = data['ball_locations']                if data['ball_locations']
           @winner_id        = data['winner_id']                     if data['winner_id']
 
@@ -143,10 +146,10 @@ module Sportradar
           ['live'].include?(@status) || ['halftime', '1st_half', '2nd_half'].include?(@match_status)
         end
         def finished?
-          ['complete', 'closed'].include?(@status) || ['ended'].include?(@match_status)
+          ['ended', 'complete', 'closed'].include?(@status) || ['ended'].include?(@match_status)
         end
         def completed?
-          'complete' == status
+          ['ended', 'complete'].include? status
         end
         def closed?
           'closed' == status
@@ -154,8 +157,8 @@ module Sportradar
 
         def clock_display
           return unless @match_time
-          if @match_time == '45:00' || @match_time == '90:00' # stoppage time
-            @match_time.split(':').first + ?'
+          if @stoppage_time && (@match_time == '45:00' || @match_time == '90:00') # stoppage time
+            @match_time.split(':').first + ?' + '+' + @stoppage_time.split(':').first
           else
             @match_time.split(':').first + ?'
           end
@@ -166,7 +169,7 @@ module Sportradar
           return nil unless @match_time
           mm, ss = @match_time.split(':').map(&:to_i)
           time = mm * 60 + ss
-          if @match_time == '45:00' || @match_time == '90:00' # stoppage time
+          if @stoppage_time && (@match_time == '45:00' || @match_time == '90:00') # stoppage time
             mm, ss = @stoppage_time.split(':').map(&:to_i)
             stop_time = mm * 60 + ss
             time += stop_time
@@ -183,9 +186,20 @@ module Sportradar
             @away.update(away_hash, match: self)
             @teams_hash[@home.id] = @home
             @teams_hash[@away.id] = @away
+            @team_ids = { away: @away.id, home: @home.id }
           end
         end
 
+        def update_stats(team, stats)
+          @team_stats.merge!(team.id => stats.merge(team: team))
+        end
+        def update_player_stats(player, stats)
+          @player_stats.merge!(player.id => stats.merge!(player: player))
+        end
+        def stats(team_id)
+          team_id.is_a?(Symbol) ? @team_stats[@team_ids[team_id]] : @team_stats[team_id]
+        end
+
         def get_tournament_id(data, **opts)
           @tournament_id ||= if opts[:tournament]
             opts[:tournament].id
@@ -212,6 +226,19 @@ module Sportradar
           end
         end
 
+        def timeline_by_minute(minute_start, minute_end = nil)
+          if minute_end
+            @timeline_hash.each_value.select { |ev| (minute_start..minute_end).cover?(ev.match_time.to_i) }
+          else
+            @timeline_hash.each_value.select { |ev| minute_start === ev.match_time }
+          end
+        end
+
+        def plays_by_minute(type, minute_start, minute_end = nil)
+          timeline_by_minute(minute_start, minute_end).select { |ev| ev.type == type }
+        end
+
+
         def lineups(which = nil)
           if which
             @lineups_hash[which.to_s]

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

@@ -3,14 +3,14 @@ module Sportradar
     module Soccer
       class Player < Data
 
-        attr_reader :id, :league_group, :name, :type, :nationality, :country_code, :height, :weight, :jersey_number, :preferred_foot, :stats, :date_of_birth, :matches_played
+        attr_reader :id, :league_group, :name, :type, :nationality, :country_code, :height, :weight, :jersey_number, :preferred_foot, :stats, :game_stats, :date_of_birth, :matches_played
         alias :position :type
 
         def initialize(data = {}, league_group: nil, **opts)
           @response     = data
           @id           = data['id'] if data['id']
           @api          = opts[:api]
-          @team     = opts[:team]
+          @team         = opts[:team]
 
           @league_group = league_group || data['league_group'] || @api&.league_group
 
@@ -38,15 +38,72 @@ module Sportradar
           @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']
+          set_game_stats(data)
 
-          @team.update_player_stats(self, data['statistics'], opts[:game]) if data['statistics'] && @team
+          @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 set_game_stats(data)
+          @game_stats ||= {}
 
+          @game_stats[:substituted_in] = data['substituted_in'] if data['substituted_in'].present?
+          @game_stats[:substituted_out] = data['substituted_out'] if data['substituted_out'].present?
+          @game_stats[:goals_scored] = data['goals_scored'] if data['goals_scored'].present?
+          @game_stats[:assists] = data['assists'] if data['assists'].present?
+          @game_stats[:own_goals] = data['own_goals'] if data['own_goals'].present?
+          @game_stats[:yellow_cards] = data['yellow_cards'] if data['yellow_cards'].present?
+          @game_stats[:yellow_red_cards] = data['yellow_red_cards'] if data['yellow_red_cards'].present?
+          @game_stats[:red_cards] = data['red_cards'] if data['red_cards'].present?
+          @game_stats[:goal_line_clearances] = data['goal_line_clearances'] if data['goal_line_clearances'].present?
+          @game_stats[:interceptions] = data['interceptions'] if data['interceptions'].present?
+          @game_stats[:chances_created] = data['chances_created'] if data['chances_created'].present?
+          @game_stats[:crosses_successful] = data['crosses_successful'] if data['crosses_successful'].present?
+          @game_stats[:crosses_total] = data['crosses_total'] if data['crosses_total'].present?
+          @game_stats[:passes_short_successful] = data['passes_short_successful'] if data['passes_short_successful'].present?
+          @game_stats[:passes_medium_successful] = data['passes_medium_successful'] if data['passes_medium_successful'].present?
+          @game_stats[:passes_long_successful] = data['passes_long_successful'] if data['passes_long_successful'].present?
+          @game_stats[:passes_short_total] = data['passes_short_total'] if data['passes_short_total'].present?
+          @game_stats[:passes_medium_total] = data['passes_medium_total'] if data['passes_medium_total'].present?
+          @game_stats[:passes_long_total] = data['passes_long_total'] if data['passes_long_total'].present?
+          @game_stats[:duels_header_successful] = data['duels_header_successful'] if data['duels_header_successful'].present?
+          @game_stats[:duels_sprint_successful] = data['duels_sprint_successful'] if data['duels_sprint_successful'].present?
+          @game_stats[:duels_tackle_successful] = data['duels_tackle_successful'] if data['duels_tackle_successful'].present?
+          @game_stats[:duels_header_total] = data['duels_header_total'] if data['duels_header_total'].present?
+          @game_stats[:duels_sprint_total] = data['duels_sprint_total'] if data['duels_sprint_total'].present?
+          @game_stats[:duels_tackle_total] = data['duels_tackle_total'] if data['duels_tackle_total'].present?
+          @game_stats[:goals_conceded] = data['goals_conceded'] if data['goals_conceded'].present?
+          @game_stats[:shots_faced_saved] = data['shots_faced_saved'] if data['shots_faced_saved'].present?
+          @game_stats[:shots_faced_total] = data['shots_faced_total'] if data['shots_faced_total'].present?
+          @game_stats[:penalties_faced] = data['penalties_faced'] if data['penalties_faced'].present?
+          @game_stats[:penalties_saved] = data['penalties_saved'] if data['penalties_saved'].present?
+          @game_stats[:fouls_committed] = data['fouls_committed'] if data['fouls_committed'].present?
+          @game_stats[:was_fouled] = data['was_fouled'] if data['was_fouled'].present?
+          @game_stats[:offsides] = data['offsides'] if data['offsides'].present?
+          @game_stats[:shots_on_goal] = data['shots_on_goal'] if data['shots_on_goal'].present?
+          @game_stats[:shots_off_goal] = data['shots_off_goal'] if data['shots_off_goal'].present?
+          @game_stats[:shots_blocked] = data['shots_blocked'] if data['shots_blocked'].present?
+          @game_stats[:minutes_played] = data['minutes_played'] if data['minutes_played'].present?
+          @game_stats[:performance_score] = data['performance_score'] if data['performance_score'].present?
+          @game_stats[:goals_by_head] = data['goals_by_head'] if data['goals_by_head'].present?
+          @game_stats[:goals_by_penalty] = data['goals_by_penalty'] if data['goals_by_penalty'].present?
         end
 
         def display_name
           @name || [@first_name, @last_name].join(' ')
         end
 
+        def birth_date
+          @date_of_birth
+        end
+
+        def jersey
+          @jersey_number
+        end
+
         def first_name
           @name.split()[1]
         end

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

@@ -2,6 +2,7 @@ module Sportradar
   module Api
     module Soccer
       class Team < Data
+        attr_reader :response
         attr_accessor :tournament_id, :venue, :player_stats
         attr_reader :id, :league_group, :name, :country, :country_code, :abbreviation, :qualifier
         alias :alias :abbreviation
@@ -39,12 +40,16 @@ 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']
 
-          # TODO team statistics
           @team_stats    = 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']
 
@@ -57,10 +62,10 @@ 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']
@@ -70,6 +75,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
@@ -101,9 +110,7 @@ module Sportradar
           url, headers, options, timeout = api.get_request_info(path_roster)
           {url: url, headers: headers, params: options, timeout: timeout, callback: method(:ingest_roster)}
         end
-        def update_player_stats(player, stats, game = nil)
-          game ? game.update_player_stats(player, stats) : @player_stats.merge(player.id => stats.merge(player: player))
-        end
+
         def path_results
           "#{ path_base }/results"
         end
@@ -143,6 +150,9 @@ module Sportradar
           data = api.get_data(path_statistics(tourn_id)).to_h
           ingest_statistics(data)
         end
+        def get_season_stats(*args)
+          get_statistics
+        end
         def ingest_statistics(data)
           update(data)
           data

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

@@ -2,7 +2,7 @@ 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
 
@@ -26,8 +26,10 @@ module Sportradar
             update(data['tournament'])
           end
 
-          @name     = data["name"]      || @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)
@@ -86,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

data/lib/sportradar/api/version.rb

@@ -1,5 +1,5 @@
 module Sportradar
   module Api
-    VERSION = "0.13.10"
+    VERSION = "0.14.0"
   end
 end

data/lib/sportradar/api.rb

@@ -60,7 +60,7 @@ module Sportradar
         {api: :nascar, version:   3},
         {api: :odds, version:   1},
         {api: :content, version:  3},
-        {api: :images, version:   2},
+        {api: :images, version:   3},
         {api: :live_images, version:  1},
         {api: :olympics, version:   2},
         {api: :soccer, version:   3},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportradar-api
 version: !ruby/object:Gem::Version
-  version: 0.13.10
+  version: 0.14.0
 platform: ruby
 authors:
 - Ben Eggett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -471,7 +471,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sportradar API client