sportdb 1.5.0 → 1.6.0

data/Rakefile

@@ -2,12 +2,12 @@ require 'hoe'
 require './lib/sportdb/version.rb'
 
 ## NB: plugin (hoe-manifest) not required; just used for future testing/development
-Hoe::plugin :manifest   # more options for manifests (in the future; not yet)
+## Hoe::plugin :manifest   # more options for manifests (in the future; not yet)
 
 
 Hoe.spec 'sportdb' do
   
-  self.version = SportDB::VERSION
+  self.version = SportDb::VERSION
   
   self.summary = 'sportdb - sport.db command line tool'
   self.description = summary
@@ -50,4 +50,72 @@ https://groups.google.com/group/opensport
 ******************************************************************************
 EOS
   
-end
+end
+
+
+##############################
+## for testing 
+##
+## NB: use rake -I ../world.db.ruby/lib -I ./lib sportdb:build
+
+namespace :sportdb do
+  
+  BUILD_DIR = "./build"
+  
+  SPORT_DB_PATH = "#{BUILD_DIR}/sport.db"
+
+  DB_CONFIG = {
+    :adapter   =>  'sqlite3',
+    :database  =>  SPORT_DB_PATH
+  }
+
+  directory BUILD_DIR
+
+  task :clean do
+    rm SPORT_DB_PATH if File.exists?( SPORT_DB_PATH )
+  end
+
+  task :env => BUILD_DIR do
+    require 'worlddb'   ### NB: for local testing use rake -I ./lib dev:test e.g. do NOT forget to add -I ./lib
+    require 'sportdb'
+    require 'logutils/db'
+
+    LogUtils::Logger.root.level = :info
+
+    pp DB_CONFIG
+    ActiveRecord::Base.establish_connection( DB_CONFIG )
+  end
+
+  task :create => :env do
+    LogDb.create
+    WorldDb.create
+    SportDb.create
+  end
+  
+  task :importworld => :env do
+    WorldDb.read_setup( 'setups/sport.db.admin', '../world.db', skip_tags: true )  # populate world tables
+    # WorldDb.stats
+  end
+
+  task :importsport => :env do
+    SportDb.read_setup( 'setups/at', '../football.db' )
+    # SportDb.stats
+  end
+
+  task :deletesport => :env do
+    SportDb.delete!
+  end
+
+
+
+  desc 'sportdb - build from scratch'
+  task :build => [:clean, :create, :importworld, :importsport] do
+    puts 'Done.'
+  end
+
+  desc 'sportdb - update'
+  task :update => [:deletesport, :importsport] do
+    puts 'Done.'
+  end
+
+end  # namespace :sportdb

data/bin/sportdb

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'sportdb'
-SportDB.main
+SportDb.main

data/lib/sportdb/cli/main.rb

@@ -19,8 +19,8 @@ require 'sportdb/cli/opts'
 LogUtils::Logger.root.level = :info   # set logging level to info 
 
 program :name,  'sportdb'
-program :version, SportDB::VERSION
-program :description, "sport.db command line tool, version #{SportDB::VERSION}"
+program :version, SportDb::VERSION
+program :description, "sport.db command line tool, version #{SportDb::VERSION}"
 
 
 # default_command :help
@@ -47,7 +47,7 @@ Further information:
 
 
 ## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
-myopts = SportDB::Opts.new
+myopts = SportDb::Opts.new
 
 ### global option (required)
 ## todo: add check that path is valid?? possible?
@@ -62,7 +62,7 @@ global_option '-w', '--verbose', "Show debug messages"
 
 
 def connect_to_db( options )
-  puts SportDB.banner
+  puts SportDb.banner
 
   puts "working directory: #{Dir.pwd}"
 
@@ -91,9 +91,9 @@ command :create do |c|
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts )
     
-    LogDB.create
-    WorldDB.create
-    SportDB.create
+    LogDb.create
+    WorldDb.create
+    SportDb.create
     puts 'Done.'
   end # action
 end # command create
