infostrada 0.1.25 → 0.1.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjU1YWFhNjRmN2NkNGJhMjAyZTk5NGRmMzNjNTg0ZmE3NWJlMzI3Ng==
+    OWUyODUxNWQ3NjMyYjVmNDAwYWRmMDE4OTdjZDQ2ZjQ5ZGZjMDNlYw==
   data.tar.gz: !binary |-
-    MDllZmQwOGVkM2M2ZDdkNDdlOWE1YjgzMjI0ZjI4NGYwODhjNDRjNQ==
+    ZTlmMWIxYTFhM2Q2NTRlYmFhN2JjZTliOTM5ZjEwNDFlNGM0MmViZg==
 SHA512:
   metadata.gz: !binary |-
-    Yjg4MzkwMjFjZGRmOWRkN2ZkZjEyZjVmMWIyOGYxODFlOGVlZDkzZTkwZjMx
-    MDg5MTNhODE4MTM1NTMzNGM5MTdmMDE3MTQ2OTk3Mzk3ZThhZDc2ZDlhOGUw
-    MmZkMTljY2RlOWU4Y2E2ZDNiNTlmYmQwODBmNDA0MmMyYzU3Mzk=
+    ZWZlMzA5YWNjODBhZWZjMmJjYzgyZjVjMDMwOTgzZWJjY2UzNjI1ZTUyNzNk
+    OWM0MmU2Mzg4ODZiYzdiYzc3Y2VhMTZkNmM0MzVkMTkyZTQ4NDJhMjMxZTUy
+    OTI0NmMyMTczOGI5MThlNzM2NTE2YzliYWMzNWIxZThjNzIzOGE=
   data.tar.gz: !binary |-
-    MDZmNTc0NDJmMTlhMTUxMGZmZTg1ZDBhNDcwMjIwNGRjNzhmMzgyMGZjNmYx
-    YzUyNjE3YTJmMzIwMTQxZjExZmE0YzFlMDFiNzVhMmZmODJlMmUzZjM3N2Ji
-    M2MxYTI3NTZhOTMyNzJlM2RiZjU2ZTI1MGQyZDZiMDEwZTI4MTg=
+    OGQzZTYwMmIxN2JlZGY2NmY2YmU1MTQyMzY2OGRkYmRiYWIyODZjZThmODg4
+    ZjAyOTBmYmI0NGM0MzBiNWI1MmU0ZDQ2ZDllZThiOWU3YjJlYjU1OGQ1Mzg3
+    NWEyMzVlOGI4NGY1ODcwMjBlM2U2NmZjODhhMWE4ZGE0YzEyODc=

data/lib/infostrada/match.rb

@@ -120,7 +120,7 @@ module Infostrada
         match.status_short              = json['status_short']
         match.leg                       = json['leg']
         match.started_at                = Time.parse(json['started_at']) if json['started_at']
-        match.knockout_phase_id            = hash['knockout_phase_id']
+        match.knockout_phase_id         = json['knockout_phase_id']
 
         match.stadium_id                = json['stadium_id']
         match.stadium_name              = json['stadium_name']
@@ -141,30 +141,30 @@ module Infostrada
 
         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'])
+        match.referee                   = Referee.from_json(json['referee'])        if json['referee']
+        match.phase                     = Phase.from_json(json['phase'])            if json['phase']
+        match.home_team                 = Team.from_json(json['home_team'], 'home') if json['home_team']
+        match.away_team                 = Team.from_json(json['away_team'], 'away') if json['away_team']
+        match.goals                     = Goals.from_json(json['goals'])            if json['goals']
+        match.edition                   = Edition.from_json(json['edition'])        if json['edition']
       end
     end
 
     def initialize(hash = {}, &block)
       @id                        = hash['n_MatchID']
-      @date                      = Formatter.format_date(hash['d_DateUTC'])
+      @date                      = Formatter.format_date(hash['d_DateUTC']) if 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'])
+      @current_period_started_at = Formatter.format_date(hash['d_CurrentPeriodStartTime']) if 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'])
+      @started_at                = Formatter.format_date(hash['d_MatchStartTime']) if hash['d_MatchStartTime']
       @knockout_phase_id         = hash['n_KnockoutPhaseID']
 
       @stadium_id                = hash['n_StadiumGeoID']
