sportdb 0.9.7 → 1.0.0

data/lib/sportdb/utils.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 ### some utils moved to worldbdb/utils for reuse
 
@@ -5,33 +6,43 @@
 module SportDB::FixtureHelpers
 
   def is_round?( line )
-    line =~ /Spieltag|Runde|Achtelfinale|Viertelfinale|Halbfinale|Finale/
+    line =~ SportDB.lang.regex_round
   end
-  
+
   def is_group?( line )
     # NB: check after is_round? (round may contain group reference!)
-    line =~ /Gruppe|Group/
+    line =~ SportDB.lang.regex_group
   end
-  
+
   def is_knockout_round?( line )
-    if line =~ /Achtelfinale|Viertelfinale|Halbfinale|Spiel um Platz 3|Finale|K\.O\.|Knockout/
+    
+    ## todo: check for adding ignore case for regex (e.g. 1st leg/1st Leg)
+    
+    if line =~ SportDB.lang.regex_leg1
+      puts "  two leg knockout; skip knockout flag on first leg"
+      false
+    elsif line =~ SportDB.lang.regex_knockout_round
       puts "   setting knockout flag to true"
       true
+    elsif line =~ /K\.O\.|Knockout/
+        ## NB: add two language independent markers, that is, K.O. and Knockout
+      puts "   setting knockout flag to true (lang independent marker)"
+      true
     else
       false
     end
   end
   
   def find_group_title_and_pos!( line )
-    ## group pos - for now support single digit e.g 1,2,3 or letter e.g. A,B,C
+    ## group pos - for now support single digit e.g 1,2,3 or letter e.g. A,B,C or HEX
     ## nb:  (?:)  = is for non-capturing group(ing)
-    regex = /(?:Group|Gruppe)\s+((?:\d{1}|[A-Z]{1}))\b/
+    regex = /(?:Group|Gruppe|Grupo)\s+((?:\d{1}|[A-Z]{1,3}))\b/
     
     match = regex.match( line )
     
     return [nil,nil] if match.nil?
 
-    pos = case match[1]      
+    pos = case match[1]
           when 'A' then 1
           when 'B' then 2
           when 'C' then 3
@@ -42,6 +53,9 @@ module SportDB::FixtureHelpers
           when 'H' then 8
           when 'I' then 9
           when 'J' then 10
+          when 'K' then 11
+          when 'L' then 12
+          when 'HEX' then 666    # HEX for Hexagonal - todo/check: map to something else ??
           else  match[1].to_i
           end
 
@@ -56,9 +70,42 @@ module SportDB::FixtureHelpers
   end
   
   def find_round_pos!( line )
+    
+    ## todo: let title2 go first to cut off //
+    ## todo: cut of end of line comments w/ # ???
+    
     ## fix/todo:
     ##  if no round found assume last_pos+1 ??? why? why not?
 
+    # extract optional round pos from line
+    # e.g.  (1)   - must start line 
+    regex = /^[ \t]*\((\d{1,3})\)[ \t]+/
+    if line =~ regex
+      puts "   pos: >#{$1}<"
+      
+      line.sub!( regex, '[ROUND|POS] ' )  ## NB: add back trailing space that got swallowed w/ regex -> [ \t]+
+      return $1.to_i
+    end
+
+    # continue; try some other options
+
+    # NB: do not search string after free standing / or //
+    #  cut-off optional trailing part w/ starting w/  / or //
+    #
+    # e.g.  Viertelfinale   //   Di+Mi 10.+11. April 2012  becomes just
+    #       Viertelfinale
+    
+    cutoff_regex = /^(.+?)[ \t]\/{1,3}[ \t]/
+    
+    if line =~ cutoff_regex
+      line = $1.to_s    # cut off the rest if regex matches
+    end
+
+    ## fix/todo: use cutoff_line for search
+    ## and use line.sub! to change original string
+    # e.g.  Jornada 3  // 1,2 y 3 febrero
+    #   only replaces match in local string w/ [ROUND|POS]
+
     regex = /\b(\d+)\b/
     
     if line =~ regex
