sports_data_api 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4888a1fe1b522f022b04ab5a1dad43912e01724b336669da51685f0e7cb4968
-  data.tar.gz: 9b56da40713366909f3b1494b75911e3b850cdf487e75bf111734b903f8404e2
+  metadata.gz: cbf259487fe366744f521ad3b30bb5e4135c6bf514d45c3f6f1cfcd39e08edda
+  data.tar.gz: 4b787131f7ccd8ab11645292a92260e62a034c037ebf6dad576b2608ba58c03f
 SHA512:
-  metadata.gz: 164a6298a5414f720977869729b04f613a6e89ea63dd271b67f33690138be6faa0629364dd4a117526e170317f28376cf92bc5d7747c6497cbeb73897e16edc9
-  data.tar.gz: 4576fecccd6f384c20d7adc31fa45e2ef3593236c1c3263f01feb2227757d0e64e2e64f7481784b0738c6ba3b6776d6dcca0f02b229de491f8d12c371aa75299
+  metadata.gz: 21daae5927341cf9fa9421affff4fae33b0eaa19c9988e80732a7905dafecb3507d939d80ff5323e49ad46bf518b6a9eb92e59a64ba570b7119fb9fd05eac37e
+  data.tar.gz: a2e3e1c5586471ecffa85f56a3b01f17262bed8cbefcff029c68f0ccb80f70aa9a4d968fa193ccfe049a5a91746a96722b7b0e38bdb0d84da173be9f4a1f2597

data/.travis.yml

@@ -3,9 +3,8 @@ before_install: gem install bundler && bundler -v
 rvm:
   - 2.2
   - 2.3
-  - 2.4.0
-  - 2.5.0
-  - ruby-head
+  - 2.4
+  - 2.5
 addons:
   code_climate:
     repo_token: a3efbc440cb5027fc10a3cfa845aab934cf8c48c27fa0b2ff34855933245aca1

data/lib/sports_data_api/merged_stats.rb

@@ -0,0 +1,15 @@
+module SportsDataApi
+  class MergedStats < JsonData
+    def initialize(json, override_var_name = nil)
+      super(json, override_var_name)
+      ivar = instance_variable_get("@#{instance_var_name}")
+      json.each do |key, val|
+        next unless val.is_a? Hash
+        json[key].each do |sub_key, data|
+          ivar["#{key}_#{sub_key}".to_sym] = data
+        end
+        ivar.delete key.to_sym
+      end
+    end
+  end
+end

data/lib/sports_data_api/mlb.rb

@@ -13,7 +13,6 @@ module SportsDataApi
     autoload :Division, File.join(DIR, 'division')
     autoload :Game, File.join(DIR, 'game')
     autoload :League, File.join(DIR, 'league')
-    autoload :MergedStats, File.join(DIR, 'merged_stats')
     autoload :Player, File.join(DIR, 'player')
     autoload :Scoring, File.join(DIR, 'scoring')
     autoload :Statistics, File.join(DIR, 'statistics')

data/lib/sports_data_api/nhl/broadcast.rb

@@ -1,14 +1,6 @@
 module SportsDataApi
   module Nhl
-    class Broadcast
-      attr_reader :network, :satellite
-      def initialize(xml)
-        xml = xml.first if xml.is_a? Nokogiri::XML::NodeSet
-        if xml.is_a? Nokogiri::XML::Element
-          @network = xml['network']
-          @satellite = xml['satellite']
-        end
-      end
+    class Broadcast < SportsDataApi::JsonData
     end
   end
 end

data/lib/sports_data_api/nhl/game.rb

@@ -1,41 +1,51 @@
 module SportsDataApi
   module Nhl
     class Game
