sportdb-config 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93799fb817b7e01251aa0e0466a139ae6a0154c
-  data.tar.gz: 98b3f7cde0179d48242d65703947f76b65ab3a8b
+  metadata.gz: b3730a1e31df7d9bd0ebbdd4f1127cdf180d94fb
+  data.tar.gz: 236e45970f9e11585cb48a68547a98e641d6ad6d
 SHA512:
-  metadata.gz: 970bb8795434f5689ebf44fc39bf102cb6aec35962db2ca23c2909a2ec342b91132a9982108eb8b34a408add5bae7b788d4101cf0c4351f79abfe6ce062af88a
-  data.tar.gz: 213ab53677e5770539072ab14fd9aad721afb202d208ab287b4690db7d30564afb13e51059951e39ddbe391a712860480f1f86cbd7ecedc36cd84cfbc8630f9c
+  metadata.gz: aac070a5652cba90e1d0b1202241f4903e8ca76b8640037d64657ee6adcefa6a56618b97b2cf927cd8cc2eb1aa4ba734e1c8282476f29201afc261316f4bf8f5
+  data.tar.gz: 8735ac9a8e0cebafcc42a3d28bced5f539e1e85992382b156e6a7111adaa20088050c321b6d810b52ca8f434d810f5e31c5bb3483c26b4bba39cba6abb0d8886

data/Manifest.txt

@@ -3,28 +3,15 @@ Manifest.txt
 NOTES.md
 README.md
 Rakefile
-config/leagues/eng.txt
-config/leagues/fr.txt
-config/leagues/gr.txt
-config/leagues/sco.txt
-config/world/ar.txt
-config/world/at.txt
-config/world/be.txt
-config/world/de.txt
-config/world/eng.txt
 lib/sportdb/config.rb
 lib/sportdb/config/config.rb
-lib/sportdb/config/league.rb
-lib/sportdb/config/league_reader.rb
-lib/sportdb/config/league_utils.rb
 lib/sportdb/config/season_utils.rb
 lib/sportdb/config/version.rb
 lib/sportdb/config/wiki_index.rb
 test/helper.rb
 test/test_clubs.rb
-test/test_config.rb
 test/test_countries.rb
-test/test_league_reader.rb
-test/test_league_utils.rb
+test/test_find_datafiles.rb
+test/test_leagues.rb
 test/test_season_utils.rb
 test/test_wiki_index.rb

data/Rakefile

@@ -22,13 +22,14 @@ Hoe.spec 'sportdb-config' do
   self.extra_deps = [
     ['sportdb-countries', '>= 0.2.0'],
     ['sportdb-clubs',     '>= 0.2.0'],
+    ['sportdb-leagues',   '>= 0.1.0'],
     ## dataset libs / gems
     ['fifa',              '>= 1.0.0'],    ## for (builtin/default) countries
-    ['footballdb-clubs',  '>= 0.2.0'],      ## for (builtin/default) clubs
+    ['footballdb-clubs',  '>= 1.0.0'],      ## for (builtin/default) clubs
   ]
 
   self.spec_extras = {
-   :required_ruby_version => '>= 2.2.2'
+   required_ruby_version: '>= 2.2.2'
   }
 
 end

data/lib/sportdb/config.rb

@@ -3,6 +3,8 @@
 ### our own sportdb libs / gems
 require 'sportdb/countries'
 require 'sportdb/clubs'
+require 'sportdb/leagues'
+
 
 ### "built-in" default dataset libs / gems
 require 'fifa'    ## get a list of all fifa countries with (three letter) codes
@@ -14,19 +16,18 @@ require 'footballdb/clubs'
 require 'sportdb/config/version' # let version always go first
 
 require 'sportdb/config/season_utils'
-require 'sportdb/config/league_utils'
-require 'sportdb/config/league'
-require 'sportdb/config/league_reader'
 require 'sportdb/config/wiki_index'
 require 'sportdb/config/config'
 
 
 
 ## use global Import config - required for countries lookup / mapping (service)
-SportDb::Import::ClubReader.config  = SportDb::Import.config
-SportDb::Import::ClubIndex.config   = SportDb::Import.config
-SportDb::Import::WikiReader.config  = SportDb::Import.config
+SportDb::Import::ClubReader.config   = SportDb::Import.config
+SportDb::Import::ClubIndex.config    = SportDb::Import.config
+SportDb::Import::WikiReader.config   = SportDb::Import.config
 