@@ -70,7 +117,7 @@ module SportDB::FixtureHelpers
       return value
     else
       return nil
-    end    
+    end
   end
   
   def find_date!( line )
@@ -80,9 +127,15 @@ module SportDB::FixtureHelpers
     
     # e.g. 2012-09-14 20:30   => YYYY-MM-DD HH:MM
     regex_db = /\b(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2})\b/
+    
+    # e.g. 2012-09-14  w/ implied hours (set to 12:00)
+    regex_db2 = /\b(\d{4})-(\d{2})-(\d{2})\b/
 
     # e.g. 14.09. 20:30  => DD.MM. HH:MM
     regex_de = /\b(\d{2})\.(\d{2})\.\s+(\d{2}):(\d{2})\b/
+    
+    # e.g. 14.09.2012 20:30   => DD.MM.YYYY HH:MM
+    regex_de2 = /\b(\d{2})\.(\d{2})\.(\d{4})\s+(\d{2}):(\d{2})\b/
 
     if line =~ regex_db
       value = "#{$1}-#{$2}-#{$3} #{$4}:#{$5}"
@@ -93,6 +146,23 @@ module SportDB::FixtureHelpers
       
       line.sub!( regex_db, '[DATE.DB]' )
 
+      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
+    elsif line =~ regex_db2
+      value = "#{$1}-#{$2}-#{$3} 12:00"
+      puts "   date: >#{value}<"
+      
+      line.sub!( regex_db2, '[DATE.DB2]' )
+
+      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
+    elsif line =~ regex_de2
+      value = "#{$3}-#{$2}-#{$1} #{$4}:#{$5}"
+      puts "   date: >#{value}<"
+
+      ## todo: lets you configure year
+      ##  and time zone (e.g. cet, eet, utc, etc.)
+      
+      line.sub!( regex_de2, '[DATE.DE2]' )
+
       return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     elsif line =~ regex_de
       value = "2012-#{$2}-#{$1} #{$3}:#{$4}"
@@ -129,18 +199,25 @@ module SportDB::FixtureHelpers
   end
 
   def find_scores!( line )
+
+    ### fix: depending on language allow 1:1 or 1-1
+    ##   do NOT allow mix and match
+    ##  e.g. default to en is  1-1
+    ##    de is 1:1 etc.
+    
+
     # extract score from line
     # and return it
     # NB: side effect - removes date from line string
     
-    # e.g. 1:2 or 0:2 or 3:3
-    regex = /\b(\d):(\d)\b/
+    # e.g. 1:2 or 0:2 or 3:3 // 1-1 or 0-2 or 3-3
+    regex = /\b(\d)[:\-](\d)\b/
     
     # e.g. 1:2nV  => overtime
-    regex_ot = /\b(\d):(\d)[ \t]?[nN][vV]\b/
+    regex_ot = /\b(\d)[:\-](\d)[ \t]?[nN][vV]\b/
     
     # e.g. 5:4iE  => penalty
-    regex_p = /\b(\d):(\d)[ \t]?[iI][eE]\b/
+    regex_p = /\b(\d)[:\-](\d)[ \t]?[iI][eE]\b/
     
     scores = []
     

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.9.7'
+  VERSION = '1.0.0'
 end

data/lib/sportdb.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+
+
 ###
 # NB: for local testing run like:
 #
@@ -7,14 +10,17 @@
 
 require 'yaml'
 require 'pp'
-require 'logger'
-require 'optparse'
+require 'logger'             ## todo/fix: no longer needed - replaced by logutils??
 require 'fileutils'
 require 'erb'
 
-# rubygems
+# rubygems  / 3rd party libs
 
 require 'active_record'   ## todo: add sqlite3? etc.
+
+require 'logutils'
+require 'textutils'
+
 require 'worlddb'
 
 
@@ -22,7 +28,6 @@ require 'worlddb'
 
 require 'sportdb/version'
 
-require 'sportdb/keys'
 require 'sportdb/models/forward'
 require 'sportdb/models/badge'
 require 'sportdb/models/city'
