infostrada 0.1.23 → 0.1.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTMzN2NiZWNjZTQ4M2I1ZTk5ZmEzOTgxZGUyMDRlODU3MTBhYmQ1NA==
+    MzE3NDBiNmMwMWIwNWI4ZTYzZDA0Y2UzMWI1OGZjYmVhMDMyMTM2NA==
   data.tar.gz: !binary |-
-    MjU5ZTNhNDMzZjhjNzY1ODkzZTJiYzg4M2I1MGE0NmI0MmU0MjllYg==
+    NmZmZDE4MzNiNjIzMmUxZDkyNzFjNGY1MTQwYjNmOTQyMGVjN2U4YQ==
 SHA512:
   metadata.gz: !binary |-
-    MTk4MGM0ZWY2YTZmNjQ0NzE0MjBiNjY0OTc2OWMxNTcyNWQ4MWJiNmMyMTNj
-    MzJiMWRkMDY0ODEwN2FiNDlhNTU1ZDFlMjJlNjRiZGM1NGQ0YmY3OTFkYjE1
-    ZTNhMTBiNjI3MDU4ZjcyMzNlYmU2MWZhZTMwZjkwZmM0NTNkZWQ=
+    NjM2NTY1MWU1YmJkMjY4MTIyYTYxYTUxMzk2Y2M3YmVkNjQ3N2ZlOTE3MjZh
+    YTY5MTNjOWQ5YjE1NGE3ODAxYTMzZjQzMjJhMDQxYmE1ZTc3MjdhNGRhMTk2
+    ZWI4YTk4ZTNjZjNhN2VmYzdmMDRiOWY2MDRkM2QzZGNhMWFjOTA=
   data.tar.gz: !binary |-
-    YjlkMTgyY2Q3YTQwNjE2MTk5NWI2MjYyMjE4NDgxMzRjYmI3Yzc4YTc4MzA1
-    YjEwNmZlY2E5YTJhNmQzNGU2MTRkYzhlNDc2ZGZlZGI3ZDk0ZWYzMTQyN2U5
-    YzQ3NjkyMGE0MDc1Y2VmYTk4MWMyOWJkOWVlNTQ5YzU3MzRhYWI=
+    ZjQxNjgyZjQxMTJjZmM4NzdjMjQzYjExODgxZjFkODkyM2MxMjE0NzMzMGY2
+    NDEyM2UwNjkwNTc4YjQ5M2I5YjZlMWU3OWJlNmZmMTI0YmMyNzMxOTY2ZGIz
+    NDViZGUxOWM4MjQ1M2UyZmJiZjQxNDAyZTdkZDMzYzRkZjRlNmQ=

data/lib/infostrada/competition.rb

@@ -14,11 +14,21 @@ module Infostrada
   class Competition
     attr_accessor :id, :name, :set, :level, :nation
 
-    def initialize(hash)
-      @id = hash.delete('n_CompetitionID')
-      @name = hash.delete('c_Competition')
+    def self.from_json(json = {})
+      self.new do |competition|
+        competition.id     = json['id']
+        competition.name   = json['name']
+        competition.nation = Nation.from_json(json['nation'], 'competition') if json['nation']
+      end
+    end
+
+    def initialize(hash = {}, &block)
+      @id     = hash.delete('n_CompetitionID')
+      @name   = hash.delete('c_Competition')
+      @nation = Nation.new(hash, 'competition') if hash.any?
 
-      @nation = Nation.new(hash, 'competition')
+      block.call(self) if block_given?
+      self
     end
   end
-end
+end

data/lib/infostrada/edition.rb

@@ -4,7 +4,7 @@ module Infostrada
   class Edition
     extend Forwardable
 
-    attr_accessor :id, :competition, :season, :start_date, :end_date
+    attr_accessor :id, :competition, :season, :start_date, :end_date, :competition
 
     def_delegator :@competition, :name, :competition_name
     def_delegator :@competition, :id, :competition_id
