sportdb 0.4.3 → 0.4.4

data/db/world/quali_2012_13_fixtures.rb

@@ -0,0 +1,119 @@
+# encoding: utf-8
+
+####################################################################
+# generiert am  2012-10-28 16:08:22 +0100
+#   using sportdb 0.4.3 on Ruby 1.9.3 (2012-02-16) [i686-linux]
+####################################################################
+
+
+###########################################
+# World Cup Quali. Europe 2012/13
+
+
+
+ev = Event.find_by_key!( 'wmq' )
+
+ger                = Team.find_by_key!( 'ger' )
+irl                = Team.find_by_key!( 'irl' )
+swe                = Team.find_by_key!( 'swe' )
+fro                = Team.find_by_key!( 'fro' )
+kaz                = Team.find_by_key!( 'kaz' )
+aut                = Team.find_by_key!( 'aut' )
+
+
+r01 = Round.create!( event: ev, pos: 1, title: '1. Runde', start_at: Time.utc('2012-09-07 15:00'))
+r02 = Round.create!( event: ev, pos: 2, title: '2. Runde', start_at: Time.utc('2012-09-11 15:00'))
+r03 = Round.create!( event: ev, pos: 3, title: '3. Runde', start_at: Time.utc('2012-10-12 20:45'))
+r04 = Round.create!( event: ev, pos: 4, title: '4. Runde', start_at: Time.utc('2012-10-16 20:45'))
+r05 = Round.create!( event: ev, pos: 5, title: '5. Runde', start_at: Time.utc('2013-03-22 15:00'))
+r06 = Round.create!( event: ev, pos: 6, title: '6. Runde', start_at: Time.utc('2013-03-26 15:00'))
+r07 = Round.create!( event: ev, pos: 7, title: '7. Runde', start_at: Time.utc('2013-06-07 15:00'))
+r08 = Round.create!( event: ev, pos: 8, title: '8. Runde', start_at: Time.utc('2013-06-11 15:00'))
+r09 = Round.create!( event: ev, pos: 9, title: '9. Runde', start_at: Time.utc('2013-09-06 15:00'))
+r10 = Round.create!( event: ev, pos: 10, title: '10. Runde', start_at: Time.utc('2013-09-10 15:00'))
+r11 = Round.create!( event: ev, pos: 11, title: '11. Runde', start_at: Time.utc('2013-10-11 15:00'))
+r12 = Round.create!( event: ev, pos: 12, title: '12. Runde', start_at: Time.utc('2013-10-15 15:00'))
+
+
+games01 = [
+ [ ger,               [3,0], fro,               Time.utc('2012-09-07 15:00') ], 
+ [ kaz,               [1,2], irl,               Time.utc('2012-09-07 15:00') ], 
+]
+
+games02 = [
+ [ aut,               [1,2], ger,               Time.utc('2012-09-11 15:00') ], 
+ [ swe,               [2,0], kaz,               Time.utc('2012-09-11 15:00') ], 
+]
+
+games03 = [
+ [ irl,               [1,6], ger,               Time.utc('2012-10-12 20:45') ], 
+ [ fro,               [1,2], swe,               Time.utc('2012-10-12 18:00') ], 
+ [ kaz,               [0,0], aut,               Time.utc('2012-10-12 18:00') ], 
+]
+
+games04 = [
+ [ ger,               [4,4], swe,               Time.utc('2012-10-16 20:45') ], 
+ [ fro,               [1,4], irl,               Time.utc('2012-10-16 20:00') ], 
+ [ aut,               [4,0], kaz,               Time.utc('2012-10-16 20:30') ], 
+]
+
+games05 = [
+ [ kaz,               [], ger,               Time.utc('2013-03-22 15:00') ], 
+ [ aut,               [], fro,               Time.utc('2013-03-22 15:00') ], 
+ [ swe,               [], irl,               Time.utc('2013-03-22 15:00') ], 
+]
+
+games06 = [
+ [ ger,               [], kaz,               Time.utc('2013-03-26 15:00') ], 
+ [ irl,               [], aut,               Time.utc('2013-03-26 15:00') ], 
+]
+
+games07 = [
+ [ irl,               [], fro,               Time.utc('2013-06-07 15:00') ], 
+ [ aut,               [], swe,               Time.utc('2013-06-07 15:00') ], 
+]
+
+games08 = [
+ [ swe,               [], fro,               Time.utc('2013-06-11 15:00') ], 
+]
+
+games09 = [
+ [ ger,               [], aut,               Time.utc('2013-09-06 15:00') ], 
+ [ kaz,               [], fro,               Time.utc('2013-09-06 15:00') ], 
+ [ irl,               [], swe,               Time.utc('2013-09-06 15:00') ], 
+]
+
+games10 = [
+ [ fro,               [], ger,               Time.utc('2013-09-10 15:00') ], 
+ [ aut,               [], irl,               Time.utc('2013-09-10 15:00') ], 
+ [ kaz,               [], swe,               Time.utc('2013-09-10 15:00') ], 
+]
+
+games11 = [
+ [ ger,               [], irl,               Time.utc('2013-10-11 15:00') ], 
+ [ fro,               [], kaz,               Time.utc('2013-10-11 15:00') ], 
+ [ swe,               [], aut,               Time.utc('2013-10-11 15:00') ], 
+]
+
+games12 = [
+ [ swe,               [], ger,               Time.utc('2013-10-15 15:00') ], 
+ [ fro,               [], aut,               Time.utc('2013-10-15 15:00') ], 
+ [ irl,               [], kaz,               Time.utc('2013-10-15 15:00') ], 
+]
+
+
+
+Game.create_from_ary!( games01, r01 )
+Game.create_from_ary!( games02, r02 )
+Game.create_from_ary!( games03, r03 )
+Game.create_from_ary!( games04, r04 )
+Game.create_from_ary!( games05, r05 )
+Game.create_from_ary!( games06, r06 )
+Game.create_from_ary!( games07, r07 )
+Game.create_from_ary!( games08, r08 )
+Game.create_from_ary!( games09, r09 )
+Game.create_from_ary!( games10, r10 )
+Game.create_from_ary!( games11, r11 )
+Game.create_from_ary!( games12, r12 )
+
+Prop.create!( key: 'db.wmq.fixtures.version', value: '1' )

