infostrada 0.0.1 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a8b5ee87337a4ef44fa4c6ef2cd039b292b9fb
-  data.tar.gz: 484e915e0c41a3ae3e4193e8aa16667611ae3e23
+  metadata.gz: a4cb72e08b9e4d09f02497612a54a0734521bfd9
+  data.tar.gz: 52471df74223d184f91240e5c8a9b9af68a7ce29
 SHA512:
-  metadata.gz: 536352807582e80903546052089a0ae636f71c0d5f9432fe0e888fb2c31e711b522c2ec5ac908a75267589556f4a737078b797e5415f1c772f766edbe0e8e44c
-  data.tar.gz: 574363bbfdd0bef6030fab3765eb2f97d4b04ae75cb74cd0c8aadddb1cae1f46991e4f1c9014068d9bb73d82d102c5a892221458185f17bd888ae475924ff6a3
+  metadata.gz: 4629ca8db63754ef1c2aa47dab651edfcbe96406a89edfa05b3a0b4f368cc48b7c4520bfa29624dad9ff037fb70b7996e6496015c9654c87a0fc8d165e1f603f
+  data.tar.gz: 2136d24be6c40c5e93f132078afe595a62bae73f2f4770b319bba4ba4b313ccf3613ea46e565556cb3462e6dd8d906e0d4d4b6b7966a0cef98020caba81f477c

data/lib/infostrada/base_request.rb

@@ -5,10 +5,13 @@ module Infostrada
   class BaseRequest
     include HTTParty
 
+    # How many times should we retry the request if Timeout::Error is raised?
+    RETRIES = 5
+
     # Uncomment to debug HTTParty calls.
     # debug_output $stdout
 
-    basic_auth 'APIdemo', 'Sauv@k@vel4'
+    basic_auth 'APIdemo', 'saTo1991W&dy'
 
     # The default format of the requests. Used on HTTP header 'Content-Type'.
     format :json
@@ -26,11 +29,27 @@ module Infostrada
     # Disable the use of rails query string format.
     #
     # With rails query string format enabled:
-    #   => get '/', :query => {:selected_ids => [1,2,3]}
+    #   => get '/', :query => { selected_ids: [1,2,3] }
     #
     # Would translate to this:
     #   => /?selected_ids[]=1&selected_ids[]=2&selected_ids[]=3
     #
     disable_rails_query_string_format
+
+    # Used with Timeout::Error rescue so we can keep trying to fetch the information after timeout.
+    def self.get!(path, options = {}, &block)
+      attempts = 1
+      result = nil
+
+      begin
+        result = get(path, options, &block)
+      rescue Timeout::Error => error
+        puts "Timeout! Retrying... (#{attempts})"
+        attempts += 1
+        retry unless attempts > RETRIES
+      end
+
+      result
+    end
   end
 end

data/lib/infostrada/competition.rb

@@ -1,4 +1,16 @@
 module Infostrada
+  # n_CompetitionSet is an indicator for the type of Competition:
+  #
+  # 1 = domestic league
+  # 2 = domestic cup
+  # 3 = international club competition (e.g. Champions League)
+  # 4 = country competition (e.g. World Cup)
+  #
+  # n_CompetitionLevel is an indicator for the level of a domestic competition:
+  #
+  # 1 = highest level (e.g. German Bundesliga)
+  # 2 = 2nd highest level (e.g. German 2. Bundesliga)
+  # 3 = 3rd highest level and so on
   class Competition
     attr_accessor :id, :name, :set, :level, :nation
 
@@ -6,19 +18,7 @@ module Infostrada
       @id = hash.delete('n_CompetitionID')
       @name = hash.delete('c_Competition')
 
-      @nation = Nation.new
-      set_nation_attributes(hash)
-    end
-
-    private
-
-    def set_nation_attributes(hash)
-      hash.each do |key, value|
-        if key =~ /[cn]_\w+Natio.*/
-          method = "#{key.snake_case.gsub(/[cn]_competition_?/, '')}="
-          @nation.send(method, value)
-        end
-      end
+      @nation = Nation.new(hash, 'competition')
     end
   end
 end

data/lib/infostrada/edition.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Infostrada
   class Edition
     extend Forwardable
@@ -15,7 +17,7 @@ module Infostrada
       @id = hash.delete('n_EditionID')
       @season = hash.delete('c_Season')
       @start_date = Formatter.format_date(hash.delete('d_EditionStartDate'))
-      @end_date = hash.delete('d_EditionEndDate')
+      @end_date = Formatter.format_date(hash.delete('d_EditionEndDate'))
 
       @competition = Competition.new(hash)
     end

