infostrada 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4cb72e08b9e4d09f02497612a54a0734521bfd9
-  data.tar.gz: 52471df74223d184f91240e5c8a9b9af68a7ce29
+  metadata.gz: ba919a27af5c409be645ab783d4e798541c0e530
+  data.tar.gz: 53e9434a6e1227844068e20916d658d2748ed1d2
 SHA512:
-  metadata.gz: 4629ca8db63754ef1c2aa47dab651edfcbe96406a89edfa05b3a0b4f368cc48b7c4520bfa29624dad9ff037fb70b7996e6496015c9654c87a0fc8d165e1f603f
-  data.tar.gz: 2136d24be6c40c5e93f132078afe595a62bae73f2f4770b319bba4ba4b313ccf3613ea46e565556cb3462e6dd8d906e0d4d4b6b7966a0cef98020caba81f477c
+  metadata.gz: f328878a653683b9d4bfcaae26fd6e5807a765d20e8e5663dc91e02937c12288adb505fc4a11cc744bdf966ed49df96fc4101e7d37269775ff7a2d7da370e836
+  data.tar.gz: effc38fcb37763919235a9125114e2c9f669cd9b8a5b5b8486affd7a5c199e3be73ad5996c9e19817ff9026ad8ff5e36ba7b68bf50062cab488ab4ca62cb6ea5

data/Gemfile.lock

@@ -1,25 +1,32 @@
 PATH
   remote: .
   specs:
-    infostrada (0.0.1)
+    infostrada (0.0.9)
       colored
       httparty (~> 0.12)
       rb-readline
+      tzinfo
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (1.1.0)
+    coderay (1.1.0)
     colored (1.2)
-    httparty (0.12.0)
+    httparty (0.13.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     json (1.8.1)
+    method_source (0.8.2)
     multi_xml (0.5.5)
     parser (2.1.4)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rainbow (2.0.0)
     rake (10.1.1)
     rb-readline (0.5.1)
@@ -39,6 +46,7 @@ GEM
       sexp_processor (~> 4.1)
     sexp_processor (4.4.1)
     slop (3.4.7)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
@@ -46,6 +54,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.5)
   infostrada!
+  pry
   rake
   reek
   rubocop

data/infostrada.gemspec

@@ -26,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'httparty', '~> 0.12'
   spec.add_dependency 'colored'
   spec.add_dependency 'rb-readline'
+  spec.add_dependency 'tzinfo'
+  spec.add_development_dependency 'pry'
 end

data/infostrada.pstore

