sportdb 0.5.0 → 0.5.1

data/Manifest.txt

@@ -15,6 +15,7 @@ db/at/2012_13/cup.txt
 db/at/2012_13/cup_fixtures.rb
 db/at/badges.rb
 db/at/teams.rb
+db/cities.rb
 db/cl/2011_12/cl.rb
 db/cl/2011_12/el.rb
 db/cl/2012_13/cl.rb
@@ -56,6 +57,7 @@ lib/sportdb/cli/opts.rb
 lib/sportdb/cli/runner.rb
 lib/sportdb/loader.rb
 lib/sportdb/models/badge.rb
+lib/sportdb/models/city.rb
 lib/sportdb/models/country.rb
 lib/sportdb/models/event.rb
 lib/sportdb/models/event_team.rb

data/db/at/teams.rb

@@ -2,16 +2,16 @@
 
 
 bl = [
-  [ 'salzburg',    'FC RB Salzburg|RB Salzburg|Red Bull Salzburg',     'RBS' ],
-  [ 'rapid',       'SK Rapid Wien|Rapid Wien',           'RAP' ],
-  [ 'admira',      'FC Admira Wacker|Admira Wacker|FC Admira Wacker Mödling',   'ADM' ],
-  [ 'austria',     'FK Austria Wien|Austria Wien',       'FAK' ],
-  [ 'sturm',       'SK Sturm Graz|Sturm Graz',           'STU' ],
-  [ 'ried',        'SV Ried|SV Josko Ried|SV Josko Fenster Ried',      'RIE' ],
-  [ 'innsbruck',   'FC Wacker Innsbruck|FC Wacker|Wacker Innsbruck',    'IBK' ],
-  [ 'mattersburg', 'SV Mattersburg',                     'SVM' ],
-  [ 'wrneustadt',  'SC Wiener Neustadt|Wiener Neustadt|Wr. Neustadt', 'WRN' ],
-  [ 'wac',         'Wolfsberger AC',                     'WAC' ]
+  [ 'salzburg',    'FC RB Salzburg|RB Salzburg|Red Bull Salzburg',     'RBS',  'city:salzburg' ],
+  [ 'rapid',       'SK Rapid Wien|Rapid Wien',            'RAP',  'city:wien'  ],
+  [ 'admira',      'FC Admira Wacker|Admira Wacker|FC Admira Wacker Mödling',   'ADM', 'city:moedling' ],
+  [ 'austria',     'FK Austria Wien|Austria Wien',       'FAK',  'city:wien' ],
+  [ 'sturm',       'SK Sturm Graz|Sturm Graz',           'STU',  'city:graz' ],
+  [ 'ried',        'SV Ried|SV Josko Ried|SV Josko Fenster Ried',      'RIE', 'city:ried' ],
+  [ 'innsbruck',   'FC Wacker Innsbruck|FC Wacker|Wacker Innsbruck',    'IBK', 'city:innsbruck' ],
+  [ 'mattersburg', 'SV Mattersburg',                     'SVM',  'city:mattersburg' ],
+  [ 'wrneustadt',  'SC Wiener Neustadt|Wiener Neustadt|Wr. Neustadt', 'WRN',  'city:wrneustadt' ],
+  [ 'wac',         'Wolfsberger AC',                     'WAC',  'city:wolfsberg' ]
 ]
 
 ersteliga = [

data/db/cities.rb

@@ -0,0 +1,162 @@
+# encoding: utf-8
+
+
+
+### todo/fix: add regions (Stmk., NOE, OOE, etc,)
+
+cities_at = [
+  ['wien',        'Wien|Vienna'],
+  ['innsbruck',   'Innsbruck'],
+  ['moedling',    'Mödling|Moedling'],
+  ['salzburg',    'Salzburg'],
+  ['graz',        'Graz'],
+  ['linz',        'Linz'],
+  ['mattersburg', 'Mattersburg'],
+  ['ried',        'Ried'],
+  ['wrneustadt',  'Wiener Neustadt|Wr. Neustadt'],
+  ['wolfsberg',   'Wolfsberg']
+]
+
+at = Country.find_by_key!( 'at' )
+City.create_from_ary!( cities_at, country: at )
+
+
+cities_en = [
+  ['manchester',  'Manchester'],
+  ['london',      'London'],
+  ['liverpool',   'Liverpool'],
+  ['birmingham',  'Birmingham'],  # e.g.Aston Villa
+  ['blackburn',   'Blackburn'],
+  ['westbrom',    'West Bromwich'],
+  ['newcastle',   'Newcastle upon Tyne'],
+  ['stoke',       'Stoke-on-Trent'],
+  ['sunderland',  'Sunderland'],
+  ['wigan',       'Wigan'],
+  ['southampton', 'Southampton'],
+  ['reading',     'Reading'],
+  ['norwich',     'Norwich'],
+  ['swansea',     'Swansea']
+]
+
+en = Country.find_by_key!( 'en' )
+City.create_from_ary!( cities_en, country: en )
+
+
+cities_de = [
+  ['hoffenheim',    'Hoffenheim'],
+  ['nuernberg',     'Nürnberg'],
+  ['stuttgart',     'Stuttgart'],
+  ['augsburg',      'Augsburg'],
+  ['wolfsburg',     'Wolfsburg'],
+  ['fuerth',        'Fürth'],
+  ['muenchen',      'München'],
+  ['gelsenkirchen', 'Gelsenkirchen'],
+  ['dortmund',      'Dortmund'],
+  ['frankfurt',     'Frankfurt'],
+  ['hannover',      'Hannover'],
+  ['leverkusen',    'Leverkusen'],
+  ['duesseldorf',   'Düsseldorf'],
+  ['hamburg',       'Hamburg'],
+  ['mainz',         'Mainz'],
+  ['mgladbach',     "Mönchengladbach|M'gladbach" ],
+  ['freiburg',      'Freiburg'],
+  ['bremen',        'Bremen']
+]
+
+de = Country.find_by_key!( 'de' )
+City.create_from_ary!( cities_de, country: de )
+
+
+cities_es = [
+  ['bilbao',    'Bilbao'],
+  ['valencia',  'Valencia'],
+  ['barcelona', 'Barcelona'],
+  ['madrid',    'Madrid'],
+  ['malaga',    'Málaga']
+]
+
+es = Country.find_by_key!( 'es' )
+City.create_from_ary!( cities_es, country: es )
+
+
+cities_fr = [
+  ['lille',       'Lille'],
+  ['paris',       'Paris'],
+  ['marseille',   'Marseille'],
+  ['montpellier', 'Montpellier']
+]
+
+fr = Country.find_by_key!( 'fr' )
+City.create_from_ary!( cities_fr, country: fr )
+
+
+cities_it = [
+  ['turin',   'Turin'],
+  ['milano',  'Mailand|Milano'],
+  ['napoli',  'Neapel|Napoli']
+]
+
+it = Country.find_by_key!( 'it' )
+City.create_from_ary!( cities_it, country: it )
+
+
+cities_pt = [
+  ['porto', 'Porto'],
+  ['braga', 'Braga'],
+  ['lisboa', 'Lissabon|Lisboa']
+]
+
+pt = Country.find_by_key!( 'pt' )
+City.create_from_ary!( cities_pt, country: pt )
+
+
+cities_ru = [
+  ['moskva',      'Moskau|Moskva'],
+  ['stpetersburg','St. Petersburg']
+]
+
+ru = Country.find_by_key!( 'ru' )
+City.create_from_ary!( cities_ru, country: ru )
+
+
+cities_be = [
+  ['brussel',   'Brüssel|Brussel|Bruxelles|Brussels']  # de|nl|fr|en   - RCA Anderlecht
+]
+
+be = Country.find_by_key!( 'be' )
+City.create_from_ary!( cities_be, country: be )
+
+
+cities_ua = [
+  ['kiev',     'Kiew|Kiev|Kyiv' ],
+  ['donetsk',  'Donezk|Donetsk'],
+  ['kharkov',  'Kharkiv|Kharkov']
+]
+
+ua = Country.find_by_key!( 'ua' )
+City.create_from_ary!( cities_ua, country: ua )
+
+
+cities_mx = [
+  ['mexico',        'México' ],
+  ['cancun',        'Cancún' ],
+  ['guadalajara',   'Guadalajara' ],
+  ['tuxtla',        'Tuxtla Gutiérrez' ],
+  ['leon',          'León' ],
+  ['morelia',       'Morelia' ],
+  ['monterrey',     'Monterrey' ],
+  ['pachuca',       'Pachuca' ],
+  ['puebla',        'Puebla' ],
+  ['queretaro',     'Querétaro' ],
+  ['sanluispotosi', 'San Luis Potosì' ],
+  ['torreon',       'Torreón' ],
+  ['tijuana',       'Tijuana' ],
+  ['toluca',        'Toluca' ],
+  ['sannicolas',    'San Nicolás de los Garza' ]
+]
+
+mx = Country.find_by_key!( 'mx' )
+City.create_from_ary!( cities_mx, country: mx )
+
+
+Prop.create!( key: 'db.cities.version', value: '1' )

data/db/cl/teams.rb

@@ -37,52 +37,49 @@ cy = Country.find_by_key!( 'cy' )
 
 
 teams = [
-  [ 'porto',        'FC Porto|FC Porto POR',             pt ],
-  [ 'kiew',         'Dynamo Kiew|FC Dynamo Kiew UKR|Dynamo Kiev',          ua ],
-  [ 'paris',        'Paris St. Germain|Paris S.Germai FRA|Paris Saint Germain',    fr ],
-  [ 'zagreb',       'Dinamo Zagreb|Dinamo Zagreb CRO|NK Dinamo Zagreb',        hr ],
-
-  [ 'olympiacos',   'Olympiakos Piräus|Olympiakos P. GRE|Olympiakos Piraeus',    gr ],
-  [ 'montpellier',  'HSC Montpellier|Montpellier FRA',      fr ],
+  [ 'malaga',       'FC Málaga|Malaga CF ESP|CF Malaga',            es, 'city:malaga' ],
+  [ 'madrid',       'Real Madrid|Real Madrid ESP',          es, 'city:madrid' ],
+  [ 'valencia',  'FC Valencia|FC Valencia ESP|CF Valencia',             es, 'city:valencia' ],
+  [ 'barcelona', 'FC Barcelona|FC Barcelona ESP',            es, 'city:barcelona' ],
+  [ 'atletico',  'Atlético Madrid',          es, 'city:madrid' ],
+  [ 'athletic',  'Athletic Bilbao',          es, 'city:bilbao' ],
+
+  [ 'porto',        'FC Porto|FC Porto POR',             pt, 'city:porto' ],
+  [ 'benfica',   'Benfica Lissabon|Benfica Lis. POR',      pt, 'city:lisboa' ],
+  [ 'braga',       'Sporting Braga|Sporting Braga POR',        pt, 'city:braga' ],
+  [ 'sporting',  'Sporting Lisboa',          pt, 'city:lisboa' ],
+
+  [ 'milan',        'AC Mailand|AC Milan ITA|AC Milan',           it, 'city:milano' ],
+  [ 'inter',     'FC Internazionale Milano', it, 'city:milano' ],
+  [ 'napoli',    'SSC Napoli',               it, 'city:napoli' ],
+  [ 'juventus',     'Juventus Turin|Juventus Turin ITA',       it, 'city:turin' ],
+
+  [ 'paris',        'Paris St. Germain|Paris S.Germai FRA|Paris Saint Germain',    fr, 'city:paris' ],
+  [ 'montpellier',  'HSC Montpellier|Montpellier FRA',      fr, 'city:montpellier' ],
+  [ 'lille',     'OSC Lille|Lille OSC FRA',               fr, 'city:lille' ],
+  [ 'marseille', 'Olympique Marseille',      fr, 'city:marseille' ],
+
+  [ 'kiew',         'Dynamo Kiew|FC Dynamo Kiew UKR|Dynamo Kiev',          ua, 'city:kiev' ],
+  [ 'donezk',       'Schachtjor Donezk|Shakhtar Don. UKR|Shakhtar Donetsk',    ua, 'city:donetsk' ],
+  [ 'metalist',  'FC Metalist Kharkiv',      ua, 'city:kharkov' ],
+
+  [ 'zenit',        'Zenit St. Petersburg|Zenit Petersb. RUS|FC Zenit St Petersburg', ru, 'city:stpetersburg' ],
+  [ 'spartak',   'Spartak Moskau|Spartak Moskau RUS|Spartak Moscow',     ru, 'city:moskva' ],
+  [ 'moskva',    'PFC CSKA Moskva',          ru, 'city:moskva' ],
+
+  [ 'anderlecht',   'RSC Anderlecht|RSC Anderlecht BEL',       be, 'city:brussel' ],
 
-  [ 'milan',        'AC Mailand|AC Milan ITA|AC Milan',           it ],
-  [ 'zenit',        'Zenit St. Petersburg|Zenit Petersb. RUS|FC Zenit St Petersburg', ru ],
-  [ 'anderlecht',   'RSC Anderlecht|RSC Anderlecht BEL',       be ],
-  [ 'malaga',       'FC Málaga|Malaga CF ESP|CF Malaga',            es ],
-
-  [ 'madrid',       'Real Madrid|Real Madrid ESP',          es ],
   [ 'ajax',         'Ajax Amsterdam|Ajax Amsterdam NED',       nl ],
+  [ 'az',        'AZ Alkmaar',               nl ],
 
-  [ 'donezk',       'Schachtjor Donezk|Shakhtar Don. UKR|Shakhtar Donetsk',    ua ],
-  [ 'juventus',     'Juventus Turin|Juventus Turin ITA',       it ],
+  [ 'zagreb',       'Dinamo Zagreb|Dinamo Zagreb CRO|NK Dinamo Zagreb',        hr ],
+  [ 'olympiacos',   'Olympiakos Piräus|Olympiakos P. GRE|Olympiakos Piraeus',    gr ],
   [ 'nordsjalland', 'FC Nordsjælland|Nordsjaelland DEN|FC Nordsjaelland',      dk ],
-
-  [ 'valencia',  'FC Valencia|FC Valencia ESP|CF Valencia',             es ],
-  [ 'lille',     'OSC Lille|Lille OSC FRA',               fr ],
   [ 'borissow',  'BATE Borissow|Bate Borisov BLR|Bate Borisov',           by ],
-
-  [ 'barcelona', 'FC Barcelona|FC Barcelona ESP',            es ],
-  [ 'benfica',   'Benfica Lissabon|Benfica Lis. POR',      pt ],
-  [ 'spartak',   'Spartak Moskau|Spartak Moskau RUS|Spartak Moscow',     ru ],
   [ 'celtic',    'Celtic Glasgow|Celtic Glasgow SCO',          sc ],
-
-  [ 'braga',       'Sporting Braga|Sporting Braga POR',        pt ],
   [ 'galatasaray', 'Galatasaray|Galatasaray TUR',           tr ],
   [ 'cluj',        'CFR Cluj|CFR Cluj ROU',              ro ],
-
-###################
-# more teams from cl/el 2011-12
-#
-  [ 'atletico',  'Atlético Madrid',          es ],
-  [ 'athletic',  'Athletic Bilbao',          es ],
-  [ 'sporting',  'Sporting Lisboa',          pt ],
-  [ 'inter',     'FC Internazionale Milano', it ],
-  [ 'napoli',    'SSC Napoli',               it ],
-  [ 'marseille', 'Olympique Marseille',      fr ],
   [ 'basel',     'FC Basel 1893',            ch ],
-  [ 'az',        'AZ Alkmaar',               nl ],
-  [ 'metalist',  'FC Metalist Kharkiv',      ua ],
-  [ 'moskva',    'PFC CSKA Moskva',          ru ],
   [ 'apoel',     'APOEL Nikosia',            cy ]
 
 ]

data/db/de/teams.rb

@@ -8,24 +8,24 @@
 ## nb: three letter codes (tags) taken from official bundesliga.de site
 
 teams = [
-  [ 'bayern',      'FC Bayern München|Bayern München|Bayern München GER',   'FCB' ],
-  [ 'schalke',     'FC Schalke 04|FC Schalke 04 GER',                       'S04' ],
-  [ 'dortmund',    'Borussia Dortmund|Bor. Dortmund|Bor. Dortmund GER',     'BVB' ],
-  [ 'frankfurt',   'Eintracht Frankfurt|E. Frankfurt',    'FFM' ],
-  [ 'hannover',    'Hannover 96',                         'H96' ],
-  [ 'leverkusen',  'Bayer 04 Leverkusen|Bay. Leverkusen', 'B04' ],
-  [ 'duesseldorf', 'Fortuna Düsseldorf|F. Düsseldorf',    'F95' ],
-  [ 'hsv',         'Hamburger SV',                        'HSV' ],
-  [ 'mainz',       '1. FSV Mainz 05',                     'M05' ],
-  [ 'mgladbach',   "Borussia M'gladbach|Bor. M'gladbach", 'BMG' ],
-  [ 'freiburg',    'SC Freiburg',                         'SCF' ],
-  [ 'bremen',      'Werder Bremen',                       'BRE' ],
-  [ 'hoffenheim',  '1899 Hoffenheim',                     'HOF' ],
-  [ 'nuernberg',   '1. FC Nürnberg',                      'FCN' ],
-  [ 'stuttgart',   'VfB Stuttgart',                       'VFB' ],
-  [ 'augsburg',    'FC Augsburg',                         'FCA' ],
-  [ 'wolfsburg',   'VfL Wolfsburg',                       'WOB' ],
-  [ 'fuerth',      'Greuther Fürth',                      'SGF' ]
+  [ 'bayern',      'FC Bayern München|Bayern München|Bayern München GER',   'FCB', 'city:muenchen' ],
+  [ 'schalke',     'FC Schalke 04|FC Schalke 04 GER',                       'S04', 'city:gelsenkirchen' ],
+  [ 'dortmund',    'Borussia Dortmund|Bor. Dortmund|Bor. Dortmund GER',     'BVB', 'city:dortmund' ],
+  [ 'frankfurt',   'Eintracht Frankfurt|E. Frankfurt',    'FFM', 'city:frankfurt' ],
+  [ 'hannover',    'Hannover 96',                         'H96', 'city:hannover' ],
+  [ 'leverkusen',  'Bayer 04 Leverkusen|Bay. Leverkusen', 'B04', 'city:leverkusen' ],
+  [ 'duesseldorf', 'Fortuna Düsseldorf|F. Düsseldorf',    'F95', 'city:duesseldorf' ],
+  [ 'hsv',         'Hamburger SV',                        'HSV', 'city:hamburg' ],
+  [ 'mainz',       '1. FSV Mainz 05',                     'M05', 'city:mainz' ],
+  [ 'mgladbach',   "Borussia M'gladbach|Bor. M'gladbach", 'BMG', 'city:mgladbach' ],
+  [ 'freiburg',    'SC Freiburg',                         'SCF', 'city:freiburg' ],
+  [ 'bremen',      'Werder Bremen',                       'BRE', 'city:bremen' ],
+  [ 'hoffenheim',  '1899 Hoffenheim',                     'HOF', 'city:hoffenheim' ],
+  [ 'nuernberg',   '1. FC Nürnberg',                      'FCN', 'city:nuernberg' ],
+  [ 'stuttgart',   'VfB Stuttgart',                       'VFB', 'city:stuttgart' ],
+  [ 'augsburg',    'FC Augsburg',                         'FCA', 'city:augsburg' ],
+  [ 'wolfsburg',   'VfL Wolfsburg',                       'WOB', 'city:wolfsburg' ],
+  [ 'fuerth',      'Greuther Fürth',                      'SGF', 'city:fuerth' ]
 ]
 
 de = Country.find_by_key!( 'de' )

data/db/en/teams.rb

@@ -10,26 +10,26 @@
 ## nb: three letter codes (tags) taken from official premierleague.com site 
 
 teams = [
-  [ 'chelsea',     'Chelsea|Chelsea FC|FC Chelsea|FC Chelsea ENG',    'CHE' ],
-  [ 'manunited',   'Manchester United|Man Utd|Manchester U. ENG',                 'MUN' ],
-  [ 'mancity',     'Manchester City|Man City|Man. City ENG',                  'MCI' ],
-  [ 'arsenal',     'Arsenal|Arsenal FC|FC Arsenal|FC Arsenal ENG',             'ARS' ],
-  [ 'everton',     'Everton|Everton FC|FC Everton',             'EVE' ],
-  [ 'tottenham',   'Tottenham Hotspur|Tottenham',               'TOT' ],
-  [ 'westbrom',    'West Bromwich Albion|West Brom',            'WBA' ],
-  [ 'westham',     'West Ham United|West Ham',                  'WHU' ],
-  [ 'fulham',      'Fulham|Fulham FC|FC Fulham',                'FUL' ],
-  [ 'newcastle',   'Newcastle United|Newcastle',                'NEW' ],
-  [ 'swansea',     'Swansea City|Swansea',                      'SWA' ],
-  [ 'stoke',       'Stoke City|Stoke',                          'STK' ],
-  [ 'sunderland',  'Sunderland|Sunderland AFC|AFC Sunderland',  'SUN' ],
-  [ 'liverpool',   'Liverpool|Liverpool FC|FC Liverpool',       'LIV' ],
-  [ 'wigan',       'Wigan Athletic|Wigan',                      'WIG' ],
-  [ 'astonvilla',  'Aston Villa',                               'AVL' ],
-  [ 'southampton', 'Southampton|Southampton FC|FC Southampton', 'SOU' ],
-  [ 'reading',     'Reading|Reading FC|FC Reading',             'RDG' ],
-  [ 'norwich',     'Norwich City|Norwich',                      'NOR' ],
-  [ 'qpr',         'Queens Park Rangers',                       'QPR' ]]
+  [ 'chelsea',     'Chelsea|Chelsea FC|FC Chelsea|FC Chelsea ENG',    'CHE', 'city:london' ],
+  [ 'manunited',   'Manchester United|Man Utd|Manchester U. ENG',                 'MUN', 'city:manchester' ],
+  [ 'mancity',     'Manchester City|Man City|Man. City ENG',                  'MCI', 'city:manchester' ],
+  [ 'arsenal',     'Arsenal|Arsenal FC|FC Arsenal|FC Arsenal ENG',             'ARS', 'city:london' ],
+  [ 'everton',     'Everton|Everton FC|FC Everton',             'EVE', 'city:liverpool' ],
+  [ 'tottenham',   'Tottenham Hotspur|Tottenham',               'TOT', 'city:london' ],
+  [ 'westbrom',    'West Bromwich Albion|West Brom',            'WBA', 'city:westbrom' ],
+  [ 'westham',     'West Ham United|West Ham',                  'WHU', 'city:london' ],
+  [ 'fulham',      'Fulham|Fulham FC|FC Fulham',                'FUL', 'city:london' ],
+  [ 'newcastle',   'Newcastle United|Newcastle',                'NEW', 'city:newcastle' ],
+  [ 'swansea',     'Swansea City|Swansea',                      'SWA', 'city:swansea' ],
+  [ 'stoke',       'Stoke City|Stoke',                          'STK', 'city:stoke' ],
+  [ 'sunderland',  'Sunderland|Sunderland AFC|AFC Sunderland',  'SUN', 'city:sunderland' ],
+  [ 'liverpool',   'Liverpool|Liverpool FC|FC Liverpool',       'LIV', 'city:liverpool' ],
+  [ 'wigan',       'Wigan Athletic|Wigan',                      'WIG', 'city:wigan' ],
+  [ 'astonvilla',  'Aston Villa',                               'AVL', 'city:birmingham' ],
+  [ 'southampton', 'Southampton|Southampton FC|FC Southampton', 'SOU', 'city:southampton' ],
+  [ 'reading',     'Reading|Reading FC|FC Reading',             'RDG', 'city:reading' ],
+  [ 'norwich',     'Norwich City|Norwich',                      'NOR', 'city:norwich' ],
+  [ 'qpr',         'Queens Park Rangers',                       'QPR', 'city:london' ]]
 
 
 en = Country.find_by_key!( 'en' )