@@ -127,25 +127,25 @@ command :setup do |c|
       #   delete sport first
       
       if options.delete.present?
-        SportDB.delete! if options.sport.present?
-        WorldDB.delete! if options.world.present?
+        SportDb.delete! if options.sport.present?
+        WorldDb.delete! if options.world.present?
       end
       
       if options.world.present?
-        WorldDB.read_all( myopts.world_data_path )
+        WorldDb.read_all( myopts.world_data_path )
       end
       
       if options.sport.present?
-        SportDB.read_setup( "setups/#{setup}", myopts.data_path )
+        SportDb.read_setup( "setups/#{setup}", myopts.data_path )
       end
 
     else  # assume "plain" regular setup
-      LogDB.create
-      WorldDB.create
-      SportDB.create
+      LogDb.create
+      WorldDb.create
+      SportDb.create
     
-      WorldDB.read_all( myopts.world_data_path )
-      SportDB.read_setup( "setups/#{setup}", myopts.data_path )
+      WorldDb.read_all( myopts.world_data_path )
+      SportDb.read_setup( "setups/#{setup}", myopts.data_path )
     end
     puts 'Done.'
   end # action
@@ -167,21 +167,21 @@ command :load do |c|
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts )
     
-    SportDB.delete! if options.delete.present?
+    SportDb.delete! if options.delete.present?
 
-    reader = SportDB::Reader.new
+    reader = SportDb::Reader.new( myopts.data_path )
 
     args.each do |arg|
       name = arg     # File.basename( arg, '.*' )
 
       if myopts.event.present?
         ## fix: rename to load_event_fixtures_w... or similar
-        reader.load_fixtures( myopts.event, name, myopts.data_path )
+        reader.load_fixtures( myopts.event, name )
       else
         ## fix> add a convenience method for loading single fixture
         ary = []
         ary << name
-        reader.load( ary, myopts.data_path )
+        reader.load( ary )
       end
     end # each arg
 
@@ -201,7 +201,7 @@ command :logs do |c|
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts ) 
     
-    LogDB::Models::Log.all.each do |log|
+    LogDb::Models::Log.all.each do |log|
       puts "[#{log.level}] -- #{log.msg}"
     end
     
@@ -221,7 +221,7 @@ command :stats do |c|
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts ) 
     
-    SportDB.tables
+    SportDb.tables
     
     puts 'Done.'
   end
@@ -239,7 +239,7 @@ command :props do |c|
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts ) 
     
-    SportDB.props
+    SportDb.props
     
     puts 'Done.'
   end

data/lib/sportdb/cli/opts.rb

@@ -1,4 +1,4 @@
-module SportDB
+module SportDb
 
 class Opts
 
@@ -45,4 +45,4 @@ class Opts
 
 end # class Opts
 
-end # module SportDB
+end # module SportDb

data/lib/sportdb/console.rb

@@ -14,21 +14,21 @@ require 'yaml'
 
 ## shortcuts for models
 
-Event   = SportDB::Models::Event
-Team    = SportDB::Models::Team
-Game    = SportDB::Models::Game
-Group   = SportDB::Models::Group
-Round   = SportDB::Models::Round
-Season  = SportDB::Models::Season
-League  = SportDB::Models::League
-Badge   = SportDB::Models::Badge
-
-Tag     = WorldDB::Models::Tag
-Tagging = WorldDB::Models::Tagging
-Country = WorldDB::Models::Country
-Region  = WorldDB::Models::Region
-City    = WorldDB::Models::City
-Prop    = WorldDB::Models::Prop
+Event   = SportDb::Models::Event
+Team    = SportDb::Models::Team
+Game    = SportDb::Models::Game
+Group   = SportDb::Models::Group
+Round   = SportDb::Models::Round
+Season  = SportDb::Models::Season
+League  = SportDb::Models::League
+Badge   = SportDb::Models::Badge
+
+Tag     = WorldDb::Models::Tag
+Tagging = WorldDb::Models::Tagging
+Country = WorldDb::Models::Country
+Region  = WorldDb::Models::Region
+City    = WorldDb::Models::City
+Prop    = WorldDb::Models::Prop
 
 ## connect to db
 