@@ -40,11 +45,24 @@ require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 require 'sportdb/utils'
-require 'sportdb/loader'
 require 'sportdb/reader'
-require 'sportdb/templater'
-require 'sportdb/cli/opts'
-require 'sportdb/cli/runner'
+require 'sportdb/lang'
+
+require 'sportdb/deleter'
+require 'sportdb/stats'
+
+###############
+# optional: for convenience add some finders etc. for known fixtures
+#
+#  only used for sportdb/console.rb
+#   and  sportdb/tasks/test.rb  -> rename to tasks.rb?
+#
+#  todo/fix => remove from here and move into console.rb and tasks.rb
+
+require 'sportdb/data/keys'
+require 'sportdb/data/fixtures'
+require 'sportdb/data/models'     # add convenience finders for known fixtures
+
 
 
 module SportDB
@@ -56,192 +74,49 @@ module SportDB
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
   end
-  
-  # builtin path to fixture data
-  def self.data_path
-    "#{root}/data"
-  end
-
 
-  def self.main
-    Runner.new.run(ARGV)
+  def self.config_path
+    "#{root}/config"
   end
 
-  def self.create
-    CreateDB.up
+  def self.lang
+    # todo/fix: find a better way for single instance ??
+     if @lang.nil?
+       @lang = Lang.new
+     end
+     @lang
   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/2011_12/bl',
-#      'at/2011_12/cup',
-#      'at/2012_13/bl',
-#      'at/2012_13/cup',
-#      'copa/sud_2012_13',
-#      '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_CUP_2012_13,    'at/2012_13/cup'],
-#       ['copa.sud.2012/13', 'copa/sud_2012_13'],
-#       [ WORLD_QUALI_AMERICA_2012_13, 'world/quali_2012_13_america']
-      ]
-    end
-
-
-    def self.team_fixtures
-      at = Country.find_by_key!( 'at' )
-      de = Country.find_by_key!( 'de' )
-      en = Country.find_by_key!( 'en' )
-      es = Country.find_by_key!( 'es' )
-      ro = Country.find_by_key!( 'ro' )
-      mx = Country.find_by_key!( 'mx' )
-
-      [
-        [ 'america/teams', { national: true } ],
-        [ 'euro/teams',    { national: true } ],
-        [ 'world/teams',   { national: true } ],
-        [ 'at/teams', { club: true, country_id: at.id } ],
-        [ 'de/teams', { club: true, country_id: de.id } ],
-        [ 'en/teams', { club: true, country_id: en.id } ],
-        [ 'es/teams', { club: true, country_id: es.id } ],
-#        [ 'ro/teams', { club: true, country_id: ro.id } ],
-        [ 'mx/teams', { club: true, country_id: mx.id } ],
-        [ 'cl/teams', { club: true } ],
-        [ 'copa/teams', { club: true } ],
-        [ 'nhl/teams', { club: true } ]
-      ]
-    end
-
-    def self.fixtures_rb  # all builtin ruby fixtures; helper for covenience
-     ['leagues',
-      'seasons',
-      'at/badges',
-      'at/2011_12/bl',
-      'at/2011_12/cup',
-      'at/2012_13/bl',
-      'at/2012_13/cup',
-      'cl/badges',
-      'cl/2011_12/cl',
-      'cl/2011_12/el',
-      'cl/2012_13/cl',
-      'de/2012_13/bl',
-      'en/2012_13/pl',
-      'euro/2008',
-      'euro/2012',
-      'america/2011',
-      'copa/sud_2012_13',
-      'mx/apertura_2012',
-      'world/2010',
-      'world/quali_2012_13_europe',
-      'world/quali_2012_13_america'
-      ]
-    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.team_fixtures
-    Fixtures.team_fixtures
+  def self.main
+    ## Runner.new.run(ARGV) - old code
+    require 'sportdb/cli/main'
   end
 
-  def self.fixtures_rb  # all builtin ruby fixtures; helper for covenience
-    Fixtures.fixtures_rb
-  end
-  
-  def self.fixtures_txt
-    Fixtures.fixtures_txt
+  def self.create
+    CreateDB.up
   end
 