data/db/mx/teams.rb

@@ -1,24 +1,24 @@
 # encoding: utf-8
 
 teams = [
- [ 'america',   'Club América',        'México' ],
- [ 'atlante',   'Atlante',             'Cancún' ],
- [ 'atlas',     'Atlas',               'Guadalajara' ],
- [ 'chivas',    'Guadalajara Chivas',  'Guadalajara' ],
- [ 'cruzazul',  'Cruz Azul',           'México' ],
- [ 'jaguares',  'Jaguares de Chiapas', 'Tuxtla Gutiérrez' ],
- [ 'leon',      'Club León',           'León' ],
- [ 'monarcas',  'Monarcas Morelia',    'Morelia' ],
- [ 'monterrey', 'Monterrey',           'Monterrey' ],
- [ 'pachuca',   'Pachuca',             'Pachuca' ],
- [ 'puebla',    'Puebla F.C. ',        'Puebla' ],
- [ 'queretaro', 'Querétaro F.C.',      'Querétaro' ],
- [ 'sanluis',   'Club  San Luis',      'San Luis Potosì' ],
- [ 'slaguna',   'Santos Laguna',       'Torreón' ],
- [ 'tijuana',   'Club Tijuana',        'Tijuana' ],
- [ 'toluca',    'Toluca',              'Toluca' ],
- [ 'tigres',    'Tigres UANL',         'San Nicolás de los Garza' ],
- [ 'pumas',     'Pumas UNAM',          'México'  ]
+ [ 'america',   'Club América',        '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',    'city:morelia' ],
+ [ 'monterrey', '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',              'city:toluca' ],
+ [ 'tigres',    'Tigres UANL',         'city:sannicolas' ],
+ [ 'pumas',     'Pumas UNAM',          'city:mexico' ]
 ]
 
 mx = Country.find_by_key!( 'mx' )

