sportdb 1.8.28 → 1.8.29

data/lib/sportdb/stats.rb

@@ -16,9 +16,10 @@ module SportDb
       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"
     end
-    
+
     ## fix/chek:
     #  move to Prop gem / reuse code from Prop gem
     def props

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.28'
+  VERSION = '1.8.29'
 end
 
 

data/test/data/national-teams/assocs.txt

@@ -0,0 +1,231 @@
+
+[fifa]
+  Fédération Internationale de Football Association (FIFA), 1904
+  World
+  www.fifa.com
+  en.wikipedia: FIFA
+  # Zürich, Switzerland
+  # 209 members
+  #  see www.fifa.com/aboutfifa/organisation/associations.html
+
+  # note: 13 teams are members or associate members
+  #  of one of the FIFA affiliated continental confederations,
+  # but who are not members of FIFA
+  # - Northern Mariana Islands (Asia)
+  # - Réunion (Africa)
+  # - Zanzibar (Africa)
+  # - French Guiana (Southamerica /CONCACAF)
+  # - Bonaire  (Caribbean / CONCACAF)
+  # - Guadeloupe (Caribbean / CONCACAF)
+  # - Martinique (Caribbean / CONCACAF)
+  # - Saint-Martin (Caribbean / CONCACAF)
+  # - Sint Maarten (Caribbean / CONCACAF)
+  # - Kiribati (Pacific)
+  # - Niue (Pacific)
+  # - Tuvalu (Pacific)
+  # - Gibraltar (Europe)
+
+
+  # note: 7 unaffiliated sovereign states (not fifa or confederation)
+  # - Federated States of Micronesia
+  # - Nauru
+  # - Palau
+  # - Marshall Islands (only state w/ no national football team) 
+  # - United Kingdom  (only for olympics otherwise england, walles,etc.)
+  # - Monaco
+  # - Vatican City
+
+
+## assume all upcase is Abbreviation
+## assume all downcase w/ only [a-z] (if not last entry) is parent assoc (e.g. fifa)
+
+
+[uefa]
+  Union of European Football Associations (UEFA), 1954
+  Europe
+  www.uefa.com
+  en.wikipedia:UEFA
+  fifa
+  # note: last tag list entry ( e.g. fifa or fifa|uefa etc. assumed as parent assocs - find better style?  use header line for all? use [uefa/fifa] ?
+  # Nyon, Switzerland
+  # 54 members
+
+# note: incl. Israel, Kazakhstan (from Asia)
+
+
+[conmebol]
+  Confederación Sudamericana de Fútbol (CONMEBOL), 1916
+  South America
+  www.conmebol.com
+  en.wikipedia:CONMEBOL
+  fifa
+  # Asunción, Paraguay  (Luque)
+  # 10 members
+
+
+[concacaf]
+  Confederation of North\, Central American and Caribbean Association Football (CONCACAF), 1961
+  North America\, Central America & Caribbean Islands
+  www.concacaf.com
+  en.wikipedia:CONCACAF
+  fifa
+  # Miami, Florida, United States
+  # 41 members
+  # - 31 from the Caribbean
+  # - 7 from Central America
+  # - 3 from North America
+
+# note: incl. French Guiana, Guyana and Suriname members (from South America) 
+
+
+[caf]
+  Confédération Africaine de Football (CAF), 1957 
+  Africa
+  www.cafonline.com
+  en.wikipedia:Confederation_of_African_Football
+  fifa
+  # Cairo, Egypt (6th of October City)
+  # 56 members
+
+[afc]
+  Asian Football Confederation (AFC), 1954
+  Asia      # incl. Middle East, Australia
+  www.the-afc.com
+  en.wikipedia:Asian_Football_Confederation
+  fifa
+  # Kuala Lumpur, Malaysia
+  # 46+1 members
+
+# note: incl. Australia member since 2006 (from Pacific/Oceania)
+
+
+[ofc]
+  Oceania Football Confederation (OFC), 1966
+  Pacific   # Oceania
+  www.oceaniafootball.com
+  en.wikipedia:Oceania_Football_Confederation
+  fifa
+  # Auckland, New Zealand
+  # 14 members (11 full)
+
+
+############################
+# more sub confederations
+
+
+#####
+# CONCACAF - 3 regions
+
+[nafu]
+  North American Football Union (NAFU) / North American Zone
+  # 3 members
+  en.wikipedia:North_American_Football_Union
+  concacaf
+  # note: has no org structure (just "informal"); no longer any competions
+
+[uncaf]
+  Unión Centroamericana de Fútbol (UNCAF) / Central American Zone
+  www.uncafut.com
+  en.wikipedia:Central_American_Football_Union
+  concacaf
+  # 7 members
+
+[cfu]
+  Caribbean Football Union (CFU) / Caribbean Zone
+  www.cfufootball.org
+  en.wikipedia:Caribbean_Football_Union
+  concacaf
+  # 31 members
+
+#########
+# CAF (Africa) - 5 regions
+
+[cecafa]
+  Council for East and Central Africa Football Associations (CECAFA)
+  Eastern Africa
+  www.cecafafootball.org
+  en.wikipedia:Council_for_East_and_Central_Africa_Football_Associations
+  # 12 members
+  # East Africa and some nations of Central Africa
+
+
+[cosafa]
+  Council of Southern Africa Football Associations (COSAFA)
+  Southern Africa
+  www.cosafa.com
+  en.wikipedia:Council_of_Southern_Africa_Football_Associations
+  # 14 members
+  # Southern Africa plus island states off the coast of Southern Africa
+
+[wafu]
+  West African Football Union (WAFU)
+  Western Africa
+  en.wikipedia:West_Africa_Football_Union
+  # Zone A - 9 members
+  # Zone B - 7 members
+
+
+[unaf]
+  Union of North African Federations (UNAF)
+  Northern Africa
+  en.wikipedia:Union_of_North_African_Football_Federations
+  # Tunis, Tunisia
+  # 5 members
+
+
+[uniffac]
+  Union des Fédérations du Football de l'Afrique Centrale (UNIFFAC)
+  Central Africa
+  en.wikipedia:Central_African_Football_Federations'_Union
+  # 8 members
+
+############
+# AFC / Asia
+#
+# - AFC is subdivided into four sub-federations
+
+[waff]
+  West Asian Football Federation (WAFF), 2001
+  West Asia (Middle East)
+  www.the-waff.com
+  en.wikipedia:West_Asian_Football_Federation
+  # 13 members
+  # represents nations at the western extremity of the continent
+
+[eaff]  
+  East Asian Football Federation (EAFF), 2002
+  East Asia
+  www.eaff.com
+  en.wikipedia:East_Asian_Football_Federation
+  # Tokyo, Japan
+  # 10 members
+  # represents nations in Northeast Asia, plus Guam and Northern Mariana Islands
+
+[csaff]
+  Central and South Asian Football Federation (CSAFF)
+  Central and South Asia
+  en.wikipedia:Central_and_South_Asian_Football_Federation
+  # 12 members
+  # represents nations in Central Asia and South Asia
+
+[aff]
+  Association of South East Asian Nations Football Federation (AFF), 1984
+  Southeast Asia & Australia
+  www.aseanfootball.org
+  en.wikipedia:ASEAN_Football_Federation
+  # Petaling Jaya, Selangor, Malaysia
+  # 12 members
+  # represents nations in Southeast Asia, plus Australia
+
+
+#######################
+# inter-continental
+
+[uafa]
+  Union of Arab Football Associations (UAFA), 1974
+  Arab League / League of Arab States
+  www.uafaonline.com
+  en.wikipedia:Union_of_Arab_Football_Associations
+  # Riyadh, Saudi Arabia
+  # 22 members
+  #  AFC members (asia/middle east) + CAF (africa) members