@@ -42,7 +42,7 @@ ActiveRecord::Base.establish_connection( DB_CONFIG )
 
 ## test drive
 
-puts "Welcome to sport.db, version #{SportDB::VERSION} (world.db, version #{WorldDB::VERSION})!"
+puts "Welcome to sport.db, version #{SportDb::VERSION} (world.db, version #{WorldDb::VERSION})!"
 puts "  #{'%5d' % Event.count} events"
 puts "  #{'%5d' % Team.count} teams"
 puts "  #{'%5d' % Game.count} games"

data/lib/sportdb/data/fixtures.rb

@@ -43,7 +43,7 @@ end
 
 
 
-module SportDB
+module SportDb
   
   module Fixtures   # use shortcut/alias Fx?
   
@@ -202,4 +202,4 @@ module SportDB
 
   end # module Fixtures
   
-end # module SportDB
+end # module SportDb

data/lib/sportdb/data/keys.rb

@@ -5,7 +5,7 @@
 
 ### fix: rename to ::Key (singular) - why? why not??
 
-module SportDB::Keys
+module SportDb::Keys
 
     module EventKeys
   # use constants for known keys; lets us define aliases (if things change)
@@ -29,6 +29,6 @@ module SportDB::Keys
   ## NB: see db/leagues.rb for keys in use
     end 
     
-    include SportDB::Keys::EventKeys
+    include SportDb::Keys::EventKeys
 
-end # module SportDB::Keys
+end # module SportDb::Keys

data/lib/sportdb/data/models.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-module SportDB::Models
+module SportDb::Models
 
   ## add convenience finders to some model classes
   
   class Event
 
-  include SportDB::Keys::EventKeys
+  include SportDb::Keys::EventKeys
 
   def self.find_at_2012_13!
     self.find_by_key!( AT_2012_13 )
@@ -38,6 +38,6 @@ module SportDB::Models
     
   end # class Event
 
-end # module SportDB::Models
+end # module SportDb::Models
 
 

data/lib/sportdb/deleter.rb

@@ -1,11 +1,11 @@
 
-module SportDB
+module SportDb
 
   class Deleter
     ######
     # NB: make models available in sportdb module by default with namespace
     #  e.g. lets you use Team instead of Models::Team 
-    include SportDB::Models
+    include SportDb::Models
 
     def run
       # for now delete all tables
@@ -24,4 +24,4 @@ module SportDB
     
   end # class Deleter
   
-end # module SportDB
+end # module SportDb

data/lib/sportdb/lang.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module SportDB
+module SportDb
 
 class Lang
 
@@ -267,4 +267,4 @@ private
 end # class LangChecker
 
 
-end # module SportDB
+end # module SportDb

data/lib/sportdb/models/badge.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 class Badge < ActiveRecord::Base
 
@@ -9,4 +9,4 @@ class Badge < ActiveRecord::Base
 end  # class Badge
   
 
-end # module SportDB::Models
+end # module SportDb::Models

data/lib/sportdb/models/city.rb

@@ -1,14 +1,14 @@
 
 ## todo: how to best extends city model?
 
-module WorldDB::Models
+module WorldDb::Models
   class City
-    has_many :teams, :class_name => 'SportDB::Models::Team', :foreign_key => 'city_id'
+    has_many :teams, :class_name => 'SportDb::Models::Team', :foreign_key => 'city_id'
   end
-end # module WorldDB::Models
+end # module WorldDb::Models
 
 
 ## moved to models/forward
