sportdb 1.9.2 → 1.9.3

data/Manifest.txt

@@ -69,11 +69,11 @@ lib/sportdb/readers/event.rb
 lib/sportdb/readers/game.rb
 lib/sportdb/readers/ground.rb
 lib/sportdb/readers/league.rb
-lib/sportdb/readers/national_team.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
@@ -130,6 +130,8 @@ test/data/world-cup/2014/cup.txt
 test/data/world-cup/2014/cup.yml
 test/data/world-cup/2014/squads/br-brazil.txt
 test/data/world-cup/2014/squads/de-deutschland.txt
+test/data/world-cup/2014/squads/jp-japan.txt
+test/data/world-cup/2014/squads/uy-uruguay.txt
 test/data/world-cup/leagues.txt
 test/data/world-cup/seasons_1930.txt
 test/data/world-cup/seasons_1954.txt
@@ -147,13 +149,13 @@ test/test_date.rb
 test/test_goals.rb
 test/test_lang.rb
 test/test_load.rb
-test/test_national_team_reader.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_standings.rb
 test/test_utils.rb
 test/test_winner.rb

data/lib/sportdb.rb

@@ -102,8 +102,8 @@ require 'sportdb/readers/league'
 require 'sportdb/readers/race'
 require 'sportdb/readers/record'
 require 'sportdb/readers/race_team'
-require 'sportdb/readers/national_team'
 require 'sportdb/readers/season'
+require 'sportdb/readers/squad'    # roster
 require 'sportdb/readers/team'
 require 'sportdb/readers/track'
 require 'sportdb/reader'

data/lib/sportdb/reader.rb

@@ -101,10 +101,26 @@ class Reader
     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
-      country = Country.find_by_key!( $1 )
-      reader = NationalTeamReader.new( include_path )
+      
+      # note: if two letters, assume country key
+      #       if three letters, assume team key
+  
+      ##   allow three letter codes
+      ##  assume three letter code are *team* codes (e.g. fdr, gdr, etc)
+      ##      not country code (allows multiple teams per country)
+
+      if $1.length == 2
+        country = Country.find_by_key!( $1 )
+        ###  for now assume country code matches team for now (do NOT forget to downcase e.g. BRA==bra)
+        logger.info "  assume country code == team code for #{country.code}"
+        team = Team.find_by_key!( country.code.downcase )
+      else  # assume length == 3
+        team = Team.find_by_key!( $1 )
+      end
+
+      reader = SquadReader.new( include_path )
       ## note: pass in @event.id - that is, last seen event (e.g. parsed via GameReader/MatchReader)
-      reader.read( name, country_id: country.id, event_id: @event.id )
+      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 )

data/lib/sportdb/readers/{national_team.rb → squad.rb}

@@ -1,10 +1,13 @@
 # encoding: UTF-8
 
+### fix: change/rename file to squads.rb !!!
+
+
 module SportDb
 
+### squad/roster reader for national teams for now
 
-### squad/roster reader for national teams
-class NationalTeamReader
+class SquadReader
 
   include LogUtils::Logging
 
@@ -27,6 +30,9 @@ class NationalTeamReader
 
 
   def read( name, more_attribs={} )
+    ## note:
+    #    event_id and team_id required!!
+
     ## todo: move name_real_path code to LineReaderV2 ????
     pos = name.index( '!/')
     if pos.nil?
@@ -46,29 +52,21 @@ class NationalTeamReader
     @event = Event.find( more_attribs[:event_id] )
     pp @event
 
-    ## check/fix:
-    ##   allow three letter codes
-    ##  assume three letter code are *team* codes (e.g. fdr, gdr, etc)
-    ##      not country code (allows multiple teams per country)
-
-    ### check for country_id
-    ##  fix: check for country_key  - allow (convert to country_id)
-
-    country = Country.find( more_attribs[:country_id] )
-    logger.info "  find national team squad/lineup for #{country.name}"
-
-    ## todo/fix: find national team for country - use event.teams w/ where country.id ??
-    ###  for now assume country code matches team for now (do NOT forget to downcase e.g. BRA==bra)
-    logger.info "  assume country code == team code for #{country.code}"
-    
     ## note: use @team - share/use in worker method
-    @team = Team.find_by_key!( country.code.downcase )
+    @team = Team.find( more_attribs[:team_id] )
     pp @team
 
     ### SportDb.lang.lang = LangChecker.new.analyze( name, include_path )
 
     reader = LineReader.new( path )
 