+SportDb::Import::LeagueReader.config  = SportDb::Import.config
+SportDb::Import::LeagueIndex.config   = SportDb::Import.config
 
 
 

data/lib/sportdb/config/config.rb

@@ -3,7 +3,7 @@
 module SportDb
   module Import
 
-# add builder convenience helper to ClubIndex
+# add builder convenience helper to ClubIndex - why? why not?
 class ClubIndex
 
   def self.build( path )
@@ -14,7 +14,7 @@ class ClubIndex
     end
     recs
 
-    clubs = self.new
+    clubs = new
     clubs.add( recs )
 
     ## add wiki(pedia) anchored links
@@ -31,6 +31,23 @@ class ClubIndex
 end # class ClubIndex
 
 
+class LeagueIndex
+
+  def self.build( path )
+    recs = []
+    datafiles = Configuration.find_datafiles_leagues( path )
+    datafiles.each do |datafile|
+      recs += LeagueReader.read( datafile )
+    end
+    recs
+
+    leagues = new
+    leagues.add( recs )
+    leagues
+  end
+end # class LeagueIndex
+
+
 class Configuration
 
   ##
@@ -55,10 +72,19 @@ class Configuration
     @clubs
   end
 
+  def leagues
+    @leagues ||= build_league_index
+    @leagues
+  end
+
+
   ####
   #  todo/fix:  find a better way to configure club / team datasets
   attr_accessor   :clubs_dir
-  def clubs_dir()   @clubs_dir; end   ### note: return nil if NOT set on purpose for now - why? why not?
+  def clubs_dir()      @clubs_dir; end   ### note: return nil if NOT set on purpose for now - why? why not?
+
+  attr_accessor   :leagues_dir
+  def leagues_dir()    @leagues_dir; end
 
 
   CLUBS_REGEX = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
@@ -66,12 +92,16 @@ class Configuration
                        clubs\.txt$
                    }x
 
-
   CLUBS_WIKI_REGEX = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
                            (?:[a-z]{1,3}\.)?   # optional country code/key e.g. eng.clubs.wiki.txt
                           clubs\.wiki\.txt$
                        }x
 
+  LEAGUES_REGEX = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
+                     (?:[a-z]{1,3}\.)?   # optional country code/key e.g. eng.clubs.txt
+                     leagues\.txt$
+                    }x
+
 
   def self.find_datafiles( path, pattern )
      datafiles = []   ## note: [country, path] pairs for now
@@ -86,9 +116,11 @@ class Configuration
      pp datafiles
      datafiles
   end
+
   def self.find_datafiles_clubs( path )       find_datafiles( path, CLUBS_REGEX ); end
   def self.find_datafiles_clubs_wiki( path )  find_datafiles( path, CLUBS_WIKI_REGEX ); end
 
+  def self.find_datafiles_leagues( path )     find_datafiles( path, LEAGUES_REGEX ); end
 
 
   def build_club_index
@@ -115,23 +147,19 @@ class Configuration
     clubs
 end # method build_club_index
 
-
-def leagues
-  read_leagues()      if @leagues.nil?
-  @leagues
+def build_league_index
+  leagues = if leagues_dir   ## check if clubs_dir is defined / set (otherwise it's nil)
+              LeagueIndex.build( leagues_dir )
+            else   ## no leagues_dir set
+              puts "** !!! ERROR !! no config.leagues_dir set; sorry; CANNOT continue; please set"
+              exit 1
+            end
 end
 
-def read_leagues
-    #####
-    # add / read-in leagues config
-    @leagues = LeagueConfig.new
 
-    self  ## return self for chaining
-  end
 end # class Configuration
 
 
-
 ## lets you use
 ##   SportDb::Import.configure do |config|
 ##      config.hello = 'World'

data/lib/sportdb/config/version.rb

@@ -7,8 +7,8 @@ module Boot      ## note: use a different module than Config to avoid confusion
                  ##   maybe rename later gem itself to sportdb-boot - why? why not?
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 7
-  PATCH = 1
+  MINOR = 8
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -23,9 +23,9 @@ module Boot      ## note: use a different module than Config to avoid confusion
     File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )
   end
 