-#  module SportDB::Models
-#  City = WorldDB::Models::City
-# end # module SportDB::Models
+#  module SportDb::Models
+#  City = WorldDb::Models::City
+# end # module SportDb::Models

data/lib/sportdb/models/country.rb

@@ -2,17 +2,17 @@
 
 ## todo: how to best extends country model?
 
-module WorldDB::Models
+module WorldDb::Models
 
   class Country
-    has_many :teams,   :class_name => 'SportDB::Models::Team',   :foreign_key => 'country_id'
-    has_many :leagues, :class_name => 'SportDB::Models::League', :foreign_key => 'country_id'
+    has_many :teams,   :class_name => 'SportDb::Models::Team',   :foreign_key => 'country_id'
+    has_many :leagues, :class_name => 'SportDb::Models::League', :foreign_key => 'country_id'
   end # class Country
 
-end # module WorldDB::Models
+end # module WorldDb::Models
 
 
 ## moved to models/forward
-# module SportDB::Models
-#  Country = WorldDB::Models::Country
-# end # module SportDB::Models
+# module SportDb::Models
+#  Country = WorldDb::Models::Country
+# end # module SportDb::Models

data/lib/sportdb/models/event.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module SportDB::Models
+module SportDb::Models
 
 class Event < ActiveRecord::Base
 
@@ -79,4 +79,4 @@ class Event < ActiveRecord::Base
 
 end # class Event
 
-end # module SportDB::Models
+end # module SportDb::Models

data/lib/sportdb/models/event_team.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class EventTeam < ActiveRecord::Base
@@ -9,4 +9,4 @@ class EventTeam < ActiveRecord::Base
 end # class EventTeam
 
 
-end # module SportDB::Models
+end # module SportDb::Models

data/lib/sportdb/models/forward.rb

@@ -2,14 +2,14 @@
 ### forward references
 ##   require first to resolve circular references
 
-module SportDB::Models
+module SportDb::Models
 
-  ## todo: why? why not use include WorldDB::Models here???
+  ## todo: why? why not use include WorldDb::Models here???
 
-  Country = WorldDB::Models::Country
-  Region  = WorldDB::Models::Region
-  City    = WorldDB::Models::City
-  Prop    = WorldDB::Models::Prop
+  Country = WorldDb::Models::Country
+  Region  = WorldDb::Models::Region
+  City    = WorldDb::Models::City
+  Prop    = WorldDb::Models::Prop
 
   ## nb: for now only team and league use worlddb tables
   #   e.g. with belongs_to assoc (country,region)
@@ -20,12 +20,12 @@ module SportDB::Models
 end
 
 
-module WorldDB::Models
+module WorldDb::Models
 
   # add alias? why? why not? # is there a better way?
   #  - just include SportDB::Models  - why? why not?
   #  - just include once in loader??
-  Team   = SportDB::Models::Team
-  League = SportDB::Models::League
+  Team   = SportDb::Models::Team
+  League = SportDb::Models::League
 
 end

data/lib/sportdb/models/game.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class Game < ActiveRecord::Base
@@ -11,6 +11,41 @@ class Game < ActiveRecord::Base
 
   before_save :calc_toto12x
 
+  ### getter/setters for deprecated attribs (score3,4,5,6) n national
+  
+  def score3
+    score1ot
+  end
+
+  def score4
+    score2ot
+  end
+
+  def score5
+    score1p
+  end
+
+  def score6
+    score2p
+  end
+
+  def score3=(value)
+    self.score1ot = value
+  end
+
+  def score4=(value)
+    self.score2ot = value
+  end
+
+  def score5=(value)
+    self.score1p = value
+  end
+
+  def score6=(value)
+    self.score2p = value
+  end
+
+
 
   def self.create_knockouts_from_ary!( games, round )
     Game.create_from_ary!( games, round, true )
@@ -58,10 +93,10 @@ class Game < ActiveRecord::Base
         :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],