data/db/world/quali_2012_13_i.rb

@@ -1,114 +1,26 @@
 # encoding: utf-8
 
-# note: timezone for games (play_at) is *always* CET (central european time)
-
 ###########################################
 ##  WM 2014 - Qualification Europe Group I
 
+# note: for teams see seeds/euro/teams.rb
 
 world = Event.find_by_key!( 'wmq' )
 
-world1  = Round.find_by_event_id_and_pos!( world.id, 1 ) # 7. Sep 2012
-world2  = Round.find_by_event_id_and_pos!( world.id, 2 ) # 11. """"""
-world3  = Round.find_by_event_id_and_pos!( world.id, 3 ) # 12. Okt 2012
-world4  = Round.find_by_event_id_and_pos!( world.id, 4 ) # 16. """""""
-world5  = Round.find_by_event_id_and_pos!( world.id, 5 ) # 22. Mär 2013
-world6  = Round.find_by_event_id_and_pos!( world.id, 6 ) # 26. """"""
-world7  = Round.find_by_event_id_and_pos!( world.id, 7 ) #  7. Jun 2013
-world8  = Round.find_by_event_id_and_pos!( world.id, 8 ) # 11. """""""
-world9  = Round.find_by_event_id_and_pos!( world.id, 9 ) #  6. Sep 2013
-world10 = Round.find_by_event_id_and_pos!( world.id, 10 ) # 10. """""""
-world11 = Round.find_by_event_id_and_pos!( world.id, 11 ) # 11. Okt 2013
-world12 = Round.find_by_event_id_and_pos!( world.id, 12 ) # 15. """"""""
-
-
-#################################3
-# Gruppe I
-
-# note: for teams see seeds/euro/teams.rb
+team_keys_worldi = [
+  'fra',
+  'esp',
+  'blr',
+  'fin',
+  'geo' ]
 
-fra = Team.find_by_key!( 'fra' )
-esp = Team.find_by_key!( 'esp' )
-blr = Team.find_by_key!( 'blr' )
-fin = Team.find_by_key!( 'fin' )
-geo = Team.find_by_key!( 'geo' )
+world.add_teams_from_ary!( team_keys_worldi )
 
 
 worldi = Group.create!( event: world, pos: 9, title: 'Gruppe I' )
 
