infostrada 0.1.24 → 0.1.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzE3NDBiNmMwMWIwNWI4ZTYzZDA0Y2UzMWI1OGZjYmVhMDMyMTM2NA==
+    NjU1YWFhNjRmN2NkNGJhMjAyZTk5NGRmMzNjNTg0ZmE3NWJlMzI3Ng==
   data.tar.gz: !binary |-
-    NmZmZDE4MzNiNjIzMmUxZDkyNzFjNGY1MTQwYjNmOTQyMGVjN2U4YQ==
+    MDllZmQwOGVkM2M2ZDdkNDdlOWE1YjgzMjI0ZjI4NGYwODhjNDRjNQ==
 SHA512:
   metadata.gz: !binary |-
-    NjM2NTY1MWU1YmJkMjY4MTIyYTYxYTUxMzk2Y2M3YmVkNjQ3N2ZlOTE3MjZh
-    YTY5MTNjOWQ5YjE1NGE3ODAxYTMzZjQzMjJhMDQxYmE1ZTc3MjdhNGRhMTk2
-    ZWI4YTk4ZTNjZjNhN2VmYzdmMDRiOWY2MDRkM2QzZGNhMWFjOTA=
+    Yjg4MzkwMjFjZGRmOWRkN2ZkZjEyZjVmMWIyOGYxODFlOGVlZDkzZTkwZjMx
+    MDg5MTNhODE4MTM1NTMzNGM5MTdmMDE3MTQ2OTk3Mzk3ZThhZDc2ZDlhOGUw
+    MmZkMTljY2RlOWU4Y2E2ZDNiNTlmYmQwODBmNDA0MmMyYzU3Mzk=
   data.tar.gz: !binary |-
-    ZjQxNjgyZjQxMTJjZmM4NzdjMjQzYjExODgxZjFkODkyM2MxMjE0NzMzMGY2
-    NDEyM2UwNjkwNTc4YjQ5M2I5YjZlMWU3OWJlNmZmMTI0YmMyNzMxOTY2ZGIz
-    NDViZGUxOWM4MjQ1M2UyZmJiZjQxNDAyZTdkZDMzYzRkZjRlNmQ=
+    MDZmNTc0NDJmMTlhMTUxMGZmZTg1ZDBhNDcwMjIwNGRjNzhmMzgyMGZjNmYx
+    YzUyNjE3YTJmMzIwMTQxZjExZmE0YzFlMDFiNzVhMmZmODJlMmUzZjM3N2Ji
+    M2MxYTI3NTZhOTMyNzJlM2RiZjU2ZTI1MGQyZDZiMDEwZTI4MTg=

data/lib/infostrada/match.rb

@@ -16,7 +16,7 @@ module Infostrada
 
     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 :postponed, :referee, :spectators, :leg, :knockout_phase_id, :first_leg_score
     attr_accessor :aggregate_winner_id, :current_period_started_at, :status, :started_at, :started
     attr_accessor :edition, :time_unknown, :date_unknown, :city
 
@@ -120,6 +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.stadium_id                = json['stadium_id']
         match.stadium_name              = json['stadium_name']
@@ -164,6 +165,7 @@ module Infostrada
       @status_short              = hash['c_MatchStatusShort']
       @leg                       = hash['n_Leg']
       @started_at                = Formatter.format_date(hash['d_MatchStartTime'])
+      @knockout_phase_id         = hash['n_KnockoutPhaseID']
 
       @stadium_id                = hash['n_StadiumGeoID']
       @stadium_name              = hash['c_Stadium']

data/lib/infostrada/table.rb

@@ -8,13 +8,20 @@ module Infostrada
 
     def self.where(options = {})
       phase_id = options.delete(:phase_id)
-
       list = get!(URL, query: { phaseid: phase_id })
 
-      table = Table.new(phase_id, list)
+      new(phase_id, list)
     end
 
-    def initialize(phase_id, table_list)
+    def self.from_json(json = {})
+      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) }
+      end
+    end
+
+    def initialize(phase_id = nil, table_list = [], &block)
       @phase_id = phase_id
 
       @entries = []
@@ -23,12 +30,13 @@ module Infostrada
         @entries << TableEntry.new(hash)
       end
 
+      block.call(self) if block_given?
       self
     end
 
-    def as_json
+    def as_json(options)
       hash = super
-      hash = { 'phase_id' => phase_id, 'entries' => hash }
+      hash = { 'phase_id' => phase_id, 'edition_id' => edition_id, 'entries' => hash }
     end
 
     def each(&block)
@@ -40,7 +48,21 @@ module Infostrada
     attr_accessor :team_id, :rank, :matches, :matches_won, :matches_drawn
     attr_accessor :matches_lost, :points, :goals_for, :goals_against
 
-    def initialize(hash)
+    def self.from_json(json = {})
+      self.new do |table_entry|
+        table_entry.team_id       = json['team_id']
+        table_entry.rank          = json['rank']
+        table_entry.matches       = json['matches']
+        table_entry.matches_won   = json['matches_won']
+        table_entry.matches_drawn = json['matches_drawn']
+        table_entry.matches_lost  = json['matches_lost']
+        table_entry.points        = json['points']
+        table_entry.goals_for     = json['goals_for']
+        table_entry.goals_against = json['goals_against']
+      end
+    end
+
+    def initialize(hash = {}, &block)
       @team_id = hash['n_TeamID']
       @rank = hash['n_RankSort']
       @matches = hash['n_Matches']
@@ -50,6 +72,9 @@ module Infostrada
       @points = hash['n_Points']
       @goals_for = hash['n_GoalsFor']
       @goals_against = hash['n_GoalsAgainst']
+
+      block.call(self) if block_given?
+      self
     end
   end
 end

data/lib/infostrada/version.rb

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

metadata

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