-  def self.data_dir  ## rename to config_dir - why? why not?
-    "#{root}/config"
-  end
+#  def self.data_dir  ## rename to config_dir - why? why not?
+#    "#{root}/config"
+#  end
 
 
 end # module Boot

data/test/helper.rb

@@ -10,4 +10,5 @@ require 'minitest/autorun'
 require 'sportdb/config'
 
 
-SportDb::Import.config.clubs_dir = '../../../openfootball/clubs'
+SportDb::Import.config.clubs_dir   = '../../../openfootball/clubs'
+SportDb::Import.config.leagues_dir = '../../../openfootball/leagues'

data/test/{test_config.rb → test_find_datafiles.rb}

@@ -2,16 +2,18 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_config.rb
+#     ruby -I ./lib -I ./test test/test_find_datafiles.rb
 
 
 require 'helper'
 
-class TestConfig < MiniTest::Test
+class TestFindDatafiles < MiniTest::Test
 
   def match_clubs( txt )      SportDb::Import::Configuration::CLUBS_REGEX.match( txt ); end
   def match_clubs_wiki( txt ) SportDb::Import::Configuration::CLUBS_WIKI_REGEX.match( txt ); end
 
+  def match_leagues( txt )    SportDb::Import::Configuration::LEAGUES_REGEX.match( txt ); end
+
   def test_find_clubs
       assert match_clubs( 'de.clubs.txt' )
       assert match_clubs( 'deutschland/de.clubs.txt' )
@@ -26,7 +28,6 @@ class TestConfig < MiniTest::Test
       assert !match_clubs( 'de-deutschland/clubs.wiki.txt' )
       assert !match_clubs( 'clubs.wiki.txt' )
       assert !match_clubs( 'deutschland/clubs.wiki.txt' )
-
   end
 
   def test_find_clubs_wiki
@@ -45,4 +46,12 @@ class TestConfig < MiniTest::Test
       assert match_clubs_wiki( 'deutschland/clubs.wiki.txt' )
   end
 
-end # class TestConfig
+  def test_find_leagues
+      assert match_leagues( 'eng.leagues.txt' )
+      assert match_leagues( 'england/eng.leagues.txt' )
+      assert match_leagues( 'europe/england/leagues.txt' )
+      assert match_leagues( 'england/leagues.txt' )
+      assert match_leagues( 'leagues.txt' )
+  end
+
+end # class TestFindDatafiles

data/test/test_leagues.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_leagues.rb
+
+
+require 'helper'
+
+class TestLeagues < MiniTest::Test
+
+  def test_match
+    pp SportDb::Import.config.leagues.errors
+
+    SportDb::Import.config.leagues.dump_duplicates
+
+    m = SportDb::Import.config.leagues.match( 'English Premier League' )
+    assert_equal 'English Premier League', m[0].name
+    assert_equal 'eng.1',                  m[0].key
+    assert_equal 'England',                m[0].country.name
+    assert_equal 'eng',                    m[0].country.key
+  end
+
+end # class TestLeagues

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-countries
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: sportdb-leagues
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: fifa
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -103,44 +117,22 @@ extra_rdoc_files:
 - Manifest.txt
 - NOTES.md
 - README.md
-- config/leagues/eng.txt
-- config/leagues/fr.txt
-- config/leagues/gr.txt
-- config/leagues/sco.txt
-- config/world/ar.txt
-- config/world/at.txt
-- config/world/be.txt
-- config/world/de.txt
-- config/world/eng.txt
 files:
 - CHANGELOG.md
 - Manifest.txt
 - NOTES.md
 - README.md
 - Rakefile
-- config/leagues/eng.txt
-- config/leagues/fr.txt
-- config/leagues/gr.txt
-- config/leagues/sco.txt
-- config/world/ar.txt
-- config/world/at.txt
-- config/world/be.txt
-- config/world/de.txt
-- config/world/eng.txt
 - lib/sportdb/config.rb
 - lib/sportdb/config/config.rb
-- lib/sportdb/config/league.rb
-- lib/sportdb/config/league_reader.rb
-- lib/sportdb/config/league_utils.rb
 - lib/sportdb/config/season_utils.rb
 - lib/sportdb/config/version.rb
 - lib/sportdb/config/wiki_index.rb
 - test/helper.rb
 - test/test_clubs.rb