-worldi.teams << fra
-worldi.teams << esp
-worldi.teams << blr
-worldi.teams << fin
-worldi.teams << geo
-
-
-world.teams << fra
-world.teams << esp
-world.teams << blr
-world.teams << fin
-world.teams << geo
-
-
-
-
-games_world1i = [
- [ 1,  geo, [1,0], blr, Time.cet( '2012-09-07 00:00' ) ],
- [ 2,  fin, [0,1], fra, Time.cet( '2012-09-07 00:00' ) ]]
-
-games_world2i = [
- [ 3,  geo, [0,1], esp, Time.cet( '2012-09-11 00:00' ) ],
- [ 4,  fra, [3,1], blr, Time.cet( '2012-09-11 00:00' ) ]]
-
-games_world3i = [
- [ 5, fin, [1,1], geo, Time.cet( '2012-10-12 17:30' ) ],
- [ 6, blr, [0,4], esp, Time.cet( '2012-10-12 20:00' ) ]]
-
-games_world4i = [
- [ 7, esp, [], fra, Time.cet( '2012-10-16 21:00' ) ],
- [ 8, blr, [], geo, Time.cet( '2012-10-16 18:00' ) ]]
- 
-games_world5i = [
- [  9,  fra, [], geo, Time.cet( '2013-03-22 00:00' ) ],
- [ 10,  esp, [], fin, Time.cet( '2013-03-22 00:00' ) ]]
-
-games_world6i = [
- [ 11,  fra, [], esp, Time.cet( '2013-03-26 00:00' ) ]]
-
-games_world7i = [
- [ 12,  fin, [], blr, Time.cet( '2013-06-07 00:00' ) ]]
-
-games_world8i = [
- [ 13,  blr, [], fin, Time.cet( '2013-06-11 00:00' ) ]]
-
-games_world9i = [
- [ 14,  geo, [], fra, Time.cet( '2013-09-06 00:00' ) ],
- [ 15,  fin, [], esp, Time.cet( '2013-09-06 00:00' ) ]]
-
-games_world10i = [
- [ 16,  blr, [], fra, Time.cet( '2013-09-10 00:00' ) ],
- [ 17,  geo, [], fin, Time.cet( '2013-09-10 00:00' ) ]]
-
-games_world11i = [
- [ 18,  esp, [], blr, Time.cet( '2013-10-11 00:00' ) ]]
-
-games_world12i = [
- [ 19,  fra, [], fin, Time.cet( '2013-10-15 00:00' ) ],
- [ 20,  esp, [], geo, Time.cet( '2013-10-15 00:00' ) ]]
-
+worldi.add_teams_from_ary!( team_keys_worldi )
 
-Game.create_from_ary!( games_world1i, world1 )
-Game.create_from_ary!( games_world2i, world2 )
-Game.create_from_ary!( games_world3i, world3 )
-Game.create_from_ary!( games_world4i, world4 )
-Game.create_from_ary!( games_world5i, world5 )
-Game.create_from_ary!( games_world6i, world6 )
-Game.create_from_ary!( games_world7i, world7 )
-Game.create_from_ary!( games_world8i, world8 )
-Game.create_from_ary!( games_world9i, world9 )
-Game.create_from_ary!( games_world10i, world10 )
-Game.create_from_ary!( games_world11i, world11 )
-Game.create_from_ary!( games_world12i, world12 )
 
 
 Prop.create!( key: 'db.world.quali.2012/13.i.version', value: '1' )

data/db/world/quali_2012_13_i.txt

