sportdb 0.9.1 → 0.9.2

data/db/euro/2012.rb

@@ -14,153 +14,12 @@ euro = Event.create!( league:  League.find_by_key!('euro'),
                       start_at: Time.cet( '2012-06-07 17:00' ),
                       team3: false )
 
-pol = Team.find_by_key!( 'pol' )
-gre = Team.find_by_key!( 'gre' )
-rus = Team.find_by_key!( 'rus' )
-cze = Team.find_by_key!( 'cze' )
-
-ned = Team.find_by_key!( 'ned' )
-den = Team.find_by_key!( 'den' )
-ger = Team.find_by_key!( 'ger' )
-por = Team.find_by_key!( 'por' )
-
-esp = Team.find_by_key!( 'esp' )
-ita = Team.find_by_key!( 'ita' )
-irl = Team.find_by_key!( 'irl' )
-cro = Team.find_by_key!( 'cro' )
-
-ukr = Team.find_by_key!( 'ukr' )
-swe = Team.find_by_key!( 'swe' )
-fra = Team.find_by_key!( 'fra' )
-eng = Team.find_by_key!( 'eng' )
-
-
-euro.teams << pol
-euro.teams << gre
-euro.teams << rus
-euro.teams << cze
-euro.teams << ned
-euro.teams << den
-euro.teams << ger
-euro.teams << por
-euro.teams << esp
-euro.teams << ita
-euro.teams << irl
-euro.teams << cro
-euro.teams << ukr
-euro.teams << swe
-euro.teams << fra
-euro.teams << eng
-
-
-
-euroa = Group.create!( event: euro, pos: 1, title: 'Gruppe A' )
-eurob = Group.create!( event: euro, pos: 2, title: 'Gruppe B' )
-euroc = Group.create!( event: euro, pos: 3, title: 'Gruppe C' )
-eurod = Group.create!( event: euro, pos: 4, title: 'Gruppe D' )
-
-#################################
-# Gruppe A
-
-euroa.teams << pol
-euroa.teams << gre
-euroa.teams << rus
-euroa.teams << cze
-
-
-#################################
-# Gruppe B
-
-eurob.teams << ned
-eurob.teams << den
-eurob.teams << ger
-eurob.teams << por
-
-
-#################################3
-# Gruppe C
-
-euroc.teams << esp
-euroc.teams << ita
-euroc.teams << irl
-euroc.teams << cro
-
-#################################3
-# Gruppe D
-
-eurod.teams << ukr
-eurod.teams << swe
-eurod.teams << fra
-eurod.teams << eng
-
-
-euro_round1 = Round.create!( event: euro, pos: 1, title: 'Vorrunde 1. Spieltag', start_at: Time.cet( '2012-06-08' ), title2: '8.-11. Juni' )
-euro_round2 = Round.create!( event: euro, pos: 2, title: 'Vorrunde 2. Spieltag', start_at: Time.cet( '2012-06-12' ), title2: '12.-15. Juni' )
-euro_round3 = Round.create!( event: euro, pos: 3, title: 'Vorrunde 3. Spieltag', start_at: Time.cet( '2012-06-16' ), title2: '16.-19. Juni' )
-
-
-
-games_euro_round1 = [
-  [  1, pol, [1,1], gre, Time.cet('2012-06-08 18:00'), euroa ],
-  [  2, rus, [4,1], cze, Time.cet('2012-06-08 20:45'), euroa ],
-  [  3, ned, [0,1], den, Time.cet('2012-06-09 18:00'), eurob ],
-  [  4, ger, [1,0], por, Time.cet('2012-06-09 20:45'), eurob ],
-  [  5, esp, [1,1], ita, Time.cet('2012-06-10 18:00'), euroc ],
-  [  6, irl, [1,3], cro, Time.cet('2012-06-10 20:45'), euroc ],
-  [  7, fra, [1,1], eng, Time.cet('2012-06-11 18:00'), eurod ],
-  [  8, ukr, [2,1], swe, Time.cet('2012-06-11 20:45'), eurod ]
-]
-
-games_euro_round2 = [
-  [  9, gre, [1,2], cze, Time.cet('2012-06-12 18:00'), euroa ],
-  [ 10, pol, [1,1], rus, Time.cet('2012-06-12 20:45'), euroa ],
-  [ 11, den, [2,3], por, Time.cet('2012-06-13 18:00'), eurob ],
-  [ 12, ned, [1,2], ger, Time.cet('2012-06-13 20:45'), eurob ],
-  [ 13, ita, [1,1], cro, Time.cet('2012-06-14 18:00'), euroc ],
-  [ 14, esp, [4,0], irl, Time.cet('2012-06-14 20:45'), euroc ],
-  [ 15, swe, [2,3], eng, Time.cet('2012-06-15 20:45'), eurod ],
-  [ 16, ukr, [0,2], fra, Time.cet('2012-06-15 18:00'), eurod ]
-]
-
-games_euro_round3 = [
-  [ 17, cze, [1,0], pol, Time.cet('2012-06-16 20:45'), euroa ],
-  [ 18, gre, [1,0], rus, Time.cet('2012-06-16 20:45'), euroa ],
-  [ 19, por, [2,1], ned, Time.cet('2012-06-17 20:45'), eurob ],
-  [ 20, den, [1,2], ger, Time.cet('2012-06-17 20:45'), eurob ],
-  [ 21, cro, [0,1], esp, Time.cet('2012-06-18 20:45'), euroc ],
-  [ 22, ita, [2,0], irl, Time.cet('2012-06-18 20:45'), euroc ],
-  [ 23, eng, [1,0], ukr, Time.cet('2012-06-19 20:45'), eurod ],
-  [ 24, swe, [2,0], fra, Time.cet('2012-06-19 20:45'), eurod ]
-]
-
-Game.create_from_ary!( games_euro_round1, euro_round1 )
-Game.create_from_ary!( games_euro_round2, euro_round2 )
-Game.create_from_ary!( games_euro_round3, euro_round3 )
-
-
-
-euro8 = Round.create!( event: euro, pos: 4, title: 'Viertelfinale', start_at: Time.cet( '2012-06-21' ) )
-euro4 = Round.create!( event: euro, pos: 5, title: 'Halbfinale',    start_at: Time.cet( '2012-06-27' ) )
-euro1 = Round.create!( event: euro, pos: 6, title: 'Finale',        start_at: Time.cet( '2012-07-01' ) )
-
-
-games_euro8 = [
-  [ 25, cze, [0,1], por, Time.cet('2012-06-21 20:45') ],
-  [ 26, ger, [4,2], gre, Time.cet('2012-06-22 20:45') ],
-  [ 27, esp, [2,0], fra, Time.cet('2012-06-23 20:45') ],
-  [ 28, eng, [0,0,0,0,2,4], ita, Time.cet('2012-06-24 20:45') ]]
-
-games_euro4 = [
-  [ 29, por, [0,0,0,0,2,4], esp, Time.cet('2012-06-27 20:45') ],
-  [ 30, ger, [1,2], ita, Time.cet('2012-06-28 20:45') ]]
-
-games_euro1 = [
-  [ 31, esp, [4,0], ita, Time.cet('2012-07-01 20:45') ]]
-
-
-Game.create_knockouts_from_ary!( games_euro8, euro8 )
-Game.create_knockouts_from_ary!( games_euro4, euro4 )
-Game.create_knockouts_from_ary!( games_euro1, euro1 )
+euro.add_teams_from_ary!([
+ 'pol', 'gre', 'rus', 'cze',
+ 'ned', 'den', 'ger', 'por',
+ 'esp', 'ita', 'irl', 'cro',
+ 'ukr', 'swe', 'fra', 'eng'
+])
 
 ## The End
 #################

