sportdb 0.8.1 → 0.9.0

data/Manifest.txt

@@ -56,6 +56,7 @@ db/world/teams.rb
 lib/sportdb.rb
 lib/sportdb/cli/opts.rb
 lib/sportdb/cli/runner.rb
+lib/sportdb/keys.rb
 lib/sportdb/loader.rb
 lib/sportdb/models/badge.rb
 lib/sportdb/models/city.rb

data/db/america/2011.rb

@@ -9,11 +9,9 @@
 #   more info -> http://en.wikipedia.org/wiki/2011_Copa_América
 #             -> http://de.wikipedia.org/wiki/Copa_América_2011
 
-copa = Event.create!( key:     'america.2011',
-                    title:   'Copa América 2011',
-                    start_at: Time.cet( '2011-07-01 12:00' ),
-                    league:  League.find_by_key!('america'),
-                    season:  Season.find_by_key!('2011'))
+copa = Event.create!( league:  League.find_by_key!('america'),
+                      season:  Season.find_by_key!('2011'),
+                      start_at: Time.cet( '2011-07-01 12:00' ) )
 
 
 ##############
@@ -47,4 +45,5 @@ copab.add_teams_from_ary!( ['bra', 'par', 'ven', 'ecu' ] )
 copac.add_teams_from_ary!( ['uru', 'chi', 'per', 'mex' ] )
 
 
-Prop.create!( key: 'db.america.2011.version', value: '1' )
+## The End
+#################

data/db/america/teams.rb

@@ -52,4 +52,6 @@ teams = teams_america1 + teams_america2
 
 Team.create_from_ary!( teams, national: true )
 
-Prop.create!( key: 'db.america.teams.version', value: '1' )
+
+## The End
+#################

data/db/at/2011_12/bl.rb

@@ -8,11 +8,9 @@
 ##
 ## more info => http://bundesliga.at
 