data/lib/infostrada/edition_request.rb

@@ -1,3 +1,5 @@
+require 'infostrada/base_request'
+
 module Infostrada
   class EditionRequest < Infostrada::BaseRequest
     URLS = {
@@ -5,7 +7,7 @@ module Infostrada
     }
 
     def self.get_list
-      list = get(URLS[:list])
+      list = get!(URLS[:list])
 
       editions = []
       list.each do |edition_hash|

data/lib/infostrada/match.rb

@@ -0,0 +1,118 @@
+require 'infostrada/referee'
+require 'infostrada/match_event_list'
+
+module Infostrada
+  class Match < Infostrada::BaseRequest
+    extend Forwardable
+
+    attr_accessor :id, :date, :rescheduled, :round, :home_team, :away_team, :phase, :status_short
+    attr_accessor :stadium_id, :stadium_name, :goals, :match_status, :finished, :awarded
+    attr_accessor :postponed, :referee, :spectators, :leg, :knockout_phase, :first_leg_score
+    attr_accessor :aggregate_winner_id, :current_period_started_at, :status, :started_at, :started
+    attr_accessor :competition
+
+    # Check if the live score, live goals and live lineups are already available
+    attr_accessor :live, :live_score, :live_goals, :live_lineup
+
+    # Lineup
+    attr_accessor :lineup_provisional, :lineup_official
+
+    def_delegator :@referee, :name, :referee_name
+    def_delegator :@phase, :name, :phase_name
+    def_delegator :@goals, :away_goals, :away_goals
+    def_delegator :@goals, :home_goals, :home_goals
+
+    # We can get all matches for a given edition (very heavy payload). Or we can just get the match
+    # information on a single match.
+    URLS = {
+      list: '/GetMatchList_Edition',
+      single: '/GetMatchInfo'
+    }
+
+    def self.where(options = {})
+      list = get_match_list(options)
+
+      matches = []
+      list.each do |match_hash|
+        matches << Match.new(match_hash)
+      end
+
+      matches.size > 1 ? matches : matches.first
+    end
+
+    def self.get_match_list(options)
+      edition_id = options.delete(:edition_id)
+      match_id = options.delete(:id)
+
+      list = get!(URLS[:list], query: { editionid: edition_id.to_i }) if edition_id
+      list = get!(URLS[:single], query: { matchid: match_id.to_i }) if match_id
+
+      list
+    end
+
+    def initialize(hash)
+      @id = hash['n_MatchID']
+      @date = Formatter.format_date(hash['d_DateUTC'])
+      @rescheduled = hash['b_RescheduledToBeResumed']
+      @round = hash['round']
+
+      @aggregate_winner_id = hash['n_WinnerOnAggregateTeamID']
+      @current_period_started_at = Formatter.format_date(hash['d_CurrentPeriodStartTime'])
+      @status = hash['c_MatchStatus']
+      @status_short = hash['c_MatchStatusShort']
+      @leg = hash['n_Leg']
+      @started_at = Formatter.format_date(hash['d_MatchStartTime'])
+
+      @stadium_id = hash['n_StadiumGeoID']
+      @stadium_name = hash['c_Stadium']
+
+      @live = hash['b_Live']
+      @started = hash['b_Started']
+      @finished = hash['b_Finished']
+      @awarded = hash['b_Awarded']
+
+      @live = hash['b_Live']
+      @live_score = hash['b_DataEntryLiveScore']
+      @live_goals = hash['b_DataEntryLiveGoal']
+      @live_lineup = hash['b_DataEntryLiveLineup']
+
+      @lineup_provisional = hash['b_LineupProvisional']
+      @lineup_official = hash['b_LineupOfficial']
+
+      @referee = Referee.new(hash)
+      @phase = Phase.new(hash)
+
+      @home_team = Team.new(hash, 'home')
+      @away_team = Team.new(hash, 'away')
+
+      @goals = Goals.new(hash)
+
+      @competition = Competition.new(hash)
+
+      self
+    end
+
+    def live_event_list
+      event_list = MatchEventList.where(match_id: self.id)
+    end
+  end
+
+  class Goals
+    attr_accessor :home_goals, :away_goals, :home_goals_half_time, :away_goals_half_time,
+      :home_goals_90_mins, :away_goals_90_mins, :home_goals_105_mins, :away_goals_150_mins,
+      :home_goals_shootout, :away_goals_shootout
+
+    def initialize(hash)
+      @home_goals = hash['n_HomeGoals']
+      @away_goals = hash['n_AwayGoals']
+      @home_goals_half_time = hash['n_HomeGoalsHalftime']
+      @away_goals_half_time = hash['n_AwayGoalsHalftime']
+      @home_goals_90_mins = hash['n_HomeGoals90mins']
+      @away_goals_90_mins = hash['n_AwayGoals90mins']
+      @home_goals_105_mins = hash['n_HomeGoals105mins']
+      @away_goals_105_mins = hash['n_AwayGoals105mins']
+      @home_goals_shootout = hash['n_HomeGoalsShootout']
+      @away_goald_shootout = hash['n_AwayGoalsShootout']
+    end
+  end
+end

