sportdb.rb in sportdb-0.9.1

- old
+ new

@@ -18,11 +18,13 @@
 require 'worlddb'
 
 
 # our own code
 
-require 'sportdb/keys'    # let keys go first; just string constants (get included in models)
+require 'sportdb/version'
+
+require 'sportdb/keys'
 require 'sportdb/models/forward'
 require 'sportdb/models/badge'
 require 'sportdb/models/city'
 require 'sportdb/models/country'
 require 'sportdb/models/event'
@@ -39,11 +41,10 @@
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 require 'sportdb/utils'
 require 'sportdb/loader'
 require 'sportdb/reader'
 require 'sportdb/templater'
-require 'sportdb/version'
 require 'sportdb/cli/opts'
 require 'sportdb/cli/runner'
 
 
 module SportDB
@@ -74,25 +75,29 @@
 
     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/bl',
 #      'at/2012_13/cup',
-      'copa/teams',
-      'copa/sud_2012_13'
+#      'copa/teams',
+#      'copa/sud_2012_13',
+      'america/teams',
+      'world/teams',
+      'world/quali_2012_13_america'
      ]
     end
 
     def self.fixtures_txt_test
       [
-#       [ AT_2011_12,        'at/2011_12/bl'],
-       [ AT_2012_13,        'at/2012_13/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']
+#       ['copa.sud.2012/13', 'copa/sud_2012_13'],
+       [ WORLD_QUALI_AMERICA_2012_13, 'world/quali_2012_13_america']
       ]
     end
 
 
     def self.fixtures_rb  # all builtin ruby fixtures; helper for covenience
@@ -124,11 +129,9 @@
       '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
\ No newline at end of file