-bl = Event.create!( key:      'at.2011/12',
-                    title:    'Österr. Bundesliga 2011/12',
-                    start_at: Time.cet('2012-04-07 00:00'),
-                    league:   League.find_by_key!('at'),
-                    season:   Season.find_by_key!('2011/12'))
+bl = Event.create!( league:   League.find_by_key!('at'),
+                    season:   Season.find_by_key!('2011/12'),
+                    start_at: Time.cet('2012-04-07 00:00'))
 
 team_keys_bl = [
  'salzburg',
@@ -28,5 +26,5 @@ team_keys_bl = [
 
 bl.add_teams_from_ary!( team_keys_bl )
 
-
-Prop.create!( key: 'db.at.2011/12.version', value: '1' )
+## The End
+#################

data/db/at/2011_12/cup.rb

@@ -6,11 +6,9 @@
 ##################################
 ### ÖFB Cup 2011/12
 
-ofb = Event.create!( key:   'at.cup.2011/12',
-                     title: 'ÖFB Cup 2011/12',
-                     start_at: Time.cet( '2011-10-10 17:00' ),
-                     league:   League.find_by_key!('at.cup'),
+ofb = Event.create!( league:   League.find_by_key!('at.cup'),
                      season:   Season.find_by_key!('2011/12'),
+                     start_at: Time.cet( '2011-10-10 17:00' ),
                      team3: false )  # no game for 3rd/4th place
 
 
@@ -64,5 +62,5 @@ Game.create_knockouts_from_ary!( games_ofb8, ofb8 )
 Game.create_knockouts_from_ary!( games_ofb4, ofb4 )
 Game.create_knockouts_from_ary!( games_ofb1, ofb1 )
 
-
-Prop.create!( key: 'db.at.cup.2011/12.version', value: '1' )
+## The End
+#################

data/db/at/2012_13/bl.rb

@@ -8,11 +8,9 @@
 ## more info => http://bundesliga.at
 
 
-bl = Event.create!( key:     'at.2012/13',
-                    title:   'Österr. Bundesliga 2012/13',
-                    start_at: Time.cet('2012-07-21 00:00'),
-                    league:   League.find_by_key!('at'),
-                    season:   Season.find_by_key!('2012/13'))
+bl = Event.create!( league:   League.find_by_key!('at'),
+                    season:   Season.find_by_key!('2012/13'),
+                    start_at: Time.cet('2012-07-21 00:00'))
 
 ## 10 Bundeliga Teams
 
@@ -30,4 +28,6 @@ team_keys_bl = [
 
 bl.add_teams_from_ary!( team_keys_bl )
 
-Prop.create!( key: 'db.at.2012/13.version', value: '1' )
+
+## The End
+#################

data/db/at/2012_13/cup.rb

@@ -3,11 +3,9 @@
 ##################################
 ### ÖFB Cup 2012/13
 
-cup = Event.create!( key:      'at.cup.2012/13',
-                     title:    'ÖFB Cup 2012/13',
-                     start_at: Time.cet( '2012-07-13 00:00' ),
-                     league:   League.find_by_key!('at.cup'),
+cup = Event.create!( league:   League.find_by_key!('at.cup'),
                      season:   Season.find_by_key!('2012/13'),
+                     start_at: Time.cet( '2012-07-13 00:00' ),
                      team3: false )  # no game for 3rd/4th place)
 
 
@@ -109,5 +107,5 @@ cup.add_teams_from_ary!(
   team_keys_rlo +
   team_keys_misc )
 
-
-Prop.create!( key: 'db.at.cup.2012/13.version', value: '1' )
+## The End
+#################

data/db/at/badges.rb

@@ -18,5 +18,5 @@ Badge.create!( team: wac,
                league: League.find_by_key!('at'),
                season: Season.find_by_key!('2011/12') )
 
-
-Prop.create!( key: 'db.at.badges.version', value: '1' )
+## The End
+#################

data/db/at/teams.rb

@@ -89,4 +89,5 @@ at = Country.find_by_key!( 'at' )
 
 Team.create_from_ary!( bl+ersteliga+rlwest+rlmitte+rlost+misc, club: true, country: at )
 
-Prop.create!( key: 'db.at.teams.version', value: '1' )
+## The End
+#################

data/db/cl/2011_12/cl.rb

@@ -5,11 +5,9 @@
 #################################
 ## Champions League 2011/12
 
-cl = Event.create!( key:      'cl.2011/12',
-                    title:    'Champions League 2011/12',
-                    start_at: Time.cet( '2011-10-10 17:00' ),
-                    league:   League.find_by_key!('cl'),
+cl = Event.create!( league:   League.find_by_key!('cl'),
                     season:   Season.find_by_key!('2011/12'),
+                    start_at: Time.cet( '2011-10-10 17:00' ),
                     team3: false )
 
 
@@ -86,5 +84,5 @@ Game.create_knockout_pairs_from_ary!( games_cl8,  cl8,  cl8_2  )
 Game.create_knockout_pairs_from_ary!( games_cl4,  cl4,  cl4_2  )
 Game.create_knockouts_from_ary!( games_cl1,  cl1 )
 
-
-Prop.create!( key: 'db.cl.2011/12.version', value: '1' )
+## The End
+#################

data/db/cl/2011_12/el.rb

@@ -5,11 +5,9 @@
 #################################
 ##  Europa League 2012
 
-el = Event.create!( key: 'el.2011/12',
-                    title: 'Europa League 2011/12',
-                    start_at: Time.cet( '2011-10-10 17:00' ),
-                    league:  League.find_by_key!('el'),
+el = Event.create!( league:  League.find_by_key!('el'),
                     season:  Season.find_by_key!('2011/12'),
+                    start_at: Time.cet( '2011-10-10 17:00' ),
                     team3: false )
 
 az       = Team.find_by_key!( 'az' )
@@ -63,5 +61,5 @@ Game.create_knockout_pairs_from_ary!( games_el8, el8, el8_2 )
 Game.create_knockout_pairs_from_ary!( games_el4, el4, el4_2 )
 Game.create_knockouts_from_ary!( games_el1,  el1 )
 
-
-Prop.create!( key: 'db.el.2011/12.version', value: '1' )
+## The End
+#################

data/db/cl/2012_13/cl.rb

@@ -5,11 +5,9 @@
 #################################
 ## Champions League 2012/13
 
-cl = Event.create!( key:      'cl.2012/13',
-                    title:    'Champions League 2012/13',
-                    start_at: Time.cet( '2012-09-18 18:30' ),
-                    league:   League.find_by_key!('cl'),
+cl = Event.create!( league:   League.find_by_key!('cl'),
                     season:   Season.find_by_key!('2012/13'),
+                    start_at: Time.cet( '2012-09-18 18:30' ),
                     team3: false )
 
 porto         = Team.find_by_key!( 'porto' )
@@ -322,4 +320,5 @@ Game.create_pairs_from_ary_for_group!( games_clg, clg )
 Game.create_pairs_from_ary_for_group!( games_clh, clh )
 
 
-Prop.create!( key: 'db.cl.2012/13.version', value: '1' )
+## The End
+#################

data/db/cl/badges.rb

@@ -64,5 +64,5 @@ Badge.create!( team: zenit,
 
 
 
-Prop.create!( key: 'db.cl.badges.version', value: '1' )
-Prop.create!( key: 'db.el.badges.version', value: '1' )
+## The End
+#################

data/db/cl/teams.rb

@@ -70,5 +70,5 @@ teams = [
 
 Team.create_from_ary!( teams, club: true )
 
-
-Prop.create!( key: 'db.cl.teams.version', value: '1' )
+## The End
+#################

data/db/copa/sud_2012_13.rb

@@ -7,11 +7,9 @@
 ## fix: time zone and times??
 
 
-sud = Event.create!( key:      'copa.sud.2012/13',
-                    title:    'Copa Sudamericana',
-                    start_at: Time.cet( '2012-08-03 12:00' ),
-                    league:   League.find_by_key!('copa.sud'),
-                    season:   Season.find_by_key!('2012/13'))
+sud = Event.create!( league:   League.find_by_key!('copa.sud'),
+                     season:   Season.find_by_key!('2012/13'),
+                     start_at: Time.cet( '2012-08-03 12:00' ))
 
 
 team_keys_sud = [
@@ -36,4 +34,5 @@ team_keys_sud = [
 
 sud.add_teams_from_ary!( team_keys_sud )
 
-Prop.create!( key: 'db.copa.sud.2012/13.version', value: '1' )
+## The End
+#################

data/db/copa/teams.rb

@@ -47,4 +47,5 @@ teams = [
 
 Team.create_from_ary!( teams, club: true )
 
-Prop.create!( key: 'db.copa.teams.version', value: '1' )
+## The End
+#################

data/db/de/2012_13/bl.rb

@@ -8,11 +8,9 @@
 ## more info => http://bundesliga.de
 
 
-bl = Event.create!( key:      'de.2012/13',
-                    title:    'Deutsche Bundesliga 2012/13',
-                    start_at: Time.cet('2012-07-21 00:00'),
-                    league:   League.find_by_key!('de'),
-                    season:   Season.find_by_key!('2012/13') )
+bl = Event.create!( league:   League.find_by_key!('de'),
+                    season:   Season.find_by_key!('2012/13'),
+                    start_at: Time.cet('2012-07-21 00:00'))
 
 team_keys_bl = [
   'bayern',
@@ -36,5 +34,5 @@ team_keys_bl = [
 
 bl.add_teams_from_ary!( team_keys_bl )
 
-
-Prop.create!( key: 'db.de.2012/13.version', value: '1' )
+## The End
+#################

data/db/de/teams.rb

@@ -32,5 +32,5 @@ de = Country.find_by_key!( 'de' )
 
 Team.create_from_ary!( teams, club: true, country: de )
 
-
-Prop.create!( key: 'db.de.teams.version', value: '1' )
+## The End
+#################

data/db/en/2012_13/pl.rb

@@ -7,11 +7,9 @@
 
 
 
-pl = Event.create!( key:      'en.2012/13',
-                    title:    'Premier League 2012/13',
-                    start_at: Time.utc('2012-08-18 12:00'),
-                    league:   League.find_by_key!('en'),
-                    season:   Season.find_by_key!('2012/13'))
+pl = Event.create!( league:   League.find_by_key!('en'),
+                    season:   Season.find_by_key!('2012/13'),
+                    start_at: Time.utc('2012-08-18 12:00'))
 
 team_keys_pl = [
   'chelsea',
@@ -37,5 +35,5 @@ team_keys_pl = [
 
 pl.add_teams_from_ary!( team_keys_pl )
 
-
-Prop.create!( key: 'db.en.2012/13.version', value: '1' )
+## The End
+#################

data/db/en/teams.rb

@@ -36,5 +36,5 @@ en = Country.find_by_key!( 'en' )
 
 Team.create_from_ary!( teams, club: true, country: en )
 
-
-Prop.create!( key: 'db.en.teams.version', value: '1' )
+## The End
+#################

data/db/es/teams.rb

@@ -14,4 +14,5 @@ es = Country.find_by_key!( 'es' )
 
 Team.create_from_ary!( teams, club: true, country: es )
 
-Prop.create!( key: 'db.es.teams.version', value: '1' )
+## The End
+#################

data/db/euro/2008.rb

@@ -13,11 +13,10 @@
 ##  31 games
 ##  22 days    
 
-euro = Event.create!( key:     'euro.2008',
-                      title:   'Euro 2008',
+euro = Event.create!( league:  League.find_by_key!('euro'),
+                      season:  Season.find_by_key!('2008'),
                       start_at: Time.cet( '2008-06-07 18:00' ),
-                      league:  League.find_by_key!('euro'),
-                      season:  Season.find_by_key!('2008'))
+                      team3: false )
 
 
 euro.add_teams_from_ary!([
@@ -52,9 +51,5 @@ euroc.add_teams_from_ary!(['ned', 'ita', 'rou', 'fra'])
 
 eurod.add_teams_from_ary!(['gre', 'swe', 'esp', 'rus'])
 
-
-Prop.create!( key: 'db.euro.2008.version', value: '1' )
-
-
-
-
+## The End
+#################

data/db/euro/2012.rb

@@ -9,11 +9,10 @@
 # or  http://de.wikipedia.org/wiki/Fu%C3%9Fball-Europameisterschaft_2012
 
 
-euro = Event.create!( key:     'euro.2012',
-                      title:   'Euro 2012',
+euro = Event.create!( league:  League.find_by_key!('euro'),
+                      season:  Season.find_by_key!('2012'),
                       start_at: Time.cet( '2012-06-07 17:00' ),
-                      league:  League.find_by_key!('euro'),
-                      season:  Season.find_by_key!('2012'))
+                      team3: false )
 
 pol = Team.find_by_key!( 'pol' )
 gre = Team.find_by_key!( 'gre' )
@@ -163,5 +162,5 @@ Game.create_knockouts_from_ary!( games_euro8, euro8 )
 Game.create_knockouts_from_ary!( games_euro4, euro4 )
 Game.create_knockouts_from_ary!( games_euro1, euro1 )
 
-
-Prop.create!( key: 'db.euro.2012.version', value: '1' )
+## The End
+#################

data/db/euro/teams.rb

@@ -74,4 +74,5 @@ teams = [
 Team.create_from_ary!( teams, national: true )
 
 
-Prop.create!( key: 'db.euro.teams.version', value: '1' )
+## The End
+#################

data/db/leagues.rb

@@ -29,6 +29,7 @@ leagues_club = [
  [ 'pt',          'SuperLiga',              pt ],
  [ 'ru',          'Premier Liga',           ru ],
  [ 'ro',          'Romania Liga 1',         ro ],
+ ## todo: make apertura into season?? remove from league? why? why not?
  [ 'mx.apertura', 'México Primera División Apertura', mx ],
  [ 'br',          'Campeonato Brasileiro Série A', br ]
 ]
@@ -55,13 +56,13 @@ League.create_from_ary!( leagues_club_intl, club: true )
 leagues_intl = [
   [ 'euro',        'Euro'      ],
   [ 'america',     'Copa América' ],
-  [ 'wm',          'World Cup' ],   ## change key to world??
-  [ 'wmq.euro',    'World Cup Quali Europe' ],
-  [ 'wmq.america', 'World Cup Quali North/Central America and Caribbean' ]
+  [ 'world',          'World Cup' ],   ## change key to world??
+  [ 'world.quali.euro',    'World Cup Quali Europe' ],
+  [ 'world.quali.america', 'World Cup Quali North/Central America and Caribbean' ]
 ]
 
 League.create_from_ary!( leagues_intl, club: false )
 
 
-
-Prop.create!( key: 'db.leagues.version', value: '1' )
+## The End
+#################

data/db/mx/apertura_2012.rb

@@ -3,11 +3,9 @@
 # note: timezone for games (play_at) is *always* CST (central standard time / -6 hours ??)
 
 
-mx = Event.create!( key: 'mx.apertura.2012',
-                    title: 'México Primera División Apertura 2012',
-                    start_at: Time.cst('2012-07-20 00:00'),
-                    league: League.find_by_key!( 'mx.apertura'),
-                    season: Season.find_by_key!( '2012'))
+mx = Event.create!( league: League.find_by_key!( 'mx.apertura' ),
+                    season: Season.find_by_key!( '2012'),
+                    start_at: Time.cst('2012-07-20 00:00') )
 
 team_keys_mx = [
   'america',
@@ -32,4 +30,6 @@ team_keys_mx = [
 
 mx.add_teams_from_ary!( team_keys_mx )
 
-Prop.create!( key: 'db.mx.apertura.2012.version', value: '1' )
+
+## The End
+#################

data/db/mx/teams.rb

@@ -25,4 +25,5 @@ mx = Country.find_by_key!( 'mx' )
 
 Team.create_from_ary!( teams, club: true, country: mx )
 
-Prop.create!( key: 'db.mx.teams.version', value: '1' )
+## The End
+#################

data/db/nfl/teams.rb

@@ -54,4 +54,5 @@ us = Country.find_by_key!( 'us' )
 
 Team.create_from_ary!( teams, club: true, country: us )
 
-Prop.create!( key: 'db.nfl.teams.version', value: '1' )
+## The End
+#################

data/db/nhl/teams.rb

@@ -47,4 +47,5 @@ teams = [
 
 Team.create_from_ary!( teams, club: true )
 
-Prop.create!( key: 'db.nhl.teams.version', value: '1' )
+## The End
+#################

data/db/ro/l1_2012_13.rb

@@ -12,11 +12,9 @@
 ## todo: check key dinamo or rapid may be already taken!!
 
 
-l1 = Event.create!( key:      'ro.2012/13',
-                    title:    'Romania Liga 1 2012/13',
-                    start_at: Time.eet('2012-07-01 00:00'),
-                    league:   League.find_by_key!('ro'),
-                    season:   Season.find_by_key!('2012/13') )
+l1 = Event.create!( league:   League.find_by_key!('ro'),
+                    season:   Season.find_by_key!('2012/13'),
+                    start_at: Time.eet('2012-07-01 00:00') )
 
 astra                      = Team.find_by_key!( 'astra' )
 ceahlau                    = Team.find_by_key!( 'ceahlau' )
@@ -135,4 +133,5 @@ Game.create_from_ary!( games_l104, l104 )
 Game.create_from_ary!( games_l105, l105 )
 
 
-Prop.create!( key: 'db.ro.2012/13.version', value: '1' )
+## The End
+#################

data/db/ro/teams.rb

@@ -28,4 +28,5 @@ ro = Country.find_by_key!( 'ro' )
 Team.create_from_ary!( l1, club: true, country: ro )
 
 
-Prop.create!( key: 'db.ro.teams.version', value: '1' )
+## The End
+#################

data/db/seasons.rb

@@ -18,4 +18,5 @@ Season.create!( key: '2009', title: '2009' )
 Season.create!( key: '2008', title: '2008' )
 
 
-Prop.create!( key: 'db.seasons.version', value: '1' )
+## The End
+#################

data/db/world/2010.rb

@@ -13,11 +13,9 @@
 ##  64 games
 ##  31 days (11 June - 11 July)
 
-wm = Event.create!( key:     'wm.2010',
-                    title:   'World Cup 2010',
-                    start_at: Time.cet( '2010-06-11 12:00' ),
-                    league:  League.find_by_key!('wm'),
-                    season:  Season.find_by_key!('2010'))
+wm = Event.create!( league:  League.find_by_key!('world'),
+                    season:  Season.find_by_key!('2010'),
+                    start_at: Time.cet( '2010-06-11 12:00' ) )
 
 ##############
 # 13 aus Europa
@@ -186,4 +184,5 @@ wmg.add_teams_from_ary!( ['bra', 'prk', 'civ', 'por'] )
 wmh.add_teams_from_ary!( ['esp', 'sui', 'hon', 'chi'] )
 
 
-Prop.create!( key: 'db.world.2010.version', value: '1' )
+## The End
+#################

data/db/world/quali_2012_13_america.rb

@@ -8,11 +8,9 @@
 ##  WM 2014 - Qualification North/Central America & Caribbean Islands
 
 
-world = Event.create!( key:      'wmq.america',
-                       title:    'World Cup Quali. North/Central America & Caribbean',
-                       start_at: Time.cet( '2012-09-06 12:00' ),
-                       league:  League.find_by_key!('wmq.america'),
-                       season:  Season.find_by_key!('2012/13'))
+world = Event.create!( league:  League.find_by_key!('world.quali.america'),
+                       season:  Season.find_by_key!('2012/13'),
+                       start_at: Time.cet( '2012-09-06 12:00' ) )
 
 team_keys_world2 = [
   'mex',
@@ -29,5 +27,5 @@ world2 = Group.create!( event: world, pos: 2, title: 'Gruppe 2' )
 world2.add_teams_from_ary!( team_keys_world2 )
 
 
-
-Prop.create!( key: 'db.world.quali.america.2012/13.version', value: '1' )
+## The End
+#################

data/db/world/quali_2012_13_europe.rb

@@ -6,10 +6,9 @@
 ##  WM 2014 - Qualification Europe
 
 
-world = Event.create!( key:      'wmq.euro',
-                       title:    'World Cup Quali. Europe',
-                       start_at: Time.cet( '2012-09-07 00:00' ),
-                       league:  League.find_by_key!('wmq.euro'),
-                       season:  Season.find_by_key!('2012/13'))
+world = Event.create!( league:  League.find_by_key!('world.quali.euro'),
+                       season:  Season.find_by_key!('2012/13'),
+                       start_at: Time.cet( '2012-09-07 00:00' ) )
 
-Prop.create!( key: 'db.world.quali.euro.2012/13.version', value: '1' )
+## The End
+#################

data/db/world/quali_2012_13_europe_c.rb

@@ -5,7 +5,7 @@
 #
 # note: for teams see seeds/euro/teams.rb
 
-world = Event.find_by_key!( 'wmq.euro' )
+world = Event.find_world_quali_euro_2012_13!
 
 team_keys_worldc = [
   'ger',
@@ -22,5 +22,5 @@ worldc = Group.create!( event: world, pos: 3, title: 'Gruppe C' )
 
 worldc.add_teams_from_ary!( team_keys_worldc )
 
-
-Prop.create!( key: 'db.world.quali.euro.2012/13.c.version', value: '1' )
+## The End
+#################

data/db/world/quali_2012_13_europe_i.rb

@@ -5,7 +5,7 @@
 
 # note: for teams see seeds/euro/teams.rb
 
-world = Event.find_by_key!( 'wmq.euro' )
+world = Event.find_world_quali_euro_2012_13!
 
 team_keys_worldi = [
   'fra',
@@ -22,5 +22,5 @@ worldi = Group.create!( event: world, pos: 9, title: 'Gruppe I' )
 worldi.add_teams_from_ary!( team_keys_worldi )
 
 
-
-Prop.create!( key: 'db.world.quali.euro.2012/13.i.version', value: '1' )
+## The End
+#################

data/db/world/teams.rb

@@ -48,5 +48,5 @@ teams = teams_africa + teams_asia + teams_oceania
 
 Team.create_from_ary!( teams, national: true )
 
-
-Prop.create!( key: 'db.world.teams.version', value: '1' )
+## The End
+#################

data/lib/sportdb.rb

@@ -20,6 +20,7 @@ require 'worlddb'
 
 # our own code
 
+require 'sportdb/keys'    # let keys go first; just string constants (get included in models)
 require 'sportdb/models/forward'
 require 'sportdb/models/badge'
 require 'sportdb/models/city'
@@ -44,6 +45,7 @@ require 'sportdb/version'
 require 'sportdb/cli/opts'
 require 'sportdb/cli/runner'
 
+
 module SportDB
 
   def self.banner
@@ -62,61 +64,102 @@ module SportDB
     CreateDB.up
   end
 
+  class Fixtures
+    ## todo: move into its own file???    
+    
+    ## make constants in Keys availabe (get include in Models) - do NOT pollute/include in SportDB
+    ## make models available in sportdb module by default with namespace
+    #  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/cup',
+      'at/2012_13/bl',
+#      'at/2012_13/cup',
+      'copa/teams',
+      'copa/sud_2012_13'
+     ]
+    end
+
+    def self.fixtures_txt_test
+      [
+#       [ 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']
+      ]
+    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_europe_c',
+      'world/quali_2012_13_europe_i',
+      'world/quali_2012_13_america',
+      'nhl/teams']
+    end
+
+    def self.fixtures_txt
+      [[ AT_2011_12,        'at/2011_12/bl'],
+       [ AT_2012_13,        'at/2012_13/bl'],
+       [ AT_CUP_2012_13,    'at/2012_13/cup'],
+       ['de.2012/13',       'de/2012_13/bl'],
+       ['en.2012/13',       'en/2012_13/pl'],
+       ['america.2011',     'america/2011'],
+       ['mx.apertura.2012', 'mx/apertura_2012'],
+       ['copa.sud.2012/13', 'copa/sud_2012_13'],
+       [ EURO_2008,                   'euro/2008'],
+       [ WORLD_2010,                  'world/2010'],
+       [ WORLD_QUALI_EURO_2012_13,    'world/quali_2012_13_europe_c'],
+       [ WORLD_QUALI_AMERICA_2012_13, 'world/quali_2012_13_america']]
+    end
+  end # class Fixtures
+
   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_europe_c',
-    'world/quali_2012_13_europe_i',
-    'world/quali_2012_13_america',
-    'nhl/teams']
+    Fixtures.fixtures_rb
+  end
+  
+  def self.fixtures_txt
+    Fixtures.fixtures_txt
   end
 
   def self.load_all
     load( fixtures_rb )
   end
 
-  def self.fixtures_txt
-    [['at.2011/12',       'at/2011_12/bl'],
-     ['at.2012/13',       'at/2012_13/bl'],
-     ['at.cup.2012/13',   'at/2012_13/cup'],
-     ['de.2012/13',       'de/2012_13/bl'],
-     ['en.2012/13',       'en/2012_13/pl'],
-     ['america.2011',     'america/2011'],
-     ['mx.apertura.2012', 'mx/apertura_2012'],
-     ['copa.sud.2012/13', 'copa/sud_2012_13'],
-     ['euro.2008',        'euro/2008'],
-     ['wm.2010',          'world/2010'],
-     ['wmq.euro',         'world/quali_2012_13_europe_c'],
-     ['wmq.america',      'world/quali_2012_13_america']]
-  end
 
   def self.read_all
     read( fixtures_txt )
@@ -252,4 +295,10 @@ end  # module SportDB
 
 ## SportDB::load_plugins
 
-SportDB.main if __FILE__ == $0
+
+if __FILE__ == $0
+  SportDB.main
+else
+   ## say hello
+  puts SportDB.banner
+end

data/lib/sportdb/keys.rb

@@ -0,0 +1,29 @@
+
+module SportDB
+  module Keys
+
+    module EventKeys
+  # use constants for known keys; lets us define aliases (if things change)
+  
+  AT_2011_12     = 'at.2011/12'
+  AT_2012_13     = 'at.2012/13'
+  AT_CUP_2012_13 = 'at.cup.2012/13'
+  
+  CL_2012_13     = 'cl.2012/13'
+  
+  EURO_2008      = 'euro.2008'
+  EURO_2012      = 'euro.2012'
+
+  WORLD_2010     = 'world.2010'
+  
+  WORLD_QUALI_EURO_2012_13    = 'world.quali.euro.2012/13'
+  WORLD_QUALI_AMERICA_2012_13 = 'world.quali.america.2012/13'
+
+  ############################
+  ## NB: see db/leagues.rb for keys in use
+    end 
+    
+    include SportDB::Keys::EventKeys
+
+  end # module Keys
+end # module SportDB

data/lib/sportdb/loader.rb

@@ -42,6 +42,11 @@ class Loader
     code = File.read( path )
     
     load_fixtures_worker( code )
+    
+    ### fix: 
+    ## for loaded from fs use filestat? for version - why? why not?
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "rb.1" )
   end
   
   def load_fixtures_builtin( name ) # load from gem (built-in)
@@ -52,10 +57,32 @@ class Loader
     code = File.read( path )
     
     load_fixtures_worker( code )
+
+    ## for builtin fixtures use VERSION of gem
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.rb.#{SportDB::VERSION}" )
   end
   
 
 private
+
+  ##
+  # fix/todo: share helper w/ other readers
+  
+  # helper
+  #   change at/2012_13/bl           to at.2012/13.bl
+  #    or    quali_2012_13_europe_c  to quali.2012/13.europe.c
+  
+  def fixture_name_to_prop_key( name )
+    prop_key = name.gsub( '/', '.' )
+    prop_key = prop_key.gsub( /(\d{4})_(\d{2})/, '\1/\2' )  # 2012_13 => 2012/13
+    prop_key = prop_key.gsub( '_', '.' )
+    prop_key
+  end
+
+
+
+
   def load_fixtures_worker( code )
     
     self.class_eval( code )
@@ -66,13 +93,6 @@ private
     #   include SportDB::Models
     #  <code here>
     # end
-    
-    
-    # require path
-    # require "#{Dir.pwd}/db/#{seed}.rb"
-
-    # Prop.create!( :key => "db.#{name}.version", :value => SportDB::VERSION )
-    
   end
   
 end # class Loader

data/lib/sportdb/models/event.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module SportDB::Models
 
 class Event < ActiveRecord::Base
@@ -13,32 +15,134 @@ class Event < ActiveRecord::Base
   has_many :event_teams, :class_name => 'EventTeam'
   has_many :teams, :through => :event_teams
 
+  before_save :on_before_save
+
   def add_teams_from_ary!( team_keys )
     team_keys.each do |team_key|
       team = Team.find_by_key!( team_key )
       self.teams << team
     end
   end
+
+  def on_before_save
+    # event key is composite of league + season (e.g. at.2012/13) etc.
+    self.key = "#{league.key}.#{season.key}"
+  end
+  
+  def title
+    league.title
+  end
+  
+  def full_title   # includes season (e.g. year)
+    "#{league.title} #{season.title}"
+  end
+  
+  #####################
+  ## convenience helper for text parser/reader
+
+  ############
+  ### fix/todo: share helper for all text readers/parsers- where to put it?  
+  ###
+  
+  def title_esc_regex( title )
+      ## todo: how to mark value as regex?
+      ##  for now escape regex special chars e.g. . to \.
+      title_for_regex = title.gsub( '.', '\.' ) # e.g. Benfica Lis.
+      title_for_regex = title_for_regex.gsub( '(', '\(' ) # e.g. Club Atlético Colón (Santa Fe)
+      title_for_regex = title_for_regex.gsub( ')', '\)' )
+      
+      ## fix: todo: match accented char with or without accents
+      ##  add (ü|ue) etc.
+      ## also make - optional change to (-| ) e.g. Blau-Weiss == Blau Weiss
+      ##  reuse for all readers!
+      title_for_regex = title_for_regex.gsub( '-', '(-| )' )
+      title_for_regex = title_for_regex.gsub( 'ß', '(ß|ss)' )
+      title_for_regex = title_for_regex.gsub( 'æ', '(æ|ae)' )
+      title_for_regex = title_for_regex.gsub( 'á', '(á|a)' )  ## e.g. Bogotá
+      title_for_regex = title_for_regex.gsub( 'ã', '(ã|a)' )   ## e.g  São Paulo
+      title_for_regex = title_for_regex.gsub( 'ä', '(ä|ae)' )  ## add a ?
+      title_for_regex = title_for_regex.gsub( 'ö', '(ö|oe)' )  ## add o ?
+      title_for_regex = title_for_regex.gsub( 'ó', '(ó|o)' )  ## e.g. Colón
+      title_for_regex = title_for_regex.gsub( 'ü', '(ü|ue)' )  ## add u ?
+      title_for_regex = title_for_regex.gsub( 'é', '(é|e)' )  ## e.g. Vélez
+      title_for_regex = title_for_regex.gsub( 'ê', '(ê|e)' )  ## e.g. Grêmio
+      title_for_regex = title_for_regex.gsub( 'ñ', '(ñ|n)' )  ## e.g. Porteño
+      title_for_regex = title_for_regex.gsub( 'ú', '(ú|u)' )  ## e.g. Fútbol
+
+      ## todo: add some more; use array for config?
+      ## see http://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references  for more
+
+      title_for_regex
+  end
+
+
+
+  def known_teams_table
+    
+    ## build known teams table w/ synonyms e.g.
+    #
+    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
+    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
+    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
+ 
+    known_teams = []
+     
+    teams.each_with_index do |team,index|
+
+      titles = []
+      titles << team.title
+      titles += team.synonyms.split('|') if team.synonyms.present?
+      
+      ## NB: sort here by length (largest goes first - best match)
+      #  exclude code and key (key should always go last)
+      titles = titles.sort { |left,right| right.length <=> left.length }
+      
+      ## escape for regex plus allow subs for special chars/accents
+      titles = titles.map { |title| title_esc_regex( title )  }
+      
+      titles << team.code                  if team.code.present?
+      titles << team.key
+            
+      known_teams << [ team.key, titles ]
+      
+      puts "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
+    end
+    
+    known_teams
+  end # method known_teams_table
   
   ###########################
   ## convenience helpers
 
+  include SportDB::Keys::EventKeys
+
   def self.find_at_2012_13!
-    self.find_by_key!( 'at.2012/13' )
+    self.find_by_key!( AT_2012_13 )
   end
   
   def self.find_at_cup_2012_13!
-    self.find_by_key!( 'at.cup.2012/13' )
+    self.find_by_key!( AT_CUP_2012_13 )
   end
   
   def self.find_cl_2012_13!
-    self.find_by_key!( 'cl.2012/13' )
+    self.find_by_key!( CL_2012_13 )
   end
   
   def self.find_euro_2012!
-    self.find_by_key!( 'euro.2012')
+    self.find_by_key!( EURO_2012 )
+  end
+  
+  def self.find_world_2010!
+    self.find_by_key!( WORLD_2010 )
   end
   
+  def self.find_world_quali_euro_2012_13!
+    self.find_by_key!( WORLD_QUALI_EURO_2012_13 )
+  end
+  
+  def self.find_world_quali_america_2012_13!
+    self.find_by_key!( WORLD_QUALI_AMERICA_2012_13 )
+  end
 
 
 end # class Event

data/lib/sportdb/models/forward.rb

@@ -2,8 +2,6 @@
 ### forward references
 ##   require first to resolve circular references
 
-module SportDB ; end
-
 module SportDB::Models
 
   ## todo: why? why not use include WorldDB::Models here???
@@ -18,6 +16,9 @@ module SportDB::Models
 
   class Team < ActiveRecord::Base ; end
   class League < ActiveRecord::Base ; end
+  
+  #### make constanst such as AT_2012_13, WORLD_2010, etc. available
+  include SportDB::Keys
 
 end
 

data/lib/sportdb/reader.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module SportDB
 
 class Reader
@@ -41,6 +43,11 @@ class Reader
     code = File.read( path )
     
     load_fixtures_worker( event_key, code )
+
+    ### fix: 
+    ## for loaded from fs use filestat? for version - why? why not?
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "txt.1" )
   end
 
   def load_fixtures_builtin( event_key, name ) # load from gem (built-in)
@@ -51,10 +58,27 @@ class Reader
     code = File.read( path )
     
     load_fixtures_worker( event_key, code )
+    
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.txt.#{SportDB::VERSION}" )
   end
 
 
 private
+
+ ##
+  # fix/todo: share helper w/ other readers
+  
+  # helper
+  #   change at/2012_13/bl           to at.2012/13.bl
+  #    or    quali_2012_13_europe_c  to quali.2012/13.europe.c
+  
+  def fixture_name_to_prop_key( name )
+    prop_key = name.gsub( '/', '.' )
+    prop_key = prop_key.gsub( /(\d{4})_(\d{2})/, '\1/\2' )  # 2012_13 => 2012/13
+    prop_key = prop_key.gsub( '_', '.' )
+    prop_key
+  end
+
   def load_fixtures_worker( event_key, data )
    
     ## assume active activerecord connection
@@ -63,37 +87,9 @@ private
     @event = Event.find_by_key!( event_key )
     
     puts "Event #{@event.key} >#{@event.title}<"
-
-
-    ## build known teams table w/ synonyms e.g.
-    #
-    #   nb: synonyms can be a regex not just a literal string
-    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
-    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
-    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
     
-    @known_teams = []
+    @known_teams = @event.known_teams_table
     
-    ## todo/fix: move calc known_teams to model!!! (for reuse)
- 
-    @event.teams.each_with_index do |team,index|
-
-      titles = []
-      titles << team.title
-      titles += team.synonyms.split('|')  if team.synonyms.present?
-
-      ## NB: sort here by length (largest goes first - best match)
-      #  exclude code and key (key should always go last)
-      titles = titles.sort { |left,right| right.length <=> left.length }
-      
-      titles << team.code                  if team.code.present?
-      titles << team.key
-            
-      @known_teams << [ team.key, titles ]
-      
-      puts "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
-    end
-  
     parse_fixtures( data )
     
   end   # method load_fixtures
@@ -253,15 +249,19 @@ private
   def find_team2!( line )
     find_team_worker!( line, 2 )
   end
-  
-  
+
+
   def match_team_worker!( line, key, values )
     values.each do |value|
-      regex = Regexp.new( "\\b#{value}\\b" )   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
+      ## nb: \b does NOT include space or newline for word boundry (only alphanums e.g. a-z0-9)
+      ## (thus add it, allows match for Benfica Lis.  for example - note . at the end)
+
+      ## check add $ e.g. (\b| |\t|$) does this work? - check w/ Benfica Lis.$
+      regex = /\b#{value}(\b| |\t)/   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
       if line =~ regex
         puts "     match for team >#{key}< >#{value}<"
         # make sure @@oo{key}oo@@ doesn't match itself with other key e.g. wacker, wac, etc.
-        line.sub!( regex, "@@oo#{key}oo@@" )
+        line.sub!( regex, "@@oo#{key}oo@@ " )    # NB: add one space char at end
         return true    # break out after first match (do NOT continue)
       end
     end

data/lib/sportdb/schema.rb

@@ -31,7 +31,6 @@ add_index :teams, :key, :unique => true
 
 
 create_table :events do |t|
-  t.string      :title,    :null => false
   t.string      :key,      :null => false   # import/export key
   t.references  :league,   :null => false
   t.references  :season,   :null => false

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-17 00:00:00 Z
+date: 2012-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -158,6 +158,7 @@ files:
 - lib/sportdb.rb
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/cli/runner.rb
+- lib/sportdb/keys.rb
 - lib/sportdb/loader.rb
 - lib/sportdb/models/badge.rb
 - lib/sportdb/models/city.rb