-- test/test_config.rb
 - test/test_countries.rb
-- test/test_league_reader.rb
-- test/test_league_utils.rb
+- test/test_find_datafiles.rb
+- test/test_leagues.rb
 - test/test_season_utils.rb
 - test/test_wiki_index.rb
 homepage: https://github.com/sportdb/sport.db

data/config/leagues/eng.txt

@@ -1,40 +0,0 @@
-## all lowercase (no-space) key optional
-##   if not present auto-generate from name
-
-#############################
-##  todo / future: add number of clubs / teams ?? why? why not?
-##   add up/down - relegation?, champions league, europe league? etc.
-##   check how to handle groups with playoffs ? (e.g. see belgium)
-##
-## use 1/2 or 1+2 or  => for relegation playoff - why? why not???
-
-
-1  =>  premierleague,   English Premier League
-2  =>  championship,    English Championship League
-3  =>  league1,         English League 1
-4  =>  league2,         English League 2
-5  =>  conference,      English Conference
-
-#########################################
-# until (including) 2003-04 season
-
-[2003-04]    # or just use 2003-04: or similar - why? why not?
-             # or use 2003/04 - 1992/93 - why? why not?
-
-1 => premierleague,   English Premier League
-2 => division1,       English Division 1
-3 => division2,       English Division 2
-4 => division3,       English Division 3
-
-
-#############################################
-# note: in season 1992/93 the premier league starts
-#        until (including) 1991-92} season
-
-[1991-92]
-1  => division1,   English Division 1
-2  => division2,   English Division 2
-3  => division3,   English Division 3
-3a => division3n,  English Division 3 (North)
-3b => division3s,  English Division 3 (South)
-4  => division4,   English Division 4      ## check if real?

data/config/leagues/fr.txt

@@ -1,9 +0,0 @@
-
-
-1  =>  ligue1, French Ligue 1
-2  =>  ligue2, French Ligue 2
-
-
-[2001-02]      ## until (including) 2001-02 season
-1  =>  division1,  ?     ## use championat or something? check official name
-2  =>  division2,  ?

data/config/leagues/gr.txt

@@ -1,7 +0,0 @@
-
-
-1  =>  superleague,  Greek Superleague
-
-
-[2005-06]    ## until (including) 2005-06 season
-1  =>  alphaethniki,  Greek Alpha Ethniki

data/config/leagues/sco.txt

@@ -1,19 +0,0 @@
-
-1  => premiership,  Scotish Premiership     # starting w/ 2013-14 season
-2  => championship, Scotish Championship
-3  => league1,      Scotish League One
-4  => league2,      Scotish League Two
-
-
-[2012-13]   ## until (including) 2012-13 season
-1  => premierleague, Scotish Premiership
-2  => division1,     Scotish 1st Division
-3  => division2,     Scotish League One
-4  => division3,     Scotish League Two
-
-
-[1997-98]   ## until (including)   season
-1  => premierdivision,  Scotish Premier Division
-2  => division1,        Scotish 1st Division
-3  => division2,        Scotish 2nd Division
-4  => division3,        Scotish 3rd Division

data/config/world/ar.txt

@@ -1,11 +0,0 @@
-===========================
-=  Argentina (ar)
-
-Buenos Aires
-Santa Fe      | Provincia Santa Fe
-Córdoba       | Provincia Córdoba
-Mendoza       | Provincia Mendoza
-San Juan      | Provincia San Juan
-Tucumán       | Provincia Tucumán
-Entre Ríos    | Provincia Entre Ríos
-Misiones      | Provincia Misiones

data/config/world/at.txt

@@ -1,19 +0,0 @@
-=================================
-=  Österreich • Austria (at)
-
-
-Wien         | Vienna [en]
-Burgenland
-Niederösterreich
-Oberösterreich
-Steiermark
-Kärnten
-Salzburg
-Tirol
-Vorarlberg
-
-
-== Niederösterreich ==
-
-Wr. Neustadt | Wiener Neustadt
-St. Pölten   | Sankt Pölten

data/config/world/be.txt