data/db/euro/2012.txt

@@ -0,0 +1,114 @@
+#################################
+##  Euro 2012
+
+############
+# Groups
+#
+
+Gruppe A  |  POL  GRE  RUS  CZE
+Gruppe B  |  NED  DEN  GER  POR
+Gruppe C  |  ESP  ITA  IRL  CRO
+Gruppe D  |  UKR  SWE  FRA  ENG
+
+
+
+##################
+## Gruppenphase  / Group stage
+
+
+#############
+# Gruppe A
+
+1. Runde / Vorrunde / Gruppe A
+
+(1) POL   1:1  GRE   2012-06-08 18:00
+(2) RUS   4:1  CZE   2012-06-08 20:45
+
+2. Runde / Vorrunde / Gruppe A
+
+(9)   GRE  1:2  CZE   2012-06-12 18:00
+(10)  POL  1:1  RUS   2012-06-12 20:45
+
+3. Runde / Vorrunde / Gruppe A
+
+(17) CZE  1:0  POL   2012-06-16 20:45
+(18) GRE  1:0  RUS   2012-06-16 20:45
+
+
+#############
+# Gruppe B
+
+1. Runde / Vorrunde / Gruppe B
+
+(3) NED   0:1  DEN   2012-06-09 18:00
+(4) GER   1:0  POR   2012-06-09 20:45
+
+2. Runde / Vorrunde / Gruppe B
+
+(11)  DEN  2:3  POR   2012-06-13 18:00
+(12)  NED  1:2  GER   2012-06-13 20:45
+
+3. Runde / Vorrunde / Gruppe B
+
+(19) POR  2:1  NED   2012-06-17 20:45
+(20) DEN  1:2  GER   2012-06-17 20:45
+
+
+#############
+# Gruppe C
+
+1. Runde / Vorrunde / Gruppe C
+
+(5) ESP   1:1  ITA   2012-06-10 18:00
+(6) IRL   1:3  CRO   2012-06-10 20:45
+
+2. Runde / Vorrunde / Gruppe C
+
+(13)  ITA  1:1  CRO   2012-06-14 18:00
+(14)  ESP  4:0  IRL   2012-06-14 20:45
+
+3. Runde / Vorrunde / Gruppe C
+
+(21) CRO  0:1  ESP   2012-06-18 20:45
+(22) ITA  2:0  IRL   2012-06-18 20:45
+
+###############
+# Gruppe D
+
+1. Runde / Vorrunde / Gruppe D
+
+(7) FRA  1:1  ENG   2012-06-11 18:00
+(8) UKR  2:1  SWE   2012-06-11 20:45
+
+2. Runde / Vorrunde / Gruppe D
+
+(15)  SWE  2:3  ENG  2012-06-15 20:45
+(16)  UKR  0:2  FRA  2012-06-15 18:00
+
+3. Runde / Vorrunde / Gruppe D
+
+(23) ENG  1:0  UKR   2012-06-19 20:45
+(24) SWE  2:0  FRA   2012-06-19 20:45
+
+
+
+#################
+# Finalrunde / Knockout phase
+
+4. Runde // Viertelfinale /  Quarter-finals
+
+(25) CZE  0:1             POR  2012-06-21 20:45
+(26) GER  4:2             GRE  2012-06-22 20:45
+(27) ESP  2:0             FRA  2012-06-23 20:45
+(28) ENG  0:0 0:0nV 2:4iE ITA  2012-06-24 20:45
+
+
+5. Runde // Halbfinale  / Semi-finals
+
+(29)  POR  0:0 0:0nV 2:4iE  ESP  2012-06-27 20:45
+(30)  GER  1:2              ITA  2012-06-28 20:45
+
+
+6. Runde // Finale  /  Final
+
+(31)  ESP  4:0  ITA   2012-07-01 20:45