@@ -0,0 +1,72 @@
+###########################################
+##  WM 2014 - Qualification Europe Group I
+
+# note: timezone for games (play_at) is *always* CET (central european time)
+
+
+1. Spieltag  -  Fr. 7. Sep 2012
+
+(1)  geo  1:0  blr   2012-09-07 15:00
+(2)  fin  0:1  fra   2012-09-07 15:00
+
+
+2. Spieltag  -  Di. 11. Sep 2012
+
+(3)  geo  0:1  esp   2012-09-11 15:00
+(4)  fra  3:1  blr   2012-09-11 15:00
+
+
+3. Spieltag  -  Fr. 12. Okt 2012
+
+(5)  fin  1:1  geo   2012-10-12 17:30
+(6)  blr  0:4  esp   2012-10-12 20:00
+
+
+4. Spieltag  -  Di. 16. Okt 2012
+
+(7)  esp  1:1  fra   2012-10-16 21:00
+(8)  blr  2:0  geo   2012-10-16 18:00
+
+
+5. Spieltag  -  Fr. 22. Mär 2013
+
+(9)   fra  -  geo   2013-03-22 15:00
+(10)  esp  -  fin   2013-03-22 15:00
+
+
+6. Spieltag  -  Di. 26. Mär 2013
+
+(11)  fra  -  esp   2013-03-26 15:00
+
+
+7. Spieltag  -   Fr. 7. Jun 2013
+
+(12)  fin  -  blr   2013-06-07 15:00
+
+
+8. Spieltag  -  Di. 11. Jun 2013
+
+(13)  blr  -  fin   2013-06-11 15:00
+
+
+9. Spieltag  -  Fr. 6. Sep 2013
+
+(14)  geo  -  fra   2013-09-06 15:00
+(15)  fin  -  esp   2013-09-06 15:00
+
+
+10. Spieltag  -  Di. 10. Sep 2013
+
+(16)  blr  -  fra   2013-09-10 15:00
+(17)  geo  -  fin   2013-09-10 15:00
+
+
+11. Spieltag  -  Fr. 11. Okt 2013
+
+(18)  esp   -   blr  2013-10-11 15:00
+
+
+12. Spieltag  -  Di. 15. Okt 2013
+
+(19)  fra  -  fin   2013-10-15 15:00
+(20)  esp  -  geo   2013-10-15 15:00

data/lib/sportdb/cli/runner.rb

@@ -97,69 +97,25 @@ EOS
       SportDB.delete!
     end
 
-    loader = nil
-    if opts.load?
-      loader = Loader.new
-    end
-    
     if opts.event.present?
       if opts.generate?
-        Templater.new( opts ).run( args )
+        Templater.new( logger ).run( opts, args ) # export/generate ruby fixtures
       else
-        Reader.new( opts ).run( args )
+        Reader.new( logger ).run( opts, args )  # load/read plain text fixtures
       end
     else
-
-      args.each do |arg|
-        name = arg     # File.basename( arg, '.*' )
-      
-        if opts.load?
-          loader.load_fixtures( name )  # load from gem (built-in)
-        else
-          load_fixtures( name )  # load from file system
-        end
-      end
-    
-      dump_stats
-      dump_props    
-    
+      Loader.new( logger ).run( opts, args ) # load ruby fixtures
     end
-    
 
     
+    dump_stats
+    dump_props
+    
     puts 'Done.'
     
   end   # method run
 
 
-  def load_fixtures( name )
-      path = "#{opts.data_path}/#{name}.rb"
- 
-      puts "*** loading data '#{name}' (#{path})..."
-
-      text = File.read( path )
-
-      # SportDB.module_eval( text )
-      
-      ## evaluate in class context of SportDB::Runner
-      ## change to loader class later
-      self.class_eval( text )
-
-      # NB: same as
-      #
-      # module SportDB
-      #  <code here>
-      # end
-
-      # require path
-      # require "#{Dir.pwd}/db/#{seed}.rb"
-
-      # Prop.create!( :key => "db.#{name}.version", :value => SportDB::VERSION )
-  end
-
-
-
-  ##### fix/todo: reuse between runner/loader - include w/ helper module?
   def dump_stats
     # todo: use %5d or similar to format string
     puts "Stats:"

data/lib/sportdb/loader.rb

@@ -1,4 +1,3 @@
-
 module SportDB
 
 class Loader
@@ -8,71 +7,73 @@ class Loader
   include SportDB::Models
 
 
-  def initialize
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-
+  def initialize( logger=nil )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
   end
 
   attr_reader :logger
 
 
-  def run( args )
-  
-    puts SportDB.banner
+  def run( opts, args )
 
-    puts "working directory: #{Dir.pwd}"
- 
-    ## assume active activerecord connection
-    ## 
- 
     args.each do |arg|
       name = arg     # File.basename( arg, '.*' )
-      load_fixtures( name )
+      
+      if opts.load?
+        load_fixtures_builtin( name )
+      else
+        load_fixtures_with_include_path( name, opts.data_path )
+      end
     end
     