+        :score1ot  => value_scores[2],
+        :score2ot  => value_scores[3],
+        :score1p   => value_scores[4],
+        :score2p   => value_scores[5],
         :team2     => value_teams[1],
         :play_at   => value_play_at,
         :group     => value_group,     # Note: group is optional (may be null/nil)
@@ -122,10 +157,10 @@ class Game < ActiveRecord::Base
         :team1     =>pair[1][1],
         :score1    =>pair[1][2][0],
         :score2    =>pair[1][2][1],
-        :score3    =>pair[1][2][2],
-        :score4    =>pair[1][2][3],
-        :score5    =>pair[1][2][4],
-        :score6    =>pair[1][2][5],
+        :score1ot  =>pair[1][2][2],
+        :score2ot  =>pair[1][2][3],
+        :score1p   =>pair[1][2][4],
+        :score1p   =>pair[1][2][5],
         :team2     =>pair[1][3],
         :play_at   =>pair[1][4],
         :knockout  =>true }
@@ -194,4 +229,4 @@ class Game < ActiveRecord::Base
 end # class Game
 
 
-end # module SportDB::Models
+end # module SportDb::Models

data/lib/sportdb/models/group.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class Group < ActiveRecord::Base
@@ -19,5 +19,5 @@ class Group < ActiveRecord::Base
 end # class Group
   
   
-end # module SportDB::Models
+end # module SportDb::Models
 

data/lib/sportdb/models/group_team.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class GroupTeam < ActiveRecord::Base
@@ -9,5 +9,5 @@ class GroupTeam < ActiveRecord::Base
 end # class GroupTeam
 
 
-end # module SportDB::Models
+end # module SportDb::Models
 

data/lib/sportdb/models/league.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class League < ActiveRecord::Base
@@ -10,7 +10,7 @@ class League < ActiveRecord::Base
   has_many :events
   has_many :seasons, :through => :events
   
-  belongs_to :country, :class_name => 'WorldDB::Models::Country', :foreign_key => 'country_id'
+  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
 
 
   def self.create_from_ary!( leagues, more_values={} )
@@ -40,4 +40,4 @@ class League < ActiveRecord::Base
 end  # class League
 
 
-end # module SportDB::Models
+end # module SportDb::Models

data/lib/sportdb/models/prop.rb

@@ -2,6 +2,6 @@
 
 
 ## moved to models/forward
-#  module SportDB::Models
-#    Prop = WorldDB::Models::Prop
-#  end # module SportDB::Models
+#  module SportDb::Models
+#    Prop = WorldDb::Models::Prop
+#  end # module SportDb::Models

data/lib/sportdb/models/region.rb

@@ -2,15 +2,15 @@
 
 ## todo: how to best extends country model?
 
-module WorldDB::Models
+module WorldDb::Models
 
   class Region
-    has_many :teams, :class_name => 'SportDB::Models::Team', :through => :cities
+    has_many :teams, :class_name => 'SportDb::Models::Team', :through => :cities
   end # class Region
 
-end # module WorldDB::Models
+end # module WorldDb::Models
 
 ## moved to models/forward
-# module SportDB::Models
-#  Region = WorldDB::Models::Region
-# end # module SportDB::Models
+# module SportDb::Models
+#  Region = WorldDb::Models::Region
+# end # module SportDb::Models

data/lib/sportdb/models/round.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class Round < ActiveRecord::Base
@@ -9,5 +9,5 @@ class Round < ActiveRecord::Base
 end # class Round
   
   
-end # module SportDB::Models
+end # module SportDb::Models
 

data/lib/sportdb/models/season.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class Season < ActiveRecord::Base
@@ -8,4 +8,4 @@ class Season < ActiveRecord::Base
 end  # class Season
 
 
-end # module SportDB::Models
+end # module SportDb::Models

data/lib/sportdb/models/team.rb

@@ -1,4 +1,4 @@
-module SportDB::Models
+module SportDb::Models
 
 
 class Team < ActiveRecord::Base
