sportdb 0.3.3 → 0.4.0

data/History.markdown

@@ -1,3 +1,8 @@
+### 0.4.0 / 2012-10-16
+
+* Add plain text fixture reader/loader
+* Add --generate/g option for generating fixtures from the DB using templates 
+
 ### 0.3.1 / 2012-10-14
 
 * Move models into its own namespace, that is, SportDB::Models

data/Manifest.txt

@@ -40,6 +40,9 @@ lib/sportdb/models/group_team.rb
 lib/sportdb/models/prop.rb
 lib/sportdb/models/round.rb
 lib/sportdb/models/team.rb
+lib/sportdb/reader.rb
 lib/sportdb/schema.rb
+lib/sportdb/templater.rb
 lib/sportdb/utils.rb
 lib/sportdb/version.rb
+templates/fixtures.rb.erb

data/lib/sportdb.rb

@@ -11,6 +11,7 @@ require 'pp'
 require 'logger'
 require 'optparse'
 require 'fileutils'
+require 'erb'
 
 # rubygems
 
@@ -31,6 +32,8 @@ 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/version'
 require 'sportdb/cli/opts'
 require 'sportdb/cli/runner'

data/lib/sportdb/cli/opts.rb

@@ -10,7 +10,25 @@ class Opts
     return false if @create.nil?   # default create flag is false
     @create == true
   end
+  
+
+  def generate=(boolean)
+    @generate = boolean
+  end
 
+  def generate?
+    return false if @generate.nil?   # default generate flag is false
+    @generate == true
+  end
+  
+  def event=(value)
+    @event = value
+  end
+  
+  def event
+    @event   # NB: option has no default; return nil  ## || '.'
+  end  
+  
 
   def delete=(boolean)
     @delete = boolean

data/lib/sportdb/cli/runner.rb

@@ -23,6 +23,9 @@ class Runner
     
       cmd.banner = "Usage: sportdb [options]"
 
+      cmd.on( '-e', '--event KEY', 'Event to Load or Generate' ) { |key| opts.event = key; }
+      cmd.on( '-g', '--generate', 'Generate Fixtures from Template' ) { opts.generate = true }
+
       ## todo: change to different flag??   use -c/--config ???
       cmd.on( '-c', '--create', 'Create DB Schema' ) { opts.create = true }
 
@@ -98,19 +101,31 @@ EOS
     if opts.load?
       loader = Loader.new
     end
+    
+    if opts.event.present?
+      if opts.generate?
+        Templater.new( opts ).run( args )
+      else
+        Reader.new( opts ).run( args )
+      end
+    else
 
-    args.each do |arg|
-      name = arg     # File.basename( arg, '.*' )
+      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
+        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    
+    
     end
     
-    dump_stats
-    dump_props
+
     
     puts 'Done.'
     

data/lib/sportdb/models/team.rb

@@ -15,9 +15,17 @@ class Team < ActiveRecord::Base
       
       ## key & title required
       attr = {
-        :key   => values[0],
-        :title => values[1]
+        :key   => values[0]
       }