-      attr_reader :id, :scheduled, :home, :home_team, :away,
-        :away_team, :status, :venue, :broadcast, :year, :season,
-        :date, :period, :clock, :home_team_id, :away_team_id
-
-      def initialize(args={})
-        xml = args.fetch(:xml)
-        @year = args[:year] ? args[:year].to_i : nil
-        @season = args[:season] ? args[:season].to_sym : nil
-        @date = args[:date]
-
-        xml = xml.first if xml.is_a? Nokogiri::XML::NodeSet
-        if xml.is_a? Nokogiri::XML::Element
-          @id = xml['id']
-          @scheduled = Time.parse xml['scheduled']
-          @home = xml['home_team']
-          @away = xml['away_team']
-          @home_team_id = xml['home_team']
-          @away_team_id = xml['away_team']
-          @status = xml['status']
-          @clock = xml['clock']
-          @period = xml['period'] ? xml['period'].to_i : nil
-
-          team_xml = xml.xpath('team')
-          @home_team = Team.new(team_xml.first)
-          @away_team = Team.new(team_xml.last)
-          @venue = Venue.new(xml.xpath('venue'))
-          @broadcast = Broadcast.new(xml.xpath('broadcast'))
-        end
+      attr_reader :id, :status, :year, :season, :clock,
+        :home_team_id, :away_team_id
+
+      def initialize(json:, year: nil, season: nil)
+        @json = json
+        @year = year
+        @season = season
+        @id = json['id']
+        @home_team_id = json['home']['id']
+        @away_team_id = json['away']['id']
+        @status = json['status']
+        @clock = json['clock']
+      end
+
+      def period
+        return unless json['period']
+        json['period'].to_i
+      end
+
+      def scheduled
+        @scheduled = Time.parse(json['scheduled'])
+      end
+
+      def home_team
+        @home_team ||= Team.new(json['home'])
+      end
+
+      def away_team
+        @away_team ||= Team.new(json['away'])
+      end
+
+      def broadcast
+        return if json['broadcast'].nil? || json['broadcast'].empty?
+        @broadcast ||= Broadcast.new(json['broadcast'])
+      end
+
+      def venue
+        return if json['venue'].nil? || json['venue'].empty?
+        @venue ||= Venue.new(json['venue'])
       end
 
       ##
       # Wrapper for Nhl.game_summary
-      # TODO
       def summary
-        Nhl.game_summary(@id)
+        Nhl.game_summary(id)
       end
 
       ##
@@ -51,6 +61,10 @@ module SportsDataApi
       def boxscore
         raise NotImplementedError
       end
+
+      private
+
+      attr_reader :json
     end
   end
 end

data/lib/sports_data_api/nhl/games.rb

@@ -2,25 +2,28 @@ module SportsDataApi
   module Nhl
     class Games
       include Enumerable
-      attr_reader :games, :date
 
-      def initialize(xml)
-        @date = xml.first['date']
+      attr_reader :date
 
-        @games = xml.xpath("games/game").map do |game_xml|
-          Game.new(date: @date, xml: game_xml)
-        end
+      def initialize(json)
+        @json = json
+        @date = json['date']
       end
 
-      def each &block
-        @games.each do |game|
-          if block_given?
-            block.call game
-          else
-            yield game
-          end
+      def games
+        @games ||= json['games'].map do |game_json|
+          Game.new(json: game_json)
         end
       end
+
+      def each
+        return games.each unless block_given?
+        games.each { |game| yield game }
+      end
+
+      private
+
+      attr_reader :json
     end
   end
 end

data/lib/sports_data_api/nhl/player.rb

@@ -1,30 +1,9 @@
 module SportsDataApi
   module Nhl
-    class Player
-      attr_reader :stats
-
-      def initialize(xml)
-        if xml.is_a? Nokogiri::XML::Element
-          player_ivar = self.instance_variable_set("@#{xml.name}", {})
-          self.class.class_eval { attr_reader :"#{xml.name}" }
-          xml.attributes.each do |attr_name, attr_value|
-            player_ivar[attr_name.to_sym] = attr_value.value
-          end
-
-          stats_xml = xml.xpath('statistics')
-          if stats_xml.is_a? Nokogiri::XML::NodeSet and stats_xml.count > 0
-            @stats = SportsDataApi::Stats.new(stats_xml.first)
-          end
-
-          if @stats
-            goaltending_xml = xml.xpath('goaltending').first
-            if goaltending_xml.is_a? Nokogiri::XML::Element
-              goaltending_ivar = @stats.instance_variable_set("@#{goaltending_xml.name}", {})
-              @stats.class.class_eval { attr_reader :"#{goaltending_xml.name}" }
-              goaltending_xml.attributes.each { |attr_name, attr_value| goaltending_ivar[attr_name.to_sym] = attr_value.value }
-            end
-          end
-        end
+    class Player < SportsDataApi::JsonData
+      def stats
+        return if player[:statistics].nil? || player[:statistics].empty?
+        @stats ||= SportsDataApi::MergedStats.new(player[:statistics])
       end
     end
   end

data/lib/sports_data_api/nhl/season.rb

@@ -1,17 +1,18 @@
 module SportsDataApi
   module Nhl
     class Season
-      attr_reader :id, :year, :type, :games
+      attr_reader :id, :year, :type
 
-      def initialize(xml)
-        if xml.is_a? Nokogiri::XML::NodeSet
-          @id = xml.first["id"]
-          @year = xml.first["year"].to_i
-          @type = xml.first["type"].to_sym
+      def initialize(json)
+        @json = json
+        @id = json['season']['id']
+        @year = json['season']['year']
+        @type = json['season']['type'].to_sym
+      end
 