@@ -76,4 +76,4 @@ class Team < ActiveRecord::Base
 end  # class Team
   
 
-end # module SportDB::Models
+end # module SportDb::Models

data/lib/sportdb/reader.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module SportDB
+module SportDb
 
 class Reader
 
@@ -11,17 +11,20 @@ class Reader
   include SportDB::Models
 
 
-  def initialize
+  attr_reader :include_path
+
+  def initialize( include_path, opts={})
+    @include_path = include_path
   end
 
-  def load_setup( setup, include_path )
-    ary = load_fixture_setup( setup, include_path )
-    load( ary, include_path )
+  def load_setup( setup )
+    ary = load_fixture_setup( setup )
+    load( ary )
   end # method load_setup
 
 
   ## fix/todo: rename ??
-  def load_fixture_setup( name, include_path )
+  def load_fixture_setup( name )
     
    ## todo/fix: cleanup quick and dirty code
     
@@ -70,7 +73,7 @@ class Reader
   end # load_fixture_setup
 
 
-  def load( ary, include_path )   # convenience helper for all-in-one reader
+  def load( ary )   # convenience helper for all-in-one reader
     
     logger.debug "enter load(include_path=>>#{include_path}<<):"
     logger.debug ary.to_json
@@ -81,30 +84,30 @@ class Reader
         name = rec
         
         if name =~ /^seasons/
-          load_seasons( name, include_path )
+          load_seasons( name )
         elsif name =~ /^leagues/
           if name =~ /club/
             # e.g. leagues_club
-            load_leagues( name, include_path, { club: true } )
+            load_leagues( name, club: true )
           else
             # e.g. leagues
-            load_leagues( name, include_path )
+            load_leagues( name )
           end
         elsif name =~ /^([a-z]{2})\/teams/
           # auto-add country code (from folder structure) for country-specific teams
           #  e.g. at/teams at/teams2 de/teams etc.
           country_key = $1
           country = Country.find_by_key!( country_key )
-          load_teams( name, include_path, { club: true, country_id: country.id } )
+          load_teams( name, club: true, country_id: country.id )
         elsif name =~ /\/teams/
           if name =~ /club/
             # club teams (many countries)
             # e.g. club/europe/teams
-            load_teams( name, include_path, { club: true } )
+            load_teams( name, club: true )
           else
             # assume national teams
             # e.g. world/teams  amercia/teams_n
-            load_teams( name, include_path, { national: true } )
+            load_teams( name, national: true )
           end
         else
           logger.error "unknown sportdb fixture type >#{name}<"
@@ -119,9 +122,9 @@ class Reader
         event_name     = rec[1]  # e.g. at/2012_13/bl
         fixture_names  = rec[1..-1]  # e.g. at/2012_13/bl, at/2012_13/bl2
       
-        load_event( event_name, include_path )
+        load_event( event_name )
         fixture_names.each do |fixture_name|
-          load_fixtures( event_key, fixture_name, include_path )
+          load_fixtures( event_key, fixture_name )
         end
       end
       
@@ -129,7 +132,7 @@ class Reader
   end # method load
 
 
-  def load_leagues( name, include_path, more_values={} )
+  def load_leagues( name, more_values={} )
     
     path = "#{include_path}/#{name}.txt"
 
@@ -144,7 +147,7 @@ class Reader
   end # load_leagues
 
 
-  def load_seasons( name, include_path )
+  def load_seasons( name )
     path = "#{include_path}/#{name}.yml"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -193,7 +196,7 @@ class Reader
 
 
 
-  def load_event( name, include_path )
+  def load_event( name )
     path = "#{include_path}/#{name}.yml"
 
     logger.info "parsing data '#{name}' (#{path})..."
@@ -291,7 +294,7 @@ class Reader
     ### Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )  
   end
 
-  def load_fixtures( event_key, name, include_path )  # load from file system
+  def load_fixtures( event_key, name )  # load from file system
      
     path = "#{include_path}/#{name}.txt"
 