@@ -13,14 +13,30 @@ module Infostrada
       editions = EditionRequest.get_list
     end
 
-    def initialize(hash)
+    def self.from_json(json = {})
+      self.new do |edition|
+        edition.id          = json['id']
+        edition.competition = json['competition']
+        edition.season      = json['season']
+        edition.start_date  = json['start_date']
+        edition.end_date    = json['end_date']
+        edition.competition = Competition.from_json(json['competition'])
+      end
+    end
+
+    def initialize(hash = {}, &block)
       @id = hash.delete('n_EditionID')
       @season = hash.delete('c_Season')
-      @start_date = Formatter.format_date(hash.delete('d_EditionStartDate'))
-      @end_date = Formatter.format_date(hash.delete('d_EditionEndDate'))
+
+      if hash['d_EditionStartDate']
+        @start_date = Formatter.format_date(hash.delete('d_EditionStartDate'))
+      end
+
+      @end_date = Formatter.format_date(hash.delete('d_EditionEndDate')) if hash['d_EditionEndDate']
 
       @competition = Competition.new(hash)
 
+      block.call(self) if block_given?
       self
     end
 

data/lib/infostrada/match.rb

@@ -99,51 +99,102 @@ module Infostrada
       list
     end
 
-    def initialize(hash)
-      @id = hash['n_MatchID']
-      @date = Formatter.format_date(hash['d_DateUTC'])
-      @rescheduled = hash['b_RescheduledToBeResumed']
-      @round = hash['n_RoundNr']
-      @time_unknown = hash['b_TimeUnknown']
-      @date_unknown = hash['b_DateUnknown']
-
-      @aggregate_winner_id = hash['n_WinnerOnAggregateTeamID']
+
+    # Useful method to get a Match object from a json serialized Match object.
+    def self.from_json(json = {})
+      self.new do |match|
+        match.id                        = json['id']
+        match.date                      = Time.parse(json['date']) if json['date']
+        match.rescheduled               = json['rescheduled']
+        match.round                     = json['round']
+        match.time_unknown              = json['time_unknown']
+        match.date_unknown              = json['date_unknown']
+        match.aggregate_winner_id       = json['aggregate_winner_id']
+
+        if json['current_period_started_at']
+          match.current_period_started_at = Time.parse(json['current_period_started_at'])
+        end
+
+        match.status_code               = json['status_code']
+        match.status                    = json['status']
+        match.status_short              = json['status_short']
+        match.leg                       = json['leg']
+        match.started_at                = Time.parse(json['started_at']) if json['started_at']
+
+        match.stadium_id                = json['stadium_id']
+        match.stadium_name              = json['stadium_name']
+        match.spectators                = json['spectators']
+        match.city                      = json['city']
+
+        match.live                      = json['live']
+        match.started                   = json['started']
+        match.finished                  = json['finished']
+        match.awarded                   = json['awarded']
+
+        match.live_score                = json['live_score']
+        match.live_goals                = json['live_goals']
+        match.live_lineup               = json['live_lineup']
+
+        match.lineup_provisional        = json['lineup_provisional']
+        match.lineup_official           = json['lineup_official']
+
+        match.period                    = json['period']
+
+        match.referee                   = Referee.from_json(json['referee'])
+        match.phase                     = Phase.from_json(json['phase'])
+        match.home_team                 = Team.from_json(json['home_team'], 'home')
+        match.away_team                 = Team.from_json(json['away_team'], 'away')
+        match.goals                     = Goals.from_json(json['goals'])
+        match.edition                   = Edition.from_json(json['edition'])
+      end
+    end
+
+    def initialize(hash = {}, &block)
+      @id                        = hash['n_MatchID']
+      @date                      = Formatter.format_date(hash['d_DateUTC'])
+      @rescheduled               = hash['b_RescheduledToBeResumed']
+      @round                     = hash['n_RoundNr']
+      @time_unknown              = hash['b_TimeUnknown']
+      @date_unknown              = hash['b_DateUnknown']
+
+      @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']
-      @started_at = Formatter.format_date(hash['d_MatchStartTime'])
+      @status_code               = hash['n_MatchStatusCode']
+      @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']
-      @spectators = hash['n_Spectators']
-      @city = hash['c_City']
+      @stadium_id                = hash['n_StadiumGeoID']
+      @stadium_name              = hash['c_Stadium']
+      @spectators                = hash['n_Spectators']
+      @city                      = hash['c_City']
 