data/test/data/national-teams/europe/assocs.txt

@@ -0,0 +1,13 @@
+#######################
+# Europe
+
+assocaut, Österreichischer Fußball-Bund, at, fifa|uefa      ## Austria
+assocbel, Koninklijke Belgische Voetbalbond, be, fifa|uefa  ## Belgium
+assoccyp, Cyprus Football Association, cy, fifa|uefa        ## Cyprus
+assocger, Deutscher Fußball-Bund, de, fifa|uefa             ## Germany
+assocest, Eesti Jalgpalli Liit, ee, fifa|uefa               ## Estonia
+assocesp, Real Federación Española de Fútbol, es, fifa|uefa ## Spain
+assocfin, Suomen Palloliitto, fi, fifa|uefa                 ## Finland
+assocfra, Fédération Française de Football, fr, fifa|uefa   ## France
+associrl, Football Association of Ireland, ie, fifa|uefa    ## Ireland
+associta, Federazione Italiana Giuoco Calcio, it, fifa|uefa ## Italy

data/test/data/national-teams/europe/teams.txt

@@ -0,0 +1,13 @@
+#######################
+# Europe
+
+aut, Austria, AUT, at
+bel, Belgium, BEL, be
+cyp, Cyprus, CYP, cy
+ger, Germany, GER, de
+est, Estonia, EST, ee
+esp, Spain, ESP, es
+fin, Finland, FIN, fi
+fra, France, FRA, fr
+irl, Ireland, IRL, ie
+ita, Italy, ITA, it