-  def self.load_all
-    ## load teams first
-    read( team_fixtures )  # converted to plain text fixtures (.rb no longer exist)
-    
-    load( fixtures_rb )
+  def self.read_setup( setup, include_path )
+    reader = Reader.new
+    reader.load_setup_with_include_path( setup, include_path )
   end
 
-
-  def self.read_all
-    ## todo/fix: remove!! roll into load_all
-    read( fixtures_txt )
+  def self.read_all( include_path )   # convenience helper
+    read_setup( 'setups/all', include_path )
   end
 
-  # load built-in (that is, bundled within the gem) named seeds
-  # - pass in an array of seed names e.g. [ 'cl/teams', 'cl/2012_13/cl' ] etc.
-
-  def self.load( ary )
-    loader = Loader.new
-    ary.each do |name|
-      loader.load_fixtures_builtin( name )
-    end
-  end
 
   # load built-in (that is, bundled within the gem) named plain text seeds
-  # - pass in an array of pairs of event/seed names e.g. [['at.2012/13', 'at/2012_13/bl'], ['cl.2012/13', 'cl/2012_13/cl']] etc.
+  # - pass in an array of pairs of event/seed names e.g.
+  #   [['at.2012/13', 'at/2012_13/bl'],
+  #    ['cl.2012/13', 'cl/2012_13/cl']] etc.
 
-  def self.read( ary )
+  def self.read( ary, include_path )
     reader = Reader.new
-    ary.each do |rec|
-      ## todo: check for teams in name too?
-      if rec[1].nil? || rec[1].kind_of?( Hash )   ## assume team fixtures
-        reader.load_teams_builtin( rec[0], rec[1] )  ## NB: name goes first than opt more_values hash
-      else
-        reader.load_fixtures_builtin( rec[0], rec[1] ) # event_key, name  -- assume game fixtures
-      end
-    end
+    reader.load_with_include_path( ary, include_path )
   end
-
   
-  class Deleter
-    ## todo: move into its own file???    
-    
-    ## make models available in sportdb module by default with namespace
-    #  e.g. lets you use Team instead of Models::Team 
-    include SportDB::Models
-
-    def run( args=[] )
-      # for now delete all tables
-      
-      Team.delete_all
-      Game.delete_all
-      Event.delete_all
-      EventTeam.delete_all
-      Group.delete_all
-      GroupTeam.delete_all
-      Round.delete_all
-      Badge.delete_all
-      League.delete_all
-      Season.delete_all
-    end
-    
-  end
   
   # delete ALL records (use with care!)
   def self.delete!
@@ -250,29 +125,6 @@ module SportDB
   end # method delete!
 
 
-  class Stats
-    include SportDB::Models
-
-    def tables
-      puts "Stats:"
-      puts "  #{Event.count} events  /  #{Round.count} rounds  /  #{Group.count} groups"
-      puts "  #{League.count} leagues  /  #{Season.count} seasons"
-      puts "  #{Country.count} countries / #{Region.count} regions / #{City.count} cities"
-      puts "  #{Team.count} teams"
-      puts "  #{Game.count} games"
-      puts "  #{Badge.count} badges"
-      
-      ## todo: add tags / taggings from worlddb
-    end
-    
-    def props
-      puts "Props:"
-      Prop.order( 'created_at asc' ).all.each do |prop|
-        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-      end
-    end
-  end
-
   def self.stats
     stats = Stats.new
     stats.tables
@@ -289,7 +141,6 @@ module SportDB
 
 
 
-
   def self.load_plugins
 
     @found  ||= []

data/tasks/test.rb