+
+      ## title (split of optional synonyms)
+      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
+      titles = values[1].split('|')
+      
+      attr[ :title ]    =  titles[0]
+      ## add optional synonyms
+      attr[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
+
       
       attr = attr.merge( more_values )
       

data/lib/sportdb/reader.rb

@@ -0,0 +1,316 @@
+module SportDB
+
+class Reader
+
+## make models available in sportdb module by default with namespace
+#  e.g. lets you use Team instead of Models::Team 
+  include SportDB::Models
+
+
+  def initialize( opts )
+    @logger = Logger.new(STDOUT)
+    @logger.level = Logger::INFO
+    
+    @opts = opts
+  end
+
+  attr_reader :logger, :opts
+
+  def run( args )
+  
+    puts SportDB.banner
+
+    puts "working directory: #{Dir.pwd}"
+ 
+    ## assume active activerecord connection
+    ##
+    
+    @event = Event.find_by_key!( opts.event )
+    
+    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 = []
+ 
+    @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 tag and key (key should always go last)
+      titles = titles.sort { |left,right| right.length <=> left.length }
+      
+      titles << team.tag                  if team.tag.present?
+      titles << team.key
+            
+      @known_teams << [ team.key, titles ]
+      
+      puts "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
+    end
+ 
+ 
+    args.each do |arg|
+      name = arg     # File.basename( arg, '.*' )
+      parse_fixtures( name )
+    end
+    
+    
+    puts 'Done.'
+    
+  end   # method run
+
+
+  def is_round?( line )
+    line =~ /Spieltag|Runde/
+  end
+  
+  def find_round_pos!( line )
+    regex = /\b(\d+)\b/
+    
+    if line =~ regex
+      value = $1.to_i
+      puts "   pos: >#{value}<"
+      
+      line.sub!( regex, '[POS]' )
+
+      return value
+    else
+      return nil
+    end    
+  end
+  
+  def find_date!( line )
+    # extract date from line
+    # and return it
+    # NB: side effect - removes date from line string
+    
+    # e.g. 14.09. 20:30
+    regex = /\b(\d{2})\.(\d{2})\.\s+(\d{2}):(\d{2})\b/
+    
+    if line =~ regex
+      value = "2012-#{$2}-#{$1} #{$3}:#{$4}"
+      puts "   date: >#{value}<"
+
+      ## todo: lets you configure year
+      ##  and time zone (e.g. cet, eet, utc, etc.)
+      
+      line.sub!( regex, '[DATE]' )
+
+      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
+    else
+      return nil
+    end
+  end
+
+  def find_score!( line )
+    # 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/
+    
+    if line =~ regex
+      value = "#{$1}-#{$2}"
+      puts "   score: >#{value}<"
+      
+      line.sub!( regex, '[SCORE]' )
+
+      return [$1.to_i,$2.to_i]
+    else
+      return []
+    end
+  end
+  
+
+  def find_team_worker!( line, index )
+    regex = /@@oo([^@]+?)oo@@/     # e.g. everything in @@ .... @@ (use non-greedy +? plus all chars but not @, that is [^@])
+    
+    if line =~ regex
+      value = "#{$1}"
+      puts "   team#{index}: >#{value}<"
+      
+      line.sub!( regex, "[TEAM#{index}]" )
+
+      return $1
+    else
+      return nil
+    end
+  end
+
+  def find_team1!( line )
+    find_team_worker!( line, 1 )
+  end
+  
+  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) 
+      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@@" )
+        return true    # break out after first match (do NOT continue)
+      end
+    end
+    return false
+  end
+
+  def match_teams!( line )
+    @known_teams.each do |rec|
+      key    = rec[0]
+      values = rec[1]
+      match_team_worker!( line, key, values )
+    end # each known_teams    
+  end # method translate_teams!
+  
+
+  def parse_fixtures( name )
+  
+    path = "#{opts.data_path}/#{name}.txt"
+ 
+    puts "*** parsing data '#{name}' (#{path})..."
+
+    old_lines = File.read( path )
+    
+    old_lines.each_line do |line|
+  
+      if line =~ /^\s*#/
+        # skip komments and do NOT copy to result (keep comments secret!)
+        logger.debug 'skipping comment line'
+        next
+      end
+        
+      if line =~ /^\s*$/ 
+        # kommentar oder leerzeile überspringen 
+        logger.debug 'skipping blank line'
+        next
+      end
+
+      # remove leading and trailing whitespace
+      line = line.strip
+
+      if is_round?( line )
+        puts "parsing round line: >#{line}<"
+        pos = find_round_pos!( line )
+        
+        ## NB: dummy/placeholder start_at, end_at date
+        ##  replace/patch after adding all games for round
+        
+        round_attribs = {
+          title: "#{pos}. Runde"
+        }
+        
+        @round = Round.find_by_event_id_and_pos( @event.id, pos )
+        if @round.present?
+          puts "*** update round #{@round.id}:"
+        else
+          puts "*** create round:"
+          @round = Round.new
+          
+          round_attribs = round_attribs.merge( {
+            event_id: @event.id,
+            pos:   pos,
+            start_at: Time.utc('1999-12-12'),
+            end_at:   Time.utc('1999-12-12')
+                                 })
+        end
+        
+        puts round_attribs.to_json
+   
+        @round.update_attributes!( round_attribs )
+
+        ### store list of round is for patching start_at/end_at at the end
+        @patch_rounds ||= {}
+        @patch_rounds[ @round.id ] = @round.id
+        
+        puts "  line: >#{line}<"
+        
+      else
+        puts "parsing game (fixture) line: >#{line}<"
+        date  = find_date!( line )
+        score = find_score!( line )
+        
+        match_teams!( line )
+        team1 = find_team1!( line )
+        team2 = find_team2!( line )
+
+
+        ### todo: cache team lookups in hash?
+
+        team1_id = Team.find_by_key!( team1 ).id
+        team2_id = Team.find_by_key!( team2 ).id
+
+        ### check if games exists
+        ##  with this teams in this round if yes only update
+        @game = Game.find_by_round_id_and_team1_id_and_team2_id(
+                         @round.id, team1_id, team2_id
+        )
+
+        game_attribs = {
+          score1:    score[0],
+          score2:    score[1],
+          play_at:  date
+        }
+
+        if @game.present?
+          puts "*** update game #{@game.id}:"
+        else
+          puts "*** create game:"
+          @game = Game.new
+
+          more_game_attribs = {
+          ## NB: use round.games.count for pos
+          ##  lets us add games out of order if later needed
+            pos:  @round.games.count+1,
+            round_id:  @round.id,
+            team1_id: team1_id,
+            team2_id: team2_id
+          }          
+          game_attribs = game_attribs.merge( more_game_attribs )
+        end
+
+        puts game_attribs.to_json
+
+        @game.update_attributes!( game_attribs )
+        
+        puts "  line: >#{line}<"
+      end             
+    end # oldlines.each
+    
+    @patch_rounds ||= {}
+    @patch_rounds.each do |k,v|
+      puts "*** patch start_at/end_at date for round #{k}:"
+      round = Round.find( k )
+      games = round.games.order( 'play_at asc' ).all
+      
+      round_attribs = {}
+      
+      ## todo: check for no records
+      ##  e.g. if game[0].present? or just if game[0]  ??
+      
+      round_attribs[:start_at] = games[0].play_at
+      round_attribs[:end_at  ] = games[-1].play_at
+
+      puts round_attribs.to_json
+      round.update_attributes!( round_attribs )
+    end
+    
+  end # method parse_fixtures
+
+  
+end # class Reader
+end # module SportDB

