sportradar-api 0.13.4 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16711fc16c1fe8cb6f89245196a545149929bc1
-  data.tar.gz: 3ddf3e0c418cb2ac9f98fb943552dd6f7a76293d
+  metadata.gz: 3d49ce56fe5c2ca03df70263e5b216efe58d4fbb
+  data.tar.gz: 65d90cefb754021c67c6dda94fa53fb4f8ad33d9
 SHA512:
-  metadata.gz: 52e1a6a9f6c7d99d908c5f862aa9bc2fc613957ec529d53758413eaee700515909bcd3ae6f4dc4f5aa01a1b1cd5fd13151dde9cdad115b2ebb39d3b4b5d3b9cc
-  data.tar.gz: 3d0b8b56c18b5ba9595dd0bd453166b40af009b04fb48da5d215b7381dd389387b53585ee39e1c37297849b53df8e879507ce74866aac3badcc8de3dac77215e
+  metadata.gz: 43ac236b4a45c7178c929036d25a4ae99340bc8e8710a4307e9f7d5791079b5e547aca9757c11ee6ae44e525c786c35687db9140474e7c90dc23e48c164c25f6
+  data.tar.gz: 9ccedccca1160d5725a5553ea5b327884ffcae3cf11548910b5fcdd8e93dff9998fd250f371665d275bf35393cbdf3b79494c32cb17d4068c3b3716aff5b2f5e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sportradar-api (0.13.4)
+    sportradar-api (0.13.5)
       activesupport
       httparty (>= 0.14.0)
 

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

@@ -212,7 +212,7 @@ module Sportradar
         end
 
         def halftime?
-          clock == '0:00' && quarter == 2
+          status == 'halftime' || clock == '00:00' && quarter == 2
         end
         def clock_display
           if clock && period
@@ -266,7 +266,7 @@ module Sportradar
         # data retrieval
 
         def get_box
-          data = api.get_data(path_box)
+          data = api.get_data(path_box).to_h
           ingest_box(data)
         end
 
@@ -283,7 +283,7 @@ module Sportradar
         end
 
         def get_pbp
-          data = api.get_data(path_pbp)
+          data = api.get_data(path_pbp).to_h
           ingest_pbp(data)
         end
 
@@ -305,12 +305,13 @@ module Sportradar
           set_pbp(period_data)
           @pbp = @periods_hash.values
           check_newness(:pbp, plays.last&.updated)
+          check_newness(:clock, @clock)
           check_newness(:score, @score)
           data
         end
 
         def get_summary
-          data = api.get_data(path_summary)
+          data = api.get_data(path_summary).to_h
           ingest_summary(data)
         end
 

data/lib/sportradar/api/basketball/nba/quarter.rb

@@ -33,8 +33,15 @@ module Sportradar
           end
           def update(data, **opts)
             create_data(@plays_hash, data.dig('events'), klass: Play, api: @api, quarter: self)
-          # rescue => e
-          #   binding.pry
+          end
+
+          def plays_by_type(play_type, *types)
+            if types.empty?
+              plays.grep(Play.subclass(play_type.delete('_')))
+            else
+              play_classes = [play_type, *types].map { |type| Play.subclass(type.delete('_')) }
+              plays.select { |play| play_classes.any? { |klass| play.kind_of?(klass) } }
+            end
           end
 
           def plays

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

@@ -35,6 +35,15 @@ module Sportradar
             create_data(@plays_hash, data.dig('events'), klass: Play, api: @api, half: self)
           end
 
+          def plays_by_type(play_type, *types)
+            if types.empty?
+              plays.grep(Play.subclass(play_type.delete('_')))
+            else
+              play_classes = [play_type, *types].map { |type| Play.subclass(type.delete('_')) }
+              plays.select { |play| play_classes.any? { |klass| play.kind_of?(klass) } }
+            end
+          end
+
           def plays
             @plays_hash.values
           end

data/lib/sportradar/api/soccer/README.md