@@ -0,0 +1 @@
+{:last_updateIu:	Time

data/lib/infostrada/base_request.rb

@@ -1,3 +1,5 @@
+require 'infostrada/endpoint_manager'
+
 module Infostrada
   # This is the class that every class making API requests must descend from. It includes HTTParty
   # to easily support every type of HTTP request. The basic_auth is set up from the
@@ -21,10 +23,19 @@ module Infostrada
     base_uri 'demo.api.infostradasports.com/svc/Football.svc/json/'
 
     # Which default parameters we can send in every request?
+    #
+    # languageCode can be one of the following:
+    # 1 = dutch
+    # 2 = english
+    # 4 = french
+    # 8 = german
+    # 128 = norwegian
+    # 256 = swedish
+    # 1024 = danish
     default_params languageCode: 2
 
     # Default request timeout in seconds. This can be overriden by module configuration.
-    default_timeout 10
+    default_timeout 15
 
     # Disable the use of rails query string format.
     #
@@ -36,6 +47,16 @@ module Infostrada
     #
     disable_rails_query_string_format
 
+    class << self
+      attr_accessor :endpoint
+
+      def register_endpoint(endpoint)
+        self.endpoint = endpoint
+
+        EndpointManager.register(endpoint => self)
+      end
+    end
+
     # Used with Timeout::Error rescue so we can keep trying to fetch the information after timeout.
     def self.get!(path, options = {}, &block)
       attempts = 1
@@ -43,10 +64,14 @@ module Infostrada
 
       begin
         result = get(path, options, &block)
-      rescue Timeout::Error => error
+      rescue Timeout::Error => e
         puts "Timeout! Retrying... (#{attempts})"
         attempts += 1
-        retry unless attempts > RETRIES
+        if attempts > RETRIES
+          raise Infostrada::RequestError.new, 'Request timeout'
+        else
+          retry
+        end
       end
 
       result

data/lib/infostrada/call_refresh.rb

@@ -0,0 +1,89 @@
+require 'pstore'
+require 'tzinfo'
+
+module Infostrada
+  class CallRefresh < Infostrada::BaseRequest
+    URL = '/GetAPICallRefresh_Module'
+
+    # The API timezone. This is very important since all the dates passed as argument to the refresh
+    # call must be in the correct timezone.
+    TIMEZONE = 'Europe/Amsterdam'
+
+    # This is the only method on Infostrada API that don't use /Football.svc but /Utility.svc
+    # instead, so we have to replace that on the default base_uri.
+    Infostrada::CallRefresh.base_uri Infostrada::CallRefresh.base_uri.gsub(/Football/, 'Utility')
+
+    # Which languages are you interested in? The GetAPICallRefresh_Module call can return multiple
+    # endpoints for the same thing if multiple languages are available.
+    #
+    # languageCode can be one of the following:
+    # 1 = dutch
+    # 2 = english
+    # 4 = french
+    # 8 = german
+    # 128 = norwegian
+    # 256 = swedish
+    # 1024 = danish
+    LANGUAGE_CODES = [2]
+
+    # The outputType parameter can be one of the following:
+    # 1 = xml
+    # 2 = json
+    # 3 = soap
+    OUTPUT_TYPE = 2
+
+    # How to format the date. This string will be used on a Date#strftime. Infostrada will work with
+    # formats like this: 2013-09-21T22:22:22.
+    DATE_FORMAT = '%FT%T'
+
+    def self.store
+      @store ||= PStore.new('infostrada.pstore')
+    end
+
+    def self.last_update
+      store.transaction { store[:last_update] }
+    end
+
+    def self.last_update=(date)
+      store.transaction { store[:last_update] = date }
+    end
+
+    def self.api_time(date)
+      @timezone ||= TZInfo::Timezone.get(TIMEZONE)
+      @timezone.utc_to_local(date.utc)
+    end
+
+    def self.get_latest
+      updated_endpoints = since(last_update || api_time(Time.now))
+    end
+
+    def self.since(date)
+      date = date.strftime(DATE_FORMAT)
+
+      list = get!(URL, query: { from: date, outputType: OUTPUT_TYPE, module: 'football' })
+
+      self.last_update = api_time(Time.now)
+
+      endpoints = []
+      list.each do |hash|
+        lang = hash['c_QueryString'].scan(/languagecode=(\d+)/).flatten.first.to_i
+
+        endpoints << Endpoint.new(hash) if LANGUAGE_CODES.include?(lang)
+      end
+
+      endpoints
+    end
+  end
+
+  class Endpoint
+    attr_accessor :method, :last_modified, :query_string
+
+    def initialize(hash)
+      @method = hash['c_Method']
+      @last_modified = Formatter.format_date(hash['d_LastModified'])
+      @query_string = hash['c_QueryString']
+
+      self
+    end
+  end
+end

data/lib/infostrada/edition.rb

@@ -20,10 +20,17 @@ module Infostrada
       @end_date = Formatter.format_date(hash.delete('d_EditionEndDate'))
 
       @competition = Competition.new(hash)
+
+      self
     end
 
     def teams
       Team.all(id)
     end
+
+    # Get phases for this edition
+    def phases
+      Phase.where(edition_id: id)
+    end
   end
 end

data/lib/infostrada/endpoint_manager.rb

@@ -0,0 +1,12 @@
+module Infostrada
+  class EndpointManager
+    def self.register(hash)
+      @endpoints ||= {}
+      @endpoints.merge!(hash)
+    end
+
+    def self.list
+      @endpoints
+    end
+  end
+end

data/lib/infostrada/errors.rb

@@ -4,4 +4,7 @@ module Infostrada
 
   class InvalidParameter < BaseError
   end
+
+  class RequestError < BaseError
+  end
 end

data/lib/infostrada/formatter.rb

@@ -1,7 +1,7 @@
 module Infostrada
-  # This class is used to format types that come from infostrada like dates.
+  # This class is used to format types that come from Infostrada like dates.
   class Formatter
-    # Formats the stupid date format from Infostrada.
+    # Formats the strange date format from Infostrada.
     def self.format_date(date)
       if date && match = date.match(/\/Date\(([0-9]+)([\+\-])([0-9]+)\)\//i)
         # The date was in miliseconds since Unix epoch
@@ -12,9 +12,9 @@ module Infostrada
 
         final = stamp.send(match[2], offset)
 
-        Time.at(final).to_date
+        Time.at(final).utc
       else
-        Time.now.to_date
+        Time.now.utc
       end
     end
   end

data/lib/infostrada/match.rb

@@ -2,6 +2,15 @@ require 'infostrada/referee'
 require 'infostrada/match_event_list'
 
 module Infostrada
+  # You can get the information about a single game, about all games in an edition or about all
+  # games in a day.
+  #
+  # Examples:
+  #
+  #  Infostrada::Match.where(edition_id: 2398)        # all matches for edition 2398
+  #  Infostrada::Match.where(date: Time.now)          # all matches for current date (live info)
+  #  Infostrada::Match.where(date: Date.today+1.day)  # all matches for tomorrow (live info)
+  #  Infostrada::Match.where(id: 1337)                # information about the match 1337
   class Match < Infostrada::BaseRequest
     extend Forwardable
 
@@ -9,7 +18,7 @@ module Infostrada
     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
+    attr_accessor :edition
 
     # Check if the live score, live goals and live lineups are already available
     attr_accessor :live, :live_score, :live_goals, :live_lineup
@@ -17,17 +26,51 @@ module Infostrada
     # Lineup
     attr_accessor :lineup_provisional, :lineup_official
 
+    # period is taken from Infostradas n_PeriodSort, that can have one of these values:
+    #
+    # 1 = Not started
+    # 2 = 1st Half
+    # 3 = Halftime
+    # 4 = 2nd Half
+    # 5 = 90 mins
+    # 6 = 1st Extra Time
+    # 7 = 105 mins
+    # 8 = 2nd Extra Time
+    # 9 = 120 mins
+    # 10 = Penalty Shootout
+    # 11 = End
+    attr_accessor :period
+
+    # status_code is taken from Infostradas n_MatchStatusCode, that can have on of these values:
+    #
+    # 2 = Line-up
+    # 4 = Not Started
+    # 8 = In Progress
+    # 16 = Interval
+    # 32 = Suspended (during the match)
+    # 128 = Finished (official result)
+    # 192 = Finished (unofficial result). This is a combination of code 64 and 128.
+    # 512 = Abandoned
+    # 1024 = Postponed
+    # 2048 = Delayed
+    #
+    # If a match is stopped temporarily, n_MatchStatusCode is set to 32 (=Suspended).
+    # If it becomes clear that the match, after being suspended, will not be restarted on the same
+    # day, n_MatchStatusCode is set to 512 (=Abandoned).
+    attr_accessor :status_code
+
     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
+    def_delegator :@edition, :id, :edition_id
 
     # 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'
-    }
+    register_endpoint 'GetMatchList_Edition'
+    #  single: '/GetMatchInfo',
+    #  live_list: '/GetMatchLiveList_Date'
+    #}
 
     def self.where(options = {})
       list = get_match_list(options)
@@ -43,9 +86,12 @@ module Infostrada
     def self.get_match_list(options)
       edition_id = options.delete(:edition_id)
       match_id = options.delete(:id)
+      date = options.delete(:date)
+      date = date.strftime('%Y%m%d') if date
 
       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 = get!(URLS[:live_list], query: { date: date }) if date
 
       list
     end
@@ -54,10 +100,11 @@ module Infostrada
       @id = hash['n_MatchID']
       @date = Formatter.format_date(hash['d_DateUTC'])
       @rescheduled = hash['b_RescheduledToBeResumed']
-      @round = hash['round']
+      @round = hash['n_RoundNr']
 
       @aggregate_winner_id = hash['n_WinnerOnAggregateTeamID']
       @current_period_started_at = Formatter.format_date(hash['d_CurrentPeriodStartTime'])
+      @status_code = hash['n_MatchStatusCode']
       @status = hash['c_MatchStatus']
       @status_short = hash['c_MatchStatusShort']
       @leg = hash['n_Leg']
@@ -65,13 +112,13 @@ module Infostrada
 
       @stadium_id = hash['n_StadiumGeoID']
       @stadium_name = hash['c_Stadium']
+      @spectators = hash['n_Spectators']
 
       @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']
@@ -79,6 +126,8 @@ module Infostrada
       @lineup_provisional = hash['b_LineupProvisional']
       @lineup_official = hash['b_LineupOfficial']
 
+      @period = hash['n_PeriodSort']
+
       @referee = Referee.new(hash)
       @phase = Phase.new(hash)
 
@@ -87,11 +136,23 @@ module Infostrada
 
       @goals = Goals.new(hash)
 
-      @competition = Competition.new(hash)
+      @edition = Edition.new(hash)
 
       self
     end
 
+    def live_score?
+      @live_score || false
+    end
+
+    def live_goals?
+      @live_goals || false
+    end
+
+    def live_lineup?
+      @live_lineup || false
+    end
+
     def live_event_list
       event_list = MatchEventList.where(match_id: self.id)
     end

data/lib/infostrada/phase.rb

@@ -1,5 +1,6 @@
 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:
   #
@@ -30,6 +31,11 @@ module Infostrada
       phases
     end
 
+    # Get the classification table for this phase.
+    def table
+      Table.where(phase_id: id)
+    end
+
     def initialize(hash)
       @id = hash['n_PhaseID']
       @name = hash['c_Phase']
@@ -40,7 +46,7 @@ module Infostrada
       @phase2_name = hash['c_Phase2']
       @phase3_id = hash['n_Phase3ID']
       @phase3_name = hash['c_Phase3']
-      @table = hash['b_Table']
+      @has_table = hash['b_Table']
       @current = hash['b_Current']
       @currents = hash['b_Currents']
 
@@ -53,5 +59,9 @@ module Infostrada
 
       self
     end
+
+    def has_table?
+      @has_table
+    end
   end
 end

data/lib/infostrada/player.rb

@@ -3,6 +3,18 @@ module Infostrada
     attr_accessor :person_id, :name, :short_name, :birthdate, :function, :shirt_number
     attr_accessor :season_stats, :nation, :contract_starts_at, :contract_ends_at
 
+    # The function_type variable maps Infostradas n_FunctionType and can have one of these values:
+    #
+    # 1 = Keeper
+    # 2 = Defender
+    # 4 = Midfielder
+    # 8 = Forward
+    # 16 = Trainer
+    # 64 = Referee
+    # 128 = Linesman
+    # 1073741824 = 4th Official
+    attr_accessor :function_type
+
     def initialize(hash)
       @person_id   = hash['n_PersonID']
       @name = hash['c_Person']
@@ -10,9 +22,10 @@ module Infostrada
 
       @birthdate = Formatter.format_date(hash['d_BirthDate'])
 
-      # Function can be one of the folowing strings:
-      # "Goalkeeper", "Defender", "Midfielder", "Forward" or "Coach"
+      # Function is one string like "Goalkeeper", "Defender", "Midfielder", "Forward", "Coach"...
+      # Infostrada doesn't document the function strings so you should rely on function_type
       @function = hash['c_Function']
+      @function_type = hash['n_FunctionType']
       @shirt_number = hash['n_ShirtNr']
 
       @contract_starts_at = Formatter.format_date(hash['d_ContractStartDate'])

data/lib/infostrada/table.rb

@@ -0,0 +1,50 @@
+module Infostrada
+  class Table < Infostrada::BaseRequest
+    include Enumerable
+
+    attr_accessor :edition_id, :phase_id, :entries
+
+    URL = '/GetTable'
+
+    def self.where(options = {})
+      phase_id = options.delete(:phase_id)
+
+      list = get!(URL, query: { phaseid: phase_id })
+
+      table = Table.new(phase_id, list)
+    end
+
+    def initialize(phase_id, table_list)
+      @phase_id = phase_id
+
+      @entries = []
+      table_list.each do |hash|
+        @edition_id ||= hash['n_EditionID']
+        @entries << TableEntry.new(hash)
+      end
+
+      self
+    end
+
+    def each(&block)
+      @entries.each(&block)
+    end
+  end
+
+  class TableEntry
+    attr_accessor :team_id, :rank, :matches, :matches_won, :matches_drawn
+    attr_accessor :matches_lost, :points, :goals_for, :goals_against
+
+    def initialize(hash)
+      @team_id = hash['n_TeamID']
+      @rank = hash['n_RankSort']
+      @matches = hash['n_Matches']
+      @matches_won = hash['n_MatchesWon']
+      @matches_drawn = hash['n_MatchesDrawn']
+      @matches_lost = hash['n_MatchesLost']
+      @points = hash['n_Points']
+      @goals_for = hash['n_GoalsFor']
+      @goals_against = hash['n_GoalsAgainst']
+    end
+  end
+end

data/lib/infostrada/version.rb

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

data/lib/infostrada.rb

@@ -21,18 +21,21 @@ require 'infostrada/team_info'
 
 require 'infostrada/match'
 require 'infostrada/phase'
+require 'infostrada/table'
 
 require 'infostrada/squad'
 require 'infostrada/player'
 require 'infostrada/person_info'
 
+require 'infostrada/call_refresh'
+
 require 'infostrada/version'
 
 module Infostrada
   # The configuration of the API requests. This configuration is also shared by
   # <Infostrada::BaseRequest> where the HTTParty configuration is done.
   class Configuration
-    attr_reader :user, :password, :timeout
+    attr_reader :user, :password, :timeout, :timezone
 
     def initialize
       BaseRequest.default_options[:basic_auth] ||= {}
@@ -58,7 +61,11 @@ module Infostrada
   end
 
   def self.configuration
-    @configuration ||=  Configuration.new
+    @configuration ||= Configuration.new
+  end
+
+  def self.endpoints
+    @endpoints ||= []
   end
 
   def self.configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infostrada
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ricardo Otero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Infostrada Football API wrapper.
 email:
 - oterosantos@gmail.com
@@ -121,13 +149,16 @@ files:
 - README.md
 - bin/strada
 - infostrada.gemspec
+- infostrada.pstore
 - lib/infostrada.rb
 - lib/infostrada/base_request.rb
+- lib/infostrada/call_refresh.rb
 - lib/infostrada/commands.rb
 - lib/infostrada/competition.rb
 - lib/infostrada/core_ext/string.rb
 - lib/infostrada/edition.rb
 - lib/infostrada/edition_request.rb
+- lib/infostrada/endpoint_manager.rb
 - lib/infostrada/errors.rb
 - lib/infostrada/formatter.rb
 - lib/infostrada/match.rb
@@ -139,6 +170,7 @@ files:
 - lib/infostrada/player.rb
 - lib/infostrada/referee.rb
 - lib/infostrada/squad.rb
+- lib/infostrada/table.rb
 - lib/infostrada/team.rb
 - lib/infostrada/team_info.rb
 - lib/infostrada/team_request.rb