@@ -307,7 +310,7 @@ class Reader
   end
 
 
-  def load_teams( name, include_path, more_values={} )
+  def load_teams( name, more_values={} )
     path = "#{include_path}/#{name}.txt"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -540,10 +543,10 @@ private
     game_attribs = {
       score1:    scores[0],
       score2:    scores[1],
-      score3:    scores[2],
-      score4:    scores[3],
-      score5:    scores[4],
-      score6:    scores[5],
+      score1ot:  scores[2],
+      score2ot:  scores[3],
+      score1p:   scores[4],
+      score2p:   scores[5],
       play_at:   date,
       knockout:  @knockout_flag,
       group_id:  @group.present? ? @group.id : nil
@@ -614,4 +617,4 @@ private
 
   
 end # class Reader
-end # module SportDB
+end # module SportDb

data/lib/sportdb/schema.rb

@@ -1,18 +1,9 @@
 
-module SportDB
+module SportDb
 
-class CreateDB   ## fix/todo: change to ActiveRecord::Migration why? why not?
-
-
-## 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.up
-
-  ActiveRecord::Schema.define do
+class CreateDb < ActiveRecord::Migration
 
+def up
 
 create_table :teams do |t|
   t.string  :title, :null => false
@@ -23,6 +14,8 @@ create_table :teams do |t|
   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)?
+  
+  ### fix: remove and add virtual attribute in model instead
   t.boolean  :national, :null => false, :default => false  # is it a national selection team (not a club)?
   t.timestamps
 end
@@ -34,8 +27,8 @@ create_table :events do |t|
   t.string      :key,      :null => false   # import/export key
   t.references  :league,   :null => false
   t.references  :season,   :null => false
-  t.datetime    :start_at, :null => false
-  t.datetime    :end_at   # make it required???
+  t.date        :start_at, :null => false    # NB: only use date (w/o time)
+  t.date        :end_at   # make it required???  # NB: only use date (w/o time)
   t.boolean     :team3,    :null => false, :default => true   ## e.g. Champions League has no 3rd place (only 1st and 2nd/final)
   t.timestamps
 end
@@ -51,8 +44,8 @@ create_table :rounds do |t|
   ## add new table stage/stages for grouping rounds in group rounds and playoff rounds, for example???
   ## # "regular" season (group) games or post-season (playoff) knockouts (k.o's)
   t.boolean    :knockout, :null => false, :default => false
-  t.datetime   :start_at, :null => false
-  t.datetime   :end_at    # todo: make it required e.g. :null => false 
+  t.date   :start_at, :null => false     # NB: only use date (w/o time)
+  t.date   :end_at    # todo: make it required e.g. :null => false    # NB: only use date (w/o time)
   t.timestamps
 end
 
@@ -96,11 +89,6 @@ create_table :games do |t|
   t.string     :toto12x      # 1,2,X,nil  calculate on save
   t.string     :key          # import/export key
 
-  t.integer    :score3    # deprecated  - remove todo: change to score1o or score1o overtime  # verlaengerung (opt)
-  t.integer    :score4    # deprecated - remove todo> change to score2o
-  t.integer    :score5    # deprecated - remove elfmeter (opt)  ## todo> change to score1p  - penality
-  t.integer    :score6    # deprecated - remove
-
   t.timestamps
 end
 
@@ -161,14 +149,14 @@ create_table :badges do |t|
   t.string      :title, :null => false   # Meister, Weltmeister, Europameister, Cupsieger, Vize-Meister, Aufsteiger, Absteiger, etc.
   t.timestamps
 end
-       
-  end # block Schema.define
 
+end # method up
 
-  Prop.create!( key: 'db.schema.sport.version', value: SportDB::VERSION )
+def down
+  raise ActiveRecord::IrreversibleMigration
+end
 
-end # method up
 