@@ -1,18 +0,0 @@
-==================================
-=  Belgium (be)
-
-Brussels
-
-Antwerpen       › Vlaanderen  | Antwerpen
-Limburg         › Vlaanderen  | Limburg
-Oost-Vlaanderen › Vlaanderen  | Oost-Vlaanderen
-West-Vlaanderen › Vlaanderen  | West-Vlaanderen
-
-Hainaut         › Wallonie    | Hainaut
-Liège           › Wallonie    | Liège
-
-
-== Hainaut › Wallonie ==
-
-Mouscron [fr] | Moeskroen [nl]
-Mons     [fr] | Bergen [nl]

data/config/world/de.txt

@@ -1,19 +0,0 @@
-============================================
-= Germany • Deutschland (de)
-
-Bayern
-Nordrhein-Westfalen
-Saarland
-Niedersachsen
-Brandenburg
-Berlin
-Hamburg
-Bremen
-Baden-Württemberg
-Hessen
-Rheinland-Pfalz
-Schleswig-Holstein
-Mecklenburg-Vorpommern
-Sachsen
-Sachsen-Anhalt
-Thüringen

data/config/world/eng.txt

@@ -1,162 +0,0 @@
-##
-# what name? use regions or maps or geos or zones or __?
-
-#
-# england
-#   see https://en.wikipedia.org/wiki/Subdivisions_of_England
-#   see https://www.bbc.co.uk/news/england/regions
-
-##
-#  todo: for sort order - allow different sort name
-#    e.g. East Sussex =>  Sussex (East) or Sussex, East   or something
-#   use <> for marking what counts for sorting
-#    e.g  East <Sussex>  => get auto-converted to Sussex, East   - why? why not?
-#
-#  more examples:
-#   North ‹Yorkshire›     =>  Yorkshire (North) or  Yorkshire, North
-#   Greater ‹London›      =>  London, Greater
-#   Greater ‹Manchaster›  =>  Manchaster, Greater
-
-
-##
-# note: uses all regions following the camra good beer guide (book)
-#
-
-======================================
-== North West England ==
-
-# Cumbria
-# Lancashire
-# Liverpool
-# Manchester
-
-Cheshire
-Cumbria
-Lancashire
-Greater Manchester | Manchester, Greater
-Liverpool & Merseyside | Merseyside          ## note: added Liverpool & - why? why not?
-
-
-===================================
-== North East England
-
-# Tees
-# Tyne & Wear
-
-Durham
-Newcastle & Northumberland | Northumberland        ## note: added Newcastle & - why? why not?
-Tyne and Wear
-
-
-=====================================
-== Yorkshire & Lincolnshire ==
-
-# Humberside
-# Leeds & West Yorkshire
-# Lincolnshire
-# Sheffield & South Yorkshire
-# York & North Yorkshire
-
-Lincolnshire
-West Yorkshire   | Yorkshire, West   | Yorkshire (West)
-South Yorkshire  | Yorkshire, South  | Yorkshire (South)
-North Yorkshire  | Yorkshire, North  | Yorkshire (North)
-East Yorkshire   | Yorkshire, East   | Yorkshire (East)
-
-
-==================================
-== West Midlands
-
-# Birmingham & Black Country
-# Coventry & Warwickshire
-# Hereford & Worcester
-# Shropshire
-# Stoke & Staffordshire
-
-Herefordshire
-Shropshire
-Staffordshire
-Warwickshire
-Birmingham & West Midlands | West Midlands       ## note: added Birmingham - why? why not?
-Worcestershire
-
-
-==================================
-== East Midlands
-
-# Derby
-# Leicester
-# Northampton
-# Nottingham
-
-Derbyshire
-Leicestershire
-Northamptonshire
-Nottinghamshire
-Rutland
-
-
-===================================
-== West & South West
-
-# Bristol
-# Cornwall
-# Devon
-# Gloucestershire
-# Somerset
-# Wiltshire
-
-
-Cornwall
-Devon
-Bristol & Gloucestershire | Gloucestershire
-Somerset
-Wiltshire
-
-
-=================================
-== East
-
-# Beds, Herts & Bucks
-# Cambridgeshire
-# Essex
-# Norfolk
-# Suffolk
-
-Bedfordshire
-Hertfordshire
-Buckinghamshire
-Cambridgeshire
-Essex
-Norfolk
-Suffolk
-
-
-===============================
-== South
-
-# Berkshire
-# Dorset
-# Hampshire & Isle of Wight
-# Oxford
-
-Berkshire
-Dorset
-Hampshire
-Oxfordshire
-
-
-
-===============================
-== London & South East
-
-# Kent
-# London
-# Surrey
-# Sussex
-
-Greater London | London, Greater
-Kent
-Surrey
-East Sussex | Sussex, East | Sussex (East)
-West Sussex | Sussex, West | Sussex (West)

