sportdb-formats 1.0.6 → 1.1.4

data/lib/sportdb/formats/team/club_reader_props.rb

@@ -36,17 +36,16 @@ class ClubPropsReader
 
       ## find / match club by (canocial) name
       m = catalog.clubs.match( name )
-      if m && m.size > 1
+      if m.size > 1
         puts "** !!! WARN !!! ambigious (multiple) club matches (#{m.size}) for name >#{name}< in props row:"
         pp rec
         pp m
 
         ## todo/fix:  try filter by canonical name if more than one match
         m = m.select { |club| club.name == name }
-        m = nil    if m.empty?     ## note: reset to nil if no more matches
       end
 
-      if m.nil?
+      if m.empty?
         puts "** !!! ERROR !!! no club match for (canonical) name >#{name}< in props row:"
         pp rec
         exit 1
@@ -62,13 +61,29 @@ class ClubPropsReader
         ## todo/fix:   only updated "on-demand" from in-memory struct/records!!!!
 
         ##  update attributes
-        club_rec.key  = rec['Key']      if rec['Key']
-        club_rec.code = rec['Code']     if rec['Code']
+        club_rec.key  = rec['Key']      if is_not_na?( rec['Key'] )
+        club_rec.code = rec['Code']     if is_not_na?( rec['Code'] )
         ## todo/fix: add (some) more props e.g. address, web, etc.
       end
     end
   end # method parse
 
+
+  ## allow various values for nil or n/a (not available/applicable) for now
+  ##  add more or less - why? why not?
+  def is_not_na?( col ) !is_na?( col); end   ## check: find a better name - why? why not?
+
+  NA_VARIANTS = ['-', '--', '---',
+                 '?', '??', '???',
+                 '_', '__', '___',
+                 'na', 'n/a',
+                 'nil', 'null']
+
+  def is_na?( col )
+    col.nil? || col.empty? || NA_VARIANTS.include?( col.downcase )
+  end
+
+
 end # class ClubPropsReader
 
 end ## module Import

data/lib/sportdb/formats/version.rb

@@ -6,8 +6,8 @@ module SportDb
 module Formats
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
-  PATCH = 6
+  MINOR = 1
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -1,5 +1,9 @@
 ## note: use the local version of gems
 $LOAD_PATH.unshift( File.expand_path( '../date-formats/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../score-formats/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../sportdb-langs/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../sportdb-structs/lib' ))
+
 
 
 ## minitest setup
@@ -54,12 +58,56 @@ TXT
 = England
 
 Chelsea FC
-Arsenal FC
 Tottenham Hotspur
 West Ham United
 Crystal Palace
-Manchester United
-Manchester City
+
+### note add move entires for testing club name history
+Manchester United FC
+  | Manchester United
+  | Newton Heath FC
+
+Manchester City FC
+  | Manchester City
+  | Ardwick FC
+
+Arsenal FC
+  | The Arsenal FC
+  | Woolwich Arsenal FC
+  | Royal Arsenal FC
+
+Gateshead FC
+  | South Shields FC
+
+Sheffield Wednesday
+  | The Wednesday FC
+
+Port Vale FC
+  | Burslem Port Vale FC
+
+Chesterfield FC
+  | Chesterfield Town FC
+
+Birmingham FC
+  | Small Heath FC
+
+Burton Swifts FC
+Burton Wanderers FC
+Burton United FC
+
+Blackpool FC
+South Shore FC
+
+Glossop FC
+  | Glossop North End FC
+
+Walsall FC
+  | Walsall Town Swifts FC
+
+
+Newcastle West End FC
+Newcastle East End FC
+Newcastle United FC
 TXT
 
     index = ClubIndex.new
@@ -82,81 +130,3 @@ end  # module SportDb
 
 
 