data/lib/sportdb/schema.rb

@@ -31,6 +31,7 @@ create_table :teams do |t|
   t.string  :title2
   t.string  :key,   :null => false   # import/export key
   t.string  :tag     # make it not null?  - three letter tag (short title)
+  t.string  :synonyms  # comma separated list of synonyms
   t.references :country,   :null => false
   t.boolean  :club,     :null => false, :default => false  # is it a club (not a national team)?
   t.boolean  :national, :null => false, :default => false  # is it a national selection team (not a club)?
@@ -57,6 +58,7 @@ create_table :rounds do |t|
   t.integer    :pos,      :null => false
   t.boolean    :playoff,  :null => false, :default => false  # "regular" season (group) games or post-season (playoff) knockouts (k.o's)
   t.datetime   :start_at, :null => false
+  t.datetime   :end_at    # todo: make it required e.g. :null => false 
   t.timestamps
 end
 

data/lib/sportdb/templater.rb

@@ -0,0 +1,83 @@
+module SportDB
+
+class Template
+
+  def initialize( path )
+    @path = path
+  end
+
+  def render( binding )
+    ## '<>' means omit newline for lines starting with <% and ending in %>
+    ERB.new( load_template(), 0, '<>' ).result( binding )
+  end
+
+private
+  def load_template
+    puts " Loading template >#{@path}<..."
+    File.read( @path )
+  end
+
+end # class Template
+
+
+class Templater
+
+## make models available in sportdb module by default with namespace
+#  e.g. lets you use Team instead of Models::Team 
+  include SportDB::Models
+
+
+  def initialize( opts )
+    @logger = Logger.new(STDOUT)
+    @logger.level = Logger::INFO
+    
+    @opts = opts
+  end
+
+  attr_reader :logger, :opts
+
+  # make props available for template
+  attr_reader :event   
+  
+  def run( args )
+  
+    puts SportDB.banner
+
+    puts "working directory: #{Dir.pwd}"
+ 
+    ## assume active activerecord connection
+    ##
+    
+    @event = Event.find_by_key!( opts.event )
+    
+    puts "Event #{@event.key} >#{@event.title}<"
+
+ 
+    args.each do |arg|
+      name = File.basename( arg, '.*' )
+      gen_fixtures( name )
+    end
+    
+    
+    puts 'Done.'
+    
+  end   # method run
+
+  
+  def gen_fixtures( name )
+
+    ## todo: honor -o/--output option ??
+
+    dest = "#{name}.rb"
+    source = "#{SportDB.root}/templates/fixtures.rb.erb"
+
+    puts " Merging template #{source} to #{dest}..."
+
+    out = File.new( dest, 'w+' )
+    out << Template.new( source ).render( binding )
+    out.flush
+    out.close
+  end
+  
+end # class Templater
+end # module SportDB

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/templates/fixtures.rb.erb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+####################################################################
+# generiert am  <%= Time.now %>
+#   using <%= SportDB.banner %>
+####################################################################
+
+
+###########################################
+# <%= event.title %>
+
+
+<%# todo: use proper key from event for variable e.g. pl or similar (strip season, etc.) %>
+
+ev = Event.find_by_key!( '<%= event.key %>' )
+
+<% event.teams.each do |team| %>
+<%= '%-18s' % team.key %> = Team.find_by_key!( '<%= team.key %>' )
+<% end %>
+
+
+<% event.rounds.each do |round| %>
+<%= 'r%02d' % round.pos %> = Round.create!( event: ev, pos: <%= round.pos %>, title: '<%= round.title %>', start_at: Time.utc('<%= round.start_at.strftime('%Y-%m-%d %H:%M') %>'))
+<% end %>
+
+
+<% event.rounds.each do |round| %>
+<%= 'games%02d' % round.pos %> = [
+<% round.games.each_with_index do |game| %>
+ [ <%= '%-18s' % "#{game.team1.key}," %> [<%= "#{game.score1},#{game.score2}" if game.score1.present? && game.score2.present? %>], <%= '%-18s' % "#{game.team2.key}," %> Time.utc('<%= game.play_at.strftime('%Y-%m-%d %H:%M') %>') ], 
+<%# does comma for last entry matter? ruby ignores it for sure? check %>
+<% end %>
+]
+
+<% end %>
+
+
+<% event.rounds.each do |round| %>
+Game.create_from_ary!( <%= 'games%02d' % round.pos %>, <%= 'r%02d' % round.pos %> )
+<% end %>
+
+<%# todo: what to put for value??? %>
+Prop.create!( key: 'db.<%= event.key %>.fixtures.version', value: '1' )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-14 00:00:00 Z
+date: 2012-10-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -113,9 +113,12 @@ files:
 - lib/sportdb/models/prop.rb
 - lib/sportdb/models/round.rb
 - lib/sportdb/models/team.rb
+- lib/sportdb/reader.rb
 - lib/sportdb/schema.rb
+- lib/sportdb/templater.rb
 - lib/sportdb/utils.rb
 - lib/sportdb/version.rb
+- templates/fixtures.rb.erb
 homepage: http://geraldb.github.com/sport.db
 licenses: []