data/lib/sportdb.rb

@@ -25,6 +25,7 @@ module SportDB   # forward reference; more to come later
 end
 
 require 'sportdb/models/badge'
+require 'sportdb/models/city'
 require 'sportdb/models/country'
 require 'sportdb/models/event'
 require 'sportdb/models/event_team'
@@ -99,7 +100,11 @@ module SportDB
       GroupTeam.delete_all
       Round.delete_all
       Prop.delete_all
-      Country.delete_all    
+      Country.delete_all
+      City.delete_all
+      Badge.delete_all
+      League.delete_all
+      Season.delete_all
     end
     
   end

data/lib/sportdb/cli/runner.rb

@@ -121,7 +121,7 @@ EOS
     puts "Stats:"
     puts "  #{Event.count} events  /  #{Round.count} rounds  /  #{Group.count} groups"
     puts "  #{League.count} leagues  /  #{Season.count} seasons"
-    puts "  #{Country.count} countries"
+    puts "  #{Country.count} countries / #{City.count} cities"
     puts "  #{Team.count} teams"
     puts "  #{Game.count} games"
     puts "  #{Badge.count} badges"

data/lib/sportdb/models/city.rb

@@ -0,0 +1,44 @@
+module SportDB::Models
+
+class City < ActiveRecord::Base
+  self.table_name = 'cities'
+
+  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+  
+  def self.create_from_ary!( cities, more_values={} )
+    cities.each do |values|
+      
+      ## todo/fix: split optional synonyms from title (see team for example)      
+      
+      ## key & title & country required
+      attr = {
+        key: values[0]
+      }
+      
+      ## title (split of optional synonyms)
+      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
+      titles = values[1].split('|')
+      
+      attr[ :title ]    =  titles[0]
+      ## add optional synonyms
+      attr[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
+      
+      attr = attr.merge( more_values )
+      
+      ## check for optional values
+      values[2..-1].each do |value|
+        if value.is_a? Country
+          attr[ :country_id ] = value.id
+        else
+          # issue warning: unknown type for value
+        end
+      end
+      
+      City.create!( attr )
+    end # each city
+  end
+
+end # class Cities
+
+
+end # module Models::SportDB

data/lib/sportdb/models/country.rb

@@ -3,6 +3,8 @@ module SportDB::Models
 
 class Country < ActiveRecord::Base
   self.table_name = 'countries'
+  
+  has_many :cities, :class_name => 'City', :foreign_key => 'city_id'
 
   def self.create_from_ary!( countries )
     countries.each do |values|

data/lib/sportdb/models/team.rb

@@ -9,6 +9,7 @@ class Team < ActiveRecord::Base
   has_many :badges   # Winner, 2nd, Cupsieger, Aufsteiger, Absteiger, etc.
 
   belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+  belongs_to :city,    :class_name => 'City',    :foreign_key => 'city_id'
   
 
   def self.create_from_ary!( teams, more_values={} )
@@ -16,7 +17,7 @@ class Team < ActiveRecord::Base
       
       ## key & title required
       attr = {
-        :key   => values[0]
+        key: values[0]
       }
 
       ## title (split of optional synonyms)
@@ -34,8 +35,14 @@ class Team < ActiveRecord::Base
       values[2..-1].each do |value|
         if value.is_a? Country
           attr[ :country_id ] = value.id
-        elsif value.length == 3   ## assume its a tag (three latters)
+        elsif value.is_a? City
+          attr[ :city_id ] = value.id 
+        elsif value.length == 3   ## assume its a tag (three letters e.g. ITA)
           attr[ :tag ] = value
+        elsif value =~ /^city:/   ## city:
+          value_city_key = value[5..-1]  ## cut off city: prefix
+          value_city = City.find_by_key!( value_city_key )
+          attr[ :city_id ] = value_city.id
         else
           attr[ :title2 ] = value
         end

data/lib/sportdb/schema.rb

@@ -15,11 +15,19 @@ def self.up
 
 create_table :countries do |t|
   t.string :title, :null => false
-  t.string :tag,   :null => false  # short three letter tag
+  t.string :tag,   :null => false  # short three letter tag (FIFA country code)
   t.string :key,   :null => false
   t.timestamps
 end
 
+create_table :cities do |t|
+  t.string :title, :null => false
+  t.string :key,   :null => false
+  t.string :synonyms  # comma separated list of synonyms
+  t.references :country,  :null => false
+  t.timestamps
+end
+
 create_table :props do |t|
   t.string :key,   :null => false
   t.string :value, :null => false
@@ -33,6 +41,7 @@ create_table :teams do |t|
   t.string  :tag     # make it not null?  - three letter tag (short title)
   t.string  :synonyms  # comma separated list of synonyms
   t.references :country,   :null => false
+  t.references :city     # NB: city is optional (should be required for clubs e.g. non-national teams)
   t.boolean  :club,     :null => false, :default => false  # is it a club (not a national team)?
   t.boolean  :national, :null => false, :default => false  # is it a national selection team (not a club)?
   t.timestamps

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-01 00:00:00 Z
+date: 2012-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -98,6 +98,7 @@ files:
 - db/at/2012_13/cup_fixtures.rb
 - db/at/badges.rb
 - db/at/teams.rb
+- db/cities.rb
 - db/cl/2011_12/cl.rb
 - db/cl/2011_12/el.rb
 - db/cl/2012_13/cl.rb
@@ -139,6 +140,7 @@ files:
 - lib/sportdb/cli/runner.rb
 - lib/sportdb/loader.rb
 - lib/sportdb/models/badge.rb
+- lib/sportdb/models/city.rb
 - lib/sportdb/models/country.rb
 - lib/sportdb/models/event.rb
 - lib/sportdb/models/event_team.rb