+
+    ##########
+    # fix: lookup table for now assumes national team
+    #   make it usable for clubs too etc. 
+    country = @team.country
+    pp country
+
     logger.info "  persons count for country: #{country.persons.count}"
     @known_persons = TextUtils.build_title_table_for( country.persons )
 
@@ -80,6 +78,9 @@ class NationalTeamReader
 
 
   def read_worker( reader )
+    ##
+    ## fix: use num (optional) for offical jersey number
+    #  use pos for internal use only (ordering)
 
     pos_counter = 999000   # pos counter for undefined players w/o pos
 
@@ -95,22 +96,48 @@ class NationalTeamReader
         pos = pos_counter
       end
 
+      #####
+      #  - for now do NOT map team
       # 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}<"
 
-      if person.nil?
-        logger.error " !!!!!! no mapping found for player in line >#{line}< for team #{@team.code} - #{@team.title}"
-        next   ## skip further processing of line; can NOT save w/o person; continue w/ next record
-      end
+      if person_key.nil?
+        ## no person match found; try auto-add person
+        logger.info "  !! no player match found; try auto-create player"
+
+        buf = line.clone
+        # remove (single match) if line starts w/ - (allow spaces)  e.g. | - or |-  note: must start line e.g. anchor ^ used
+        buf = buf.sub( /^[ ]*-[ ]*/, '' )
+        buf = buf.gsub( /\[[^\]]+\]/, '' )         # remove [POS] or similar
+        buf = buf.gsub( /\b(GK|DF|MF|FW)\b/, '' )   # remove position marker - use sub (just single marker?)
+        buf = buf.strip   # remove leading and trailing spaces
+
+        ## assume what's left is player name
+        logger.info "   player_name >#{buf}<"
+
+        ## fix: add auto flag (for auto-created persons/players)
+        ## fix: move title_to_key logic to person model etc.
+        person_attribs = {
+               key:   TextUtils.title_to_key( buf ),
+               title: buf
+        }
+        logger.info "   using attribs: #{person_attribs.inspect}"
+
+        person = Person.create!( person_attribs )
+      else
+        person = Person.find_by_key( person_key )
 
+        if person.nil?
+          logger.error " !!!!!! no mapping found for player in line >#{line}< for team #{@team.code} - #{@team.title}"
+          next   ## skip further processing of line; can NOT save w/o person; continue w/ next record
+        end
+      end
 
 
       ### check if roster record exists
@@ -138,5 +165,5 @@ class NationalTeamReader
   end # method read_worker
 
 
-end # class NationTeamReader
+end # class SquadReader
 end # module SportDb

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.9.2'
+  VERSION = '1.9.3'
 end
 
 

data/test/data/world-cup/2014/squads/jp-japan.txt

@@ -0,0 +1,30 @@
+#######
+# note: players NOT in players database; will get auto-created for testing
+#
+
+ (1)  GK  Eiji Kawashima                     ##  56, Standard Liège (BEL)
+(12)  GK  Shusaku Nishikawa                  ##  12, Urawa Red Diamonds (JPN)
+(23)  GK  Shūichi Gonda                      ##   2, F.C. Tokyo (JPN)
+
+ (2)  DF  Atsuto Uchida                      ##  67, Schalke 04 (GER)
+ (3)  DF  Gōtoku Sakai                       ##  12, VfB Stuttgart (GER)
+ (5)  DF  Yuto Nagatomo                      ##  69, Internazionale (ITA)
+ (6)  DF  Masato Morishige                   ##   9, F.C. Tokyo (JPN)
+(15)  DF  Yasuyuki Konno                     ##  80, Gamba Osaka (JPN)
+(19)  DF  Masahiko Inoha                     ##  21, Jubilo Iwata (JPN)
+(21)  DF  Hiroki Sakai                       ##  17, Hannover 96 (GER)
+(22)  DF  Maya Yoshida                       ##  40, Southampton (ENG)
+
+ (4)  MF  Keisuke Honda                      ##  55, Milan (ITA)
+ (7)  MF  Yasuhito Endō                      ## 143, Gamba Osaka (JPN)
+ (8)  MF  Hiroshi Kiyotake                   ##  25, 1. FC Nürnberg (GER)
+(10)  MF  Shinji Kagawa                      ##  56, Manchester United (ENG)
+(14)  MF  Toshihiro Aoyama                   ##   5, Sanfrecce Hiroshima (JPN)
+(16)  MF  Hotaru Yamaguchi                   ##  11, Cerezo Osaka (JPN)
+(17)  MF  Makoto Hasebe                      ##  78, 1. FC Nürnberg (GER)
+
+ (9)  FW  Shinji Okazaki                     ##  75, Mainz 05 (GER)
+(11)  FW  Yoichiro Kakitani                  ##  11, Cerezo Osaka (JPN)
+(13)  FW  Yoshito Ōkubo                      ##  56, Kawasaki Frontale (JPN)
+(18)  FW  Yuya Osako                         ##   8, 1860 München (GER)
+(20)  FW  Manabu Saitō                       ##   4, Yokohama F. Marinos (JPN)