-      @live = hash['b_Live']
-      @started = hash['b_Started']
-      @finished = hash['b_Finished']
-      @awarded = hash['b_Awarded']
+      @live                      = hash['b_Live']
+      @started                   = hash['b_Started']
+      @finished                  = hash['b_Finished']
+      @awarded                   = hash['b_Awarded']
 
-      @live_score = hash['b_DataEntryLiveScore']
-      @live_goals = hash['b_DataEntryLiveGoal']
-      @live_lineup = hash['b_DataEntryLiveLineup']
+      @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']
+      @lineup_provisional        = hash['b_LineupProvisional']
+      @lineup_official           = hash['b_LineupOfficial']
 
-      @period = hash['n_PeriodSort']
+      @period                    = hash['n_PeriodSort']
 
-      @referee = Referee.new(hash)
-      @phase = Phase.new(hash)
+      @referee                   = Referee.new(hash)
+      @phase                     = Phase.new(hash)
 
-      @home_team = Team.new(hash, 'home')
-      @away_team = Team.new(hash, 'away')
+      @home_team                 = Team.new(hash, 'home')
+      @away_team                 = Team.new(hash, 'away')
 
-      @goals = Goals.new(hash)
+      @goals                     = Goals.new(hash)
 
-      @edition = Edition.new(hash)
+      @edition                   = Edition.new(hash)
 
+      block.call(self) if block_given?
       self
     end
 
@@ -166,10 +217,25 @@ module Infostrada
 
   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_90_mins, :away_goals_90_mins, :home_goals_105_mins, :away_goals_105_mins,
       :home_goals_shootout, :away_goals_shootout
 
-    def initialize(hash)
+    def self.from_json(json = {})
+      self.new do |goals|
+        goals.home_goals           = json['home_goals']
+        goals.away_goals           = json['away_goals']
+        goals.home_goals_half_time = json['home_goals_half_time']
+        goals.away_goals_half_time = json['away_goals_half_time']
+        goals.home_goals_90_mins   = json['home_goals_90_mins']
+        goals.away_goals_90_mins   = json['away_goals_90_mins']
+        goals.home_goals_105_mins  = json['home_goals_105_mins']
+        goals.away_goals_105_mins  = json['away_goals_105_mins']
+        goals.home_goals_shootout  = json['home_goals_shootout']
+        goals.away_goals_shootout  = json['away_goald_shootout']
+      end
+    end
+
+    def initialize(hash = {}, &block)
       @home_goals = hash['n_HomeGoals']
       @away_goals = hash['n_AwayGoals']
       @home_goals_half_time = hash['n_HomeGoalsHalftime']
@@ -180,6 +246,9 @@ module Infostrada
       @away_goals_105_mins = hash['n_AwayGoals105mins']
       @home_goals_shootout = hash['n_HomeGoalsShootout']
       @away_goald_shootout = hash['n_AwayGoalsShootout']
+
+      block.call(self) if block_given?
+      self
     end
   end
 end

data/lib/infostrada/nation.rb

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

data/lib/infostrada/phase.rb

@@ -15,8 +15,9 @@ module Infostrada
     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, :level
-    attr_accessor :phase3_name, :table, :current, :currents, :start_date, :end_date, :short_name
+    attr_accessor :id, :name, :phase1_id, :phase1_name, :phase2_id, :phase2_name, :phase3_id,
+                  :level, :phase3_name, :table, :current, :currents, :start_date, :end_date,
+                  :short_name, :has_table
 
     def self.where(options = {})
       edition_id = options.delete(:edition_id)