data/lib/infostrada/match_event.rb

@@ -0,0 +1,34 @@
+module Infostrada
+  class MatchEvent
+    attr_accessor :id, :description, :short_description, :period, :period_short, :time, :home_goals
+    attr_accessor :away_goals, :home_event, :team_id, :team_name, :team_short_name, :person_id
+    attr_accessor :person_name, :person_short_name, :reason, :info, :person2_id, :person2_name
+    attr_accessor :person2_short_name, :minute
+
+    def initialize(hash)
+      @id                 = hash['n_ActionID']
+      @description        = hash['c_Action']
+      @short_description  = hash['c_ActionShort']
+      @period             = hash['c_Period']
+      @period_short       = hash['c_PeriodShort']
+      @time               = hash['n_ActionTime']
+      @home_goals         = hash['n_HomeGoals']
+      @away_goals         = hash['n_AwayGoals']
+      @home_event         = (hash['n_HomeOrAway'] == 1) ? true : false
+      @team_id            = hash['n_TeamID']
+      @team_name          = hash['c_Team']
+      @team_short_name    = hash['c_TeamShort']
+      @person_id          = hash['n_PersonID']
+      @person_name        = hash['c_Person']
+      @person_short_name  = hash['c_PersonShort']
+      @reason             = hash['c_ActionReason']
+      @info               = hash['c_ActionInfo']
+      @person2_id         = hash['n_SubPersonID']
+      @person2_name       = hash['c_SubPerson']
+      @person2_short_name = hash['c_SubPersonShort']
+      @minute             = hash['c_ActionMinute']
+
+      self
+    end
+  end
+end

data/lib/infostrada/match_event_list.rb

@@ -0,0 +1,22 @@
+require 'infostrada/match_event'
+
+module Infostrada
+  class MatchEventList < Infostrada::BaseRequest
+    URL = '/GetMatchActionList_All'
+
+    attr_accessor :events
+
+    def self.where(options = {})
+      match_id = options.delete(:match_id)
+
+      list = get!(URL, query: { matchid: match_id.to_i })
+
+      events = []
+      list.each do |event_hash|
+        events << MatchEvent.new(event_hash)
+      end
+
+      events
+    end
+  end
+end

data/lib/infostrada/nation.rb

@@ -2,6 +2,13 @@ module Infostrada
   class Nation
     attr_accessor :id, :name, :short_name
 