data/test/data/world-cup/2014/squads/uy-uruguay.txt

@@ -0,0 +1,32 @@
+#######
+# note: try without (w/o) jersey number e.g.  use - instead of (1) (12) etc.
+#   - players NOT in players database; will get auto-created for testing
+
+
+  -  GK  Fernando Muslera                   ##  57, Galatasaray (TUR)
+  -  GK  Rodrigo Muñoz                      ##   0, Libertad (PAR)
+  -  GK  Martín Silva                       ##   4, Vasco da Gama (BRA)
+
+  -  DF  Diego Lugano                       ##  93, West Bromwich Albion (ENG)
+  -  DF  Diego Godín                        ##  76, Atlético Madrid (ESP)
+  -  DF  Sebastián Coates                   ##  14, Nacional (URU)
+  -  DF  Jorge Fucile                       ##  41, Porto (POR)
+  -  DF  Maxi Pereira                       ##  89, Benfica (POR)
+  -  DF  José María Giménez                 ##   5, Atlético Madrid (ESP)
+  -  DF  Martín Cáceres                     ##  56, Juventus (ITA)
+
+  -  MF  Walter Gargano                     ##  62, Parma (ITA)
+  -  MF  Álvaro Pereira                     ##  56, São Paulo (BRA)
+  -  MF  Cristian Rodríguez                 ##  72, Atlético Madrid (ESP)
+  -  MF  Nicolás Lodeiro                    ##  26, Botafogo (BRA)
+  -  MF  Diego Pérez                        ##  89, Bologna (ITA)
+  -  MF  Egidio Arévalo Ríos                ##  54, Morelia (MEX)
+  -  MF  Gastón Ramírez                     ##  28, Southampton (ENG)
+  -  MF  Álvaro González                    ##  42, Lazio (ITA)
+
+  -  FW  Abel Hernández                     ##  12, Palermo (ITA)
+  -  FW  Luis Suárez                        ##  77, Liverpool (ENG)
+  -  FW  Diego Forlán                       ## 109, Cerezo Osaka (JPN)
+  -  FW  Christian Stuani                   ##   9, Espanyol (ESP)
+  -  FW  Edinson Cavani                     ##  61, Paris Saint-Germain (FRA)
+

data/test/helper.rb

@@ -52,7 +52,7 @@ SeasonReader       = SportDb::SeasonReader
 LeagueReader       = SportDb::LeagueReader
 EventReader        = SportDb::EventReader
 GameReader         = SportDb::GameReader
-NationalTeamReader = SportDb::NationalTeamReader
+SquadReader        = SportDb::SquadReader
 RaceTeamReader     = SportDb::RaceTeamReader
 
 PersonReader       = PersonDb::PersonReader

data/test/{test_national_team_reader.rb → test_squad_reader.rb}

@@ -2,14 +2,14 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_national_team_reader.rb
+#     ruby -I ./lib -I ./test test/test_squad_reader.rb
 #  or better
 #     rake -I ./lib test
 
 
 require 'helper'
 
-class TestNationalTeamReader < MiniTest::Unit::TestCase
+class TestSquadReader < MiniTest::Unit::TestCase
 
   def setup
     WorldDb.delete!
@@ -50,8 +50,8 @@ class TestNationalTeamReader < MiniTest::Unit::TestCase
 
     event = Event.find_by_key!( 'world.2014' )
 
-    reader = NationalTeamReader.new( SportDb.test_data_path )
-    reader.read( 'world-cup/2014/squads/br-brazil', country_id: br.id, event_id: event.id )
+    reader = SquadReader.new( SportDb.test_data_path )
+    reader.read( 'world-cup/2014/squads/br-brazil', team_id: bra.id, event_id: event.id )
 
     assert_equal 23, Roster.count
   end  # method test_br
@@ -70,11 +70,47 @@ class TestNationalTeamReader < MiniTest::Unit::TestCase
 
     event = Event.find_by_key!( 'world.2014' )
 