-          @games = xml.first.xpath("games/game").map do |game_xml|
-            Game.new(year: @year, season: @type, xml: game_xml)
-          end
+      def games
+        @games ||= json['games'].map do |game_json|
+          Game.new(year: year, season: type, json: game_json)
         end
       end
 
@@ -21,8 +22,12 @@ module SportsDataApi
       #
       # The only valid types are: :pre, :reg, :pst
       def self.valid?(season)
-        [:PRE, :REG, :PST].include?(season)
+        %i[PRE REG PST].include?(season)
       end
+
+      private
+
+      attr_reader :json
     end
   end
 end

data/lib/sports_data_api/nhl/team.rb

@@ -1,29 +1,46 @@
 module SportsDataApi
   module Nhl
     class Team
-      attr_reader :id, :name, :market, :alias, :conference, :division,
-                  :stats, :players, :points
-
-      def initialize(xml, conference = nil, division = nil)
-        xml = xml.first if xml.is_a? Nokogiri::XML::NodeSet
-        if xml.is_a? Nokogiri::XML::Element
-          @id = xml['id']
-          @name = xml['name']
-          @market = xml['market']
-          @alias = xml['alias']
-          @points = xml['points'] ? xml['points'].to_i : nil
-          @conference = conference
-          @division = division
-          @players = xml.xpath("players/player").map do |player_xml|
-            Player.new(player_xml)
-          end
+      attr_reader :id, :name, :market, :alias
+
+      def initialize(json, conference = nil, division = nil)
+        @json = json
+        @id = json['id']
+        @name = json['name']
+        @market = json['market']
+        @alias = json['alias']
+        @conference = conference
+        @division = division
+      end
+
+      def conference
+        @conference ||= json.fetch('conference', {})['alias']
+      end
+
+      def division
+        @division ||= json.fetch('division', {})['alias']
+      end
+
+      def points
+        return unless json['points']
+        json['points'].to_i
+      end
+
+      def players
+        return [] if json['players'].nil?
+        @players ||= json['players'].map do |player_json|
+          Player.new(player_json)
         end
       end
 
+      def venue
+        return if json['venue'].nil?
+        @venue ||= Venue.new(json['venue'])
+      end
+
       ##
       # Compare the Team with another team
       def ==(other)
-        # Must have an id to compare
         return false if id.nil?
 
         if other.is_a? SportsDataApi::Nhl::Team
@@ -34,6 +51,10 @@ module SportsDataApi
           super(other)
         end
       end
+
+      private
+
+      attr_reader :json
     end
   end
 end

data/lib/sports_data_api/nhl/teams.rb

@@ -3,81 +3,30 @@ module SportsDataApi
     class Teams
       include Enumerable
 
-      attr_reader :conferences, :divisions
-
-      ##
-      # Initialize by passing the raw XML returned from the API
-      def initialize(xml)
-        @teams = []
-        xml = xml.first if xml.is_a? Nokogiri::XML::NodeSet
-        if xml.is_a? Nokogiri::XML::Element
-          xml.xpath('conference').each do |conference|
-            # Conference ID, e.g., EASTERN or WESTERN
-            cname = conference['alias']
-
-            conference.xpath('division').each do |division|
-              # Division ID, e.g., ATLANTIC, PACIFIC
-              dname = division['alias']
+      def initialize(json)
+        @json = json
+      end
 
-              # Create a new team
-              @teams << division.xpath('team').map { |team| Team.new(team, cname, dname) }
+      def teams
+        @teams ||= json['conferences'].flat_map do |conference|
+          conference['divisions'].flat_map do |division|
+            division['teams'].map do |team_json|
+              Team.new(team_json, conference['alias'], division['alias'])
             end
           end
         end
-
-        @teams.flatten!
-
-        uniq_conferences = @teams.map { |team| team.conference.upcase }.uniq
-        @allowed_conferences = uniq_conferences.map { |str| str.to_sym }.concat(uniq_conferences.map { |str| str.downcase.to_sym })
-        @conferences = uniq_conferences.map { |conf| conf.to_sym }
-
-        uniq_divisions = @teams.map { |team| team.division.upcase }.uniq
-        @divisions =  @teams.map { |team| team.division.to_sym }.uniq
-        @allowed_divisions = uniq_divisions.map { |str| str.to_sym }.concat(uniq_divisions.map { |str| str.downcase.to_sym })
-      end
-
-      def [](search_index)
-        found_index = @teams.index(search_index)
-        unless found_index.nil?
-          @teams[found_index]
-        end
       end
 
       ##