-end # class CreateDB
+end # class CreateDb
 
-end # module SportDB
+end # module SportDb

data/lib/sportdb/stats.rb

@@ -1,8 +1,8 @@
 
-module SportDB
+module SportDb
   
   class Stats
-    include SportDB::Models
+    include SportDb::Models
 
     def tables
       puts "Stats:"
@@ -25,4 +25,4 @@ module SportDB
   
   end  # class Stats
 
-end  # module SportDB
+end  # module SportDb

data/lib/sportdb/utils.rb

@@ -3,25 +3,25 @@
 ### some utils moved to worldbdb/utils for reuse
 
 
-module SportDB::FixtureHelpers
+module SportDb::FixtureHelpers
 
   def is_round?( line )
-    line =~ SportDB.lang.regex_round
+    line =~ SportDb.lang.regex_round
   end
 
   def is_group?( line )
     # NB: check after is_round? (round may contain group reference!)
-    line =~ SportDB.lang.regex_group
+    line =~ SportDb.lang.regex_group
   end
 
   def is_knockout_round?( line )
     
     ## todo: check for adding ignore case for regex (e.g. 1st leg/1st Leg)
     
-    if line =~ SportDB.lang.regex_leg1
+    if line =~ SportDb.lang.regex_leg1
       logger.debug "  two leg knockout; skip knockout flag on first leg"
       false
-    elsif line =~ SportDB.lang.regex_knockout_round
+    elsif line =~ SportDb.lang.regex_knockout_round
       logger.debug "   setting knockout flag to true"
       true
     elsif line =~ /K\.O\.|K\.o\.|Knockout/
@@ -328,4 +328,4 @@ module SportDB::FixtureHelpers
   end # method translate_teams!
   
 
-end # module SportDB::FixtureHelpers
+end # module SportDb::FixtureHelpers

data/lib/sportdb/version.rb

@@ -1,4 +1,9 @@
 
-module SportDB
-  VERSION = '1.5.0'
+module SportDb
+  VERSION = '1.6.0'
 end
+
+###########################################
+## fix: remove old alias for SportDb
+
+SportDB = SportDb

data/lib/sportdb.rb

@@ -94,12 +94,13 @@ module SportDB
   end
 
   def self.create
-    CreateDB.up
+    CreateDb.new.up
+    WorldDb::Models::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
   end
 
   def self.read_setup( setup, include_path )
-    reader = Reader.new
-    reader.load_setup( setup, include_path )
+    reader = Reader.new( include_path )
+    reader.load_setup( setup )
   end
 
   def self.read_all( include_path )   # convenience helper
@@ -113,11 +114,11 @@ module SportDB
   #    ['cl.2012/13', 'cl/2012_13/cl']] etc.
 
   def self.read( ary, include_path )
-    reader = Reader.new
-    reader.load( ary, include_path )
+    reader = Reader.new( include_path )
+    reader.load( ary )
   end
-  
-  
+
+
   # delete ALL records (use with care!)
   def self.delete!
     puts '*** deleting sport table records/data...'
@@ -174,15 +175,15 @@ module SportDB
 
   end
 
-end  # module SportDB
+end  # module SportDb
 
 
-## SportDB::load_plugins
+## SportDb::load_plugins
 
 
 if __FILE__ == $0
-  SportDB.main
+  SportDb.main
 else
    ## say hello
-  puts SportDB.banner
+  puts SportDb.banner
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &79472040 !ruby/object:Gem::Requirement
+  requirement: &81812490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *79472040
+  version_requirements: *81812490
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &79471820 !ruby/object:Gem::Requirement
+  requirement: &81812230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *79471820
+  version_requirements: *81812230
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &79471600 !ruby/object:Gem::Requirement
+  requirement: &81811960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *79471600
+  version_requirements: *81811960
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &79471380 !ruby/object:Gem::Requirement
+  requirement: &81811710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *79471380
+  version_requirements: *81811710
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: