sportdb-config 0.4.0 → 0.4.1

data/lib/sportdb/config/league_reader.rb

@@ -1,65 +1,65 @@
-# encoding: utf-8
-
-
-module SportDb
-  module Import
-
-class LeagueReader
-
-def self.read( path )
-  txt = File.open( path, 'r:utf-8' ).read
-  parse( txt )
-end
-
-
-
-SEASON_REGEX = /\[
-                (?<season>
-                   \d{4}
-                   (-\d{2,4})?
-                )
-               \]/x
-
-def self.parse( txt )
-  hash = {}
-  season = '*'   ## use '*' for default/latest season
-
-  txt.each_line do |line|
-    line = line.strip
-
-    next if line.empty?
-    next if line.start_with?( '#' )   ## skip comments too
-
-    ## strip inline comments too
-    line = line.sub( /#.*/, '' ).strip
-
-    pp line
-
-
-    if (m=line.match( SEASON_REGEX ))
-        season = m[:season]
-    else
-      key_line, values_line = line.split( '=>' )
-      values  = values_line.split( ',' )
-
-      ## remove leading and trailing spaces
-      key_line = key_line.strip
-      values = values.map { |value| value.strip }
-      pp values
-
-      league_key      = key_line
-      league_basename = values[0]
-
-      hash[season] ||= {}
-      hash[season][league_key] = league_basename
-    end
-  end
-  hash
-end # method read
-
-end ## class LeagueReader
-
-
-
-end ## module Import
-end ## module SportDb
+# encoding: utf-8
+
+
+module SportDb
+  module Import
+
+class LeagueReader
+
+def self.read( path )
+  txt = File.open( path, 'r:utf-8' ).read
+  parse( txt )
+end
+
+
+
+SEASON_REGEX = /\[
+                (?<season>
+                   \d{4}
+                   (-\d{2,4})?
+                )
+               \]/x
+
+def self.parse( txt )
+  hash = {}
+  season = '*'   ## use '*' for default/latest season
+
+  txt.each_line do |line|
+    line = line.strip
+
+    next if line.empty?
+    next if line.start_with?( '#' )   ## skip comments too
+
+    ## strip inline comments too
+    line = line.sub( /#.*/, '' ).strip
+
+    pp line
+
+
+    if (m=line.match( SEASON_REGEX ))
+        season = m[:season]
+    else
+      key_line, values_line = line.split( '=>' )
+      values  = values_line.split( ',' )
+
+      ## remove leading and trailing spaces
+      key_line = key_line.strip
+      values = values.map { |value| value.strip }
+      pp values
+
+      league_key      = key_line
+      league_basename = values[0]
+
+      hash[season] ||= {}
+      hash[season][league_key] = league_basename
+    end
+  end
+  hash
+end # method read
+
+end ## class LeagueReader
+
+
+
+end ## module Import
+end ## module SportDb

data/lib/sportdb/config/league_utils.rb

@@ -1,24 +1,24 @@
-# encoding: utf-8
-
-
-module LeagueHelper
-  def basename( league, country:, season: nil )
-     ## e.g. eng-england, 2011-12, 1  returns  1-premierleague
-     ##
-     ##  allow country code or (repo) package name
-     ##    e.g. eng-england or eng
-     ##         de-deutschland or de etc.
-
-     leagues = SportDb::Import.config.leagues
-
-     result = leagues.basename( league, country: country, season: season )
-
-     ##
-     # note: if no mapping / nothing found return league e.g. 1, 2, 3, 3a, 3b, cup(?), etc.
-     result ? result : league
-  end
-end
-
-module LeagueUtils
-  extend LeagueHelper
-end
+# encoding: utf-8
+
+
+module LeagueHelper
+  def basename( league, country:, season: nil )
+     ## e.g. eng-england, 2011-12, 1  returns  1-premierleague
+     ##
+     ##  allow country code or (repo) package name
+     ##    e.g. eng-england or eng
+     ##         de-deutschland or de etc.
+
+     leagues = SportDb::Import.config.leagues
+
+     result = leagues.basename( league, country: country, season: season )
+
+     ##
+     # note: if no mapping / nothing found return league e.g. 1, 2, 3, 3a, 3b, cup(?), etc.
+     result ? result : league
+  end
+end
+
+module LeagueUtils
+  extend LeagueHelper
+end

data/lib/sportdb/config/variants.rb

@@ -1,81 +1,91 @@
-# encoding: utf-8
-
-module SportDb
-  module Import
-
-
-
-class Variant    ## (spelling) variant finder / builder for names
-
-
-def self.frequency_table( name )   ## todo/check: use/rename to char_frequency_table
-  ## calculate the frequency table of letters, digits, etc.
-  freq = Hash.new(0)
-  name.each_char do |ch|
-     freq[ch] += 1
-  end
-  freq
-end
-
-ALPHA_SPECIALS = %w[
-  Ä Ö Ü
-  ä ö ü ß
-]
-
-##  "simple" translation
-SUB_ALPHA_SPECIALS = {
-  'Ä'=>'A',  'ä'=>'a',
-  'Ö'=>'O',  'ö'=>'o',
-  'Ü'=>'U',  'ü'=>'u',
-             'ß'=>'ss',
-}
-
-##  de,at,ch translation for umlauts
-SUB_ALPHA_SPECIALS_DE = {
-  'Ä'=>'Ae',  'ä'=>'ae',
-  'Ö'=>'Oe',  'ö'=>'oe',
-  'Ü'=>'Ue',  'ü'=>'ue',
-              'ß'=>'ss',
-}
-
-
-def self.alpha_specials_count( freq )
-  ALPHA_SPECIALS.reduce(0) do |count,ch|
-    count += freq[ch]
-    count
-  end
-end
-
-def self.tr( name, mapping )
-  buf = String.new
-  name.each_char do |ch|
-    buf << if mapping[ch]
-              mapping[ch]
-            else
-              ch
-            end
-  end
-  buf
-end
-
-
-
-def self.find( name )
-  alt_names = []
-
-  freq = frequency_table( name )
-
-  if alpha_specials_count( freq ) > 0    # check if includes äöü etc.
-    alt_names <<  tr( name, SUB_ALPHA_SPECIALS )
-    alt_names <<  tr( name, SUB_ALPHA_SPECIALS_DE )
-  end
-
-  ## todo - make uniq  e.g. Preußen is Preussen, Preussen 2x
-  alt_names = alt_names.uniq
-  alt_names
-end
-end   # Variant
-
-
-end ## module Import
-end ## module SportDb
+# encoding: utf-8
+
+module SportDb
+  module Import
+
+
+
+class Variant    ## (spelling) variant finder / builder for names
+
+
+def self.frequency_table( name )   ## todo/check: use/rename to char_frequency_table
+  ## calculate the frequency table of letters, digits, etc.
+  freq = Hash.new(0)
+  name.each_char do |ch|
+     freq[ch] += 1
+  end
+  freq
+end
+
+
+##  "simple" translation
+ALPHA_SPECIALS = {
+  'Ä'=>'A',  'ä'=>'a',
+             'á'=>'a',
+             'à'=>'a',
+  'É'=>'E',  'é'=>'e',
+             'í'=>'i',
+             'ñ'=>'n',
+  'Ö'=>'O',  'ö'=>'o',
+             'ó'=>'o',
+  'Ü'=>'U',  'ü'=>'u',
+             'ú'=>'u',
+             'ß'=>'ss',
+}
+
+##  de,at,ch translation for umlauts
+ALPHA_SPECIALS_DE = {
+  'Ä'=>'Ae',  'ä'=>'ae',
+  'Ö'=>'Oe',  'ö'=>'oe',
+  'Ü'=>'Ue',  'ü'=>'ue',
+              'ß'=>'ss',
+}
+
+## add ALPHA_SPECIALS_ES - why? why not?  is Espanyol catalan spelling or spanish (castillian)?
+# 'ñ'=>'ny',    ## e.g. Español => Espanyol
+
+
+
+def self.alpha_specials_count( freq, mapping )
+  mapping.keys.reduce(0) do |count,ch|
+    count += freq[ch]
+    count
+  end
+end
+
+def self.tr( name, mapping )
+  buf = String.new
+  name.each_char do |ch|
+    buf << if mapping[ch]
+              mapping[ch]
+            else
+              ch
+            end
+  end
+  buf
+end
+
+
+
+def self.find( name )
+  alt_names = []
+
+  freq = frequency_table( name )
+
+  if alpha_specials_count( freq, ALPHA_SPECIALS  ) > 0    # check if includes äöü etc.
+    alt_names <<  tr( name, ALPHA_SPECIALS )
+  end
+
+  if alpha_specials_count( freq, ALPHA_SPECIALS_DE  ) > 0   ## todo/fix: add / pass-in language/country code and check - why? why not?
+    alt_names <<  tr( name, ALPHA_SPECIALS_DE )
+  end
+
+  ## todo - make uniq  e.g. Preußen is Preussen, Preussen 2x
+  alt_names = alt_names.uniq
+  alt_names
+end
+end   # Variant
+
+
+end ## module Import
+end ## module SportDb

data/lib/sportdb/config/version.rb

@@ -8,7 +8,7 @@ module Boot      ## note: use a different module than Config to avoid confusion
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 4
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_club_reader.rb

@@ -1,150 +1,150 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_club_reader.rb
-
-
-require 'helper'
-
-class TestClubReader < MiniTest::Test
-
-  def test_parse_at
-    recs = SportDb::Import::ClubReader.parse( <<TXT )
-==================================
-=  Austria (at)
-
-FK Austria Wien, Wien
-  | Austria Vienna | Austria Wien
-SK Rapid Wien, Wien
-  | Rapid Vienna | Rapid Wien
-Wiener Sport-Club, Wien
-TXT
-
-    pp recs
-
-    assert_equal 3, recs.size
-    assert_equal 'FK Austria Wien',  recs[0].name
-    assert_equal 'Wien',             recs[0].city
-  end
-
-  def test_parse_us
-    recs = SportDb::Import::ClubReader.parse( <<TXT )
-==================================================
-= United States (us)
-
-#######################################
-# Major League Soccer (MLS) teams
-
-Atlanta United FC, 2017,  Atlanta       › Georgia
-  | Atlanta United
-Chicago Fire, 1998,  Bridgeview    › Illinois
-FC Dallas, 1996,  Frisco        › Texas     ## note: FC Dallas named >Dallas Burn< from 1996-2004
-
-##################################
-#  Defunct / Historic
-Miami Fusion     (1998-2001),  Fort Lauderdale › Florida
-CD Chivas USA    (2005-2014),  Carson          › California
-  | Chivas USA
-TXT
-
-    pp recs
-
-    assert_equal 5, recs.size
-    assert_equal 'Atlanta United FC',  recs[0].name
-    assert_equal 2017,                 recs[0].year
-    assert_equal 'Atlanta',            recs[0].city
-    assert_equal ['Georgia'],          recs[0].geos
-  end
-
-
-  def test_parse_years
-    recs = SportDb::Import::ClubReader.parse( <<TXT )
-= United States (us)
-FC Dallas (1996-),         Frisco        › Texas
-Miami Fusion (1998-2001),  Fort Lauderdale › Florida
-CD Chivas USA (-2014),     Carson          › California
-TXT
-
-    pp recs
-
-    assert_equal 3, recs.size
-    assert_equal 1996,   recs[0].year
-    assert_equal false,  recs[0].historic?
-    assert_equal false,  recs[0].past?
-
-    assert_equal 1998,   recs[1].year
-    assert_equal 2001,   recs[1].year_end
-    assert_equal true,   recs[1].historic?
-    assert_equal true,   recs[1].past?
-
-    assert_equal 2014,   recs[2].year_end
-    assert_equal true,   recs[2].historic?
-    assert_equal true,   recs[2].past?
-  end
-
-  def test_parse_geos
-    recs = SportDb::Import::ClubReader.parse( <<TXT )
-=  England (eng)
-== Greater London
-
-Fulham FC, 1879,  @ Craven Cottage,   London (Fulham)   › Greater London
-  | Fulham | FC Fulham
-Charlton Athletic FC,  @ The Valley,  London (Charlton) › Greater London
-  | Charlton | Charlton Athletic
-
-=  Deutschland (de)
-== Hamburg
-
-St. Pauli,   Hamburg (St. Pauli)
-TXT
-
-    pp recs
-
-    assert_equal 3, recs.size
-    assert_equal 'London',           recs[0].city
-    assert_equal 'Fulham',           recs[0].district
-    assert_equal ['Greater London'], recs[0].geos
-    assert_equal 'England',          recs[0].country.name
-    assert_equal 'eng',              recs[0].country.key
-
-    assert_equal 'London',           recs[1].city
-    assert_equal 'Charlton',         recs[1].district
-    assert_equal ['Greater London'], recs[1].geos
-    assert_equal 'England',          recs[1].country.name
-    assert_equal 'eng',              recs[1].country.key
-
-    assert_equal 'Hamburg',          recs[2].city
-    assert_equal 'St. Pauli',        recs[2].district
-    assert_equal ['Hamburg'],        recs[2].geos
-    assert_equal 'Germany',          recs[2].country.name
-    assert_equal 'de',               recs[2].country.key
-  end
-
-
-  def test_parse_headings
-    recs = SportDb::Import::ClubReader.parse( <<TXT )
-==============
-====
-===========
-= Heading 1   - Austria (at)
-= Heading 1   - Austria (at) ==================
-== Heading 2
-== Heading 2 =========
-=== Heading 3
-=== Heading 3 ===============
-=== Heading 3             # with end-of-line comment
-=== Heading 3             ## with end-of-line comment
-=== Heading 3 =========   # with end-of-line comment
-== Heading 2
-==== Heading 4
-= ?????
-== ???
-TXT
-
-    pp recs
-
-    assert_equal 0, recs.size
-  end
-
-end # class TestClubReader
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_club_reader.rb
+
+
+require 'helper'
+
+class TestClubReader < MiniTest::Test
+
+  def test_parse_at
+    recs = SportDb::Import::ClubReader.parse( <<TXT )
+==================================
+=  Austria (at)
+
+FK Austria Wien, Wien
+  | Austria Vienna | Austria Wien
+SK Rapid Wien, Wien
+  | Rapid Vienna | Rapid Wien
+Wiener Sport-Club, Wien
+TXT
+
+    pp recs
+
+    assert_equal 3, recs.size
+    assert_equal 'FK Austria Wien',  recs[0].name
+    assert_equal 'Wien',             recs[0].city
+  end
+
+  def test_parse_us
+    recs = SportDb::Import::ClubReader.parse( <<TXT )
+==================================================
+= United States (us)
+
+#######################################
+# Major League Soccer (MLS) teams
+
+Atlanta United FC, 2017,  Atlanta       › Georgia
+  | Atlanta United
+Chicago Fire, 1998,  Bridgeview    › Illinois
+FC Dallas, 1996,  Frisco        › Texas     ## note: FC Dallas named >Dallas Burn< from 1996-2004
+
+##################################
+#  Defunct / Historic
+Miami Fusion     (1998-2001),  Fort Lauderdale › Florida
+CD Chivas USA    (2005-2014),  Carson          › California
+  | Chivas USA
+TXT
+
+    pp recs
+
+    assert_equal 5, recs.size
+    assert_equal 'Atlanta United FC',  recs[0].name
+    assert_equal 2017,                 recs[0].year
+    assert_equal 'Atlanta',            recs[0].city
+    assert_equal ['Georgia'],          recs[0].geos
+  end
+
+
+  def test_parse_years
+    recs = SportDb::Import::ClubReader.parse( <<TXT )
+= United States (us)
+FC Dallas (1996-),         Frisco        › Texas
+Miami Fusion (1998-2001),  Fort Lauderdale › Florida
+CD Chivas USA (-2014),     Carson          › California
+TXT
+
+    pp recs
+
+    assert_equal 3, recs.size
+    assert_equal 1996,   recs[0].year
+    assert_equal false,  recs[0].historic?
+    assert_equal false,  recs[0].past?
+
+    assert_equal 1998,   recs[1].year
+    assert_equal 2001,   recs[1].year_end
+    assert_equal true,   recs[1].historic?
+    assert_equal true,   recs[1].past?
+
+    assert_equal 2014,   recs[2].year_end
+    assert_equal true,   recs[2].historic?
+    assert_equal true,   recs[2].past?
+  end
+
+  def test_parse_geos
+    recs = SportDb::Import::ClubReader.parse( <<TXT )
+=  England (eng)
+== Greater London
+
+Fulham FC, 1879,  @ Craven Cottage,   London (Fulham)   › Greater London
+  | Fulham | FC Fulham
+Charlton Athletic FC,  @ The Valley,  London (Charlton) › Greater London
+  | Charlton | Charlton Athletic
+
+=  Deutschland (de)
+== Hamburg
+
+St. Pauli,   Hamburg (St. Pauli)
+TXT
+
+    pp recs
+
+    assert_equal 3, recs.size
+    assert_equal 'London',           recs[0].city
+    assert_equal 'Fulham',           recs[0].district
+    assert_equal ['Greater London'], recs[0].geos
+    assert_equal 'England',          recs[0].country.name
+    assert_equal 'eng',              recs[0].country.key
+
+    assert_equal 'London',           recs[1].city
+    assert_equal 'Charlton',         recs[1].district
+    assert_equal ['Greater London'], recs[1].geos
+    assert_equal 'England',          recs[1].country.name
+    assert_equal 'eng',              recs[1].country.key
+
+    assert_equal 'Hamburg',          recs[2].city
+    assert_equal 'St. Pauli',        recs[2].district
+    assert_equal ['Hamburg'],        recs[2].geos
+    assert_equal 'Germany',          recs[2].country.name
+    assert_equal 'de',               recs[2].country.key
+  end
+
+
+  def test_parse_headings
+    recs = SportDb::Import::ClubReader.parse( <<TXT )
+==============
+====
+===========
+= Heading 1   - Austria (at)
+= Heading 1   - Austria (at) ==================
+== Heading 2
+== Heading 2 =========
+=== Heading 3
+=== Heading 3 ===============
+=== Heading 3             # with end-of-line comment
+=== Heading 3             ## with end-of-line comment
+=== Heading 3 =========   # with end-of-line comment
+== Heading 2
+==== Heading 4
+= ?????
+== ???
+TXT
+
+    pp recs
+
+    assert_equal 0, recs.size
+  end
+
+end # class TestClubReader