-      #
-      def respond_to?(method)
-        @allowed_conferences.include?(method) || @allowed_divisions.include?(method)
+      # Make the class Enumerable
+      def each
+        return teams.each unless block_given?
+        teams.each { |team| yield team }
       end
 
-      ##
-      #
-      def method_missing(method)
-        if @allowed_conferences.include?(method)
-          @teams.select do |team|
-            up = team.conference.upcase.to_sym
-            dw = team.conference.downcase.to_sym
-            up === method || dw === method
-          end
-        elsif @allowed_divisions.include?(method)
-          @teams.select do |team|
-            up = team.division.upcase.to_sym
-            dw = team.division.downcase.to_sym
-            up === method || dw === method
-          end
-        end
-      end
+      private
 
-      ##
-      # Make the class Enumerable
-      def each(&block)
-        @teams.each do |team|
-          if block_given?
-            block.call team
-          else
-            yield team
-          end
-        end
-      end
+      attr_reader :json
     end
   end
 end

data/lib/sports_data_api/nhl/venue.rb

@@ -1,20 +1,6 @@
 module SportsDataApi
   module Nhl
-    class Venue
-      attr_reader :id, :name, :address, :city, :state, :zip, :country, :capacity
-      def initialize(xml)
-        xml = xml.first if xml.is_a? Nokogiri::XML::NodeSet
-        if xml.is_a? Nokogiri::XML::Element
-          @id = xml['id']
-          @name = xml['name']
-          @address = xml['address']
-          @city = xml['city']
-          @state = xml['state']
-          @zip = xml['zip']
-          @country = xml['country']
-          @capacity = xml['capacity']
-        end
-      end
+    class Venue < SportsDataApi::JsonData
     end
   end
 end

data/lib/sports_data_api/nhl.rb

@@ -5,8 +5,8 @@ module SportsDataApi
     class Exception < ::Exception
     end
 
-    API_VERSION = 4
-    BASE_URL = 'https://api.sportsdatallc.org/nhl-%{access_level}%{version}'
+    API_VERSION = 5
+    BASE_URL = 'https://api.sportradar.us/nhl/%{access_level}/v%{version}/en'
     DIR = File.join(File.dirname(__FILE__), 'nhl')
     SPORT = :nhl
 
@@ -26,31 +26,31 @@ module SportsDataApi
         season = season.to_s.upcase.to_sym
         raise Exception.new("#{season} is not a valid season") unless Season.valid?(season)
 
-        Season.new(response_xml_xpath("/games/#{year}/#{season}/schedule.xml", '/league/season-schedule'))
+        Season.new(response_json("/games/#{year}/#{season}/schedule.json"))
       end
 
       ##
       # Fetches NHL team roster
-      def team_roster(team)
-        Team.new(response_xml_xpath("/teams/#{team}/profile.xml", 'team'))
+      def team_roster(team_id)
+        Team.new(response_json("/teams/#{team_id}/profile.json"))
       end
 
       ##
       # Fetches NHL game summary for a given game
-      def game_summary(game)
-        Game.new(xml: response_xml_xpath("/games/#{game}/summary.xml", '/game'))
+      def game_summary(game_id)
+        Game.new(json: response_json("/games/#{game_id}/summary.json"))
       end
 
       ##
       # Fetches all NHL teams
       def teams
-        Teams.new(response_xml_xpath("/league/hierarchy.xml", '/league'))
+        Teams.new(response_json('/league/hierarchy.json'))
       end
 
       ##
       # Fetches NHL daily schedule for a given date
       def daily(year, month, day)
-        Games.new(response_xml_xpath("/games/#{year}/#{month}/#{day}/schedule.xml", 'league/daily-schedule'))
+        Games.new(response_json("/games/#{year}/#{month}/#{day}/schedule.json"))
       end
     end
   end

data/lib/sports_data_api/version.rb

@@ -1,3 +1,3 @@
 module SportsDataApi
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

data/lib/sports_data_api.rb

@@ -57,6 +57,7 @@ module SportsDataApi
   autoload :Exception,   File.join(LIBRARY_PATH, 'exception')
   autoload :Golf,        File.join(LIBRARY_PATH, 'golf')
   autoload :JsonData,    File.join(LIBRARY_PATH, 'json_data')
+  autoload :MergedStats, File.join(LIBRARY_PATH, 'merged_stats')
   autoload :Mlb,         File.join(LIBRARY_PATH, 'mlb')
   autoload :Nba,         File.join(LIBRARY_PATH, 'nba')
   autoload :Ncaafb,      File.join(LIBRARY_PATH, 'ncaafb')