data/test/data/national-teams/north-america/assocs.txt

@@ -0,0 +1,10 @@
+####################
+# North America
+
+# CONCACAF / NAFU (North American Football Union)
+# - 3 members (North American Zone)
+
+assocmex, Federación Mexicana de Fútbol Asociación, mx, fifa|concacaf|nafu ## Mexico
+assocusa, United States Soccer Federation, us, fifa|concacaf|nafu          ## United States
+assoccan, Canadian Soccer Association, ca, fifa|concacaf|nafu              ## Canada
+

data/test/data/national-teams/north-america/teams.txt

@@ -0,0 +1,7 @@
+####################
+# North America
+# - CONCACAF / NAFU (North American Football Union)
+
+mex, Mexico, MEX,        mx
+usa, United States, USA, us
+can, Canada, CAN,        ca

data/test/data/national-teams/teams.txt

@@ -0,0 +1,19 @@
+
+########################
+# Africa
+# - CAF (Africa) - 5 regions
+# - UNAF (Union of North African Football Federations)
+
+alg, Algeria, ALG, dz
+egy, Egypt, EGY,   eg
+
+###############################
+# Oceania w/ Australia
+
+aus, Australia,   AUS, au
+nzl, New Zealand, NZL, nz
+
+# not FIFA members
+
+kir, Kiribati, KIR, ki
+tuv, Tuvalu,   TUV, tv

data/test/helper.rb

@@ -19,11 +19,13 @@ Country    = WorldDb::Model::Country
 
 Person     = PersonDb::Model::Person
 
-League     = SportDb::Model::League
-Season     = SportDb::Model::Season
-Event      = SportDb::Model::Event
-Team       = SportDb::Model::Team
-Roster     = SportDb::Model::Roster
+League      = SportDb::Model::League
+Season      = SportDb::Model::Season
+Event       = SportDb::Model::Event
+Team        = SportDb::Model::Team
+Roster      = SportDb::Model::Roster
+Assoc       = SportDb::Model::Assoc
+AssocAssoc  = SportDb::Model::AssocAssoc
 
 Round      = SportDb::Model::Round
 Group      = SportDb::Model::Group
@@ -45,6 +47,7 @@ AlltimeStandingEntry = SportDb::Model::AlltimeStandingEntry
 
 Reader             = SportDb::Reader
 TeamReader         = SportDb::TeamReader
+AssocReader        = SportDb::AssocReader
 SeasonReader       = SportDb::SeasonReader
 LeagueReader       = SportDb::LeagueReader
 GameReader         = SportDb::GameReader

data/test/test_assoc_reader.rb