@@ -0,0 +1,4 @@
+# Sportradar Soccer
+
+![League Reference](https://www.evernote.com/l/ASYGl8UICK1A6q_yrarGw1iFpRLzyQP6HJ4B/image.png)
+

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

@@ -12,18 +12,19 @@ module Sportradar
         end
 
         def update(data, **opts)
-          @type           = data['type']
-          @time           = Time.parse(data['time']) if data['time']
-          @period         = data['period']
-          @period_type    = data['period_type']
-          @period_name    = data['period_name']
-          @match_time     = data['match_time']
-          @team           = data['team'] # home/away
-          @x              = data['x']
-          @y              = data['y']
-          @outcome        = data['outcome']
-          @home_score     = data['home_score']
-          @away_score     = data['away_score']
+          @type           = data['type']                        if data['type']
+          @time           = Time.parse(data['time'])            if data['time']
+          @period         = data['period']                      if data['period']
+          @period_type    = data['period_type']                 if data['period_type']
+          @period_name    = data['period_name']                 if data['period_name']
+          @match_time     = data['match_time']                  if data['match_time']
+          @team           = data['team']                        if data['team']
+          @x              = data['x']                           if data['x']
+          @y              = data['y']                           if data['y']
+          @outcome        = data['outcome']                     if data['outcome']
+          @home_score     = data['home_score']                  if data['home_score']
+          @away_score     = data['away_score']                  if data['away_score']
+          @commentaries   = data['commentaries']                if data['commentaries']
           @goal_scorer    = OpenStruct.new(data['goal_scorer']) if data['goal_scorer']
           @stoppage_time  = data['stoppage_time'].to_i          if data['stoppage_time']
           @player_out     = OpenStruct.new(data['player_out'])  if data['player_out']
@@ -31,7 +32,7 @@ module Sportradar
           @player         = OpenStruct.new(data['player'])      if data['player'] # red/yellow cards
         end
 
-        def updated_at
+        def updated
           @time
         end
 

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

@@ -6,12 +6,15 @@ module Sportradar
         attr_reader :home_score, :away_score, :winner_id, :aggregate_home_score, :aggregate_away_score, :aggregate_winner_id
         attr_reader :referee, :weather_info, :coverage_info, :probabilities
         attr_reader :home, :away, :tournament_id
-        attr_reader :clock, :period, :score, :scoring, :broadcast, :coverage # these are for consistency with other sports
+        attr_reader :period, :score, :broadcast, :coverage # these are for consistency with other sports
+        attr_reader :match_time, :stoppage_time
 
         def initialize(data = {}, league_group: nil, **opts)
           @response     = data
           @id           = data['id']
           @api          = opts[:api]
+          @updates      = {}
+          @changes      = {}
 
           @league_group = league_group || data['league_group'] || @api&.league_group
 
@@ -49,7 +52,6 @@ module Sportradar
             update_teams(stats)
           end
 
-
           @scheduled        = Time.parse(data['scheduled'])         if data['scheduled']
           @start_time_tbd   = data['start_time_tbd']                if data.key?('start_time_tbd')
           @status           = data['status']                        if data['status']
@@ -62,14 +64,18 @@ module Sportradar
 
           @home_score       = data['home_score']                    if data['home_score']
           @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')
+          @ball_locations   = data['ball_locations']                if data['ball_locations']
           @winner_id        = data['winner_id']                     if data['winner_id']
 
           @aggregate_home_score = data['aggregate_home_score']      if data['aggregate_home_score']
           @aggregate_away_score = data['aggregate_away_score']      if data['aggregate_away_score']
           @aggregate_winner_id  = data['aggregate_winner_id']       if data['aggregate_winner_id']
+          @scoring_raw.update(data, source: opts[:source])
           create_data(@timeline_hash, data['timeline'], klass: Event, api: api)
-          # @season
-          # @tournament
+
           if data['competitors']
             update_teams(data['competitors'])
           end
@@ -80,14 +86,92 @@ module Sportradar
         def title
           [@home, @away].compact.map(&:name).join(' vs ')
         end
+        def scoring
+          @scoring_raw.scores.each { |period, hash| hash[@home.id] = hash['home']; hash[@away.id] = hash['away'] }
+        end
+        def score
+          {@home.id => @home_score, @away.id => @away_score}
+        end
+
+        # status helpers
+        def realtime_state_short
+          if future?
+            'Scheduled' # ??
+          elsif finished?
+            'FT'
+          elsif postponed?
+            'PPD'
+          elsif halftime?
+            'HT'
+          else
+            clock_display
+          end
+        end
 
         def realtime_state
-          
+          if future?
+            'Scheduled'
+          elsif finished?
+            'Final'
+          elsif postponed?
+            'Postponed'
+          elsif halftime?
+            'Halftime'
+          else
+            clock_display
+          end
         end
 
-        def scoring
-          @scoring_raw.scores
+        def halftime?
+          @match_status == "halftime"
+        end
+
+        def postponed?
+          'postponed' == status
+        end
+        def unnecessary?
+          'unnecessary' == status
+        end
+        def cancelled?
+          ['unnecessary', 'postponed'].include? status
+        end
+        def future?
+          ['not_started', 'scheduled', 'delayed', 'created', 'time-tbd', 'if-necessary'].include? status
+        end
+        def started?
+          ['live'].include?(@status) || ['halftime', '1st_half', '2nd_half'].include?(@match_status)
         end
+        def finished?
+          ['complete', 'closed'].include?(@status) || ['ended'].include?(@match_status)
+        end
+        def completed?
+          'complete' == status
+        end
+        def closed?
+          'closed' == status
+        end
+
+        def clock_display
+          if @match_time == '45:00' || @match_time == '90:00' # stoppage time
+            @match_time.split(':').first + ?'
+          else
+            @match_time.split(':').first + ?'
+          end
+        end
+        alias :clock :clock_display
+
+        def match_seconds
+          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
+            mm, ss = @stoppage_time.split(':').map(&:to_i)
+            stop_time = mm * 60 + ss
+            time += stop_time
+          end
+          time
+        end
+        alias :game_seconds :match_seconds
 
         def update_teams(data)
           home_hash = data.detect { |team_hash| team_hash["qualifier"] == "home" || team_hash["team"] == "home" }
@@ -214,7 +298,9 @@ module Sportradar
           ingest_timeline(data)
         end
         def ingest_timeline(data)
-          update(data)
+          update(data, source: :pbp)
+          check_newness(:pbp, timeline.last&.updated)
+          check_newness(:clock, self.match_seconds.to_s)
           data
         end
         def queue_timeline
@@ -222,6 +308,21 @@ module Sportradar
           {url: url, headers: headers, params: options, timeout: timeout, callback: method(:ingest_timeline)}
         end
 
+        # tracking updates
+        def remember(key, object)
+          @updates[key] = object&.dup
+        end
+        def not_updated?(key, object)
+          @updates[key] == object
+        end
+        def changed?(key)
+          @changes[key]
+        end
+        def check_newness(key, new_object)
+          @changes[key] = !not_updated?(key, new_object)
+          remember(key, new_object)
+        end
+
       end
     end
   end
@@ -240,6 +341,17 @@ __END__
  [{"id"=>"sr:competitor:2793", "name"=>"US Sassuolo", "country"=>"Italy", "country_code"=>"ITA", "abbreviation"=>"SAS", "qualifier"=>"home"},
   {"id"=>"sr:competitor:2702", "name"=>"AS Roma", "country"=>"Italy", "country_code"=>"ITA", "abbreviation"=>"ROM", "qualifier"=>"away"}]
 
+"sport_event_status"=>
+ {"status"=>"live",
+  "match_status"=>"1st_half",
+  "home_score"=>1,
+  "away_score"=>0,
+  "period"=>1,
+  "clock"=>{"match_time"=>"19:25"},
+  "clock"=>{"match_time"=>"45:00", "stoppage_time"=>"00:05"}
+  "ball_locations"=>[{"x"=>"95", "y"=>"50", "team"=>"away"}, {"x"=>"80", "y"=>"62", "team"=>"home"}, {"x"=>"82", "y"=>"60", "team"=>"home"}, {"x"=>"79", "y"=>"58", "team"=>"home"}]},
+
+
 
 m = Sportradar::Api::Soccer::Match.new({"id"=>"sr:match:12090446"}, league_group: 'eu')
 res = m.get_summary

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

@@ -44,6 +44,14 @@ module Sportradar
           @name || [@first_name, @last_name].join(' ')
         end
 
+        def first_name
+          @first_name || (@name && @name.split(', ')[1])
+        end
+
+        def last_name
+          @last_name || (@name && @name.split(', ')[0])
+        end
+
         def api
           @api || Sportradar::Api::Soccer::Api.new(league_group: @league_group)
         end
@@ -67,9 +75,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

@@ -15,22 +15,23 @@ module Sportradar
         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 = 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)
@@ -47,6 +48,13 @@ module Sportradar
         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

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

@@ -61,6 +61,8 @@ module Sportradar
             opts[:season].tournament_id
           elsif opts[:match]
             opts[:match].tournament_id
+          elsif data['tournament_id']
+            data['tournament_id']
           elsif data['tournament']
             data.dig('tournament', 'id')
           elsif data['season']

data/lib/sportradar/api/version.rb

@@ -1,5 +1,5 @@
 module Sportradar
   module Api
-    VERSION = "0.13.4"
+    VERSION = "0.13.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportradar-api
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
 platform: ruby
 authors:
 - Ben Eggett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -433,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
@@ -466,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