sportdb 1.6.10 → 1.6.11

data/Manifest.txt

@@ -31,9 +31,11 @@ lib/sportdb/models/league.rb
 lib/sportdb/models/person.rb
 lib/sportdb/models/prop.rb
 lib/sportdb/models/race.rb
+lib/sportdb/models/record.rb
 lib/sportdb/models/region.rb
 lib/sportdb/models/roster.rb
 lib/sportdb/models/round.rb
+lib/sportdb/models/run.rb
 lib/sportdb/models/season.rb
 lib/sportdb/models/team.rb
 lib/sportdb/models/track.rb

data/lib/sportdb.rb

@@ -43,9 +43,11 @@ require 'sportdb/models/league'
 require 'sportdb/models/person'
 require 'sportdb/models/prop'
 require 'sportdb/models/race'
+require 'sportdb/models/record'
 require 'sportdb/models/region'
 require 'sportdb/models/roster'
 require 'sportdb/models/round'
+require 'sportdb/models/run'
 require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/models/track'

data/lib/sportdb/console.rb

@@ -14,14 +14,22 @@ require 'yaml'
 
 ## shortcuts for models
 
+Badge   = SportDb::Models::Badge
 Event   = SportDb::Models::Event
-Team    = SportDb::Models::Team
 Game    = SportDb::Models::Game
+Goal    = SportDb::Models::Goal
 Group   = SportDb::Models::Group
+League  = SportDb::Models::League
+Person  = SportDb::Models::Person
+Race    = SportDb::Models::Race
+Record  = SportDb::Models::Record
+Roster  = SportDb::Models::Roster
 Round   = SportDb::Models::Round
+Run     = SportDb::Models::Run
 Season  = SportDb::Models::Season
-League  = SportDb::Models::League
-Badge   = SportDb::Models::Badge
+Team    = SportDb::Models::Team
+Track   = SportDb::Models::Track
+
 
 Tag       = WorldDb::Models::Tag
 Tagging   = WorldDb::Models::Tagging

data/lib/sportdb/deleter.rb

@@ -11,6 +11,7 @@ module SportDb
       # for now delete all tables
       
       Goal.delete_all
+      Record.delete_all
 
       Game.delete_all
       Event.delete_all
@@ -19,7 +20,8 @@ module SportDb
       GroupTeam.delete_all
       Round.delete_all
       Badge.delete_all
-      
+
+      Run.delete_all
       Race.delete_all
       Roster.delete_all
 

data/lib/sportdb/models/event.rb

@@ -32,14 +32,21 @@ class Event < ActiveRecord::Base
   def title
     league.title
   end
-  
+
   def full_title   # includes season (e.g. year)
     "#{league.title} #{season.title}"
   end
-  
+
+
   #####################
   ## convenience helper for text parser/reader
 
+  ###
+  ## fix: use/add  to_teams_table( rec )  for reuse
+  #
+  ##  @known_teams = @event.known_teams_table
+
+
   def known_teams_table
     
     ## build known teams table w/ synonyms e.g.
@@ -61,7 +68,7 @@ class Event < ActiveRecord::Base
       titles = titles.sort { |left,right| right.length <=> left.length }
       
       ## escape for regex plus allow subs for special chars/accents
-      titles = titles.map { |title| title_esc_regex( title )  }
+      titles = titles.map { |title| TextUtils.title_esc_regex( title )  }
       
       titles << team.code                  if team.code.present?
       titles << team.key

data/lib/sportdb/models/goal.rb

@@ -3,8 +3,8 @@ module SportDb::Models
 
 class Goal < ActiveRecord::Base
 
-    belongs_to :game
-    belongs_to :person
+  belongs_to :game
+  belongs_to :person
 
 end  # class Goal
 

data/lib/sportdb/models/race.rb

@@ -3,12 +3,12 @@ module SportDb::Models
 
 class Race < ActiveRecord::Base
 
-    belongs_to :track
-    belongs_to :event
-    
-    ### fix/todo: add runs/records  (records - join table - run/race+person)
-    ## has_many :runs    # e.g. Test Drive, Quali 1, Quali 2, Quali 3, Race
-    ## run - has_many  records? - run_stats?  - what name to use?
+  belongs_to :track
+  belongs_to :event
+
+  ### fix/todo: add runs/records  (records - join table - run/race+person)
+  ## has_many :runs    # e.g. Test Drive, Quali 1, Quali 2, Quali 3, Race
+  ## run - has_many  records? - run_stats?  - what name to use?
 
 end  # class Race
 