@@ -0,0 +1,199 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_assoc_reader.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestAssocReader < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    PersonDb.delete!
+  end
+
+  def test_models
+    assert_equal 0, Assoc.count
+    assert_equal 0, Team.count
+    assert_equal 0, AssocAssoc.count
+
+    uefa = Assoc.create!( key: 'uefa', title: 'UEFA' )
+    assert_equal 1, Assoc.count
+
+    at       = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
+    assocaut = Assoc.create!( key: 'assocaut', title: 'Assoc Austria',
+                              national: true, country_id: at.id )
+
+    aut      = Team.create!( key: 'aut', title: 'Austria', code: 'AUT',
+                             country_id: at.id,
+                             assoc_id: assocaut.id )
+
+    assert_equal 1, Team.count
+    assert_equal 'Assoc Austria', aut.assoc.title   # team.assoc belongs_to ref
+    assert_equal 'Assoc Austria', at.assoc.title    # country.assoc has_one ref
+
+    assert_equal 0, AssocAssoc.count
+
+    AssocAssoc.create!( assoc1_id: uefa.id, assoc2_id: assocaut.id )
+
+    assert_equal 1, AssocAssoc.count
+    assert_equal 1, uefa.member_assoc_assocs.count
+    assert_equal 1, uefa.all_assocs.count
+    assert_equal 0, uefa.sub_assocs.count
+    assert_equal 1, uefa.national_assocs.count
+    assert_equal 0, uefa.parent_assoc_assocs.count
+    assert_equal 0, uefa.parent_assocs.count
+    assert_equal 1, assocaut.parent_assoc_assocs.count
+    assert_equal 1, assocaut.parent_assocs.count
+    assert_equal 0, assocaut.member_assoc_assocs.count
+    assert_equal 0, assocaut.all_assocs.count
+
+
+    it       = Country.create!( key: 'it', name: 'Italy', code: 'ITA', pop: 1, area: 1)
+    associta = Assoc.create!( key: 'associta', title: 'Assoc Italy',
+                              national: true, country_id: it.id )
+
+    ita      = Team.create!( key: 'ita', title: 'Italy', code: 'ITA',
+                             country_id: it.id,
+                             assoc_id: associta.id )
+
+    assert_equal 2, Team.count
+    assert_equal 'Assoc Italy', ita.assoc.title   # team.assoc belongs_to ref
+    assert_equal 'Assoc Italy', it.assoc.title    # country.assoc has_one ref
+
+    AssocAssoc.create!( assoc1_id: uefa.id, assoc2_id: associta.id )
+
+    assert_equal 2, AssocAssoc.count
+    assert_equal 2, uefa.member_assoc_assocs.count
+    assert_equal 2, uefa.national_assocs.count
+    assert_equal 0, uefa.sub_assocs.count
+    assert_equal 0, uefa.parent_assoc_assocs.count
+    assert_equal 1, associta.parent_assoc_assocs.count
+    assert_equal 0, associta.member_assoc_assocs.count
+  end
+
+
+  def test_assocs
+    reader = AssocReader.new( SportDb.test_data_path )
+    reader.read( 'national-teams/assocs' )
+
+    assert_equal 20, Assoc.count
+
+    fifa = Assoc.find_by_key!( 'fifa' )
+
+    assert_equal 'Fédération Internationale de Football Association (FIFA)', fifa.title
+    assert_equal 1904, fifa.since
+    assert_equal 'www.fifa.com', fifa.web
+    assert_equal 0, fifa.parent_assoc_assocs.count
+    assert_equal 6, fifa.member_assoc_assocs.count
+    assert_equal 6, fifa.all_assocs.count
+    assert_equal 6, fifa.sub_assocs.count
+    assert_equal 0, fifa.national_assocs.count
+    assert_equal 0, fifa.parent_assocs.count
+
+    uefa = Assoc.find_by_key!( 'uefa' )
+
+    assert_equal 'Union of European Football Associations (UEFA)', uefa.title
+    assert_equal 1954, uefa.since
+    assert_equal 'www.uefa.com', uefa.web
+    assert_equal 1, uefa.parent_assoc_assocs.count
+    assert_equal 0, uefa.member_assoc_assocs.count
+    assert_equal 0, uefa.all_assocs.count
+    assert_equal 0, uefa.sub_assocs.count
+    assert_equal 0, uefa.national_assocs.count
+    assert_equal 1, uefa.parent_assocs.count
+
+    concacaf = Assoc.find_by_key!( 'concacaf' )
+
+    assert_equal 'Confederation of North, Central American and Caribbean Association Football (CONCACAF)', concacaf.title
+    assert_equal 1961, concacaf.since
+    assert_equal 1, concacaf.parent_assoc_assocs.count
+    assert_equal 3, concacaf.member_assoc_assocs.count
+    assert_equal 3, concacaf.all_assocs.count
+    assert_equal 3, concacaf.sub_assocs.count
+    assert_equal 0, concacaf.national_assocs.count
+    assert_equal 1, concacaf.parent_assocs.count
+
+
+    mx = Country.create!( key: 'mx', name: 'Mexico', code: 'MEX', pop: 1, area: 1)
+    ca = Country.create!( key: 'ca', name: 'Canada', code: 'CAN', pop: 1, area: 1)
+    us = Country.create!( key: 'us', name: 'United States', code: 'USA', pop: 1, area: 1)
+
+    reader.read( 'national-teams/north-america/assocs' )
+
+    assert_equal 23, Assoc.count
+
+    assert_equal 6+3, fifa.all_assocs.count
+    assert_equal 6,   fifa.sub_assocs.count
+    assert_equal 0+3, fifa.national_assocs.count
+
+    assert_equal 3+3, concacaf.all_assocs.count
+    assert_equal 3,   concacaf.sub_assocs.count
+    assert_equal 0+3, concacaf.national_assocs.count
+    assert_equal 1,   concacaf.parent_assocs.count
+
+    assocusa = Assoc.find_by_key!( 'assocusa' )
+    assert_equal 'United States Soccer Federation', assocusa.title
+    assert_equal 3, assocusa.parent_assocs.count
+    assert_equal 0, assocusa.all_assocs.count
+    assert_equal 0, assocusa.sub_assocs.count
+    assert_equal 0, assocusa.national_assocs.count
+
+  end  # method test_assocs
+
+
+  def test_teams
+    assocreader = AssocReader.new( SportDb.test_data_path )
+    assocreader.read( 'national-teams/assocs' )
+
+    assert_equal 20, Assoc.count
+    
+    ## add countries
+    countries = [['mx', 'Mexico', 'MEX'],
+                 ['us', 'United States', 'USA'],
+                 ['ca', 'Canada', 'CAN'],
+                 ['dz', 'Algeria', 'ALG'],
+                 ['eg', 'Egypt', 'EGY'],
+                 ['au', 'Australia', 'AUS'],
+                 ['nz', 'New Zealand', 'NZL'],
+                 ['ki', 'Kiribati', 'KIR'],
+                 ['tv', 'Tuvalu',  'TUV']]
+
+    countries.each do |country|
+      Country.create!( key:  country[0],
+                       name: country[1],
+                       code: country[2],
+                       pop: 1,
+                       area: 1)
+    end
+
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'national-teams/teams' )
+    teamreader.read( 'national-teams/north-america/teams' )
+
+    assert_equal 9, Team.count
+    
+    ## fifa = Assoc.find_by_key!( 'fifa' )
+    ## assert_equal 7, fifa.teams.count
+
+    ## ofc = Assoc.find_by_key!( 'ofc' )
+    ## assert_equal 3, ofc.teams.count
+
+    ## mex = Team.find_by_key!( 'mex' )
+    ## assert_equal 3, mex.assocs.count
+
+    ## tuv = Team.find_by_key!( 'tuv' )
+    ## assert_equal 1, tuv.assocs.count
+
+    ### fix/todo: run teamreader again!! (2nd run)
+    ##   assert no new assocs (just update existing)
+
+  end  # method test_teams
+
+
+end # class TestAssocReader