data/lib/sportdb/config/league.rb

@@ -1,118 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-  module Import
-
-
-class LeagueConfig   ## use LeagueInfo or LeagueMap or LeagueHash or similar
-
-def initialize
-
-  ## just use leagues without latest for latest - why? why not?
-  @leagues_latest = {
-   'es' => { '1' => 'liga',  # spanish liga 1
-             '2' => 'liga2',  # spanish liga 2
-           },
-   'it' => { '1' => 'seriea',  # italian serie a
-             '2' => 'serieb',  # italian serie b
-           },
-   'de' => { '1' => 'bundesliga',  # german bundesliga
-             '2' => 'bundesliga2', # german 2. bundesliga
-           },
-  'nl'  =>  { '1' => 'eredivisie' },   # dutch eredivisie
-  'be'  =>  { '1' => 'proleague' },    # belgian pro league
-  'pt'  =>  { '1' => 'liga' },         # portugese Primeira Liga
-  'tr'  =>  { '1' => 'superlig' },     # turkish Süper Lig
-
-#  note: eng now read from txt
-#     'eng'  => { '1' => 'premierleague',  # english premier league
-#                 '2' => 'championship',  # english championship league
-#                 '3' => 'league1',  # english league 1
-#               },
-  }
-
-  ## change history to past or changes/changelog something - why? why not?
-  @leagues_history = {
-
-#  note: eng now read from txt
-#    'eng' => {
-#               ## until (including) 2003-04 season
-#               '2003-04' => { '1' => 'premierleague', # english premier league
-#                              '2' => 'division1',     # english division 1
-#                            },
-#               ## until (including) 1991-92} season
-#               '1991-92' => { '1' => 'division1', # english division 1
-#                              '2' => 'division2', # english division 2
-#                            }
-#             }
-  }
-
-  pp @leagues_latest
-  pp @leagues_history
-
-  %w(eng sco fr gr).each do |country|
-    hash = LeagueReader.read( "#{Boot.data_dir}/leagues/#{country}.txt" )
-    pp hash
-
-    hash.each do |season,league_hash|
-      if season == '*'  ## assume latest / default season
-        @leagues_latest[ country ] = league_hash
-      else
-        @leagues_history[ country ] ||= {}
-        @leagues_history[ country ][ season ]  = league_hash
-      end
-    end
-  end
-
-  pp @leagues_latest
-  pp @leagues_history
-end
-
-
-
-def basename( league, country:, season: )
-  ## todo/check: rename league: to key: - why? why not?
-
-  if country.include?( '-' )  ## assume package name e.g. eng-england etc.
-    ## cut off country code from package name
-    cc = country.split( '-' )[0]   # use first part
-  else
-    cc = country
-  end
-
-  if season
-    puts "  checking season >#{season}<"
-    ## check history if season is provided / supplied / known
-    history = @leagues_history[ cc ]
-    if history
-       season_start_year = SeasonUtils.start_year( season ).to_i
-       ##
-       ##  todo: sorty season keys - why? why not?  -- assume reverse chronological order for now
-       history.keys.reverse.each do |key|
-          history_season_start_year = SeasonUtils.start_year( key ).to_i
-          puts "  #{season_start_year} <= #{history_season_start_year} - #{season_start_year <= history_season_start_year}"
-          if season_start_year <= history_season_start_year
-            result = history[ key ][ league ]
-            if result
-              return "#{league}-#{result}"
-            else
-              return nil
-            end
-          end
-       end
-    end
-  end
-
-  latest  = @leagues_latest[ cc ]
-  if latest
-     result = latest[ league ]
-     return "#{league}-#{result}"   if result
-  end
-
-  nil
-end # method basename
-end # class LeagueConfig
-
-
-end ## module Import
-end ## module SportDb

data/lib/sportdb/config/league_reader.rb

@@ -1,65 +0,0 @@
-# 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 +0,0 @@
-# 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/test/test_league_reader.rb