+    def initialize(hash, prefix)
+      hash.each do |key, value|
+        match = key.snake_case.match(/[cn]_#{prefix}_?(natio\w*)$/)
+        self.send("#{$1}=", value) if match
+      end
+    end
+
     def natio_geo_id=(id)
       self.id = id
     end

data/lib/infostrada/person_info.rb

@@ -1,3 +1,5 @@
+require 'infostrada/base_request'
+
 module Infostrada
   class PersonInfo < Infostrada::BaseRequest
     URL = '/GetPersonInfo'
@@ -7,7 +9,7 @@ module Infostrada
 
     def self.where(options)
       id = options.delete(:person_id)
-      info = get(URL, query: { personid: id }).first
+      info = get!(URL, query: { personid: id }).first
       self.new(id, info)
     end
 

data/lib/infostrada/phase.rb

@@ -0,0 +1,57 @@
+module Infostrada
+  # Phase of a given edition.
+  # The only thing that can be confusing is the current and currents boolean variables. Here's an
+  # explanation from the Infostrada API website:
+  #
+  #  * b_Current: this boolean field describes the current phase. This field can be True for only
+  #               one phase.
+  #
+  #  * b_Currents: this boolean field describes the current phases. More than one phases can be
+  #                True, e.g. multiple groups in the Champions League.
+  #
+  # You can only get a list of phases on Infostradas GetPhaseList endpoint.
+  class Phase < Infostrada::BaseRequest
+    URL = '/GetPhaseList'
+
+    # Short name is only set outside GetPhaseList endpoint. For example on match list.
+    attr_accessor :id, :name, :phase1_id, :phase1_name, :phase2_id, :phase2_name, :phase3_id
+    attr_accessor :phase3_name, :table, :current, :currents, :start_date, :end_date, :short_name
+
+    def self.where(options = {})
+      edition_id = options.delete(:edition_id)
+
+      list = get!(URL, query: { editionid: edition_id.to_i })
+
+      phases = []
+      list.each do |phase_hash|
+        phases << Phase.new(phase_hash)
+      end
+
+      phases
+    end
+
+    def initialize(hash)
+      @id = hash['n_PhaseID']
+      @name = hash['c_Phase']
+      @short_name = hash['c_PhaseShort']
+      @phase1_id = hash['n_Phase1ID']
+      @phase1_name = hash['c_Phase1']
+      @phase2_id = hash['n_Phase2ID']
+      @phase2_name = hash['c_Phase2']
+      @phase3_id = hash['n_Phase3ID']
+      @phase3_name = hash['c_Phase3']
+      @table = hash['b_Table']
+      @current = hash['b_Current']
+      @currents = hash['b_Currents']
+
+      # On GetPhaseList endpoint dates are just yyymmdd. Example: 20100629 (which translates to
+      # 2010-06-29).
+      if hash['n_DateStart'] && hash['n_DateEnd']
+        @start_date = Date.parse(hash['n_DateStart'].to_s)
+        @end_date = Date.parse(hash['n_DateEnd'].to_s)
+      end
+
+      self
+    end
+  end
+end

data/lib/infostrada/player.rb

@@ -1,7 +1,7 @@
 module Infostrada
   class Player
     attr_accessor :person_id, :name, :short_name, :birthdate, :function, :shirt_number
-    attr_accessor :season_stats, :nation
+    attr_accessor :season_stats, :nation, :contract_starts_at, :contract_ends_at
 
     def initialize(hash)
       @person_id   = hash['n_PersonID']
@@ -15,11 +15,19 @@ module Infostrada
       @function = hash['c_Function']
       @shirt_number = hash['n_ShirtNr']
 
+      @contract_starts_at = Formatter.format_date(hash['d_ContractStartDate'])
+      @contract_ends_at = Formatter.format_date(hash['d_ContractEndDate'])
+
       # Season statistics
       set_season_stats(hash)
 
-      @nation = Nation.new
-      set_nation_attributes(hash)
+      @nation = Nation.new(hash, 'person')
+
+      self
+    end
+
+    def name?
+      @name && !@name.empty?
     end
 
     private
@@ -40,15 +48,6 @@ module Infostrada
       @season_stats[:cards_red_direct]      = hash['n_CardsRedDirect']
       @season_stats[:cards_red_from_yellow] = hash['n_CardsRed2Yellow']
     end
-
-    def set_nation_attributes(hash)
-      hash.each do |key, value|
-        if key =~ /[cn]_\w+Natio.*/
-          method = "#{key.snake_case.gsub(/[cn]_person_?/, '')}="
-          @nation.send(method, value)
-        end
-      end
-    end
   end
 end
 

data/lib/infostrada/referee.rb

@@ -0,0 +1,13 @@
+module Infostrada
+  class Referee
+    attr_accessor :id, :name, :nation
+
+    def initialize(hash)
+      @id = hash.delete('n_RefereeID')
+
+      @name = hash.delete('c_Referee')
+
+      @nation = Nation.new(hash, 'referee')
+    end
+  end
+end

data/lib/infostrada/squad.rb

@@ -1,3 +1,5 @@
+require 'infostrada/base_request'
+
 module Infostrada
   class Squad < Infostrada::BaseRequest
     URL = '/GetSquad'
@@ -6,7 +8,7 @@ module Infostrada
       edition_id = options.delete(:edition_id)
       team_id = options.delete(:team_id)
 
-      list = get(URL, query: { editionid: edition_id, teamid: team_id })
+      list = get!(URL, query: { editionid: edition_id, teamid: team_id })
 
       players = []
       list.each do |player_hash|

data/lib/infostrada/team.rb

@@ -1,34 +1,49 @@
 module Infostrada
   class Team
+    extend Forwardable
+
+    def_delegator :@nation, :id, :nation_id
+    def_delegator :@nation, :name, :nation_name
+    def_delegator :@nation, :short_name, :nation_short_name
+
     attr_accessor :id, :name, :short_name, :nation, :edition_id
 
-    def self.all(edition_id)
+    def self.where(options = {})
+      edition_id = options.delete(:edition_id)
       teams = TeamRequest.get_edition(edition_id.to_i)
     end
 
-    def initialize(hash)
-      @id = hash.delete('n_TeamID')
-      @name = hash.delete('c_Team')
-      @short_name = hash.delete('c_TeamShort')
-      @edition_id = hash.delete('edition_id')
+    def initialize(hash, prefix)
+      @edition_id = hash['edition_id']
+
+      hash.each do |key, value|
+        case key.snake_case
+        when /^[cn]\w+#{prefix}_?team_id$/
+          self.send('team_id=', value)
+        when /^[cn]\w+#{prefix}_?team$/
+          self.send('team_name=', value)
+        when /^[cn]\w+#{prefix}_?team_short$/
+          self.send('team_short=', value)
+        end
+      end
 
-      @nation = Nation.new
-      set_nation_attributes(hash)
+      @nation = Nation.new(hash, "#{prefix}_team")
     end
 
-    def details
-      info ||= TeamInfo.fetch(self)
+    def team_id=(id)
+      @id = id
     end
 
-    private
+    def team_name=(name)
+      @name = name
+    end
 
-    def set_nation_attributes(hash)
-      hash.each do |key, value|
-        if key =~ /[cn]_\w+Natio.*/
-          method = "#{key.snake_case.gsub(/[cn]_team_?/, '')}="
-          @nation.send(method, value)
-        end
-      end
+    def team_short=(short_name)
+      @short_name = short_name
+    end
+
+    def details
+      info ||= TeamInfo.fetch(self)
     end
   end
 end

data/lib/infostrada/team_info.rb

@@ -1,5 +1,7 @@
+require 'infostrada/base_request'
+
 module Infostrada
-  class TeamInfo < BaseRequest
+  class TeamInfo < Infostrada::BaseRequest
     attr_accessor :official_name, :official_short_name, :public_name, :public_short_name, :nickname
     attr_accessor :foundation_date, :official_stadium_name, :stadium_name, :stadium_capacity
     attr_accessor :url, :city
@@ -7,7 +9,7 @@ module Infostrada
     URL = '/GetTeamInfo'
 
     def self.fetch(team_id)
-      info_hash = get(URL, query: { teamid: team_id.to_i })
+      info_hash = get!(URL, query: { teamid: team_id.to_i })
 
       self.new(info_hash.first)
     end
@@ -24,6 +26,8 @@ module Infostrada
       @stadium_capacity       =  hash['n_StadiumCapacity']
       @url                    =  hash['c_URL']
       @city                   =  hash['c_City']
+
+      self
     end
   end
 end

data/lib/infostrada/team_request.rb

@@ -1,3 +1,5 @@
+require 'infostrada/base_request'
+
 module Infostrada
   class TeamRequest < Infostrada::BaseRequest
     URLS = {
@@ -5,11 +7,11 @@ module Infostrada
     }
 
     def self.get_edition(edition_id)
-      list = get(URLS[:list], query: { editionid: edition_id.to_i })
+      list = get!(URLS[:list], query: { editionid: edition_id.to_i })
 
       teams = []
       list.each do |team_hash|
-        teams << Team.new(team_hash.merge('edition_id' => edition_id.to_i))
+        teams << Team.new(team_hash.merge('edition_id' => edition_id.to_i), '')
       end
 
       teams

data/lib/infostrada/version.rb

@@ -1,3 +1,3 @@
 module Infostrada
-  VERSION = '0.0.1'
+  VERSION = '0.0.9'
 end

data/lib/infostrada.rb

@@ -4,7 +4,6 @@ require 'httparty'
 
 require 'infostrada/core_ext/string'
 
-require 'infostrada/base_request'
 require 'infostrada/competition'
 
 require 'infostrada/edition'
@@ -14,10 +13,15 @@ require 'infostrada/errors'
 
 require 'infostrada/nation'
 
+require 'infostrada/formatter'
+
 require 'infostrada/team'
 require 'infostrada/team_request'
 require 'infostrada/team_info'
 
+require 'infostrada/match'
+require 'infostrada/phase'
+
 require 'infostrada/squad'
 require 'infostrada/player'
 require 'infostrada/person_info'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infostrada
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.9
 platform: ruby
 authors:
 - Ricardo Otero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,9 +130,14 @@ files:
 - lib/infostrada/edition_request.rb
 - lib/infostrada/errors.rb
 - lib/infostrada/formatter.rb
+- lib/infostrada/match.rb
+- lib/infostrada/match_event.rb
+- lib/infostrada/match_event_list.rb
 - lib/infostrada/nation.rb
 - lib/infostrada/person_info.rb
+- lib/infostrada/phase.rb
 - lib/infostrada/player.rb
+- lib/infostrada/referee.rb
 - lib/infostrada/squad.rb
 - lib/infostrada/team.rb
 - lib/infostrada/team_info.rb