sportdb 1.9.4 → 1.9.5

data/Manifest.txt

@@ -42,11 +42,8 @@ lib/sportdb/models/group_comp.rb
 lib/sportdb/models/group_team.rb
 lib/sportdb/models/league.rb
 lib/sportdb/models/person.rb
-lib/sportdb/models/race.rb
-lib/sportdb/models/record.rb
 lib/sportdb/models/roster.rb
 lib/sportdb/models/round.rb
-lib/sportdb/models/run.rb
 lib/sportdb/models/season.rb
 lib/sportdb/models/stats/alltime_standing.rb
 lib/sportdb/models/stats/alltime_standing_entry.rb
@@ -56,7 +53,6 @@ lib/sportdb/models/stats/group_standing.rb
 lib/sportdb/models/stats/group_standing_entry.rb
 lib/sportdb/models/team.rb
 lib/sportdb/models/team_comp.rb
-lib/sportdb/models/track.rb
 lib/sportdb/models/utils.rb
 lib/sportdb/models/world/city.rb
 lib/sportdb/models/world/continent.rb
@@ -69,13 +65,9 @@ lib/sportdb/readers/event.rb
 lib/sportdb/readers/game.rb
 lib/sportdb/readers/ground.rb
 lib/sportdb/readers/league.rb
-lib/sportdb/readers/race.rb
-lib/sportdb/readers/race_team.rb
-lib/sportdb/readers/record.rb
 lib/sportdb/readers/season.rb
 lib/sportdb/readers/squad.rb
 lib/sportdb/readers/team.rb
-lib/sportdb/readers/track.rb
 lib/sportdb/schema.rb
 lib/sportdb/service.rb
 lib/sportdb/service/public/style.css

data/lib/sportdb.rb

@@ -49,15 +49,18 @@ require 'sportdb/models/group_comp'
 require 'sportdb/models/group_team'
 require 'sportdb/models/league'
 require 'sportdb/models/person'
-require 'sportdb/models/race'
-require 'sportdb/models/record'
 require 'sportdb/models/roster'
 require 'sportdb/models/round'
-require 'sportdb/models/run'
 require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/models/team_comp'
-require 'sportdb/models/track'
+
+### note: moved to racing.db !! - delete
+## require 'sportdb/models/race'
+## require 'sportdb/models/record'
+## require 'sportdb/models/run'
+## require 'sportdb/models/track'
+
 
 require 'sportdb/models/stats/alltime_standing'
 require 'sportdb/models/stats/alltime_standing_entry'
@@ -99,15 +102,19 @@ require 'sportdb/readers/event'
 require 'sportdb/readers/game'
 require 'sportdb/readers/ground'
 require 'sportdb/readers/league'
-require 'sportdb/readers/race'
-require 'sportdb/readers/record'
-require 'sportdb/readers/race_team'
 require 'sportdb/readers/season'
 require 'sportdb/readers/squad'    # roster
 require 'sportdb/readers/team'
-require 'sportdb/readers/track'
 require 'sportdb/reader'
 
+
+### note: moved to racing.db !! - delete
+## require 'sportdb/readers/race'
+## require 'sportdb/readers/record'
+## require 'sportdb/readers/race_team'
+## require 'sportdb/readers/track'
+
+
 require 'sportdb/lang'
 
 require 'sportdb/updater'

data/lib/sportdb/data/keys.rb

@@ -2,6 +2,17 @@
 
 
 ### todo/fix: move to sportdb-data gem/plugin/addon ??
+##
+###  move to sportdb/data  ??  or sportdb/const ?? sportdb/
+##  or let use sportdb/keys addon ??
+
+###
+##  add all known repos settings from build scripts ???
+##
+#
+
+##   or sportdb/data  ??
+
 ### fix: rename to ::Key (singular) - why? why not??
 
 

data/lib/sportdb/deleter.rb

@@ -18,7 +18,6 @@ module SportDb
 
 
       Goal.delete_all
-      Record.delete_all
 
       Game.delete_all
       Event.delete_all
@@ -29,11 +28,8 @@ module SportDb
       Round.delete_all
       Badge.delete_all
 
-      Run.delete_all
-      Race.delete_all
       Roster.delete_all
 
-      Track.delete_all
       Team.delete_all
       
       League.delete_all
@@ -43,6 +39,12 @@ module SportDb
       
       Assoc.delete_all       # associations / organizations
       AssocAssoc.delete_all  # associations / organizations
+
+## note: moved to racing.db - delete/remove!!!
+##      Record.delete_all
+##      Run.delete_all
+##      Race.delete_all
+##      Track.delete_all
     end
     
   end # class Deleter

data/lib/sportdb/finders/date.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+#### fix: move to textutils for reuse !!!!!
+
+
 module SportDb
 
 class DateFinder
@@ -7,6 +10,45 @@ class DateFinder
   include LogUtils::Logging
 
   # todo: make more generic for reuse
+  ### fix:
+  ### move to textutils
+  ##     date/fr.yml  en.yml etc. ???
+  ##  why? why not?
+
+  MONTH_FR = 'Janvier|Janv|Jan|' +
+             'Février|Févr|Fév|' +
+             'Mars|Mar|' +
+             'Avril|Avri|Avr|' +
+             'Mai|'  +
+             'Juin|' +
+             'Juillet|Juil|' +
+             'Août|' +
+             'Septembre|Sept|' +
+             'Octobre|Octo|Oct|' +
+             'Novembre|Nove|Nov|' +
+             'Décembre|Déce|Déc'
+  MONTH_FR_TO_MM = {
+        'Janvier' => '1', 'Janv' => '1', 'Jan' => '1',   ## check janv in use??
+        'Février' => '2', 'Févr' => '2', 'Fév' => '2',   ## check fevr in use???
+        'Mars'    => '3', 'Mar' => '3',
+        'Avril'   => '4', 'Avri' => '4', 'Avr' => '4',   ## check avri in use??? if not remove
+        'Mai'     => '5',
+        'Juin'    => '6',
+        'Juillet' => '7', 'Juil' => '7',
+        'Août'    => '8',
+        'Septembre' => '9', 'Sept' => '9',
+        'Octobre' => '10',  'Octo' => '10', 'Oct' => '10',  ### check octo in use??
+        'Novembre' => '11', 'Nove' => '11', 'Nov' => '11',  ##  check nove in use??
+        'Décembre' => '12', 'Déce' => '12', 'Déc' => '12' } ## check dece in use??
+  WEEKDAY_FR = 'Lundi|Lun|L|' +
+           'Mardi|Mar|Ma|' +
+           'Mercredi|Mer|Me|' +
+           'Jeudi|Jeu|J|' +
+           'Vendredi|Ven|V|' +
+           'Samedi|Sam|S|' +
+           'Dimanche|Dim|D|'
+
+
   MONTH_EN = 'January|Jan|'+
              'February|Feb|'+
              'March|Mar|'+
@@ -33,6 +75,14 @@ class DateFinder
         'Nov' => '11', 'November' => '11',
         'Dec' => '12', 'December' =>'12' }
 
+###
+## todo: add days
+## 1. Sunday - Sun.	2. Monday - Mon.
+## 3. Tuesday - Tu., Tue., or Tues.	4. Wednesday - Wed.
+## 5. Thursday - Th., Thu., Thur., or Thurs.	6. Friday - Fri.
+## 7. Saturday - Sat.
+
+
   MONTH_ES = 'Enero|Ene|Feb|Marzo|Mar|Abril|Abr|Mayo|May|Junio|Jun|Julio|Jul|Agosto|Ago|Sept|Set|Sep|Oct|Nov|Dic'
   MONTH_ES_TO_MM  = {
         'Ene' => '1', 'Enero' => '1',
@@ -123,7 +173,7 @@ class DateFinder
   # e.g. 14.09.  => DD.MM. w/ implied year and implied hours (set to 12:00)
   #  note: allow end delimiter ] e.g. [Sa 12.01.] or end-of-string ($) too
   #  note: we use a lookahead for last part e.g. (?:\s+|$|[\]]) - do NOT cosume
-  # regex_de4
+  # regex_de4 (use lookahead assert)
   DD_MM__DATE_REGEX = /\b
                      (?<day>\d{1,2})
                         \.
@@ -206,6 +256,18 @@ class DateFinder
                    (?<month_es>#{MONTH_ES})
                      \b/x
 
+  # e.g. Ven 8. Août  or [Ven 8. Août]
+  ### note: do NOT consume [] in regex (use lookahead assert)
+  FR__WEEKDAY_DD_MONTH__DATE_REGEX = /\b
+       (?:#{WEEKDAY_FR})   # note: skip weekday for now; do NOT capture
+         \s+
+       (?<day>\d{1,2})
+         \.
+         \s+
+       (?<month_fr>#{MONTH_FR})
+         (?=\s+|$|[\]])/x  ## note: allow end-of-string/line too
+
+
 
 
   # map table - 1) tag, 2) regex - note: order matters; first come-first matched/served
@@ -216,6 +278,7 @@ class DateFinder
     [ '[DD_MM_hh_mm]',             DD_MM__DATE_TIME_REGEX ],
     [ '[DD_MM_YYYY]',              DD_MM_YYYY__DATE_REGEX ],
     [ '[DD_MM]',                   DD_MM__DATE_REGEX ],
+    [ '[FR_WEEKDAY_DD_MONTH]',     FR__WEEKDAY_DD_MONTH__DATE_REGEX ],
     [ '[EN_DD_MONTH_YYYY_hh_mm]',  EN__DD_MONTH_YYYY__DATE_TIME_REGEX ],
     [ '[EN_MONTH_DD_YYYY_hh_mm]',  EN__MONTH_DD_YYYY__DATE_TIME_REGEX ],
     [ '[EN_MONTH_DD_hh_mm]',       EN__MONTH_DD__DATE_TIME_REGEX ],
@@ -289,6 +352,7 @@ private
 
     h[ :month ] = MONTH_EN_TO_MM[ h[:month_en] ]  if h[:month_en]
     h[ :month ] = MONTH_ES_TO_MM[ h[:month_es] ]  if h[:month_es]
+    h[ :month ] = MONTH_FR_TO_MM[ h[:month_fr] ]  if h[:month_fr]
 
     month   = h[:month]
     day     = h[:day]

data/lib/sportdb/reader.rb

@@ -54,11 +54,8 @@ class Reader
     end
   end
 
-
-  def load( name )   # convenience helper for all-in-one reader
-
-    logger.debug "enter load( name=>>#{name}<<, include_path=>>#{include_path}<<)"
-
+  def fix_fix_load_racing_fix_fix
+=begin
     if name  =~ /^circuits/  # e.g. circuits.txt in formula1.db
       reader = TrackReader.new( include_path )
       reader.read( name )
@@ -75,11 +72,6 @@ class Reader
     elsif name =~ /^drivers/ # e.g. drivers.txt in formula1.db
       reader = PersonDb::PersonReader.new( include_path )
       reader.read( name )
-    elsif match_players_for_country( name ) do |country_key|
-            country = Country.find_by_key!( country_key )
-            reader = PersonDb::PersonReader.new( include_path )
-            reader.read( name, country_id: country.id )
-          end
     elsif match_skiers_for_country( name ) do |country_key|  # name =~ /^([a-z]{2})\/skiers/
             # auto-add country code (from folder structure) for country-specific skiers (persons)
             #  e.g. at/skiers  or at-austria/skiers.men
@@ -90,14 +82,45 @@ class Reader
     elsif name =~ /^skiers/ # e.g. skiers.men.txt in ski.db
       reader = PersonDb::PersonReader.new( include_path )
       reader.read( name )
-    elsif name =~ /^teams/   # e.g. teams.txt in formula1.db   ### fix: check if used for football ? - add clubs
-      reader = TeamReader.new( include_path )
-      reader.read( name )
     elsif name =~ /\/races/  # e.g. 2013/races.txt in formula1.db
       ## fix/bug:  NOT working for now; sorry
       #   need to read event first and pass along to read (event_id: event.id) etc.
       reader = RaceReader.new( include_path )
       reader.read( name )
+    elsif name =~ /^teams/   # e.g. teams.txt in formula1.db   ### fix: check if used for football ? - add clubs
+      reader = TeamReader.new( include_path )
+      reader.read( name )
+##  fix!!! - find a better unique pattern  to generic???
+##
+##    fix: use two routes/tracks/modes:
+##
+##    races w/ records etc   and  teams/matches etc.   split into two to make code easier to read/extend!!!
+##
+    elsif name =~ /\/([0-9]{2})-/
+      race_pos = $1.to_i
+      # NB: assume @event is set from previous load 
+      race = Race.find_by_event_id_and_pos( @event.id, race_pos )
+      reader = RecordReader.new( include_path )
+      reader.read( name, race_id: race.id ) # e.g. 2013/04-gp-monaco.txt in formula1.db
+
+    elsif name =~ /\/squads/ || name =~ /\/rosters/  # e.g. 2013/squads.txt in formula1.db
+      reader = RaceTeamReader.new( include_path )
+      reader.read( name )
+
+=end
+  end
+
+
+  def load( name )   # convenience helper for all-in-one reader
+
+    logger.debug "enter load( name=>>#{name}<<, include_path=>>#{include_path}<<)"
+
+
+    if match_players_for_country( name ) do |country_key|
+            country = Country.find_by_key!( country_key )
+            reader = PersonDb::PersonReader.new( include_path )
+            reader.read( name, country_id: country.id )
+          end
     elsif name =~ /\/squads\/([a-z]{2,3})-[^\/]+$/
       ## fix: add to country matcher new format
       ##   name is country! and parent folder is type name e.g. /squads/br-brazil
@@ -121,25 +144,6 @@ class Reader
       reader = SquadReader.new( include_path )
       ## note: pass in @event.id - that is, last seen event (e.g. parsed via GameReader/MatchReader)
       reader.read( name, team_id: team.id, event_id: @event.id )
-    elsif name =~ /\/squads/ || name =~ /\/rosters/  # e.g. 2013/squads.txt in formula1.db
-      reader = RaceTeamReader.new( include_path )
-      reader.read( name )
-
-
-##  fix!!! - find a better unique pattern  to generic???
-##
-##    fix: use two routes/tracks/modes:
-##
-##    races w/ records etc   and  teams/matches etc.   split into two to make code easier to read/extend!!!
-##
-    elsif name =~ /\/([0-9]{2})-/
-      race_pos = $1.to_i
-      # NB: assume @event is set from previous load 
-      race = Race.find_by_event_id_and_pos( @event.id, race_pos )
-      reader = RecordReader.new( include_path )
-      reader.read( name, race_id: race.id ) # e.g. 2013/04-gp-monaco.txt in formula1.db
-
-
     elsif name =~ /(?:^|\/)seasons/  # NB: ^seasons or also possible at-austria!/seasons
       reader = SeasonReader.new( include_path )
       reader.read( name )

data/lib/sportdb/schema.rb

@@ -76,56 +76,6 @@ create_table :goals do |t|
 end
 
 
-create_table :tracks do |t|    # e.g. Formula 1 circuits or Apline Ski resorts/slops/pistes
-  t.string      :key,       null: false   # import/export key
-  t.string      :title,     null: false
-  t.string      :synonyms   # comma separated list of synonyms
-  t.string      :code       # three letter code (short title)
-
-  t.references  :city
-  t.references  :region
-  t.references  :country,   null: false
-  t.timestamps
-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,    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
-
-
 ################
 #  fix/todo: rename to squads / lineups
 

data/lib/sportdb/stats.rb

@@ -11,13 +11,15 @@ module SportDb
       puts "  #{Game.count} games"
       puts "  #{Badge.count} badges"
 
-      puts "  #{Track.count} tracks / #{Race.count} races (track+event recs) / #{Run.count} runs"
-      puts "  #{Record.count} records (race|run+person recs)"
       puts "  #{Roster.count} rosters (person+team+event recs)"
       puts "  #{Goal.count} goals (person+game recs)"
 
       puts "  #{Assoc.count}  assocs|orgs"
       puts "  #{Ground.count}  grounds|stadiums"
+
+## note: moved to racing.db  -- remove/delete!!
+##      puts "  #{Track.count} tracks / #{Race.count} races (track+event recs) / #{Run.count} runs"
+##      puts "  #{Record.count} records (race|run+person recs)"
     end
 
     ## fix/chek:

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.9.4'
+  VERSION = '1.9.5'
 end
 
 

data/test/helper.rb

@@ -53,7 +53,9 @@ LeagueReader       = SportDb::LeagueReader
 EventReader        = SportDb::EventReader
 GameReader         = SportDb::GameReader
 SquadReader        = SportDb::SquadReader
-RaceTeamReader     = SportDb::RaceTeamReader
+
+## moved to racing.db  - remove/delete!!
+## RaceTeamReader     = SportDb::RaceTeamReader
 
 PersonReader       = PersonDb::PersonReader
 

data/test/test_date.rb

@@ -20,6 +20,22 @@ class TestDate < MiniTest::Unit::TestCase
     assert_dates( data, start_at: DateTime.new( 2013, 1, 1 ) )
   end
 
+  def test_date_fr
+    data = [
+      [ '[Ven 08. Août]', '2014-08-08' ],
+      [ 'Ven 08. Août',   '2014-08-08' ],
+      [ 'Ven 8. Août',    '2014-08-08' ],
+      [ '[Sam 9. Août]', '2014-08-09' ],
+      [ '[Dim 10. Août]', '2014-08-10' ],
+      [ '[Sam 31. Janv]', '2015-01-31' ],
+      [ '[Sam 7. Févr]', '2015-02-07' ],
+      [ '[Sam 31. Jan]', '2015-01-31' ],
+      [ '[Sam 7. Fév]', '2015-02-07' ],
+    ]
+
+    assert_dates( data, start_at: DateTime.new( 2014, 8, 1 ) )
+  end
+
   def test_date_en
     data = [
       [ 'Jun/12 2011 14:00', '2011-06-12 14:00' ],

data/test/test_lang.rb

@@ -17,7 +17,7 @@ class TestLang < MiniTest::Unit::TestCase
 
      group = 'Group'
 
-     round = 'Round|Matchday'
+     round = 'Round|Matchday|Week'
      round << '|Round of 32|Last 32'
      round << '|Round of 16|Last 16|8th finals'
      round << '|Quarterfinals|Quarter-finals|Quarters|Quarterfinal|Last 8'

metadata

@@ -1,183 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
+  prerelease: 
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72969190 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72969190
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72968780 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72968780
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72968550 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72968550
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72968280 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+  version_requirements: *72968280
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72968080 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72968080
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72967860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72967860
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72967640 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72967640
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72967380 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.3'
+  version_requirements: *72967380
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72967120 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.6
+  version_requirements: *72967120
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72983150 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *72983150
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72982730 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
+  version_requirements: *72982730
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &72982430 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+  version_requirements: *72982430
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -232,11 +197,8 @@ files:
 - lib/sportdb/models/group_team.rb
 - lib/sportdb/models/league.rb
 - lib/sportdb/models/person.rb
-- lib/sportdb/models/race.rb
-- lib/sportdb/models/record.rb
 - lib/sportdb/models/roster.rb
 - lib/sportdb/models/round.rb
-- lib/sportdb/models/run.rb
 - lib/sportdb/models/season.rb
 - lib/sportdb/models/stats/alltime_standing.rb
 - lib/sportdb/models/stats/alltime_standing_entry.rb
@@ -246,7 +208,6 @@ files:
 - lib/sportdb/models/stats/group_standing_entry.rb
 - lib/sportdb/models/team.rb
 - lib/sportdb/models/team_comp.rb
-- lib/sportdb/models/track.rb
 - lib/sportdb/models/utils.rb
 - lib/sportdb/models/world/city.rb
 - lib/sportdb/models/world/continent.rb
@@ -259,13 +220,9 @@ files:
 - lib/sportdb/readers/game.rb
 - lib/sportdb/readers/ground.rb
 - lib/sportdb/readers/league.rb
-- lib/sportdb/readers/race.rb
-- lib/sportdb/readers/race_team.rb
-- lib/sportdb/readers/record.rb
 - lib/sportdb/readers/season.rb
 - lib/sportdb/readers/squad.rb
 - lib/sportdb/readers/team.rb
-- lib/sportdb/readers/track.rb
 - lib/sportdb/schema.rb
 - lib/sportdb/service.rb
 - lib/sportdb/service/public/style.css
@@ -353,7 +310,6 @@ files:
 homepage: https://github.com/sportdb/sport.db.ruby
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -371,36 +327,38 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: sportdb - sport.db command line tool
 test_files:
-- test/test_assoc_reader.rb
-- test/test_changes.rb
-- test/test_cursor.rb
 - test/test_date.rb
-- test/test_goals.rb
 - test/test_lang.rb
 - test/test_load.rb
-- test/test_reader.rb
-- test/test_reader_from_string.rb
-- test/test_round_auto.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
-- test/test_scores.rb
-- test/test_squad_reader.rb
+- test/test_cursor.rb
 - test/test_standings.rb
-- test/test_utils.rb
+- test/test_scores.rb
 - test/test_winner.rb
+- test/test_round_def.rb
+- test/test_utils.rb
+- test/test_squad_reader.rb
+- test/test_reader_from_string.rb
+- test/test_round_header.rb
+- test/test_round_auto.rb
+- test/test_goals.rb
+- test/test_reader.rb
+- test/test_assoc_reader.rb
+- test/test_changes.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 75701bce9778f7729f1ea7a9e5244ba7fb471edb
-  data.tar.gz: e08713c56ec7e46286b7b8f2ded213d1b8db42aa
-SHA512:
-  metadata.gz: 996b1532556e67a7b9b56db38e955f87375968ae0fb4c872ae2eb377f83730c05c9777e01f073638e76dc6e077061e92d6b988ece00c12b8073fbc9b0d1db87d
-  data.tar.gz: 837ba63144656e2596294e4f76e490889592456e9d77d63155fcf7b466a6640d7342a9d57f236cb702d211286d1fa04e01d8f31184254ece93c5e6425753ec4c

data/lib/sportdb/models/race.rb

@@ -1,20 +0,0 @@
-
-module SportDb
-  module Model
-
-
-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?
-
-end  # class Race
-
-
-  end # module Model
-end # module SportDb
-

data/lib/sportdb/models/record.rb

@@ -1,17 +0,0 @@
-
-module SportDb
-  module Model
-
-
-class Record < ActiveRecord::Base
-
-  belongs_to :race   # or
-  belongs_to :run
-  belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
-
-end  # class Record
-
-
-  end # module Model
-end # module SportDb
-

data/lib/sportdb/models/run.rb

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

data/lib/sportdb/models/track.rb

@@ -1,61 +0,0 @@
-module SportDb
-  module Model
-
-class Track < ActiveRecord::Base
-
-  has_many :races
-
-  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
-
-  #####################
-  ## convenience helper for text parser/reader
-
-
-  ### fix: move known_tracks_table to event!!! (e.g. scoped by event)
-
-  def self.known_tracks_table
-    @@known_tracks_table ||= TextUtils.build_title_table_for( Track.all )
-  end # method known_tracks_table
-
-
-  def self.create_or_update_from_values( new_attributes, values )
-
-    ## fix: add/configure logger for ActiveRecord!!!
-    logger = LogKernel::Logger.root
-
-    ## check optional values
-    values.each_with_index do |value, index|
-      if value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
-        value_country = Country.find_by_key!( value )
-        new_attributes[ :country_id ] = value_country.id
-      elsif value =~ /^[A-Z]{3}$/  ## assume three-letter code e.g. AUS, MAL, etc.
-        new_attributes[ :code ] = value
-      else
-        ## todo: assume title2 ??
-        ## assume title2 if title2 is empty (not already in use)
-        ##  and if it title2 contains at least two letter e.g. [a-zA-Z].*[a-zA-Z]
-        # issue warning: unknown type for value
-        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
-      end
-    end
-
-    rec = Track.find_by_key( new_attributes[ :key ] )
-    if rec.present?
-      logger.debug "update Track #{rec.id}-#{rec.key}:"
-    else
-      logger.debug "create Track:"
-      rec = Track.new
-    end
-      
-    logger.debug new_attributes.to_json
-   
-    rec.update_attributes!( new_attributes )
-  end # create_or_update_from_values
-
-
-end  # class Track
-
-
-  end # module Model
-end # module SportDb
-

data/lib/sportdb/readers/race.rb

@@ -1,102 +0,0 @@
-# encoding: UTF-8
-
-module SportDb
-
-
-class RaceReader
-
-  include LogUtils::Logging
-
-## make models available by default with namespace
-#  e.g. lets you use Usage instead of Model::Usage
-  include Models
-
-## value helpers e.g. is_year?, is_taglist? etc.
-  include TextUtils::ValueHelper
-
-  include FixtureHelpers
-
-
-  attr_reader :include_path
-
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
-  end
-
-
-  ###
-  ## fix: use read_fixtures( event_key, name )
-  ##
-  ## move EventReader out of read - why?? why not??
-
-  def read( name, more_attribs={} )
-
-    # must have .yml file with same name for event definition 
-    evreader = EventReader.new( include_path )
-    evreader.read( name )
-
-    @event = evreader.event
-
-    logger.info "  event: #{@event.key} >>#{@event.full_title}<<"
-
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-    
-    ### SportDb.lang.lang = LangChecker.new.analyze( name, include_path )
-
-    ## for now: use all tracks (later filter/scope by event)
-    @known_tracks = Track.known_tracks_table
-
-    reader = LineReader.new( path )
-        
-    read_races_worker( reader )
-
-    Prop.create_from_fixture!( name, path )
-  end
-
-
-  def read_races_worker( reader )
-
-    reader.each_line do |line|
-      logger.debug "  line: >#{line}<"
-
-      cut_off_end_of_line_comment!( line )
-
-      pos = find_leading_pos!( line )
-
-      map_track!( line )
-      track_key = find_track!( line )
-      track = Track.find_by_key!( track_key )
-
-      date      = find_date!( line )
-
-      logger.debug "  line2: >#{line}<"
-
-      ### check if games exists
-      race = Race.find_by_event_id_and_track_id( @event.id, track.id )
-
-      if race.present?
-        logger.debug "update race #{race.id}:"
-      else
-        logger.debug "create race:"
-        race = Race.new
-      end
-          
-      race_attribs = {
-        pos:      pos,
-        track_id: track.id,
-        start_at:  date,
-        event_id:  @event.id
-      }
-
-      logger.debug race_attribs.to_json
-
-      race.update_attributes!( race_attribs )
-    end # lines.each
-
-  end # method read_races_worker
-
-
-end # class RaceReader
-end # module SportDb

data/lib/sportdb/readers/race_team.rb

@@ -1,109 +0,0 @@
-# encoding: UTF-8
-
-module SportDb
-
-
-### squad/roster reader for races
-class RaceTeamReader
-
-  include LogUtils::Logging
-
-## make models available by default with namespace
-#  e.g. lets you use Usage instead of Model::Usage
-  include Models
-
-## value helpers e.g. is_year?, is_taglist? etc.
-  include TextUtils::ValueHelper
-
-  include FixtureHelpers
-
-
-  attr_reader :include_path
-
-
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
-  end
-
-
-  def read( name, more_attribs={} )
-    ## todo: move name_real_path code to LineReaderV2 ????
-    pos = name.index( '!/')
-    if pos.nil?
-      name_real_path = name   # not found; real path is the same as name
-    else
-      # cut off everything until !/ e.g.
-      #   at-austria!/w-wien/beers becomes
-      #   w-wien/beers
-      name_real_path = name[ (pos+2)..-1 ]
-    end
-
-    path = "#{include_path}/#{name_real_path}.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)
-    ## for now use all teams
-    @known_teams   = TextUtils.build_title_table_for( Team.all )
-    ## and for now use all persons
-    @known_persons = TextUtils.build_title_table_for( Person.all )
-
-
-    read_worker( reader )
-
-    Prop.create_from_fixture!( name, path )  
-  end
-
-
-  def read_worker( reader )
-
-    reader.each_line do |line|
-      logger.debug "  line: >#{line}<"
-
-      cut_off_end_of_line_comment!( line )
-
-      pos = find_leading_pos!( line )
-
-      map_team!( line )
-      team_key = find_team!( line )
-      team = Team.find_by_key!( team_key )
-
-      map_person!( line )
-      person_key = find_person!( line )
-      person = Person.find_by_key!( person_key )
-
-      logger.debug "  line2: >#{line}<"
-
-      ### check if roster record exists
-      roster = Roster.find_by_event_id_and_team_id_and_person_id( @event.id, team.id, person.id )
-
-      if roster.present?
-        logger.debug "update Roster #{roster.id}:"
-      else
-        logger.debug "create Roster:"
-        roster = Roster.new
-      end
-
-      roster_attribs = {
-        pos:       pos,
-        team_id:   team.id,
-        person_id: person.id,
-        event_id:  @event.id   # NB: reuse/fallthrough from races - make sure load_races goes first (to setup event)
-      }
-
-      logger.debug roster_attribs.to_json
-
-      roster.update_attributes!( roster_attribs )
-    end # lines.each
-
-  end # method read_worker
-
-
-end # class RaceTeamReader
-end # module SportDb

data/lib/sportdb/readers/record.rb

@@ -1,108 +0,0 @@
-# encoding: UTF-8
-
-module SportDb
-
-
-class RecordReader
-
-  include LogUtils::Logging
-
-## make models available by default with namespace
-#  e.g. lets you use Usage instead of Model::Usage
-  include Models
-
-## value helpers e.g. is_year?, is_taglist? etc.
-  include TextUtils::ValueHelper
-
-  include FixtureHelpers
-
-
-  attr_reader :include_path
-
-
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
-  end
-
-
-  def read( name, more_attribs={} )
-    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)
-    @known_teams   = TextUtils.build_title_table_for( Team.all )
-    ## and for now use all persons
-    @known_persons = TextUtils.build_title_table_for( Person.all )
-
-    read_records_worker( reader, more_attribs )
-
-    Prop.create_from_fixture!( name, path )
-  end
-
-
-  def read_records_worker( reader, more_attribs )
-
-    reader.each_line do |line|
-      logger.debug "  line: >#{line}<"
-
-      cut_off_end_of_line_comment!( line )
-
-      state = find_record_leading_state!( line )
-
-      map_team!( line )
-      team_key = find_team!( line )
-      team = Team.find_by_key!( team_key )
-
-      map_person!( line )
-      person_key = find_person!( line )
-      person = Person.find_by_key!( person_key )
-
-      timeline = find_record_timeline!( line )
-
-      laps  = find_record_laps!( line )
-      
-      comment = find_record_comment!( line )
-
-      logger.debug "  line2: >#{line}<"
-
-      record_attribs = {
-        state:  state,
-        ## team_id: team.id,   ## NB: not needed for db 
-        person_id: person.id,
-        timeline: timeline,
-        comment: comment,
-        laps: laps
-      }
-
-      record_attribs = record_attribs.merge( more_attribs )
-
-      ### check if record exists
-      record = Record.find_by_race_id_and_person_id( record_attribs[ :race_id ],
-                                                     record_attribs[ :person_id ])
-
-      if record.present?
-        logger.debug "update Record #{record.id}:"
-      else
-        logger.debug "create Record:"
-        record = Record.new
-      end
-
-      logger.debug record_attribs.to_json
-
-      record.update_attributes!( record_attribs )
-
-    end # lines.each
-
-  end # method read_records_worker
-
-
-end # class RecordReader
-end # module SportDb

data/lib/sportdb/readers/track.rb

@@ -1,34 +0,0 @@
-# encoding: UTF-8
-
-module SportDb
-
-
-class TrackReader
-
-  include LogUtils::Logging
-
-## make models available by default with namespace
-#  e.g. lets you use Usage instead of Model::Usage
-  include Models
-
-
-  attr_reader :include_path
-
-
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
-  end
-
-
-  def read( name, more_attribs={} )
-    reader = ValuesReaderV2.new( name, include_path, more_attribs )
-
-    reader.each_line do |new_attributes, values|
-      Track.create_or_update_from_values( new_attributes, values )
-    end # each lines
-  end
-
-
-
-end # class TrackReader
-end # module SportDb