@@ -1,54 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_league_reader.rb
-
-
-require 'helper'
-
-class TestLeagueReader < MiniTest::Test
-
-  def test_parse_eng
-
-    hash = SportDb::Import::LeagueReader.parse( <<TXT )
-1  =>  premierleague,   English Premier League
-2  =>  championship,    English Championship League
-3  =>  league1,         English League 1
-4  =>  league2,         English League 2
-5  =>  conference,      English Conference
-
-#########################################
-# until (including) 2003-04 season
-
-[2003-04]    # or just use 2003-04: or similar - why? why not?
-             # or use 2003/04 - 1992/93 - why? why not?
-
-1 => premierleague,   English Premier League
-2 => division1,       English Division 1
-3 => division2,       English Division 2
-4 => division3,       English Division 3
-
-
-#############################################
-# note: in season 1992/93 the premier league starts
-#        until (including) 1991-92} season
-
-[1991-92]
-1  => division1,   English Division 1
-2  => division2,   English Division 2
-3  => division3,   English Division 3
-3a => division3n,  English Division 3 (North)
-3b => division3s,  English Division 3 (South)
-4  => division4,   English Division 4      ## check if real?
-TXT
-
-
-   assert_equal 'premierleague', hash['*']['1']
-   assert_equal 'championship',  hash['*']['2']
-   assert_equal 'league1',       hash['*']['3']
-
-   assert_equal 'division1',     hash['1991-92']['1']
-   assert_equal 'division2',     hash['1991-92']['2']
- end  # method test_parse_eng
-end # class TestLeagueUtils

data/test/test_league_utils.rb

@@ -1,46 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_league_utils.rb
-
-
-require 'helper'
-
-class TestLeagueUtils < MiniTest::Test
-
-  def test_basename_eng
-    assert_equal '1-premierleague',   LeagueUtils.basename( '1',  country: 'eng', season: '2011-12' )
-    assert_equal '1-premierleague',   LeagueUtils.basename( '1',  country: 'eng' )
-    assert_equal '1-premierleague',   LeagueUtils.basename( '1',  country: 'eng-england' ) ## allow country code or (repo) package name
-    assert_equal '1-division1',       LeagueUtils.basename( '1',  country: 'eng', season: '1991-92' )
-    assert_equal '3a',                LeagueUtils.basename( '3a', country: 'eng', season: '2011-12' )
-
-    assert_equal '2-championship',    LeagueUtils.basename( '2',  country: 'eng', season: '2011-12' )
-    assert_equal '2-championship',    LeagueUtils.basename( '2',  country: 'eng' )
-    assert_equal '2-championship',    LeagueUtils.basename( '2',  country: 'eng-england' ) ## allow country code or (repo) package name
-    assert_equal '2-division1',       LeagueUtils.basename( '2',  country: 'eng', season: '2003-04' )
-    assert_equal '2-division2',       LeagueUtils.basename( '2',  country: 'eng', season: '1991-92' )
-    assert_equal '2-division2',       LeagueUtils.basename( '2',  country: 'eng', season: '1989-90' )
-  end  # method test_basename
-
-  def test_basename_sco
-    assert_equal '1-premiership',     LeagueUtils.basename( '1',  country: 'sco' )
-    assert_equal '1-premierleague',   LeagueUtils.basename( '1',  country: 'sco', season: '2012-13' )
-    assert_equal '1-premierdivision', LeagueUtils.basename( '1',  country: 'sco', season: '1997-98' )
-
-    assert_equal '2-championship',    LeagueUtils.basename( '2',  country: 'sco' )
-    assert_equal '2-division1',       LeagueUtils.basename( '2',  country: 'sco', season: '2012-13' )
-  end
-
-  def test_basename_fr
-    assert_equal '1-ligue1',          LeagueUtils.basename( '1',  country: 'fr' )
-    assert_equal '1-division1',       LeagueUtils.basename( '1',  country: 'fr', season: '2001-02' )
-  end
-
-  def test_basename_gr
-    assert_equal '1-superleague',     LeagueUtils.basename( '1',  country: 'gr' )
-    assert_equal '1-alphaethniki',    LeagueUtils.basename( '1',  country: 'gr', season: '2005-06' )
-  end
-
-end # class TestLeagueUtils