-    reader = NationalTeamReader.new( SportDb.test_data_path )
-    reader.read( 'world-cup/2014/squads/de-deutschland', country_id: de.id, event_id: event.id )
+    reader = SquadReader.new( SportDb.test_data_path )
+    reader.read( 'world-cup/2014/squads/de-deutschland', team_id: ger.id, event_id: event.id )
 
     assert_equal 3, Roster.count
   end  # method test_de
 
 
-end # class TestNationalTeamReader
+  def test_uy
+    uy = Country.create!( key: 'uy', title: 'Uruguay', code: 'URU', pop: 1, area: 1)
+
+    assert_equal 0, Person.count
+    assert_equal 0, Roster.count
+
+    uru = Team.create!( key: 'uru', title: 'Uruguay', code: 'URU', country_id: uy.id )
+
+    event = Event.find_by_key!( 'world.2014' )
+
+    reader = SquadReader.new( SportDb.test_data_path )
+    reader.read( 'world-cup/2014/squads/uy-uruguay', team_id: uru.id, event_id: event.id )
+
+    assert_equal 23, Roster.count
+    assert_equal 23, Person.count
+  end  # method test_uy
+
+
+  def test_jp
+    jp = Country.create!( key: 'jp', title: 'Japan', code: 'JPN', pop: 1, area: 1)
+
+    assert_equal 0, Person.count
+    assert_equal 0, Roster.count
+
+    jpn = Team.create!( key: 'jpn', title: 'Japan', code: 'JPN', country_id: jp.id )
+
+    event = Event.find_by_key!( 'world.2014' )
+
+    reader = SquadReader.new( SportDb.test_data_path )
+    reader.read( 'world-cup/2014/squads/jp-japan', team_id: jpn.id, event_id: event.id )
+
+    assert_equal 23, Roster.count
+    assert_equal 23, Person.count
+  end  # method test_jp
+
+
+end # class TestSquadReader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &72505740 !ruby/object:Gem::Requirement
+  requirement: &77222090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72505740
+  version_requirements: *77222090
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &72505490 !ruby/object:Gem::Requirement
+  requirement: &77221830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72505490
+  version_requirements: *77221830
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &72505260 !ruby/object:Gem::Requirement
+  requirement: &77221580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72505260
+  version_requirements: *77221580
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &72521250 !ruby/object:Gem::Requirement
+  requirement: &77221170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *72521250
+  version_requirements: *77221170
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &72520820 !ruby/object:Gem::Requirement
+  requirement: &77220840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72520820
+  version_requirements: *77220840
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &72520360 !ruby/object:Gem::Requirement
+  requirement: &77220610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72520360
+  version_requirements: *77220610
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &72519880 !ruby/object:Gem::Requirement
+  requirement: &77220380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72519880
+  version_requirements: *77220380
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &72518680 !ruby/object:Gem::Requirement
+  requirement: &77220110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *72518680
+  version_requirements: *77220110
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &72517660 !ruby/object:Gem::Requirement
+  requirement: &77219890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *72517660
+  version_requirements: *77219890
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &72516940 !ruby/object:Gem::Requirement
+  requirement: &77219700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72516940
+  version_requirements: *77219700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72516180 !ruby/object:Gem::Requirement
+  requirement: &77219450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *72516180
+  version_requirements: *77219450
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &72514980 !ruby/object:Gem::Requirement
+  requirement: &77219100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *72514980
+  version_requirements: *77219100
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -224,11 +224,11 @@ files:
 - lib/sportdb/readers/game.rb
 - lib/sportdb/readers/ground.rb
 - lib/sportdb/readers/league.rb
-- lib/sportdb/readers/national_team.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
@@ -285,6 +285,8 @@ files:
 - test/data/world-cup/2014/cup.yml
 - test/data/world-cup/2014/squads/br-brazil.txt
 - test/data/world-cup/2014/squads/de-deutschland.txt
+- test/data/world-cup/2014/squads/jp-japan.txt
+- test/data/world-cup/2014/squads/uy-uruguay.txt
 - test/data/world-cup/leagues.txt
 - test/data/world-cup/seasons_1930.txt
 - test/data/world-cup/seasons_1954.txt
@@ -302,13 +304,13 @@ files:
 - test/test_goals.rb
 - test/test_lang.rb
 - test/test_load.rb
-- test/test_national_team_reader.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_standings.rb
 - test/test_utils.rb
 - test/test_winner.rb
@@ -360,10 +362,10 @@ test_files:
 - 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_national_team_reader.rb
 - test/test_goals.rb
 - test/test_reader.rb
 - test/test_assoc_reader.rb