@@ -31,25 +32,46 @@ module Infostrada
       phases
     end
 
+    # Useful method to get a Phase object from a json serialized Phase object.
+    def self.from_json(json = {})
+      self.new do |phase|
+        phase.id          = json['id']
+        phase.name        = json['name']
+        phase.level       = json['level']
+        phase.short_name  = json['short_name']
+        phase.phase1_id   = json['phase1_id']
+        phase.phase1_name = json['phase1_name']
+        phase.phase2_id   = json['phase2_id']
+        phase.phase2_name = json['phase2_name']
+        phase.phase3_id   = json['phase3_id']
+        phase.phase3_name = json['phase3_name']
+        phase.has_table   = json['has_table']
+        phase.current     = json['current']
+        phase.currents    = json['currents']
+        phase.start_date  = Date.parse(json['start_date']) if json['start_date']
+        phase.end_date    = Date.parse(json['end_date'])   if json['end_date']
+      end
+    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']
-      @level = hash['n_PhaseLevel']
-      @short_name = hash['c_PhaseShort']
-      @phase1_id = hash['n_Phase1ID']
+    def initialize(hash = {}, &block)
+      @id          = hash['n_PhaseID']
+      @name        = hash['c_Phase']
+      @level       = hash['n_PhaseLevel']
+      @short_name  = hash['c_PhaseShort']
+      @phase1_id   = hash['n_Phase1ID']
       @phase1_name = hash['c_Phase1']
-      @phase2_id = hash['n_Phase2ID']
+      @phase2_id   = hash['n_Phase2ID']
       @phase2_name = hash['c_Phase2']
-      @phase3_id = hash['n_Phase3ID']
+      @phase3_id   = hash['n_Phase3ID']
       @phase3_name = hash['c_Phase3']
-      @has_table = hash['b_Table']
-      @current = hash['b_Current']
-      @currents = hash['b_Currents']
+      @has_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).
@@ -58,6 +80,7 @@ module Infostrada
         @end_date = Date.parse(hash['n_DateEnd'].to_s)
       end
 
+      block.call(self) if block_given?
       self
     end
 

data/lib/infostrada/referee.rb

@@ -2,12 +2,23 @@ module Infostrada
   class Referee
     attr_accessor :id, :name, :nation
 
-    def initialize(hash)
+    def self.from_json(json = {})
+      self.new do |referee|
+        referee.id     = json['id']
+        referee.name   = json['name']
+        referee.nation = json['nation']
+      end
+    end
+
+    def initialize(hash = {}, &block)
       @id = hash.delete('n_RefereeID')
 
       @name = hash.delete('c_Referee')
 
       @nation = Nation.new(hash, 'referee')
+
+      block.call(self) if block_given?
+      self
     end
   end
 end

data/lib/infostrada/team.rb

@@ -13,7 +13,17 @@ module Infostrada
       teams = TeamRequest.get_edition(edition_id.to_i)
     end
 
-    def initialize(hash, prefix)
+    def self.from_json(json = {}, prefix)
+      self.new(prefix) do |team|
+        team.id         = json['id']
+        team.name       = json['name']
+        team.short_name = json['short_name']
+        team.nation     = Nation.from_json(json['nation'], "#{prefix}_team") if json['nation']
+        team.edition_id = json['edition_id']
+      end
+    end
+
+    def initialize(hash = {}, prefix, &block)
       @edition_id = hash['edition_id']
 
       hash.each do |key, value|
@@ -26,8 +36,10 @@ module Infostrada
           self.send('team_short=', value)
         end
       end
-
       @nation = Nation.new(hash, "#{prefix}_team")
+
+      block.call(self) if block_given?
+      self
     end
 
     def team_id=(id)

data/lib/infostrada/version.rb

@@ -1,3 +1,3 @@
 module Infostrada
-  VERSION = '0.1.23'
+  VERSION = '0.1.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infostrada
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Ricardo Otero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler