sportdb 1.8.22 → 1.8.23

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7aa8a4205419c3506fc1527e6cf45ca56d4bfcb8
+  data.tar.gz: bed9fcb72a3f0f931048afb1c348f4d24a224dc0
+SHA512:
+  metadata.gz: 2b16a61eb98bd836272199997275f8dd08989bb2501a8939c961208367566ab8a99cb4198f563b027249523f6ad247a781a65a6f6a0602ae6b7b9ed5b17082cd
+  data.tar.gz: 167a8ec86e1b0f8069e6f02ae7eff72fb9acc08ee1b31222d1786f4d3d3f80e55a625f4b50c377528ac57607932edf216964225caffb254adf8e52cacff53ce2

data/Manifest.txt

@@ -116,13 +116,19 @@ test/data/world-cup/1954/cup.txt
 test/data/world-cup/1954/cup.yml
 test/data/world-cup/1962/cup.txt
 test/data/world-cup/1962/cup.yml
+test/data/world-cup/1974/cup.yml
+test/data/world-cup/1974/cup_finals.txt
+test/data/world-cup/1974/cup_i.txt
+test/data/world-cup/1974/cup_ii.txt
 test/data/world-cup/leagues.txt
 test/data/world-cup/seasons_1930.txt
 test/data/world-cup/seasons_1954.txt
 test/data/world-cup/seasons_1962.txt
+test/data/world-cup/seasons_1974.txt
 test/data/world-cup/teams_1930.txt
 test/data/world-cup/teams_1954.txt
 test/data/world-cup/teams_1962.txt
+test/data/world-cup/teams_1974.txt
 test/helper.rb
 test/test_changes.rb
 test/test_cursor.rb

data/Rakefile

@@ -30,6 +30,8 @@ Hoe.spec 'sportdb' do
                                #         - logutils
                                #         - textutils
     ['tagutils'],     # tags n tagging tables
+    ['persondb'],     # persons (people) table
+    ['activerecord-utils'],   # extras e.g. rnd, find_by! for 3.x etc.
     ['fetcher', '>= 0.3'],
 
     ## 3rd party

data/lib/sportdb.rb

@@ -14,14 +14,23 @@ require 'logger'             ## todo/fix: no longer needed - replaced by logutil
 require 'fileutils'
 require 'erb'
 
+
 # rubygems  / 3rd party libs
 
 require 'active_record'   ## todo: add sqlite3? etc.
+require 'activerecord/utils' # check - if dependency on logutils? or props? etc let others go first
 
 require 'logutils'
+require 'logutils/db'   # NB: explict require required for LogDb (NOT automatic)
+
 require 'textutils'
+require 'tagutils'
+
+require 'props'
+require 'props/db'  # NB: explict require required for ConfDb (NOT automatic)  - move to textutils/deb - why/why not??
 
 require 'worlddb'
+require 'persondb'
 
 require 'fetcher'   # for fetching/downloading fixtures via HTTP/HTTPS etc.
 
@@ -206,10 +215,34 @@ module SportDb
     Stats.new.tables
   end
 
+  ### fix:
+  ## remove - use ConfDb.dump or similar -- add api depreciated
   def self.props
     Stats.new.props
   end
 
+  def self.setup_in_memory_db
+    # Database Setup & Config
+
+    ActiveRecord::Base.logger = Logger.new( STDOUT )
+    ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
+
+    ## NB: every connect will create a new empty in memory db
+    ActiveRecord::Base.establish_connection(
+                           adapter:  'sqlite3',
+                           database: ':memory:' )
+
+    ## build schema
+    LogDb.create
+    ConfDb.create
+    TagDb.create
+    WorldDb.create
+    PersonDb.create
+    SportDb.create
+
+    ## read builtins - why? why not?
+    SportDb.read_builtin
+  end # setup_in_memory_db (using SQLite :memory:)
 
 
   def self.load_plugins

data/lib/sportdb/cli/main.rb

@@ -98,6 +98,7 @@ command [:create] do |c|
     ConfDb.create
     TagDb.create
     WorldDb.create
+    PersonDb.create
     SportDb.create
     
     SportDb.read_builtin   # e.g. seasons.txt etc
@@ -131,6 +132,7 @@ command [:setup,:s] do |c|
     ConfDb.create
     TagDb.create
     WorldDb.create
+    PersonDb.create
     SportDb.create
 
     SportDb.read_builtin   # e.g. seasons.txt etc

data/lib/sportdb/deleter.rb

@@ -27,7 +27,6 @@ module SportDb
       Roster.delete_all
 
       Track.delete_all
-      Person.delete_all
       Team.delete_all
       
       League.delete_all

data/lib/sportdb/matcher.rb

@@ -22,6 +22,10 @@ module Matcher
     match_xxx_for_country( name, 'skiers', &blk )
   end
 
+  def match_players_for_country( name, &blk )
+    match_xxx_for_country( name, 'players', &blk )
+  end
+
   def match_stadiums_for_country( name, &blk )
     match_xxx_for_country( name, 'stadiums', &blk )
   end

data/lib/sportdb/models/forward.rb

@@ -5,14 +5,15 @@
 module SportDb
   module Model
 
-  ## todo: why? why not use include WorldDb::Models here???
+  Prop      = ConfDb::Model::Prop
 
+  ## todo: why? why not use include WorldDb::Models here???
   Continent = WorldDb::Model::Continent
   Country   = WorldDb::Model::Country
   Region    = WorldDb::Model::Region
   City      = WorldDb::Model::City
 
-  Prop      = ConfDb::Model::Prop
+  Person    = PersonDb::Model::Person
 
   ## nb: for now only team and league use worlddb tables
   #   e.g. with belongs_to assoc (country,region)
@@ -20,6 +21,7 @@ module SportDb
   class Team < ActiveRecord::Base ; end
   class League < ActiveRecord::Base ; end
   class Ground < ActiveRecord::Base ; end
+  class Goal  < ActiveRecord::Base ; end
 
   end
 end
@@ -38,3 +40,11 @@ module WorldDb
   end
 end
 
+
+module PersonDb
+  module Model
+    Goal  = SportDb::Model::Goal
+  end
+end
+
+

data/lib/sportdb/models/goal.rb

@@ -6,7 +6,7 @@ module SportDb
 class Goal < ActiveRecord::Base
 
   belongs_to :game
-  belongs_to :person
+  belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
 
 end  # class Goal
 

data/lib/sportdb/models/person.rb

@@ -1,69 +1,21 @@
 
-module SportDb
-  module Model
-
-
-class Person < ActiveRecord::Base
-  self.table_name = 'persons'  #  avoids possible "smart" plural inflection to people
-
-  has_many :goals
-
-  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
-
+#### note ---
+## uses PersonDb namespace!!!!!
+#
+# move to models/person/person.rb  - why? why not??
 
-  def title()       name               end  # alias for name
-  def title=(value) self.name = value  end  # alias for name
 
+module PersonDb
+  module Model
 
-  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
-      elsif value =~ /^([0-9]{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s([0-9]{4})$/  ## assume birthday
-        value_date_str = '%02d/%s/%d' % [$1, $2, $3]     ## move to matcher!!
-        value_date = Date.strptime( value_date_str, '%d/%b/%Y' )  ## %b - abbreviated month name (e.g. Jan,Feb, etc.)
-        logger.debug "   birthday #{value_date_str}  -  #{value_date}"
-        new_attributes[ :born_at ] = value_date
-        ## todo: convert to date
-      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
-
-    ## quick hack: set nationality_id if not present to country_id
-    if new_attributes[ :nationality_id ].blank?
-      new_attributes[ :nationality_id ] = new_attributes[ :country_id ]
-    end
-
-    rec = Person.find_by_key( new_attributes[ :key ] )
-    if rec.present?
-      logger.debug "update Person #{rec.id}-#{rec.key}:"
-    else
-      logger.debug "create Person:"
-      rec = Person.new
-    end
-      
-    logger.debug new_attributes.to_json
-   
-    rec.update_attributes!( new_attributes )
-  end # create_or_update_from_values
+### extends "basic" person model in PersonDb
+class Person
 
+  has_many :goals
 
 end  # class Person
 
 
   end # module Model
-end # module SportDb
+end # module PersonDb
 

data/lib/sportdb/models/record.rb

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

data/lib/sportdb/models/roster.rb

@@ -8,7 +8,7 @@ class Roster < ActiveRecord::Base
 
   belongs_to :event
   belongs_to :team
-  belongs_to :person
+  belongs_to :person, class_name: 'PersonDb::Model::Person', foreign_key: 'person_id'
 
 end  # class Roster
 

data/lib/sportdb/reader.rb

@@ -74,6 +74,10 @@ class Reader
       reader.read( name )
     elsif name =~ /^drivers/ # e.g. drivers.txt in formula1.db
       load_persons( name )
+    elsif match_players_for_country( name ) do |country_key|
+            country = Country.find_by_key!( country_key )
+            load_persons( 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
@@ -139,16 +143,13 @@ class Reader
 
 
   ####
-  ## fix: move to persondb for (re)use
+  # fix: move to persondb for (re)use
 
   def load_persons( name, more_attribs={} )
-
-    reader = ValuesReaderV2.new( name, include_path, more_attribs )
-
-    reader.each_line do |new_attributes, values|
-      Person.create_or_update_from_values( new_attributes, values )
-    end # each lines
-
+    reader = PersonDb::PersonReader.new( include_path )
+    ## fix: add more_attribs !!!!!   -- check other readers as an example
+    ##  - gets added to new or read??
+    reader.read( name )
   end # load_persons
 
   

data/lib/sportdb/schema.rb

@@ -27,7 +27,8 @@ end
 
 add_index :teams, :key, unique: true
 
-
+###########
+# check: use table (rename to) venues / stadiums - why? why not?
 create_table :grounds do |t|
   t.string     :key,      null: false   # import/export key
   t.string     :title,    null: false 
@@ -53,25 +54,6 @@ end
 add_index :grounds, :key, unique: true
 
 
-create_table :persons do |t|    # use people ? instead of persons (person/persons makes it easier?)
-  t.string      :key,      null: false   # import/export key
-  t.string      :name,     null: false
-  t.string      :synonyms  # comma separated list of synonyms
-  t.string      :code       # three letter code (short title)
-
-  ## todo: add gender flag (male/female -man/lady  how?)
-  t.date        :born_at     # optional date of birth (birthday)
-  ## todo: add country of birth  might not be the same as nationality
-
-  t.references  :city
-  t.references  :region
-  t.references  :country,   null: false
-
-  t.references  :nationality, null: false  # by default assume same as country of birth (see above)
-
-  t.timestamps
-end
-
 # join table: person+game(team1+team2+event(season+league))
 create_table :goals do |t|
   t.references  :person,   null: false
@@ -139,6 +121,9 @@ create_table :records do |t|   # use TimeRecord? instead of simple record
 end
 
 
+################
+#  fix/todo: rename to squads / lineups
+
 # join table -> person+team+event(season+league)
 create_table :rosters do |t|   # use squads as an alternative name? why? why not??
   t.references :person,  null: false
@@ -200,7 +185,8 @@ end
 
 add_index :groups, :event_id  # fk event_id index
 
-
+###########################
+# fix: rename table to matches
 create_table :games do |t|
   t.string     :key          # import/export key
   t.references :round,    null: false

data/lib/sportdb/stats.rb

@@ -13,12 +13,14 @@ module SportDb
 
       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 "  #{Roster.count} rosters (person+team+event recs)"
       puts "  #{Goal.count} goals (person+game recs)"
 
       puts "  #{Ground.count}  grounds|stadiums"
     end
     
+    ## fix/chek:
+    #  move to Prop gem / reuse code from Prop gem
     def props
       puts "Props:"
       Prop.order( 'created_at asc' ).all.each do |prop|

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.22'
+  VERSION = '1.8.23'
 end
 
 

data/test/data/world-cup/1974/cup.yml

@@ -0,0 +1,35 @@
+##################################################
+# World Cup 1974 West Germany, 13 June - 7 July
+
+league: world
+season: 1974
+start_at: 1974-06-13
+
+fixtures:
+- cup_i
+- cup_ii
+- cup_finals
+
+# 16 Teams
+teams:
+# -- Africa
+- zai # Zaire
+# -- Asia
+- aus # Australia
+# -- Europe
+- bul # Bulgaria
+- frg # West Germany
+- gdr # East Germany
+- ita # Italy
+- ned # Netherlands
+- pol # Poland
+- sco # Scotland
+- swe # Sweden
+- yug # Yugoslavia
+# -- North and Central America
+- hai # Haiti
+# -- South America
+- arg # Argentina
+- bra # Brazil
+- chi # Chile
+- uru # Uruguay

data/test/data/world-cup/1974/cup_finals.txt

@@ -0,0 +1,14 @@
+##################################################
+# World Cup 1974 West Germany, 13 June - 7 July
+
+
+
+Match for third place
+
+# fix: use Muenchen not Munich 
+(37) 6 July     Brazil        0-1  Poland        @ Olympiastadion, Munich
+
+Final
+
+(38) 7 July     Netherlands   1-2  West Germany  @ Olympiastadion, Munich
+

data/test/data/world-cup/1974/cup_i.txt

@@ -0,0 +1,55 @@
+##################################################
+# World Cup 1974 West Germany, 13 June - 7 July
+
+Group 1  |  East Germany   West Germany    Chile         Australia
+Group 2  |  Yugoslavia     Brazil          Scotland      Zaire
+Group 3  |  Netherlands    Sweden          Bulgaria      Uruguay
+Group 4  |  Poland         Argentina       Italy         Haiti
+
+
+Group 1:
+
+(1)  14 June    West Germany  1-0   Chile        @ Olympiastadion, West Berlin
+(2)  14 June    East Germany  2-0   Australia    @ Volksparkstadion, Hamburg
+
+(9)  18 June    Chile         1-1   East Germany   @ Olympiastadion, West Berlin
+(10) 18 June    Australia     0-3   West Germany   @ Volksparkstadion, Hamburg
+
+(17) 22 June    Australia     0-0   Chile          @ Olympiastadion, West Berlin
+(18) 22 June    East Germany  1-0   West Germany   @ Volksparkstadion, Hamburg
+
+
+Group 2:
+
+(3)  13 June    Brazil      0-0   Yugoslavia      @ Waldstadion, Frankfurt
+(4)  14 June    Zaire       0-2   Scotland        @ Westfalenstadion, Dortmund
+
+(11) 18 June    Yugoslavia  9-0   Zaire           @ Parkstadion, Gelsenkirchen
+(12) 18 June    Scotland    0-0   Brazil          @ Waldstadion, Frankfurt
+
+(19) 22 June    Scotland    1-1   Yugoslavia      @ Waldstadion, Frankfurt
+(20) 22 June    Zaire       0-3   Brazil          @ Parkstadion, Gelsenkirchen
+
+
+Group 3:
+
+(5)  15 June    Uruguay      0-2    Netherlands    @ Niedersachsenstadion, Hanover
+(6)  15 June    Sweden       0-0    Bulgaria       @ Rheinstadion, Düsseldorf
+
+(13) 19 June    Netherlands  0-0    Sweden         @ Westfalenstadion, Dortmund
+(14) 19 June    Uruguay      1-1    Bulgaria       @ Niedersachsenstadion, Hanover
+
+(21) 23 June    Netherlands  4-1    Bulgaria       @ Westfalenstadion, Dortmund
+(22) 23 June    Sweden       3-0    Uruguay        @ Rheinstadion, Düsseldorf
+
+
+Group 4:
+
+(7)  15 June    Italy       3-1    Haiti          @ Olympiastadion, Munich
+(8)  15 June    Poland      3-2    Argentina      @ Neckarstadion, Stuttgart
+
+(15) 19 June    Haiti       0-7    Poland         @ Olympiastadion, Munich
+(16) 19 June    Argentina   1-1    Italy          @ Neckarstadion, Stuttgart
+
+(23) 23 June    Argentina   4-1    Haiti          @ Olympiastadion, Munich
+(24) 23 June    Poland      2-1    Italy          @ Neckarstadion, Stuttgart

data/test/data/world-cup/1974/cup_ii.txt

@@ -0,0 +1,34 @@
+##################################################
+# World Cup 1974 West Germany, 13 June - 7 July
+
+
+#### Second Round
+## todo/fix: add stage/add stage key to rounds
+#
+# Group A -> I
+# Group B -> J   - fix: use Group A,B etc.
+
+Group I  |  Netherlands     Brazil     East Germany     Argentina
+Group J  |  West Germany    Poland     Sweden           Yugoslavia
+
+Group I:
+
+(25) 26 June    Brazil         1-0   East Germany     @ Niedersachsenstadion, Hanover
+(26) 26 June    Netherlands    4-0   Argentina        @ Parkstadion, Gelsenkirchen
+
+(29) 30 June    East Germany   0-2   Netherlands      @ Parkstadion, Gelsenkirchen
+(30) 30 June    Argentina      1-2   Brazil           @ Niedersachsenstadion, Hanover
+
+(33) 3 July     Argentina      1-1   East Germany     @ Parkstadion, Gelsenkirchen
+(34) 3 July     Netherlands    2-0   Brazil           @ Westfalenstadion, Dortmund
+
+Group J:
+
+(27) 26 June    Yugoslavia    0-2   West Germany   @ Rheinstadion, Düsseldorf
+(28) 26 June    Sweden        0-1   Poland         @ Neckarstadion, Stuttgart
+
+(31) 30 June    West Germany  4-2   Sweden         @ Rheinstadion, Düsseldorf
+(32) 30 June    Poland        2-1   Yugoslavia     @ Waldstadion, Frankfurt
+
+(35) 3 July     Poland        0-1   West Germany   @ Waldstadion, Frankfurt
+(36) 3 July     Sweden        2-1   Yugoslavia     @ Rheinstadion, Düsseldorf

data/test/data/world-cup/seasons_1974.txt

@@ -0,0 +1,5 @@
+#####################
+# Seasons / Years
+
+1974
+

data/test/data/world-cup/teams_1974.txt

@@ -0,0 +1,29 @@
+########################
+# 16 Teams
+
+# -- Africa
+zai, Zaire, ZAI, cd
+
+# -- Asia
+aus, Australia, AUS, au
+
+# -- Europe
+bul, Bulgaria,     BUL, bg
+frg, West Germany, FRG, de
+gdr, East Germany, GDR, de
+ita, Italy,        ITA, it
+ned, Netherlands,  NED, nl
+pol, Poland,       POL, pl
+sco, Scotland,     SCO, sc
+swe, Sweden,       SWE, se
+yug, Yugoslavia,   YUG, rs
+
+
+# -- North and Central America
+hai, Haiti,        HAI, ht
+
+# -- South America
+arg, Argentina,    ARG, ar
+bra, Brazil,       BRA, br
+chi, Chile,        CHI, cl
+uru, Uruguay,      URU, uy

data/test/helper.rb

@@ -7,67 +7,18 @@
 require 'minitest/autorun'
 
 
-
-require 'pp'
-
-
-# ruby gems
-
-require 'active_record'
-
-require 'worlddb'
-require 'logutils'
-require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
-require 'props/db'   ## fix: use textutils/db in the future too ??
-
-
 ## our own code
 
 require 'sportdb'
 
 
-#######################
-#
-#  for reuse
-#   --- move to sportdb/test.rb ???
-#    SportDb.setup_in_memory_db  ??? why? why not??  or
-#    SportDb.setup_test_db  - alias ??
-
-
-
-def setup_in_memory_db
-  # Database Setup & Config
-
-  db_config = {
-    adapter:  'sqlite3',
-    database: ':memory:'
-  }
-
-  pp db_config
-
-  ActiveRecord::Base.logger = Logger.new( STDOUT )
-  ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
-
-  ## NB: every connect will create a new empty in memory db
-  ActiveRecord::Base.establish_connection( db_config )
-
-
-  ## build schema
-
-  LogDb.create
-  ConfDb.create
-  TagDb.create
-  WorldDb.create
-  SportDb.create
-
-  SportDb.read_builtin
-end
-
-####
+#####################
 # Models shortcuts
 
 Country    = WorldDb::Model::Country
 
+Person     = PersonDb::Model::Person
+
 League     = SportDb::Model::League
 Season     = SportDb::Model::Season
 Event      = SportDb::Model::Event
@@ -77,7 +28,7 @@ Round      = SportDb::Model::Round
 Game       = SportDb::Model::Game
 GameCursor = SportDb::Model::GameCursor
 
-####
+####################
 # Reader shortcuts
 
 TeamReader   = SportDb::TeamReader
@@ -86,4 +37,8 @@ LeagueReader = SportDb::LeagueReader
 GameReader   = SportDb::GameReader
 
 
-setup_in_memory_db()
+#################################
+# setup db -> schema / tables
+
+SportDb.setup_in_memory_db
+

data/test/test_round_auto.rb

@@ -21,8 +21,10 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
   def add_countries
     countries = [
+      ['cd', 'Congo DR',       'COD' ],
       ['kr', 'South Korea',    'KOR' ],
- 
+      ['au', 'Australia',      'AUS' ],
+
       ['ar', 'Argentina',      'ARG' ],
       ['br', 'Brazil',         'BRA' ],
       ['bo', 'Bolivia',        'BOL' ],
@@ -34,6 +36,7 @@ class TestRoundAuto < MiniTest::Unit::TestCase
  
       ['mx', 'Mexico',         'MEX' ],
       ['us', 'United States',  'USA' ],
+      ['ht', 'Haiti',          'HAI' ],
 
       ['at', 'Austria',        'AUT' ],
       ['be', 'Belgium',        'BEL' ],
@@ -51,9 +54,11 @@ class TestRoundAuto < MiniTest::Unit::TestCase
       ['ch', 'Switzerland',    'SUI' ],
       ['sc', 'Scotland',       'SCO' ],
       ['tr', 'Turkey',         'TUR' ],
+      ['nl', 'Netherlands',    'NED' ],
+      ['pl', 'Poland',         'POL' ],
+      ['se', 'Sweden',         'SWE' ],
     ]
 
-
     countries.each do |country|
       key   = country[0]
       name  = country[1]
@@ -63,23 +68,89 @@ class TestRoundAuto < MiniTest::Unit::TestCase
   end
 
 
-  def test_world_cup_1954
+  def test_world_cup_1974
     teamreader = TeamReader.new( SportDb.test_data_path )
-    teamreader.read( 'world-cup/teams_1954' )
+    teamreader.read( 'world-cup/teams_1974' )
 
     assert_equal  16, Team.count
 
-    br = Team.find_by_key!( 'bra' )
-    uy = Team.find_by_key!( 'uru' )
-    be = Team.find_by_key!( 'bel' )
+    seasonreader = SeasonReader.new( SportDb.test_data_path )
+    seasonreader.read( 'world-cup/seasons_1974')
+
+    assert_equal 1, Season.count
+
+    y = Season.find_by_key!( '1974' )
+    assert_equal '1974', y.title
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'world-cup/leagues' )
+
+    assert_equal 1, League.count
+
+    l = League.find_by_key!( 'world' )
+    assert_equal 'World Cup', l.title
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    gamereader.read( 'world-cup/1974/cup' )
 
-    assert_equal 'Brazil',    br.title
-    assert_equal 'Uruguay',   uy.title
-    assert_equal 'Belgium',   be.title
+    assert_equal 1, Event.count
 
-    assert_equal 'BRA', br.code
-    assert_equal 'URU', uy.code
+    w = Event.find_by_key!( 'world.1974' )
+
+    assert_equal  16, w.teams.count
+    assert_equal  38, w.games.count
+    assert_equal  12, w.rounds.count
+
+    rounds_exp = [
+      [1,   'Matchday 1',            '1974-06-13', 1], # first group stage
+      [2,   'Matchday 2',            '1974-06-14', 3],
+      [3,   'Matchday 3',            '1974-06-15', 4],
+      [4,   'Matchday 4',            '1974-06-18', 4],
+      [5,   'Matchday 5',            '1974-06-19', 4],
+      [6,   'Matchday 6',            '1974-06-22', 4],
+      [7,   'Matchday 7',            '1974-06-23', 4],
+      [8,   'Matchday 8',            '1974-06-26', 4], # second group stage
+      [9,   'Matchday 9',            '1974-06-30', 4],
+      [10,  'Matchday 10',           '1974-07-03', 4],
+      [11,  'Match for third place', '1974-07-06', 1], # finals
+      [12,  'Final',                 '1974-07-07', 1],
+    ]
 
+    assert_rounds( rounds_exp )
+
+    #########################
+    ## 2nd run
+    ### try update (e.g. read again - should NOT create new rounds/games/teams)
+    #
+    #  note: update only works if rounds get not deleted or added
+    #  - (adding for updates works only at the end/tail - not at the beginning or inbetween, for example)
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    gamereader.read( 'world-cup/1974/cup' )
+
+    assert_equal 1, Event.count
+
+    w = Event.find_by_key!( 'world.1974' )
+
+    assert_equal  16, w.teams.count
+    assert_equal  38, w.games.count
+    assert_equal  12, w.rounds.count
+
+    assert_rounds( rounds_exp )
+
+  end # method test_world_cup_1974
+
+
+  def test_world_cup_1954
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'world-cup/teams_1954' )
+
+    assert_equal  16, Team.count
+
+    assert_teams( [
+      [ 'bra', 'Brazil',  'BRA' ],
+      [ 'uru', 'Uruguay', 'URU' ],
+      [ 'bel', 'Belgium', 'BEL' ] ] )
 
     seasonreader = SeasonReader.new( SportDb.test_data_path )
     seasonreader.read( 'world-cup/seasons_1954')
@@ -134,17 +205,10 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
     assert_equal  13, Team.count
 
-    ar = Team.find_by_key!( 'arg' )
-    br = Team.find_by_key!( 'bra' )
-    be = Team.find_by_key!( 'bel' )
-
-    assert_equal 'Argentina', ar.title
-    assert_equal 'Brazil',    br.title
-    assert_equal 'Belgium',   be.title
-
-    assert_equal 'ARG', ar.code
-    assert_equal 'BRA', br.code
-
+    assert_teams( [
+      [ 'arg', 'Argentina', 'ARG' ],
+      [ 'bra', 'Brazil',    'BRA' ],
+      [ 'bel', 'Belgium',   'BEL' ] ] )
 
     seasonreader = SeasonReader.new( SportDb.test_data_path )
     seasonreader.read( 'world-cup/seasons_1930')
@@ -191,19 +255,6 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     ]
 
     assert_rounds( rounds_exp )
-
-    ##
-    # auto-numbered knock-out rounds
-    # r11 = Round.find_by_pos!( 11 )
-
-    # assert_equal 'Semi-finals', r11.title
-    # assert_equal 2,             r11.games.count
-
-    # r12 = Round.find_by_pos!( 12 )
-
-    # assert_equal 'Final', r12.title
-    # assert_equal 1,       r12.games.count
-
   end  # method test_world_cup_1930
 
 
@@ -213,17 +264,10 @@ class TestRoundAuto < MiniTest::Unit::TestCase
 
     assert_equal  16, Team.count
 
-    ar = Team.find_by_key!( 'arg' )
-    br = Team.find_by_key!( 'bra' )
-    it = Team.find_by_key!( 'ita' )
-
-    assert_equal 'Argentina', ar.title
-    assert_equal 'Brazil',    br.title
-    assert_equal 'Italy',     it.title
-
-    assert_equal 'ARG', ar.code
-    assert_equal 'BRA', br.code
-
+    assert_teams( [
+      [ 'arg', 'Argentina', 'ARG' ],
+      [ 'bra', 'Brazil',    'BRA' ],
+      [ 'ita', 'Italy',     'ITA' ] ] )
 
     seasonreader = SeasonReader.new( SportDb.test_data_path )
     seasonreader.read( 'world-cup/seasons_1962')