-    dump_stats
-    dump_props
-    
-    puts 'Done.'
-    
-  end   # method run
+  end # method run
 
 
+  def load_fixtures_with_include_path( name, include_path )  # load from file system
+    path = "#{include_path}/#{name}.rb"
+ 
+    puts "*** loading data '#{name}' (#{path})..."
 
-  def load_fixtures( name )
+    code = File.read( path )
     
+    load_fixtures_worker( code )
+  end
+  
+  def load_fixtures_builtin( name ) # load from gem (built-in)
     path = "#{SportDB.root}/db/#{name}.rb"
  
     puts "*** loading data '#{name}' (#{path})..."
 
-    text = File.read( path )
+    code = File.read( path )
+    
+    load_fixtures_worker( code )
+  end
+  
 
-    self.class_eval( text )
+private
+  def load_fixtures_worker( code )
+    
+    self.class_eval( code )
 
     # NB: same as
     #
     # module SportDB
+    #   include SportDB::Models
     #  <code here>
     # end
-  end
-
-  ##### fix/todo: reuse between runner/loader - include w/ helper module?
-  def dump_stats
-    # todo: use %5d or similar to format string
-    puts "Stats:"
-    puts "  #{Event.count} events"
-    puts "  #{Team.count} teams"
-    puts "  #{Game.count} games"
-  end
+    
+    
+    # require path
+    # require "#{Dir.pwd}/db/#{seed}.rb"
 
-  def dump_props
-    # todo: use %5 or similar to format string
-    puts "Props:"
-    Prop.order( 'created_at asc' ).all.each do |prop|
-      puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-    end
+    # Prop.create!( :key => "db.#{name}.version", :value => SportDB::VERSION )
+    
   end
   
 end # class Loader
-end # module SportDB
+end # module SportDB

data/lib/sportdb/models/game.rb

@@ -18,33 +18,55 @@ class Game < ActiveRecord::Base
   end
 
   def self.create_from_ary!( games, round, knockout=false )
+
+### fix:
+#  replace knockout=false with more attribs
+#    see create teams and than merge attribs
+
     games.each_with_index do |values,index|
       
-      ## check if first value (that is, values[0]) is a numeric/number
-      ##  if NOT add pos automatic (counting from 1 to n)
+      value_pos      = index+1
+      value_scores   = []
+      value_teams    = []
+      value_knockout = knockout
+      value_play_at  = round.start_at  # if no date present use it from round
+      value_group    = nil
       
-      if values[0].kind_of? Numeric
-        pos    = values[0]
-        offset = 1
-      else
-        pos    = index
-        offset = 0
-      end
+      ### lets you use arguments in any order
+      ##   makes pos optional (if not present counting from 1 to n)
       
+      values.each do |value|
+        if value.kind_of? Numeric
+          value_pos = value
+        elsif value.kind_of?( TrueClass ) || value.kind_of?( FalseClass )
+          value_knockout = value
+        elsif value.kind_of? Array
+          value_scores = value
+        elsif value.kind_of? Team
+          value_teams << value
+        elsif value.kind_of? Group
+          value_group = value
+        elsif value.kind_of?( Date ) || value.kind_of?( Time ) || value.kind_of?( DateTime )
+          value_play_at = value
+        else
+          # issue an error/warning here
+        end
+      end
+
       Game.create!(
         :round     => round,
-        :pos       => pos,
-        :team1     => values[offset],
-        :score1    => values[offset+1][0],
-        :score2    => values[offset+1][1],
-        :score3    => values[offset+1][2],
-        :score4    => values[offset+1][3],
-        :score5    => values[offset+1][4],
-        :score6    => values[offset+1][5],
-        :team2     => values[offset+2],
-        :play_at   => values[offset+3],
-        :group     => values[offset+4],    # Note: group is optional (may be null/nil)
-        :knockout  => knockout )
+        :pos       => value_pos,
+        :team1     => value_teams[0],
+        :score1    => value_scores[0],
+        :score2    => value_scores[1],
+        :score3    => value_scores[2],
+        :score4    => value_scores[3],
+        :score5    => value_scores[4],
+        :score6    => value_scores[5],
+        :team2     => value_teams[1],
+        :play_at   => value_play_at,
+        :group     => value_group,     # Note: group is optional (may be null/nil)
+        :knockout  => value_knockout )
     end # each games
   end