data/lib/sportdb/models/record.rb

@@ -0,0 +1,13 @@
+module SportDb::Models
+
+
+class Record < ActiveRecord::Base
+
+  belongs_to :race   # or
+  belongs_to :run
+  belongs_to :person
+
+end  # class Record
+
+
+end # module SportDb::Models

data/lib/sportdb/models/run.rb

@@ -0,0 +1,11 @@
+module SportDb::Models
+
+
+class Run < ActiveRecord::Base
+
+  belongs_to :race
+
+end  # class Run
+
+
+end # module SportDb::Models

data/lib/sportdb/models/track.rb

@@ -6,6 +6,46 @@ class Track < ActiveRecord::Base
 
   belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
 
+  #####################
+  ## convenience helper for text parser/reader
+
+  ### fix: move to event!!! (e.g. scoped by event)
+
+  def self.known_tracks_table
+    
+    ## build known tracks table w/ synonyms e.g.
+    #
+    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
+    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
+    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
+ 
+    known_tracks = []
+     
+    Track.all.each_with_index do |track,index|
+
+      titles = []
+      titles << track.title
+      titles += track.synonyms.split('|') if track.synonyms.present?
+      
+      ## NB: sort here by length (largest goes first - best match)
+      #  exclude code and key (key should always go last)
+      titles = titles.sort { |left,right| right.length <=> left.length }
+      
+      ## escape for regex plus allow subs for special chars/accents
+      titles = titles.map { |title| TextUtils.title_esc_regex( title )  }
+       
+      known_tracks << [ track.key, titles ]
+      
+      ### fix:
+      ## plain logger
+      
+      LogUtils::Logger.root.debug "  Track[#{index+1}] #{track.key} >#{titles.join('|')}<"
+    end
+    
+    known_tracks
+  end # method known_tracks_table
+
+
 
   def self.create_or_update_from_values( new_attributes, values )
 

data/lib/sportdb/reader.rb

@@ -89,6 +89,12 @@ class Reader
           load_persons( name )
         elsif name =~ /^teams/   # e.g. teams.txt in formula1.db
           load_teams( name )
+        elsif name =~ /\/races/  # e.g. 2013/races.txt in formula1.db
+          load_races( name )
+        elsif name =~ /\/squads/ || name =~ /\/rosters/  # e.g. 2013/squads.txt in formula1.db
+          load_rosters( name )
+        elsif name =~ /\/([0-9]{2})-/
+          load_records( name ) # e.g. 2013/04-gp-monaco.txt in formula1.db
         elsif name =~ /^seasons/
           load_seasons( name )
         elsif name =~ /^leagues/
@@ -372,6 +378,136 @@ class Reader
   end
 
 
+
+  def load_records( name )
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    ### SportDB.lang.lang = LangChecker.new.analyze( name, include_path )
+
+    reader = LineReader.new( path )
+
+    ## for now: use all tracks (later filter/scope by event)
+    # @known_tracks = Track.known_tracks_table
+
+    ## fix: add @known_teams  - for now; use teams (not scoped by event)
+
+    load_records_worker( reader )
+
+    Prop.create_from_fixture!( name, path )
+  end
+
+  def load_records_worker( reader )
+
+    reader.each_line do |line|
+      logger.debug "  line: >#{line}<"
+
+      ### fix: use new find_leading_pos!
+      # pos = find_game_pos!( line )  # alias -> rename to find_pos! or better use find_leading_pos!( line )
+
+      # match_person!( line )
+
+      # match_teams!( line )
+
+      record_attribs = {
+      #  pos:  pos,
+      #  team_key: team_key   # fix: use team_id
+      }
+
+      pp record_attribs
+    end # lines.each
+
+  end # method load_record_worker
+
+
+
+  def load_rosters( name )
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    ### SportDB.lang.lang = LangChecker.new.analyze( name, include_path )
+
+    reader = LineReader.new( path )
+
+    ## for now: use all tracks (later filter/scope by event)
+    # @known_tracks = Track.known_tracks_table
+
+    ## fix: add @known_teams  - for now; use teams (not scoped by event)
+
+    load_rosters_worker( reader )
+
+    Prop.create_from_fixture!( name, path )
+  
+  end
+
+  def load_rosters_worker( reader )
+
+    reader.each_line do |line|
+      logger.debug "  line: >#{line}<"
+
+      ### fix: use new find_leading_pos!
+      pos = find_game_pos!( line )  # alias -> rename to find_pos! or better use find_leading_pos!( line )
+
+      # match_person!( line )
+
+      # match_teams!( line )
+
+      roster_attribs = {
+        pos:  pos,
+      #  team_key: team_key   # fix: use team_id
+      }
+
+      pp roster_attribs
+    end # lines.each
+
+  end # method load_rosters_worker
+
+
+
+  def load_races( name )
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+    
+    ### SportDB.lang.lang = LangChecker.new.analyze( name, include_path )
+
+    reader = LineReader.new( path )
+    
+    ## for now: use all tracks (later filter/scope by event)
+    @known_tracks = Track.known_tracks_table
+    
+    load_races_worker( reader )
+
+    Prop.create_from_fixture!( name, path )
+  
+  end
+
+  def load_races_worker( reader )
+
+    reader.each_line do |line|
+      logger.debug "  line: >#{line}<"
+
+      ### fix: use new find_leading_pos!
+      pos = find_game_pos!( line )  # alias -> rename to find_pos! or better use find_leading_pos!( line )
+
+      match_track!( line )
+      track_key = find_track!( line )
+      date      = find_date!( line )
+      
+      race_attribs = {
+        pos:  pos,
+        track_key: track_key,   # fix: use track_id
+        start_at:  date
+      }
+
+      pp race_attribs
+    end # lines.each
+
+  end # method load_races_worker
+
+
   def load_teams( name, more_values={} )
     path = "#{include_path}/#{name}.txt"
 

data/lib/sportdb/schema.rb

@@ -6,9 +6,9 @@ class CreateDb < ActiveRecord::Migration
 def up
 
 create_table :teams do |t|
+  t.string  :key,   :null => false   # import/export key
   t.string  :title, :null => false
   t.string  :title2
-  t.string  :key,   :null => false   # import/export key
   t.string  :code     # make it not null?  - three letter code (short title)
   t.string  :synonyms  # comma separated list of synonyms
   t.references :country,   :null => false
@@ -72,20 +72,48 @@ end
 
 # join table -> event(season+league)+track
 create_table :races do |t|     # e.g. Formula 1 race (Grand Prix Monaco) or Alpine Ski race (Downhill Lake Louise)
-  t.references :track
-  t.references :event
+  t.references :track,    :null => false
+  t.references :event,    :null => false
   t.integer    :pos,      :null => false   # Race #1,#2,#3,#4 etc.
-  
+
+  ## todo: add auto-created key (for import/export) e.g.
+
+  t.datetime   :start_at
+  t.timestamps
+end
+
+create_table :runs do |t|
+  t.references :race,     :null => false
+  t.integer    :pos,      :null => false
+
   t.datetime   :start_at
   t.timestamps
 end
 
+# join table -> race+person or run+person
+create_table :records do |t|   # use TimeRecord? instead of simple record
+ t.references :race  # optional either race or run references
+ t.references :run
+ t.references :person,  :null => false
+ t.integer    :pos      # 1,2,3, etc or 0
+ t.boolean    :completed,  :null => false, :default => true    # completed race - find better name?
+ t.string     :state   # find a better name? e.g. retired, e.g.
+ t.string     :comment  #   find a better name ?  e.g.  collision damage (if ret) for formula 1
+ t.time       :time
+ t.string     :timeline   # e.g. + 0:45.343   or +1 lap
+ t.integer    :laps      # laps counter for formula1
+
+ t.timestamps
+end
+
+
 # join table -> person+team+event(season+league)
 create_table :rosters do |t|   # use squads as an alternative name? why? why not??
-  t.references :person
-  t.references :team
-  t.references :event
+  t.references :person,  :null => false
+  t.references :team,    :null => false
+  t.references :event      # make required?
   t.integer    :pos,      :null => false
+
   t.timestamps
 end
 
@@ -97,6 +125,7 @@ create_table :events do |t|
   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
 
@@ -113,6 +142,7 @@ create_table :rounds do |t|
   t.boolean    :knockout, :null => false, :default => 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
 
@@ -130,6 +160,7 @@ add_index :groups, :event_id  # fk event_id index
 
 
 create_table :games do |t|
+  t.string     :key          # import/export key
   t.references :round,    :null => false
   t.integer    :pos,      :null => false
   t.references :group      # note: group is optional
@@ -161,7 +192,6 @@ create_table :games do |t|
   ### todo> find a better name (toto is not international/english?)
   ## rename to score12x or pt12x or result12x
   t.string     :toto12x      # 1,2,X,nil  calculate on save
-  t.string     :key          # import/export key
 
   t.timestamps
 end

data/lib/sportdb/stats.rb

@@ -12,7 +12,8 @@ module SportDb
       puts "  #{Game.count} games"
       puts "  #{Badge.count} badges"
 
-      puts "  #{Track.count} tracks / #{Race.count} races (track+event recs)"
+      puts "  #{Track.count} tracks / #{Race.count} races (track+event recs) / #{Run.count} runs"
+      puts "  #{Record.count} records (race|run+person recs)"
       puts "  #{Person.count} persons / #{Roster.count} rosters (person+team+event recs)"
       puts "  #{Goal.count} goals (person+game recs)"
 

data/lib/sportdb/utils.rb

@@ -350,7 +350,52 @@ module SportDb::FixtureHelpers
       values = rec[1]
       match_team_worker!( line, key, values )
     end # each known_teams    
-  end # method translate_teams!
-  
+  end # method match_teams!
+
+
+
+
+
+  def find_track!( line )
+    regex = /@@oo([^@]+?)oo@@/     # e.g. everything in @@ .... @@ (use non-greedy +? plus all chars but not @, that is [^@])
+
+    if line =~ regex
+      value = "#{$1}"
+      logger.debug "   track#{index}: >#{value}<"
+      
+      line.sub!( regex, "[TRACK]" )
+
+      return $1
+    else
+      return nil
+    end
+  end
+
+  def match_track_worker!( line, key, values )
+    values.each do |value|
+      ## nb: \b does NOT include space or newline for word boundry (only alphanums e.g. a-z0-9)
+      ## (thus add it, allows match for Benfica Lis.  for example - note . at the end)
+
+      ## check add $ e.g. (\b| |\t|$) does this work? - check w/ Benfica Lis.$
+      regex = /\b#{value}(\b| |\t|$)/   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
+      if line =~ regex
+        logger.debug "     match for track >#{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@@ " )    # NB: add one space char at end
+        return true    # break out after first match (do NOT continue)
+      end
+    end
+    return false
+  end
+
+  ## todo/fix: pass in known_tracks as a parameter? why? why not?
+  def match_track!( line )
+    @known_tracks.each do |rec|
+      key    = rec[0]
+      values = rec[1]
+      match_track_worker!( line, key, values )
+    end # each known_tracks
+  end # method match_tracks!
+
 
 end # module SportDb::FixtureHelpers

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.10'
+  VERSION = '1.6.11'
 end
 
 ###########################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &15460344 !ruby/object:Gem::Requirement
+  requirement: &73622090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *15460344
+  version_requirements: *73622090
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &15459576 !ruby/object:Gem::Requirement
+  requirement: &73621870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,38 +32,36 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *15459576
+  version_requirements: *73621870
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15459108 !ruby/object:Gem::Requirement
+  requirement: &73621650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *15459108
+  version_requirements: *73621650
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &15458508 !ruby/object:Gem::Requirement
+  requirement: &73621430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *15458508
+  version_requirements: *73621430
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
 extensions: []
 extra_rdoc_files:
-- History.md
 - Manifest.txt
-- README.md
 files:
 - History.md
 - Manifest.txt
@@ -98,9 +96,11 @@ files:
 - lib/sportdb/models/person.rb
 - lib/sportdb/models/prop.rb
 - lib/sportdb/models/race.rb
+- lib/sportdb/models/record.rb
 - lib/sportdb/models/region.rb
 - lib/sportdb/models/roster.rb
 - lib/sportdb/models/round.rb
+- lib/sportdb/models/run.rb
 - lib/sportdb/models/season.rb
 - lib/sportdb/models/team.rb
 - lib/sportdb/models/track.rb
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sportdb
-rubygems_version: 1.7.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: sportdb - sport.db command line tool