-################
-## helper
-
-def parse_auto_conf( txt, lang: 'en', start: nil )
-  start = start ? start : Date.new( 2017, 7, 1 )
-
-  SportDb::Import.config.lang = lang
-
-  parser = SportDb::AutoConfParser.new( txt, start )
-  parser.parse
-end
-
-def parse_conf( txt )
-  parser = SportDb::ConfParser.new( txt )
-  parser.parse
-end
-
-
-## note: json always returns hash tables with string keys (not symbols),
-##        thus, always stringify keys before comparing!!!!
-class Object
-  def deep_stringify_keys
-    if self.is_a? Hash
-      self.reduce({}) {|memo,(k,v)| memo[k.to_s] = v.deep_stringify_keys; memo }
-    elsif self.is_a? Array
-      self.reduce([]) {|memo,v    | memo           << v.deep_stringify_keys; memo }
-    else
-      self
-    end
-  end
-end
-
-
-def read_blocks( path )
-  txt = File.open( path, 'r:utf-8' ).read
-
-  blocks = []
-  buf    = String.new('')
-  txt.each_line do |line|
-    if line =~ /^[ ]*
-              ([>]{3,} |
-               [<]{3,})
-              [ ]*
-             $/x   ## three or more markers
-      blocks << buf
-      buf = String.new('')
-    else
-      buf << line
-    end
-  end
-  blocks << buf
-  blocks
-end
-
-
-def parse_json( str )
-   ## note: allow empty string; fall back to empty hash
-  if str.strip.empty?
-    {}
-  else
-    JSON.parse( str )
-  end
-end
-
-def read_test( path )
-  blocks = read_blocks( "#{SportDb::Test.data_dir}/football.txt/#{path}" )
-
-  if blocks.size == 2
-    [blocks[0], parse_json( blocks[1] )]
-  elsif blocks.size == 3
-    ## note: returned in different order
-    ##         optional option block that comes first returned last!
-    [blocks[1], parse_json( blocks[2] ), blocks[0]]
-  else
-    puts "!! ERROR: expected two or three text blocks in >#{path}<; got #{blocks.size}"
-    exit 1
-  end
-end

data/test/test_club_index_history.rb

@@ -0,0 +1,107 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_club_index_history.rb
+
+
+require 'helper'
+
+class TestClubHistoryIndex < MiniTest::Test
+
+  def test_eng
+    txt =<<TXT
+=  England
+
+##  note: use history log by season (instead of by year) - why? why not?
+##
+##  note/warn/remember !! a line starting with arrow (=>)
+##    will get turned into a heading 1!!!
+##    as an ascii-alternative to ⇒   use >> or -> or ??? - why? why not?
+
+== 1930/1
+MOVE        South Shields FC, South Shields  ⇒  Gateshead FC, Gateshead
+
+
+== 1929/30
+RENAME     The Wednesday FC, Sheffield   ⇒  Sheffield Wednesday
+
+== 1927/8
+RENAME     The Arsenal FC, London   ⇒  Arsenal FC
+
+
+== 1914/5
+RENAME     Woolwich Arsenal FC, London   ⇒  The Arsenal FC
+
+
+== 1911/2
+REFORM     Burslem Port Vale FC, Burslem  ⇒  Port Vale FC, Stoke-on-Trent
+  ## the towns of Burslem having been merged in 1910 with the towns of Fenton, Hanley,
+  ## Longton, Stoke-upon-Trent and Tunstall as the city of Stoke-on-Trent
+
+
+== 1909/10
+RENAME      Chesterfield Town FC, Chesterfield  ⇒  Chesterfield FC
+
+
+== 1905/6
+RENAME      Chesterfield FC, Chesterfield ⇒ Chesterfield Town FC
+            Small Heath FC, Birmingham    ⇒ Birmingham FC
+
+== 1902/3
+REFORM      Newton Heath FC, Manchester  ⇒  Manchester United
+
+== 1901/2
+MERGE       Burton Swifts FC,    Burton-upon-Trent
+            Burton Wanderers FC, Burton-upon-Trent
+              ⇒ Burton United FC
+
+BANKRUPT    Newton Heath FC, Manchester
+
+
+== 1899/00
+MERGE      Blackpool FC,   Blackpool
+           South Shore FC, Blackpool
+             ⇒ Blackpool FC
+
+== 1898/9
+RENAME     Glossop North End FC, Glossop  ⇒  Glossop FC
+
+
+== 1895/6
+RENAME      Walsall Town Swifts FC, Walsall  ⇒  Walsall FC
+
+
+== 1894/5
+REFORM      Ardwick FC, Manchester  ⇒  Manchester City FC
+
+== 1893/4
+BANKRUPT    Ardwick FC, Manchester
+
+MERGE      Newcastle West End FC, Newcastle-upon-Tyne
+           Newcastle East End FC, Newcastle-upon-Tyne
+            ⇒ Newcastle United FC
+
+== 1892/3
+RENAME     Royal Arsenal FC, London  ⇒  Woolwich Arsenal FC
+TXT
+
+    recs = SportDb::Import::ClubHistoryReader.parse( txt )
+
+    history = SportDb::Import::ClubHistoryIndex.new
+    history.add( recs )
+
+    pp history.errors
+    pp history.mappings
+
+    # [[1927/28, ["RENAME", [["The Arsenal FC, London", "eng"], ["Arsenal FC", "eng"]]]],
+    #  [1914/15, ["RENAME", [["Woolwich Arsenal FC, London", "eng"], ["The Arsenal FC", "eng"]]]],
+    #  [1892/93, ["RENAME", [["Royal Arsenal FC, London", "eng"], ["Woolwich Arsenal FC", "eng"]]]]],
+    assert_equal 'Arsenal FC',          history.find_name_by( name: 'Arsenal FC', season: '2000/1' )
+    assert_equal 'Arsenal FC',          history.find_name_by( name: 'Arsenal FC', season: '1927/8' )
+    assert_equal 'The Arsenal FC',      history.find_name_by( name: 'Arsenal FC', season: '1926/7' )
+    assert_equal 'Woolwich Arsenal FC', history.find_name_by( name: 'Arsenal FC', season: '1913/4' )
+    assert_equal 'Royal Arsenal FC',    history.find_name_by( name: 'Arsenal FC', season: '1891/2' )
+  end
+
+end # class TestClubHistoryIndex

data/test/test_club_reader_history.rb

@@ -0,0 +1,212 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_club_reader_history.rb
+
+
+require 'helper'
+
+
+class TestClubHistoryReader < MiniTest::Test
+
+  def test_parse_eng
+    txt =<<TXT
+=  England
+
+##  note: use history log by season (instead of by year) - why? why not?
+##
+##  note/warn/remember !! a line starting with arrow (=>)
+##    will get turned into a heading 1!!!
+##    as an ascii-alternative to ⇒   use >> or -> or ??? - why? why not?
+
+
+
+== 1958/9
+RENAME      Scunthorpe & Lindsey United FC, Scunthorpe  ⇒  Scunthorpe United FC
+
+== 1946/7
+RENAME      Clapton Orient FC, London  ⇒  Leyton Orient FC
+
+== 1945/6
+RENAME      Birmingham FC, Birmingham  ⇒  Birmingham City FC
+
+== 1930/1
+MOVE        South Shields FC, South Shields  ⇒  Gateshead FC, Gateshead
+
+
+
+== 1929/30
+RENAME     The Wednesday FC, Sheffield   ⇒  Sheffield Wednesday
+
+== 1927/8
+RENAME     The Arsenal FC, London   ⇒  Arsenal FC
+
+== 1925/6
+RENAME      Millwall Athletic FC, London   ⇒  Millwall FC
+            Stoke FC, Stoke-on-Trent       ⇒  Stoke City FC
+
+MERGE       Rotherham County FC, Rotherham
+            Rotherham Town FC,   Rotherham
+              ⇒ Rotherham United FC
+
+== 1914/5
+RENAME     Woolwich Arsenal FC, London   ⇒  The Arsenal FC
+
+
+== 1911/2
+REFORM     Burslem Port Vale FC, Burslem  ⇒  Port Vale FC, Stoke-on-Trent
+  ## the towns of Burslem having been merged in 1910 with the towns of Fenton, Hanley,
+  ## Longton, Stoke-upon-Trent and Tunstall as the city of Stoke-on-Trent
+
+
+== 1909/10
+RENAME      Chesterfield Town FC, Chesterfield  ⇒  Chesterfield FC
+
+
+== 1905/6
+RENAME      Chesterfield FC, Chesterfield ⇒ Chesterfield Town FC
+            Small Heath FC, Birmingham    ⇒ Birmingham FC
+
+== 1902/3
+REFORM      Newton Heath FC, Manchester  ⇒  Manchester United
+
+== 1901/2
+MERGE       Burton Swifts FC,    Burton-upon-Trent
+            Burton Wanderers FC, Burton-upon-Trent
+              ⇒ Burton United FC
+
+BANKRUPT    Newton Heath FC, Manchester
+
+
+== 1899/00
+RENAME     Barnsley St. Peter's FC, Barnsley  ⇒  Barnsley FC
+
+MERGE      Blackpool FC,   Blackpool
+           South Shore FC, Blackpool
+             ⇒ Blackpool FC
+
+== 1898/9
+RENAME     Glossop North End FC, Glossop  ⇒  Glossop FC
+
+
+== 1895/6
+RENAME      Walsall Town Swifts FC, Walsall  ⇒  Walsall FC
+
+
+== 1894/5
+REFORM      Ardwick FC, Manchester  ⇒  Manchester City FC
+
+== 1893/4
+BANKRUPT    Ardwick FC, Manchester
+
+MERGE      Newcastle West End FC, Newcastle-upon-Tyne
+           Newcastle East End FC, Newcastle-upon-Tyne
+            ⇒ Newcastle United FC
+
+== 1892/3
+RENAME     Royal Arsenal FC, London  ⇒  Woolwich Arsenal FC
+TXT
+
+    recs = SportDb::Import::ClubHistoryReader.parse( txt )
+
+    pp recs
+
+    exp = [["RENAME", "1958/59",
+             ["Scunthorpe & Lindsey United FC, Scunthorpe", "eng"],
+             ["Scunthorpe United FC", "eng"]],
+          ["RENAME", "1946/47",
+            ["Clapton Orient FC, London", "eng"],
+            ["Leyton Orient FC", "eng"]],
+         ["RENAME", "1945/46",
+            ["Birmingham FC, Birmingham", "eng"],
+            ["Birmingham City FC", "eng"]],
+         ["MOVE", "1930/31",
+            ["South Shields FC, South Shields", "eng"],
+            ["Gateshead FC, Gateshead", "eng"]],
+   ["RENAME",
+    "1929/30",
+    ["The Wednesday FC, Sheffield", "eng"],
+    ["Sheffield Wednesday", "eng"]],
+   ["RENAME",
+    "1927/28",
+    ["The Arsenal FC, London", "eng"],
+    ["Arsenal FC", "eng"]],
+   ["RENAME",
+    "1925/26",
+    ["Millwall Athletic FC, London", "eng"],
+    ["Millwall FC", "eng"]],
+   ["RENAME",
+    "1925/26",
+    ["Stoke FC, Stoke-on-Trent", "eng"],
+    ["Stoke City FC", "eng"]],
+   ["MERGE",
+    "1925/26",
+    [["Rotherham County FC, Rotherham", "eng"],
+     ["Rotherham Town FC, Rotherham", "eng"]],
+    ["Rotherham United FC", "eng"]],
+   ["RENAME",
+    "1914/15",
+    ["Woolwich Arsenal FC, London", "eng"],
+    ["The Arsenal FC", "eng"]],
+   ["REFORM",
+    "1911/12",
+    ["Burslem Port Vale FC, Burslem", "eng"],
+    ["Port Vale FC, Stoke-on-Trent", "eng"]],
+   ["RENAME",
+    "1909/10",
+    ["Chesterfield Town FC, Chesterfield", "eng"],
+    ["Chesterfield FC", "eng"]],
+   ["RENAME",
+    "1905/06",
+    ["Chesterfield FC, Chesterfield", "eng"],
+    ["Chesterfield Town FC", "eng"]],
+   ["RENAME",
+    "1905/06",
+    ["Small Heath FC, Birmingham", "eng"],
+    ["Birmingham FC", "eng"]],
+   ["REFORM",
+    "1902/03",
+    ["Newton Heath FC, Manchester", "eng"],
+    ["Manchester United", "eng"]],
+   ["MERGE",
+    "1901/02",
+    [["Burton Swifts FC, Burton-upon-Trent", "eng"],
+     ["Burton Wanderers FC, Burton-upon-Trent", "eng"]],
+    ["Burton United FC", "eng"]],
+   ["BANKRUPT", "1901/02", ["Newton Heath FC, Manchester", "eng"]],
+   ["RENAME",
+    "1899/00",
+    ["Barnsley St. Peter's FC, Barnsley", "eng"],
+    ["Barnsley FC", "eng"]],
+   ["MERGE",
+    "1899/00",
+    [["Blackpool FC, Blackpool", "eng"], ["South Shore FC, Blackpool", "eng"]],
+    ["Blackpool FC", "eng"]],
+   ["RENAME",
+    "1898/99",
+    ["Glossop North End FC, Glossop", "eng"],
+    ["Glossop FC", "eng"]],
+   ["RENAME",
+    "1895/96",
+    ["Walsall Town Swifts FC, Walsall", "eng"],
+    ["Walsall FC", "eng"]],
+   ["REFORM",
+    "1894/95",
+    ["Ardwick FC, Manchester", "eng"],
+    ["Manchester City FC", "eng"]],
+   ["BANKRUPT", "1893/94", ["Ardwick FC, Manchester", "eng"]],
+   ["MERGE",
+    "1893/94",
+    [["Newcastle West End FC, Newcastle-upon-Tyne", "eng"],
+     ["Newcastle East End FC, Newcastle-upon-Tyne", "eng"]],
+    ["Newcastle United FC", "eng"]],
+   ["RENAME",
+    "1892/93",
+    ["Royal Arsenal FC, London", "eng"],
+    ["Woolwich Arsenal FC", "eng"]]]
+
+  assert_equal exp, recs
+  end
+
+end # class TestClubHistoryReader