@@ -0,0 +1,163 @@
+
+#########################
+#  Fill up sport.db w/ football.db fixtures
+
+
+##############################
+## for testing 
+##
+## NB: use
+#   rake -I ../world.db.ruby/lib -I ../sport.db.ruby/lib update
+
+
+include SportDB::Fixtures   # include fixture constants like WORLD_FIXTURES, EN_FIXTURES etc.
+
+
+##########
+# TODO: configure - copy to your rake file
+
+#  INCLUDE_PATH = "../football.db"
+  
+#  BUILD_DIR = "./db"
+  
+#  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
+    pp DB_CONFIG
+    ActiveRecord::Base.establish_connection( DB_CONFIG )
+  end
+
+ # task :create => :env do
+ #   WorldDB.create
+ # end
+
+  task :import => :env do
+    reader = SportDB::Reader.new
+    
+    reader.load_seasons_with_include_path( 'seasons', INCLUDE_PATH )
+    
+    reader.load_leagues_with_include_path( 'leagues',      INCLUDE_PATH )
+    reader.load_leagues_with_include_path( 'leagues_club', INCLUDE_PATH, { club: true } )
+  end
+  
+  ### club europe (cl,el)
+  task :club_europe => [:import] do
+    import_fixtures( CLUB_EUROPE_TEAMS, CLUB_EUROPE_FIXTURES )
+  end
+
+  ### club america 
+  task :club_america => [:import] do
+    import_fixtures( CLUB_AMERICA_TEAMS, CLUB_AMERICA_FIXTURES )
+  end
+  
+  task :europe  => [:import] do
+    import_fixtures( EUROPE_TEAMS, EUROPE_FIXTURES )
+  end
+
+  task :america  => [:import] do
+    import_fixtures( AMERICA_TEAMS, AMERICA_FIXTURES )
+  end
+  
+  task :world  => [:import] do
+    import_fixtures( WORLD_TEAMS, WORLD_FIXTURES )
+  end
+
+  ### ar - Argentina
+  task :ar => [:import] do
+    import_fixtures( AR_TEAMS, AR_FIXTURES )
+  end
+
+  ### br - Brasil
+  task :br => [:import] do
+    import_fixtures( BR_TEAMS, BR_FIXTURES )
+  end
+  
+  ### mx - Mexico
+  task :mx => [:import] do
+    import_fixtures( MX_TEAMS, MX_FIXTURES )
+  end
+  
+  #### at - Austria
+  task :at => [:import] do
+    import_fixtures( AT_TEAMS, AT_FIXTURES )
+  end
+  
+  #### de - Deutschland/Germany
+  task :de => [:import] do
+    import_fixtures( DE_TEAMS, DE_FIXTURES )
+  end
+
+  #### en - England
+  task :en => [:import] do
+    import_fixtures( EN_TEAMS, EN_FIXTURES )
+  end
+
+  #### ro - Romania
+  task :ro => [:import] do
+    import_fixtures( RO_TEAMS, RO_FIXTURES )
+  end
+
+
+
+  desc 'worlddb - test loading of builtin fixtures (update)'
+  task :update => [:world]
+  # task :update => [:at, :de, :en, :ro, :ar, :br, :mx]
+
+
+
+  def import_fixtures( teams, fixtures )
+    reader = SportDB::Reader.new
+    reader.load_with_include_path( teams, INCLUDE_PATH )
+    reader.load_with_include_path( fixtures, INCLUDE_PATH )
+  end
+
+
+
+=begin
+
+##################
+# usage sample
+##################
+
+#### step 1) configure tasks in test.rb in your rake file
+
+Rakefile:
+
+INCLUDE_PATH = "../football.db"
+  
+BUILD_DIR = "./db"
+  
+SPORT_DB_PATH = "#{BUILD_DIR}/sport.db"
+
+
+#### step 2) include tasks in test.rb
+
+SPORT_DB_RUBY_PATH = "../sport.db.ruby"
+WORLD_DB_RUBY_PATH = "../world.db.ruby"
+
+require "#{WORLD_DB_RUBY_PATH}/lib/worlddb.rb"
+require "#{SPORT_DB_RUBY_PATH}/lib/sportdb.rb"
+
+require "#{SPORT_DB_RUBY_PATH}/tasks/test.rb"
+
+Shell:
+
+### step 3) call on command line
+
+$ rake -I ../world.db.ruby/lib -I ../sport.db.ruby/lib update
+
+=end