data/db/euro/teams.txt

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+pol, Polen|Poland,        POL, pl
+gre, Griechenland|Greece, GRE, gr
+rus, Russland|Russia,     RUS, ru
+cze, Tschechien|Czech Republic,   CZE, cz
+ned, Niederlande|Netherlands,  NED, nl
+den, Dänemark,     DEN, dk
+ger, Deutschland|Germany,  GER, de
+por, Portugal,     POR, pt
+esp, Spanien|Spain,      ESP, es
+ita, Italien|Italy,      ITA, it
+irl, Irland,       IRL, ie
+cro, Kroatien|Croatia,     CRO, hr
+ukr, Ukraine,      UKR, ua
+swe, Schweden|Sweden,     SWE, se
+fra, Frankreich|France,   FRA, fr
+eng, England,      ENG, en
+
+## some more teams for wm quali
+
+fro, Färöer|Färöer Inseln,  FRO, fo
+kaz, Kasachstan,   KAZ, kz
+aut, Österreich|Austria,   AUT, at
+blr, Weißrussland, BLR, by
+fin, Finnland,     FIN, fi
+geo, Georgien,     GEO, ge
+  
+## some more teams for wm 2010
+
+sui, Schweiz|Switzerland,      SUI, ch 
+srb, Serbien,      SRB, rs
+svn, Slowenien,    SVN, si
+svk, Slowakei,     SVK, sk
+tur, Türkei|Turkey,  TUR, tr
+rou, Rumänien|Romania,   ROU, ro

data/db/mx/teams.txt

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+america,   Club América|América de Mexico,   city:mexico
+atlante,   Atlante,             city:cancun
+atlas,     Atlas,               city:guadalajara
+chivas,    Guadalajara Chivas,  city:guadalajara
+cruzazul,  Cruz Azul,           city:mexico
+jaguares,  Jaguares de Chiapas, city:tuxtla
+leon,      Club León,           city:leon
+monarcas,  Monarcas Morelia|Atletico Monarcas Morelia,    city:morelia
+monterrey, Monterrey|CF Monterrey ,           city:monterrey
+pachuca,   Pachuca,             city:pachuca
+puebla,    Puebla F.C. ,        city:puebla
+queretaro, Querétaro F.C.,      city:queretaro
+sanluis,   Club San Luis,      city:sanluispotosi
+slaguna,   Santos Laguna,       city:torreon
+tijuana,   Club Tijuana,        city:tijuana
+toluca,    Toluca|Deportivo Toluca,              city:toluca
+tigres,    Tigres UANL,         city:sannicolas
+pumas,     Pumas UNAM,          city:mexico

data/db/nhl/teams.txt

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+######################################
+## NHL  Teams 2012
+
+newjersey,    New Jersey Devils,   East/Atlantic, us
+nyislanders,  New York Islanders,  East/Atlantic, us, city:newyork
+nyrangers,    New York Rangers,    East/Atlantic, us, city:newyork
+philadelphia, Philadelphia Flyers, East/Atlantic, us, city:philadelphia
+pittsburgh,   Pittsburgh Penguins, East/Atlantic, us, city:pittsburgh
+
+boston,   Boston Bruis,        East/Northeast, us, city:boston
+buffalo,  Buffalo Sabres,      East/Northeast, us, city:buffalo
+montreal, Montreal Canadiens,  East/Northeast, ca, city:montreal
+ottawa,   Ottawa Senators,     East/Northeast, ca, city:ottawa
+toronto,  Toronto Maple Leafs, East/Northeast, ca, city:toronto
+
+carolina, Carolina Hurricanes,   East/Southeast, us
+florida,   Florida Panthers,     East/Southeast, us
+tampabay,  Tampa Bay Lightning,  East/Southeast, us
+washington, Washington Capitals, East/Southeast, us, city:washington
+winnipeg,   Winnipeg Jets,       East/Southeast, ca, city:winnipeg
+
+chicago,   Chicago Blackhawks,    West/Central, us, city:chicago
+columbus,  Columbus Blue Jackets, West/Central, us, city:columbus
+detroit,   Detroit Red Wings,     West/Central, us, city:detroit
+nashville,  Nashville Predators,  West/Central, us, city:nashville
+stlouis,    St. Louis Blues,      West/Central, us, city:stlouis
+
+calgary,     Calgary Flames,     West/Northwest, ca, city:calgary
+colorado,    Colorado Avalanche, West/Northwest, us
+edmonton,    Edmonton Oilers,    West/Northwest, ca, city:edmonton
+minnesota,   Minnesota Wild,     West/Northwest, us
+vancouver,    Vancouver Canucks, West/Northwest, ca, city:vancouver
+
+anaheim,      Anaheim Ducks,     West/Pacific, us, city:anaheim
+dallas,       Dallas Stars,      West/Pacific, us, city:dallas
+losangeles,   Los Angeles Kings, West/Pacific, us, city:losangeles
+phoenix,      Phoenix Coyotes,   West/Pacific, us, city:phoenix
+sanjose,      San Jose Sharks,   West/Pacific, us, city:sanjose

data/db/ro/teams.txt

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+## fix: remove _ underscore from key (not supported)
+
+
+astra,              Astra Ploiesti,         AFC
+ceahlau,            Ceahlaul Piatra Neamt,  FCC
+cfr,                CFR Cluj,               CFR
+chiajna,            Concordia Chiajna,      CCH
+iasi,               CSMS Iasi,              CSI
+dinamo,             Dinamo Bucuresti,       FCD
+fcbrasov,           FC Brasov,              FCB
+gazmetan_severin,   FC Severin,             FCS
+vaslui,             FC Vaslui,              FCV
+gazmetan_medias,    Gaz Metan Medias,       GMM
+gloria_bistrita,    Gloria Bistrita,        GBS
+otelul,             Otelul Galati,          OTG
+pandurii,           Pandurii Tg Jiu,        PTJ
+petrolul,           Petrolul Ploiesti,      PPL
+
+## fix: at/rapid!!!! already taken 
+
+rapid,              Rapid Bucuresti,        RBU
+steaua,             Steaua Bucuresti,       SBU
+u_cluj,             U Cluj,                 UCJ
+viitorul_constanta, Viitorul Constanta,     VCT

data/db/world/2010.txt

@@ -2,11 +2,6 @@
 ##  World Cup 2010
  
 
-####
-## todo: check why we get with umlauts:
-# sportdb/reader.rb:261:in `=~': incompatible encoding regexp match (UTF-8 regexp with
-#   CP850 string) (Encoding::CompatibilityError)
-
 ######
 # Groups
 

data/db/world/teams.txt

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+########################
+## africa
+  
+alg, Algerien,       ALG, dz
+civ, Elfenbeinküste, CIV, ci
+gha, Ghana,          GHA, gh
+cmr, Kamerun,        CMR, cm
+nga, Nigeria,        NGA, ng
+rsa, Südafrika,      RSA, za
+
+
+#############################
+## asia w/ australia
+
+aus, Australien, AUS, au
+jpn, Japan,      JPN, jp
+prk, Nordkorea,  PRK, kp
+kor, Südkorea, KOR, kr
+
+###############################
+## oceania
+  
+nzl, Neuseeland, NZL, nz

data/lib/sportdb.rb

@@ -73,66 +73,77 @@ module SportDB
     #  e.g. lets you use Team instead of Models::Team 
     include SportDB::Models
 
+
     def self.fixtures_rb_test
      ['leagues',
       'seasons',
-      'at/teams',
-      'at/2011_12/bl',
+#      'at/2011_12/bl',
 #      'at/2011_12/cup',
 #      'at/2012_13/bl',
 #      'at/2012_13/cup',
-#      'copa/teams',
 #      'copa/sud_2012_13',
-      'america/teams',
-      'world/teams',
-      'world/quali_2012_13_america'
+#      'world/quali_2012_13_america'
      ]
     end
 
     def self.fixtures_txt_test
       [
-       [ AT_2011_12,        'at/2011_12/bl'],
+#       [ AT_2011_12,        'at/2011_12/bl'],
 #       [ AT_2012_13,        'at/2012_13/bl'],
 #       [ AT_CUP_2012_13,    'at/2012_13/cup'],
 #       ['copa.sud.2012/13', 'copa/sud_2012_13'],
-       [ WORLD_QUALI_AMERICA_2012_13, 'world/quali_2012_13_america']
+#       [ WORLD_QUALI_AMERICA_2012_13, 'world/quali_2012_13_america']
       ]
     end
 
 