@@ -313,5 +357,14 @@ class TestRoundAuto < MiniTest::Unit::TestCase
     end
   end # method assert_rounds
 
+  def assert_teams( teams_exp )
+    teams_exp.each do |team_exp|
+       team = Team.find_by_key!( team_exp[0] )
+    
+       assert_equal team_exp[1], team.title
+       assert_equal team_exp[2], team.code
+    end
+  end # method assert_teams
+
 
 end # class TestRoundAuto

metadata

@@ -1,126 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.22
-  prerelease: 
+  version: 1.8.23
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &68241960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68241960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &68241240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68241240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &68255670 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68255670
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &68255160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *68255160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &68254520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: persondb
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68254520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &68254010 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *68254010
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &68253470 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *68253470
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.6
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &68253190 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68253190
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &68252660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *68252660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &68252210 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *68252210
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -249,13 +306,19 @@ files:
 - test/data/world-cup/1954/cup.yml
 - test/data/world-cup/1962/cup.txt
 - test/data/world-cup/1962/cup.yml
+- test/data/world-cup/1974/cup.yml
+- test/data/world-cup/1974/cup_finals.txt
+- test/data/world-cup/1974/cup_i.txt
+- test/data/world-cup/1974/cup_ii.txt
 - test/data/world-cup/leagues.txt
 - test/data/world-cup/seasons_1930.txt
 - test/data/world-cup/seasons_1954.txt
 - test/data/world-cup/seasons_1962.txt
+- test/data/world-cup/seasons_1974.txt
 - test/data/world-cup/teams_1930.txt
 - test/data/world-cup/teams_1954.txt
 - test/data/world-cup/teams_1962.txt
+- test/data/world-cup/teams_1974.txt
 - test/helper.rb
 - test/test_changes.rb
 - test/test_cursor.rb
@@ -272,6 +335,7 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -289,32 +353,30 @@ 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: 1.8.17
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: sportdb - sport.db command line tool
 test_files:
+- test/test_changes.rb
+- test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
-- test/test_cursor.rb
-- test/test_scores.rb
-- test/test_winner.rb
+- test/test_reader.rb
+- test/test_round_auto.rb
 - test/test_round_def.rb
-- test/test_utils.rb
 - test/test_round_header.rb
-- test/test_round_auto.rb
-- test/test_reader.rb
-- test/test_changes.rb
+- test/test_scores.rb
+- test/test_utils.rb
+- test/test_winner.rb