@@ -185,16 +185,14 @@ module Infostrada
       @lineup_official           = hash['b_LineupOfficial']
 
       @period                    = hash['n_PeriodSort']
+      @referee                   = Referee.new(hash)      if hash['n_RefereeID']
+      @phase                     = Phase.new(hash)        if hash['n_PhaseID']
 
-      @referee                   = Referee.new(hash)
-      @phase                     = Phase.new(hash)
+      @home_team                 = Team.new(hash, 'home') if hash['n_EditionID']
+      @away_team                 = Team.new(hash, 'away') if hash['n_EditionID']
 
-      @home_team                 = Team.new(hash, 'home')
-      @away_team                 = Team.new(hash, 'away')
-
-      @goals                     = Goals.new(hash)
-
-      @edition                   = Edition.new(hash)
+      @goals                     = Goals.new(hash)        if hash['n_HomeGoals']
+      @edition                   = Edition.new(hash)      if hash['n_EditionID']
 
       block.call(self) if block_given?
       self

data/lib/infostrada/match_event.rb

@@ -42,9 +42,41 @@ module Infostrada
     # These action codes are documented on the Infostrada ADVANCED PROGRAMMING documentation
     attr_accessor :action_code, :action_code_2, :action_code_3
 
-    def initialize(match_id, hash)
-      @match_id = match_id
+    def self.from_json(hash = {})
+      self.new do |event|
+        event.match_id           = hash['match_id']
+        event.id                 = hash['id']
+        event.description        = hash['description']
+        event.short_description  = hash['short_description']
+        event.period             = hash['period']
+        event.period_short       = hash['period_short']
+        event.period_code        = hash['period_code']
+        event.time               = hash['time']
+        event.home_goals         = hash['home_goals']
+        event.away_goals         = hash['away_goals']
+        event.home_event         = hash['home_event']
+        event.team_id            = hash['team_id']
+        event.team_name          = hash['team_name']
+        event.team_short_name    = hash['team_short_name']
+        event.person_id          = hash['person_id']
+        event.person_name        = hash['person_name']
+        event.person_short_name  = hash['person_short_name']
+        event.reason             = hash['reason']
+        event.info               = hash['info']
+        event.person2_id         = hash['person2_id']
+        event.person2_name       = hash['person2_name']
+        event.person2_short_name = hash['person2_short_name']
+        event.minute             = hash['minute']
+        event.action_set         = hash['action_set']
+        event.action_code        = hash['action_code']
+        event.action_code_2      = hash['action_code_2']
+        event.action_code_3      = hash['action_code_3']
+        event.action_sort        = hash['action_sort']
+      end
+    end
 
+    def initialize(match_id = nil, hash = {}, &block)
+      @match_id           = match_id
       @id                 = hash['n_ActionID']
       @description        = hash['c_Action']
       @short_description  = hash['c_ActionShort']
@@ -73,6 +105,7 @@ module Infostrada
       @action_code_3      = hash['n_ActionCode3']
       @action_sort        = hash['n_ActionSort']
 
+      block.call(self) if block_given?
       self
     end
 

data/lib/infostrada/table.rb

@@ -17,7 +17,9 @@ module Infostrada
       self.new do |table|
         table.phase_id    = json['phase_id']
         table.edition_id  = json['edition_id']
-        table.entries     = json['entries'].map{ |entry| TableEntry.from_json(entry) }
+        table.entries     = json['entries'].map{ |entry|
+          TableEntry.from_json(entry)
+        }
       end
     end
 
@@ -27,14 +29,14 @@ module Infostrada
       @entries = []
       table_list.each do |hash|
         @edition_id ||= hash['n_EditionID']
-        @entries << TableEntry.new(hash)
+        @entries << TableEntry.new(hash) if hash['n_TeamID']
       end
 
       block.call(self) if block_given?
       self
     end
 
-    def as_json(options)
+    def as_json(options = {})
       hash = super
       hash = { 'phase_id' => phase_id, 'edition_id' => edition_id, 'entries' => hash }
     end

data/lib/infostrada/version.rb

@@ -1,3 +1,3 @@
 module Infostrada
-  VERSION = '0.1.25'
+  VERSION = '0.1.26'
 end

metadata

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