+    def self.team_fixtures
+      at = Country.find_by_key!( 'at' )
+      de = Country.find_by_key!( 'de' )
+      en = Country.find_by_key!( 'en' )
+      es = Country.find_by_key!( 'es' )
+      ro = Country.find_by_key!( 'ro' )
+      mx = Country.find_by_key!( 'mx' )
+
+      [
+        [ 'america/teams', { national: true } ],
+        [ 'euro/teams',    { national: true } ],
+        [ 'world/teams',   { national: true } ],
+        [ 'at/teams', { club: true, country_id: at.id } ],
+        [ 'de/teams', { club: true, country_id: de.id } ],
+        [ 'en/teams', { club: true, country_id: en.id } ],
+        [ 'es/teams', { club: true, country_id: es.id } ],
+#        [ 'ro/teams', { club: true, country_id: ro.id } ],
+        [ 'mx/teams', { club: true, country_id: mx.id } ],
+        [ 'cl/teams', { club: true } ],
+        [ 'copa/teams', { club: true } ],
+        [ 'nhl/teams', { club: true } ]
+      ]
+    end
+
     def self.fixtures_rb  # all builtin ruby fixtures; helper for covenience
      ['leagues',
       'seasons',
-      'at/teams',
       'at/badges',
       'at/2011_12/bl',
       'at/2011_12/cup',
       'at/2012_13/bl',
       'at/2012_13/cup',
-      'de/teams',
-      'en/teams',
-      'es/teams',
-      'cl/teams',
       'cl/badges',
       'cl/2011_12/cl',
       'cl/2011_12/el',
       'cl/2012_13/cl',
       'de/2012_13/bl',
       'en/2012_13/pl',
-      'euro/teams',
       'euro/2008',
       'euro/2012',
-      'america/teams',
       'america/2011',
-      'copa/teams',
       'copa/sud_2012_13',
-      'mx/teams',
       'mx/apertura_2012',
-      'world/teams',
       'world/2010',
       'world/quali_2012_13_europe',
-      'world/quali_2012_13_america',
-      'nhl/teams']
+      'world/quali_2012_13_america'
+      ]
     end
 
     def self.fixtures_txt
@@ -151,6 +162,10 @@ module SportDB
     end
   end # class Fixtures
 
+  def self.team_fixtures
+    Fixtures.team_fixtures
+  end
+
   def self.fixtures_rb  # all builtin ruby fixtures; helper for covenience
     Fixtures.fixtures_rb
   end
@@ -160,11 +175,15 @@ module SportDB
   end
 
   def self.load_all
+    ## load teams first
+    read( team_fixtures )  # converted to plain text fixtures (.rb no longer exist)
+    
     load( fixtures_rb )
   end
 
 
   def self.read_all
+    ## todo/fix: remove!! roll into load_all
     read( fixtures_txt )
   end
 
@@ -184,7 +203,12 @@ module SportDB
   def self.read( ary )
     reader = Reader.new
     ary.each do |rec|
-      reader.load_fixtures_builtin( rec[0], rec[1] ) # event_key, name 
+      ## todo: check for teams in name too?
+      if rec[1].nil? || rec[1].kind_of?( Hash )   ## assume team fixtures
+        reader.load_teams_builtin( rec[0], rec[1] )  ## NB: name goes first than opt more_values hash
+      else
+        reader.load_fixtures_builtin( rec[0], rec[1] ) # event_key, name  -- assume game fixtures
+      end
     end
   end