footballdata-12xpert 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d9f93e00ee1b85e5848b4dee48988b16e659c3
-  data.tar.gz: 60068169b3aaab76e84d4875a00db617e4e6211d
+  metadata.gz: 96ce5cd82665871ff21e654619be6cd0c43c8b68
+  data.tar.gz: 6153b37d95190031bff57618554ddd3c973ac046
 SHA512:
-  metadata.gz: fedfd89358237ef25ba0083c8d1f21c7ec13df976e70ea8460f9682ba5966b718dcfbbf6d4b3b92d1fb9310dbb3739b9f62972f8fce5d43d3c2afcfdaf98e2b0
-  data.tar.gz: 36691c7a8a0e4ebfd70aaeecba2d8e363977a9ced0ebb05d1550b5cf3b33bb3e93dc31e76ffb5d4f512165a75149c70edb9f0c76e96277c31ee034199bfd0c73
+  metadata.gz: cae4688ec1b1a30115ba30d701ba1716abfeacd32c8421dae2db475a2dc30f484f0dce96348c610da3c1e98a37f8805ea2be2f6ba4e4944b13773942b574821d
+  data.tar.gz: b11525344e6255c87b41758f6eb5d47f350a17545b2bac950684ce4031eb9fd2aef177f9e1952f0a54e24fd91747f2b830b6d622d9f629455a78f1553cfd4ccc

data/Manifest.txt

@@ -6,6 +6,7 @@ lib/footballdata-12xpert.rb
 lib/footballdata-12xpert/config.rb
 lib/footballdata-12xpert/convert.rb
 lib/footballdata-12xpert/download.rb
+lib/footballdata-12xpert/import.rb
 lib/footballdata-12xpert/version.rb
 lib/footballdata/12xpert.rb
 test/helper.rb

data/README.md

@@ -57,6 +57,11 @@ and get at least updated twice weekly
 
 ## Usage
 
+[Download](#download) • [Convert](#convert) • [Import](#import)
+
+
+### Download
+
 Let's download all datasets (about 570+) for offline usage into the
 default web cache directory (that is, `~/.cache/www.football-data.co.uk`):
 
@@ -94,7 +99,7 @@ Stand back ten feet. Resulting in:
 │   SWZ.csv
 │   USA.csv
 │
-├───9394
+├───9394      # 1993/94 season by season main top leagues
 │       D1.csv
 │       D2.csv
 │       E0.csv
@@ -106,7 +111,7 @@ Stand back ten feet. Resulting in:
 │       N1.csv
 │       SP1.csv
 │
-├───9495
+├───9495      # 1994/95 season by season main top leagues
 │       D1.csv
 │       D2.csv
 │       E0.csv
@@ -123,7 +128,7 @@ Stand back ten feet. Resulting in:
 │       SP1.csv
 │       T1.csv
 ...
-├───1819
+├───1920      # 2019/20 season by season main top leagues
 │       B1.csv
 │       D1.csv
 │       D2.csv
@@ -147,7 +152,7 @@ Stand back ten feet. Resulting in:
 │       SP2.csv
 │       T1.csv
 │
-└───1920
+└───2021      # 2020/21 season by season main top leagues
         B1.csv
         D1.csv
         D2.csv
@@ -171,10 +176,10 @@ Stand back ten feet. Resulting in:
 
 The football datasets come in two flavors / formats.
 The main leagues use season-by-season datafiles.
-For example, `E0.csv`, `E1.csv`, `E2.csv`, `E3.csv` & `E4.csv` in the `1920`
+For example, `E0.csv`, `E1.csv`, `E2.csv`, `E3.csv` & `E4.csv` in the `2021`
 season directory hold the matches for the English Premiership & Divs 1, 2, 3 & Conference;
 `D1.csv` & `D2.csv` for the Bundesligas 1 & 2 and so on
-for the 2019/20 season.
+for the 2020/21 season.
 
 The extra leagues use an all-seasons-in-one datafile.
 For example, `ARG.csv`
@@ -192,7 +197,7 @@ You can download datasets for selected countries only. Pass in
 the country keys. Let's download only England (`eng`)'s leagues:
 
 ``` ruby
-Footballdata.download( 'eng' )
+Footballdata12xpert.download( 'eng' )
 ```
 
 Or let's download only the top five leagues, that is,
@@ -200,12 +205,158 @@ England (`eng`), Spain (`es`), Germany (`de`), France (`fr`)
 and Italy (`it`):
 
 ``` ruby
-Footballdata.download( 'eng', 'es', 'de', 'fr', 'it' )
+Footballdata12xpert.download( 'eng', 'es', 'de', 'fr', 'it' )
+```
+
+### Convert
+
+Now what? Let's convert all football datasets from the web cache
+to the one-line, one-match & one-file, one-season "standard" [Football.CSV format](https://github.com/footballcsv).
+Example:
+
+
+``` ruby
+require 'footballdata/12xpert'
+
+Footballdata12xpert.convert
+```
+
+Stand back ten feet. Resulting in:
+
+```
+./o
+├───1993-94
+│       de.1.csv
+│       de.2.csv
+│       eng.1.csv
+│       eng.2.csv
+│       eng.3.csv
+│       eng.4.csv
+│       es.1.csv
+│       fr.1.csv
+│       it.1.csv
+│       nl.1.csv
+│
+├───1994-95
+│       de.1.csv
+│       de.2.csv
+│       eng.1.csv
+│       eng.2.csv
+│       eng.3.csv
+│       eng.4.csv
+│       es.1.csv
+│       fr.1.csv
+│       gr.1.csv
+│       it.1.csv
+│       nl.1.csv
+│       pt.1.csv
+│       sco.1.csv
+│       sco.2.csv
+│       tr.1.csv
+...
+├───2020
+│       ar.1.csv
+│       br.1.csv
+│       cn.1.csv
+│       fi.1.csv
+│       ie.1.csv
+│       jp.1.csv
+│       no.1.csv
+│       se.1.csv
+│       us.1.csv
+│
+└───2020-21
+        at.1.csv
+        be.1.csv
+        ch.1.csv
+        de.1.csv
+        de.2.csv
+        dk.1.csv
+        eng.1.csv
+        eng.2.csv
+        eng.3.csv
+        eng.4.csv
+        eng.5.csv
+        es.1.csv
+        es.2.csv
+```
+
+Note: By default all datasets get written into the `./o`
+directory.  Use `Footballdata12xpert.config.convert.out_dir`
+to change the output directory.
+
+The English Premier League (`eng.1`) results in `./o/2020-21/eng.1.csv`:
+
+```
+Date,Team 1,FT,HT,Team 2
+Sat Sep 12 2020,Fulham,0-3,0-1,Arsenal
+Sat Sep 12 2020,Crystal Palace,1-0,1-0,Southampton
+Sat Sep 12 2020,Liverpool,4-3,3-2,Leeds
+Sat Sep 12 2020,West Ham,0-2,0-0,Newcastle
+Sun Sep 13 2020,West Brom,0-3,0-0,Leicester
+Sun Sep 13 2020,Tottenham,0-1,0-0,Everton
+Mon Sep 14 2020,Brighton,1-3,0-1,Chelsea
+Mon Sep 14 2020,Sheffield United,0-2,0-2,Wolves
+Sat Sep 19 2020,Everton,5-2,2-1,West Brom
+Sat Sep 19 2020,Leeds,4-3,2-1,Fulham
+Sat Sep 19 2020,Man United,1-3,0-1,Crystal Palace
+...
+```
+
+Or the Brasileirão (`br.1`) in  `./o/2020/br.1.csv`:
+
+```
+Date,Team 1,FT,HT,Team 2
+Sat Aug 8 2020,Fortaleza,0-2,?,Athletico-PR
+Sat Aug 8 2020,Coritiba,0-1,?,Internacional
+Sat Aug 8 2020,Sport Recife,3-2,?,Ceara
+Sun Aug 9 2020,Flamengo RJ,0-1,?,Atletico-MG
+Sun Aug 9 2020,Santos,1-1,?,Bragantino
+Sun Aug 9 2020,Gremio,1-0,?,Fluminense
+Wed Aug 12 2020,Athletico-PR,2-1,?,Goias
+Wed Aug 12 2020,Atletico-MG,3-2,?,Corinthians
+Wed Aug 12 2020,Bragantino,1-1,?,Botafogo RJ
+Wed Aug 12 2020,Atletico GO,3-0,?,Flamengo RJ
+Wed Aug 12 2020,Bahia,1-0,?,Coritiba
+...
+```
+
+and so on.
+
+
+Less is More?
+
+You can convert datasets for selected countries only. Pass in
+the country keys. Let's download only England (`eng`)'s leagues:
+
+``` ruby
+Footballdata12xpert.convert( 'eng' )
+```
+
+Or let's convert only the top five leagues, that is,
+England (`eng`), Spain (`es`), Germany (`de`), France (`fr`)
+and Italy (`it`):
+
+``` ruby
+Footballdata12xpert.convert( 'eng', 'es', 'de', 'fr', 'it' )
 ```
 
+Or let's convert only the top five leagues starting from the 2019/20 season on:
+
+``` ruby
+Footballdata12xpert.convert( 'eng', 'es', 'de', 'fr', 'it', start: '2019/20' )
+```
+
+
+### Import
+
+Now what? Let's import all (converted) football datasets
+in the one-line, one-match & one-file, one-season "standard"
+Football.CSV format into an SQL database.
 
-Now what? Let's import all football datasets from the web cache
-into an SQL database.
+Note: By default all datasets get read in from the `./o`
+output directory.  Use `Footballdata12xpert.config.convert.out_dir`
+to change the output directory.
 
 
 ``` ruby
@@ -215,7 +366,7 @@ SportDb.connect( adapter:  'sqlite3',
 SportDb.create_all   ## build database schema / tables
 
 
-Footballdata.import
+Footballdata12xpert.import
 ```
 
 Note: Depending on your computing processing power the import might take
@@ -227,18 +378,18 @@ Done. Let's try some database (SQL) queries (using the sport.db ActiveRecord mod
 ``` ruby
 ## ActiveRecord model (convenience) shortcuts
 Team   = SportDb::Model::Team
-Game   = SportDb::Model::Game
+Match  = SportDb::Model::Match
 League = SportDb::Model::League
 Event  = SportDb::Model::Event
 
 
-## Let's query for some stats  - How many teams? How many games / matches? etc.
+## Let's query for some stats  - How many teams? How many matches? etc.
 
 puts Team.count   #=> 1143
 # SELECT COUNT(*) FROM teams
 
-puts Game.count   #=> 227_142
-# SELECT COUNT(*) FROM games
+puts Match.count   #=> 227_142
+# SELECT COUNT(*) FROM matches
 
 puts League.count  #=> 38
 # SELECT COUNT(*) FROM leagues
@@ -250,41 +401,41 @@ club names by country.
 ``` ruby
 ## Let's query for the Real Madrid football club from Spain
 
-madrid = Team.find_by( title: 'Real Madrid' )
-# SELECT * FROM teams WHERE title = 'Real Madrid' LIMIT 1
+madrid = Team.find_by( name: 'Real Madrid' )
+# SELECT * FROM teams WHERE name = 'Real Madrid' LIMIT 1
 
-puts madrid.games.count   #=> 1023
-# SELECT COUNT(*) FROM games WHERE (team1_id = 380 or team2_id = 380)
-g = madrid.games.first
-# SELECT * FROM "games" WHERE (team1_id = 380 or team2_id = 380) LIMIT 1
+puts madrid.matches.count   #=> 1023
+# SELECT COUNT(*) FROM matches WHERE (team1_id = 380 or team2_id = 380)
+m = madrid.matches.first
+# SELECT * FROM matches WHERE (team1_id = 380 or team2_id = 380) LIMIT 1
 
-puts g.team1.title #=> CA Osasuna
-puts g.team2.title #=> Real Madrid
-puts g.score_str   #=> 1 - 4
+puts m.team1.name #=> CA Osasuna
+puts m.team2.name #=> Real Madrid
+puts m.score_str   #=> 1 - 4
 
 
 ## Or let's query for the Liverpool football club from England
 
-liverpool = Team.find_by( title: 'Liverpool FC' )
+liverpool = Team.find_by( name: 'Liverpool FC' )
 
-puts liverpool.games.count  #=> 1025
+puts liverpool.matches.count  #=> 1025
 
-g = liverpool.games.first
-puts g.team1.title  #=> Liverpool FC
-puts g.team2.title  #=> Sheffield Wednesday FC
-puts g.score_str    #=> 2 - 0
+m = liverpool.matches.first
+puts m.team1.title  #=> Liverpool FC
+puts m.team2.title  #=> Sheffield Wednesday FC
+puts m.score_str    #=> 2 - 0
 
 
 ## Let's try the English Premier League 2019/20
 
 pl = Event.find_by( key: 'eng.1.2019/20' )
 
-puts pl.games.count  #=> 288
+puts pl.matches.count  #=> 288
 
-g = pl.games.first
-puts g.team1.title  #=> Liverpool FC
-puts g.team2.title  #=> Norwich City FC
-puts g.score_str    #=> 4 - 1
+m = pl.matches.first
+puts m.team1.title  #=> Liverpool FC
+puts m.team2.title  #=> Norwich City FC
+puts m.score_str    #=> 4 - 1
 
 # and so on
 ```
@@ -293,9 +444,21 @@ That's it. Enjoy the beautiful game.
 
 
 
+## Installation
+
+Use
+
+    gem install footballdata-12xpert
+
+or add to your Gemfile
+
+    gem 'footballdata-12xpert'
+
+
+
 ## License
 
-The `sportdb-source-footballdata` scripts are dedicated to the public domain.
+The `footballdata-12xpert` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
 

data/lib/footballdata-12xpert.rb

@@ -14,128 +14,12 @@ require 'footballdata-12xpert/version' # let version always go first
 require 'footballdata-12xpert/config'
 require 'footballdata-12xpert/download'
 require 'footballdata-12xpert/convert'
-
-###
-##  add alternate aliases - why? why not?
-Footballdata12Xpert   = Footballdata12xpert
-Footballdata_12xpert  = Footballdata12xpert
-Footballdata_12Xpert  = Footballdata12xpert
-
+require 'footballdata-12xpert/import'
 
 
 
 module Footballdata12xpert
 
-
-def self.import( *args, dir: './dl' )
-
-  country_keys = args  ## countries to include / fetch - optinal
-
-  FOOTBALLDATA_SOURCES.each do |country_key, country_sources|
-    if country_keys.empty? || country_keys.include?( country_key )
-      Footballdata.import_season_by_season( country_key, country_sources, dir: dir )
-    else
-      ## skipping country
-    end
-  end
-
-  FOOTBALLDATA_SOURCES_II.each do |country_key, country_basename|
-    if country_keys.empty? || country_keys.include?( country_key )
-      Footballdata.import_all_seasons( country_key, country_basename, dir: dir )
-    else
-      ## skipping country
-    end
-  end
-end # method import
-
-class << self
-  alias_method :load,     :import
-end
-
-
-
-def self.import_season_by_season( country_key, sources, dir: )
-
-  ## todo/check: make sure timezones entry for country_key exists!!! what results with nil/24.0 ??
-  fix_date_converter = ->(row) { fix_date( row, FOOTBALLDATA_TIMEZONES[country_key]/24.0 ) }
-
-  sources.each do |rec|
-    season_key  = rec[0]   ## note: dirname is season_key e.g. 2011-12 etc.
-    basenames  = rec[1]   ## e.g. E1,E2,etc.
-
-    basenames.each do |basename|
-
-      path = "#{dir}/#{season_key}/#{basename}.csv"
-
-      league_key = FOOTBALLDATA_LEAGUES[basename]  ## e.g.: eng.1, fr.1, fr.2 etc.
-      if league_key.nil?
-        puts "** !!! ERROR !!! league key missing for >#{basename}<; sorry - please add"
-        exit 1
-      end
-
-      country, league = find_or_create_country_and_league( league_key )
-
-      season = SportDb::Importer::Season.find_or_create_builtin( season_key )
-
-      puts "path: #{path}"
-
-      matches = CsvMatchReader.read( path, converters: fix_date_converter )
-
-      update_matches_txt( matches,
-                            league:  league,
-                            season:  season )
-    end
-  end
-end  # method import_season_by_season
-
-
-
-def self.import_all_seasons( country_key, basename, dir: )
-
-  col  = 'Season'
-  path = "#{dir}/#{basename}.csv"
-
-  season_keys = CsvMatchSplitter.find_seasons( path, col: col )
-  pp season_keys
-
-  ## note: assume always first level/tier league for now
-  league_key = "#{country_key}.1"
-  country, league = find_or_create_country_and_league( league_key )
-
-  ## todo/check: make sure timezones entry for country_key exists!!! what results with nil/24.0 ??
-  fix_date_converter = ->(row) { fix_date( row, FOOTBALLDATA_TIMEZONES[country_key]/24.0 ) }
-
-  season_keys.each do |season_key|
-    season = SportDb::Importer::Season.find_or_create_builtin( season_key )
-
-    matches = CsvMatchReader.read( path, filters: { col => season_key },
-                                         converters: fix_date_converter )
-
-    pp matches[0..2]
-    pp matches.size
-
-    update_matches_txt( matches,
-                          league:  league,
-                          season:  season )
-  end
-end  # method import_all_seasons
-
-
-###
-## helper for country and league db record
-def self.find_or_create_country_and_league( league_key )
-  country_key, level = league_key.split( '.' )
-  country = SportDb::Importer::Country.find_or_create_builtin!( country_key )
-
-  league_auto_name = "#{country.name} #{level}"   ## "fallback" auto-generated league name
-  pp league_auto_name
-  league = SportDb::Importer::League.find_or_create( league_key,
-                                                       name:       league_auto_name,
-                                                       country_id: country.id )
-
-  [country, league]
-end
-
 ## helper to fix dates to use local timezone (and not utc/london time)
 def self.fix_date( row, offset )
   return row    if row['Time'].nil?   ## note: time (column) required for fix
@@ -159,10 +43,15 @@ def self.fix_date( row, offset )
   row   ## return row for possible pipelining - why? why not?
 end
 
+end ## module Footballdata12xpert
 
 
-end ## module Footballdata12xpert
 
+###
+##  add alternate aliases - why? why not?
+Footballdata12Xpert   = Footballdata12xpert
+Footballdata_12xpert  = Footballdata12xpert
+Footballdata_12Xpert  = Footballdata12xpert
 
 
 puts Footballdata12xpert.banner   # say hello

data/lib/footballdata-12xpert/config.rb

@@ -87,225 +87,225 @@ SOURCES_I =
         [ '1995/96', %w(D1 D2) ],
         [ '1994/95', %w(D1 D2) ],
         [ '1993/94', %w(D1 D2) ]],
-  it:  [[ '2020-21', %w(I1 I2) ],
-        [ '2019-20', %w(I1 I2) ],
-        [ '2018-19', %w(I1 I2) ],
-        [ '2017-18', %w(I1 I2) ],
-        [ '2016-17', %w(I1 I2) ],
-        [ '2015-16', %w(I1 I2) ],
-        [ '2014-15', %w(I1 I2) ],
-        [ '2013-14', %w(I1 I2) ],
-        [ '2012-13', %w(I1 I2) ],
-        [ '2011-12', %w(I1 I2) ],
-        [ '2010-11', %w(I1 I2) ],
-        [ '2009-10', %w(I1 I2) ],
-        [ '2008-09', %w(I1 I2) ],
-        [ '2007-08', %w(I1 I2) ],
-        [ '2006-07', %w(I1 I2) ],
-        [ '2005-06', %w(I1 I2) ],
-        [ '2004-05', %w(I1 I2) ],
-        [ '2003-04', %w(I1 I2) ],
-        [ '2002-03', %w(I1 I2) ],
-        [ '2001-02', %w(I1 I2) ],
-        [ '2000-01', %w(I1 I2) ],
-        [ '1999-00', %w(I1 I2) ],
-        [ '1998-99', %w(I1 I2) ],
-        [ '1997-98', %w(I1 I2) ],
-        [ '1996-97', %w(I1) ],
-        [ '1995-96', %w(I1) ],
-        [ '1994-95', %w(I1) ],
-        [ '1993-94', %w(I1) ]],
-  es:  [[ '2020-21', %w(SP1 SP2) ],
-        [ '2019-20', %w(SP1 SP2) ],
-        [ '2018-19', %w(SP1 SP2) ],
-        [ '2017-18', %w(SP1 SP2) ],
-        [ '2016-17', %w(SP1 SP2) ],
-        [ '2015-16', %w(SP1 SP2) ],
-        [ '2014-15', %w(SP1 SP2) ],
-        [ '2013-14', %w(SP1 SP2) ],
-        [ '2012-13', %w(SP1 SP2) ],
-        [ '2011-12', %w(SP1 SP2) ],
-        [ '2010-11', %w(SP1 SP2) ],
-        [ '2009-10', %w(SP1 SP2) ],
-        [ '2008-09', %w(SP1 SP2) ],
-        [ '2007-08', %w(SP1 SP2) ],
-        [ '2006-07', %w(SP1 SP2) ],
-        [ '2005-06', %w(SP1 SP2) ],
-        [ '2004-05', %w(SP1 SP2) ],
-        [ '2003-04', %w(SP1 SP2) ],
-        [ '2002-03', %w(SP1 SP2) ],
-        [ '2001-02', %w(SP1 SP2) ],
-        [ '2000-01', %w(SP1 SP2) ],
-        [ '1999-00', %w(SP1 SP2) ],
-        [ '1998-99', %w(SP1 SP2) ],
-        [ '1997-98', %w(SP1 SP2) ],
-        [ '1996-97', %w(SP1 SP2) ],
-        [ '1995-96', %w(SP1) ],
-        [ '1994-95', %w(SP1) ],
-        [ '1993-94', %w(SP1) ]],
-  fr:  [[ '2020-21', %w(F1 F2) ],
-        [ '2019-20', %w(F1 F2) ],
-        [ '2018-19', %w(F1 F2) ],
-        [ '2017-18', %w(F1 F2) ],
-        [ '2016-17', %w(F1 F2) ],
-        [ '2015-16', %w(F1 F2) ],
-        [ '2014-15', %w(F1 F2) ],
-        [ '2013-14', %w(F1 F2) ],
-        [ '2012-13', %w(F1 F2) ],
-        [ '2011-12', %w(F1 F2) ],
-        [ '2010-11', %w(F1 F2) ],
-        [ '2009-10', %w(F1 F2) ],
-        [ '2008-09', %w(F1 F2) ],
-        [ '2007-08', %w(F1 F2) ],
-        [ '2006-07', %w(F1 F2) ],
-        [ '2005-06', %w(F1 F2) ],
-        [ '2004-05', %w(F1 F2) ],
-        [ '2003-04', %w(F1 F2) ],
-        [ '2002-03', %w(F1 F2) ],
-        [ '2001-02', %w(F1 F2) ],
-        [ '2000-01', %w(F1 F2) ],
-        [ '1999-00', %w(F1 F2) ],
-        [ '1998-99', %w(F1 F2) ],
-        [ '1997-98', %w(F1 F2) ],
-        [ '1996-97', %w(F1 F2) ],
-        [ '1995-96', %w(F1) ],
-        [ '1994-95', %w(F1) ],
-        [ '1993-94', %w(F1) ]],
-  nl:  [[ '2020-21', %w(N1) ],
-        [ '2019-20', %w(N1) ],
-        [ '2018-19', %w(N1) ],
-        [ '2017-18', %w(N1) ],
-        [ '2016-17', %w(N1) ],
-        [ '2015-16', %w(N1) ],
-        [ '2014-15', %w(N1) ],
-        [ '2013-14', %w(N1) ],
-        [ '2012-13', %w(N1) ],
-        [ '2011-12', %w(N1) ],
-        [ '2010-11', %w(N1) ],
-        [ '2009-10', %w(N1) ],
-        [ '2008-09', %w(N1) ],
-        [ '2007-08', %w(N1) ],
-        [ '2006-07', %w(N1) ],
-        [ '2005-06', %w(N1) ],
-        [ '2004-05', %w(N1) ],
-        [ '2003-04', %w(N1) ],
-        [ '2002-03', %w(N1) ],
-        [ '2001-02', %w(N1) ],
-        [ '2000-01', %w(N1) ],
-        [ '1999-00', %w(N1) ],
-        [ '1998-99', %w(N1) ],
-        [ '1997-98', %w(N1) ],
-        [ '1996-97', %w(N1) ],
-        [ '1995-96', %w(N1) ],
-        [ '1994-95', %w(N1) ],
-        [ '1993-94', %w(N1) ]],
-  be:  [[ '2020-21', %w(B1) ],
-        [ '2019-20', %w(B1) ],
-        [ '2018-19', %w(B1) ],
-        [ '2017-18', %w(B1) ],
-        [ '2016-17', %w(B1) ],
-        [ '2015-16', %w(B1) ],
-        [ '2014-15', %w(B1) ],
-        [ '2013-14', %w(B1) ],
-        [ '2012-13', %w(B1) ],
-        [ '2011-12', %w(B1) ],
-        [ '2010-11', %w(B1) ],
-        [ '2009-10', %w(B1) ],
-        [ '2008-09', %w(B1) ],
-        [ '2007-08', %w(B1) ],
-        [ '2006-07', %w(B1) ],
-        [ '2005-06', %w(B1) ],
-        [ '2004-05', %w(B1) ],
-        [ '2003-04', %w(B1) ],
-        [ '2002-03', %w(B1) ],
-        [ '2001-02', %w(B1) ],
-        [ '2000-01', %w(B1) ],
-        [ '1999-00', %w(B1) ],
-        [ '1998-99', %w(B1) ],
-        [ '1997-98', %w(B1) ],
-        [ '1996-97', %w(B1) ],
-        [ '1995-96', %w(B1) ]],
-  pt:  [[ '2020-21', %w(P1) ],
-        [ '2019-20', %w(P1) ],
-        [ '2018-19', %w(P1) ],
-        [ '2017-18', %w(P1) ],
-        [ '2016-17', %w(P1) ],
-        [ '2015-16', %w(P1) ],
-        [ '2014-15', %w(P1) ],
-        [ '2013-14', %w(P1) ],
-        [ '2012-13', %w(P1) ],
-        [ '2011-12', %w(P1) ],
-        [ '2010-11', %w(P1) ],
-        [ '2009-10', %w(P1) ],
-        [ '2008-09', %w(P1) ],
-        [ '2007-08', %w(P1) ],
-        [ '2006-07', %w(P1) ],
-        [ '2005-06', %w(P1) ],
-        [ '2004-05', %w(P1) ],
-        [ '2003-04', %w(P1) ],
-        [ '2002-03', %w(P1) ],
-        [ '2001-02', %w(P1) ],
-        [ '2000-01', %w(P1) ],
-        [ '1999-00', %w(P1) ],
-        [ '1998-99', %w(P1) ],
-        [ '1997-98', %w(P1) ],
-        [ '1996-97', %w(P1) ],
-        [ '1995-96', %w(P1) ],
-        [ '1994-95', %w(P1) ]],
-  tr:  [[ '2020-21', %w(T1) ],
-        [ '2019-20', %w(T1) ],
-        [ '2018-19', %w(T1) ],
-        [ '2017-18', %w(T1) ],
-        [ '2016-17', %w(T1) ],
-        [ '2015-16', %w(T1) ],
-        [ '2014-15', %w(T1) ],
-        [ '2013-14', %w(T1) ],
-        [ '2012-13', %w(T1) ],
-        [ '2011-12', %w(T1) ],
-        [ '2010-11', %w(T1) ],
-        [ '2009-10', %w(T1) ],
-        [ '2008-09', %w(T1) ],
-        [ '2007-08', %w(T1) ],
-        [ '2006-07', %w(T1) ],
-        [ '2005-06', %w(T1) ],
-        [ '2004-05', %w(T1) ],
-        [ '2003-04', %w(T1) ],
-        [ '2002-03', %w(T1) ],
-        [ '2001-02', %w(T1) ],
-        [ '2000-01', %w(T1) ],
-        [ '1999-00', %w(T1) ],
-        [ '1998-99', %w(T1) ],
-        [ '1997-98', %w(T1) ],
-        [ '1996-97', %w(T1) ],
-        [ '1995-96', %w(T1) ],
-        [ '1994-95', %w(T1) ]],
-  gr:  [[ '2020-21', %w(G1) ],
-        [ '2019-20', %w(G1) ],
-        [ '2018-19', %w(G1) ],
-        [ '2017-18', %w(G1) ],
-        [ '2016-17', %w(G1) ],
-        [ '2015-16', %w(G1) ],
-        [ '2014-15', %w(G1) ],
-        [ '2013-14', %w(G1) ],
-        [ '2012-13', %w(G1) ],
-        [ '2011-12', %w(G1) ],
-        [ '2010-11', %w(G1) ],
-        [ '2009-10', %w(G1) ],
-        [ '2008-09', %w(G1) ],
-        [ '2007-08', %w(G1) ],
-        [ '2006-07', %w(G1) ],
-        [ '2005-06', %w(G1) ],
-        [ '2004-05', %w(G1) ],
-        [ '2003-04', %w(G1) ],
-        [ '2002-03', %w(G1) ],
-        [ '2001-02', %w(G1) ],
-        [ '2000-01', %w(G1) ],
-        [ '1999-00', %w(G1) ],
-        [ '1998-99', %w(G1) ],
-        [ '1997-98', %w(G1) ],
-        [ '1996-97', %w(G1) ],
-        [ '1995-96', %w(G1) ],
-        [ '1994-95', %w(G1) ]]
+  it:  [[ '2020/21', %w(I1 I2) ],
+        [ '2019/20', %w(I1 I2) ],
+        [ '2018/19', %w(I1 I2) ],
+        [ '2017/18', %w(I1 I2) ],
+        [ '2016/17', %w(I1 I2) ],
+        [ '2015/16', %w(I1 I2) ],
+        [ '2014/15', %w(I1 I2) ],
+        [ '2013/14', %w(I1 I2) ],
+        [ '2012/13', %w(I1 I2) ],
+        [ '2011/12', %w(I1 I2) ],
+        [ '2010/11', %w(I1 I2) ],
+        [ '2009/10', %w(I1 I2) ],
+        [ '2008/09', %w(I1 I2) ],
+        [ '2007/08', %w(I1 I2) ],
+        [ '2006/07', %w(I1 I2) ],
+        [ '2005/06', %w(I1 I2) ],
+        [ '2004/05', %w(I1 I2) ],
+        [ '2003/04', %w(I1 I2) ],
+        [ '2002/03', %w(I1 I2) ],
+        [ '2001/02', %w(I1 I2) ],
+        [ '2000/01', %w(I1 I2) ],
+        [ '1999/00', %w(I1 I2) ],
+        [ '1998/99', %w(I1 I2) ],
+        [ '1997/98', %w(I1 I2) ],
+        [ '1996/97', %w(I1) ],
+        [ '1995/96', %w(I1) ],
+        [ '1994/95', %w(I1) ],
+        [ '1993/94', %w(I1) ]],
+  es:  [[ '2020/21', %w(SP1 SP2) ],
+        [ '2019/20', %w(SP1 SP2) ],
+        [ '2018/19', %w(SP1 SP2) ],
+        [ '2017/18', %w(SP1 SP2) ],
+        [ '2016/17', %w(SP1 SP2) ],
+        [ '2015/16', %w(SP1 SP2) ],
+        [ '2014/15', %w(SP1 SP2) ],
+        [ '2013/14', %w(SP1 SP2) ],
+        [ '2012/13', %w(SP1 SP2) ],
+        [ '2011/12', %w(SP1 SP2) ],
+        [ '2010/11', %w(SP1 SP2) ],
+        [ '2009/10', %w(SP1 SP2) ],
+        [ '2008/09', %w(SP1 SP2) ],
+        [ '2007/08', %w(SP1 SP2) ],
+        [ '2006/07', %w(SP1 SP2) ],
+        [ '2005/06', %w(SP1 SP2) ],
+        [ '2004/05', %w(SP1 SP2) ],
+        [ '2003/04', %w(SP1 SP2) ],
+        [ '2002/03', %w(SP1 SP2) ],
+        [ '2001/02', %w(SP1 SP2) ],
+        [ '2000/01', %w(SP1 SP2) ],
+        [ '1999/00', %w(SP1 SP2) ],
+        [ '1998/99', %w(SP1 SP2) ],
+        [ '1997/98', %w(SP1 SP2) ],
+        [ '1996/97', %w(SP1 SP2) ],
+        [ '1995/96', %w(SP1) ],
+        [ '1994/95', %w(SP1) ],
+        [ '1993/94', %w(SP1) ]],
+  fr:  [[ '2020/21', %w(F1 F2) ],
+        [ '2019/20', %w(F1 F2) ],
+        [ '2018/19', %w(F1 F2) ],
+        [ '2017/18', %w(F1 F2) ],
+        [ '2016/17', %w(F1 F2) ],
+        [ '2015/16', %w(F1 F2) ],
+        [ '2014/15', %w(F1 F2) ],
+        [ '2013/14', %w(F1 F2) ],
+        [ '2012/13', %w(F1 F2) ],
+        [ '2011/12', %w(F1 F2) ],
+        [ '2010/11', %w(F1 F2) ],
+        [ '2009/10', %w(F1 F2) ],
+        [ '2008/09', %w(F1 F2) ],
+        [ '2007/08', %w(F1 F2) ],
+        [ '2006/07', %w(F1 F2) ],
+        [ '2005/06', %w(F1 F2) ],
+        [ '2004/05', %w(F1 F2) ],
+        [ '2003/04', %w(F1 F2) ],
+        [ '2002/03', %w(F1 F2) ],
+        [ '2001/02', %w(F1 F2) ],
+        [ '2000/01', %w(F1 F2) ],
+        [ '1999/00', %w(F1 F2) ],
+        [ '1998/99', %w(F1 F2) ],
+        [ '1997/98', %w(F1 F2) ],
+        [ '1996/97', %w(F1 F2) ],
+        [ '1995/96', %w(F1) ],
+        [ '1994/95', %w(F1) ],
+        [ '1993/94', %w(F1) ]],
+  nl:  [[ '2020/21', %w(N1) ],
+        [ '2019/20', %w(N1) ],
+        [ '2018/19', %w(N1) ],
+        [ '2017/18', %w(N1) ],
+        [ '2016/17', %w(N1) ],
+        [ '2015/16', %w(N1) ],
+        [ '2014/15', %w(N1) ],
+        [ '2013/14', %w(N1) ],
+        [ '2012/13', %w(N1) ],
+        [ '2011/12', %w(N1) ],
+        [ '2010/11', %w(N1) ],
+        [ '2009/10', %w(N1) ],
+        [ '2008/09', %w(N1) ],
+        [ '2007/08', %w(N1) ],
+        [ '2006/07', %w(N1) ],
+        [ '2005/06', %w(N1) ],
+        [ '2004/05', %w(N1) ],
+        [ '2003/04', %w(N1) ],
+        [ '2002/03', %w(N1) ],
+        [ '2001/02', %w(N1) ],
+        [ '2000/01', %w(N1) ],
+        [ '1999/00', %w(N1) ],
+        [ '1998/99', %w(N1) ],
+        [ '1997/98', %w(N1) ],
+        [ '1996/97', %w(N1) ],
+        [ '1995/96', %w(N1) ],
+        [ '1994/95', %w(N1) ],
+        [ '1993/94', %w(N1) ]],
+  be:  [[ '2020/21', %w(B1) ],
+        [ '2019/20', %w(B1) ],
+        [ '2018/19', %w(B1) ],
+        [ '2017/18', %w(B1) ],
+        [ '2016/17', %w(B1) ],
+        [ '2015/16', %w(B1) ],
+        [ '2014/15', %w(B1) ],
+        [ '2013/14', %w(B1) ],
+        [ '2012/13', %w(B1) ],
+        [ '2011/12', %w(B1) ],
+        [ '2010/11', %w(B1) ],
+        [ '2009/10', %w(B1) ],
+        [ '2008/09', %w(B1) ],
+        [ '2007/08', %w(B1) ],
+        [ '2006/07', %w(B1) ],
+        [ '2005/06', %w(B1) ],
+        [ '2004/05', %w(B1) ],
+        [ '2003/04', %w(B1) ],
+        [ '2002/03', %w(B1) ],
+        [ '2001/02', %w(B1) ],
+        [ '2000/01', %w(B1) ],
+        [ '1999/00', %w(B1) ],
+        [ '1998/99', %w(B1) ],
+        [ '1997/98', %w(B1) ],
+        [ '1996/97', %w(B1) ],
+        [ '1995/96', %w(B1) ]],
+  pt:  [[ '2020/21', %w(P1) ],
+        [ '2019/20', %w(P1) ],
+        [ '2018/19', %w(P1) ],
+        [ '2017/18', %w(P1) ],
+        [ '2016/17', %w(P1) ],
+        [ '2015/16', %w(P1) ],
+        [ '2014/15', %w(P1) ],
+        [ '2013/14', %w(P1) ],
+        [ '2012/13', %w(P1) ],
+        [ '2011/12', %w(P1) ],
+        [ '2010/11', %w(P1) ],
+        [ '2009/10', %w(P1) ],
+        [ '2008/09', %w(P1) ],
+        [ '2007/08', %w(P1) ],
+        [ '2006/07', %w(P1) ],
+        [ '2005/06', %w(P1) ],
+        [ '2004/05', %w(P1) ],
+        [ '2003/04', %w(P1) ],
+        [ '2002/03', %w(P1) ],
+        [ '2001/02', %w(P1) ],
+        [ '2000/01', %w(P1) ],
+        [ '1999/00', %w(P1) ],
+        [ '1998/99', %w(P1) ],
+        [ '1997/98', %w(P1) ],
+        [ '1996/97', %w(P1) ],
+        [ '1995/96', %w(P1) ],
+        [ '1994/95', %w(P1) ]],
+  tr:  [[ '2020/21', %w(T1) ],
+        [ '2019/20', %w(T1) ],
+        [ '2018/19', %w(T1) ],
+        [ '2017/18', %w(T1) ],
+        [ '2016/17', %w(T1) ],
+        [ '2015/16', %w(T1) ],
+        [ '2014/15', %w(T1) ],
+        [ '2013/14', %w(T1) ],
+        [ '2012/13', %w(T1) ],
+        [ '2011/12', %w(T1) ],
+        [ '2010/11', %w(T1) ],
+        [ '2009/10', %w(T1) ],
+        [ '2008/09', %w(T1) ],
+        [ '2007/08', %w(T1) ],
+        [ '2006/07', %w(T1) ],
+        [ '2005/06', %w(T1) ],
+        [ '2004/05', %w(T1) ],
+        [ '2003/04', %w(T1) ],
+        [ '2002/03', %w(T1) ],
+        [ '2001/02', %w(T1) ],
+        [ '2000/01', %w(T1) ],
+        [ '1999/00', %w(T1) ],
+        [ '1998/99', %w(T1) ],
+        [ '1997/98', %w(T1) ],
+        [ '1996/97', %w(T1) ],
+        [ '1995/96', %w(T1) ],
+        [ '1994/95', %w(T1) ]],
+  gr:  [[ '2020/21', %w(G1) ],
+        [ '2019/20', %w(G1) ],
+        [ '2018/19', %w(G1) ],
+        [ '2017/18', %w(G1) ],
+        [ '2016/17', %w(G1) ],
+        [ '2015/16', %w(G1) ],
+        [ '2014/15', %w(G1) ],
+        [ '2013/14', %w(G1) ],
+        [ '2012/13', %w(G1) ],
+        [ '2011/12', %w(G1) ],
+        [ '2010/11', %w(G1) ],
+        [ '2009/10', %w(G1) ],
+        [ '2008/09', %w(G1) ],
+        [ '2007/08', %w(G1) ],
+        [ '2006/07', %w(G1) ],
+        [ '2005/06', %w(G1) ],
+        [ '2004/05', %w(G1) ],
+        [ '2003/04', %w(G1) ],
+        [ '2002/03', %w(G1) ],
+        [ '2001/02', %w(G1) ],
+        [ '2000/01', %w(G1) ],
+        [ '1999/00', %w(G1) ],
+        [ '1998/99', %w(G1) ],
+        [ '1997/98', %w(G1) ],
+        [ '1996/97', %w(G1) ],
+        [ '1995/96', %w(G1) ],
+        [ '1994/95', %w(G1) ]]
 }
 
 ## all seasons in-one-file datasets
@@ -417,4 +417,26 @@ TIMEZONES = {
   jp:  +9,     ## Asia/Tokyo
 }
 
+
+  ##################
+  ###  config options / settings
+  class Configuration
+    #########
+    ## nested configuration classes - use - why? why not?
+    class Convert
+       def out_dir()       @out_dir || './o'; end
+       def out_dir=(value) @out_dir = value; end
+    end
+
+   def convert()  @convert ||= Convert.new; end
+  end # class Configuration
+
+  ## lets you use
+  ##   Footballdata12xpert.configure do |config|
+  ##      config.convert.out_dir = './o'
+  ##   end
+
+  def self.configure()  yield( config ); end
+  def self.config()  @config ||= Configuration.new;  end
 end # module Footballdata12xpert
+

data/lib/footballdata-12xpert/convert.rb

@@ -85,6 +85,7 @@ class CsvMatchWriter
 end # class CsvMatchWriter
 
 
+
 module Footballdata12xpert
 
 ##
@@ -123,10 +124,6 @@ def self.convert_season_by_season( country_key, sources, start: nil )
 
   start = Season.parse( start )   if start  ## convert to season obj
 
-
-  out_dir = './o'
-
-
   sources.each do |rec|
     season     = Season.parse( rec[0] )   ## note: dirname is season e.g. 2011-12 etc.
     basenames  = rec[1]   ## e.g. E1,E2,etc.
@@ -146,7 +143,7 @@ def self.convert_season_by_season( country_key, sources, start: nil )
       league_key = LEAGUES[basename]
       league_basename = league_key   ## e.g.: eng.1, fr.1, fr.2 etc.
 
-      out_path = "#{out_dir}/#{season.to_path}/#{league_basename}.csv"
+      out_path = "#{config.convert.out_dir}/#{season.to_path}/#{league_basename}.csv"
 
       puts "out_path: #{out_path}"
 
@@ -166,7 +163,6 @@ def self.convert_all_seasons( country_key, basename, start: nil )
 
   start = Season.parse( start )   if start  ## convert to season obj
 
-  out_dir = './o'
 
   url = all_seasons_url( basename )
 
@@ -197,7 +193,7 @@ def self.convert_all_seasons( country_key, basename, start: nil )
     ## note: assume (always) first level league for now
     league_basename = "#{country_key}.1"    ## e.g.: ar.1, at.1, mx.1, us.1, etc.
 
-    out_path = "#{out_dir}/#{season.to_path}/#{league_basename}.csv"
+    out_path = "#{config.convert.out_dir}/#{season.to_path}/#{league_basename}.csv"
 
     CsvMatchWriter.write( out_path, matches )
   end

data/lib/footballdata-12xpert/import.rb

@@ -0,0 +1,21 @@
+module Footballdata12xpert
+
+
+def self.import( *country_keys, start: nil )
+  ## note: always downcase and symbolize keys (thus, allow strings too for now)
+  country_keys = country_keys.map {|key| key.downcase.to_sym }
+
+  ## fix/todo:  filter by country keys and start sesason to be (re)done
+
+  ## todo/fix:  use/add normalize: true  option!!!!!
+
+  dir = File.expand_path( config.convert.out_dir )
+  puts "  dir: >#{dir}<"
+
+  # SportDb.read_csv( dir )
+  ##  todo/fix: use SportDb Csv Package or such???
+  puts "import to be (re)done; sorry"
+end # method import
+
+
+end ## module Footballdata12xpert

data/lib/footballdata-12xpert/version.rb

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

data/test/test_import.rb

@@ -19,15 +19,15 @@ class TestImport < MiniTest::Test
 
 
   def test_import_at
-    Footballdata.import( :at, dir: './dl'  )
+    Footballdata12xpert.import( 'at' )
   end
 
   def test_import_eng
-    Footballdata.import( :eng, dir: './dl')
+    Footballdata12xpert.import( 'eng', start: '2020/21' )
   end
 
-  def test_import_all
-     Footballdata.import( dir: './dl' )
+  def xxx_test_import_all     ## note: test disabled for now
+     Footballdata12xpert.import
   end
 
 end # class TestImport

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-12xpert
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Gerald Bauer
@@ -105,6 +105,7 @@ files:
 - lib/footballdata-12xpert/config.rb
 - lib/footballdata-12xpert/convert.rb
 - lib/footballdata-12xpert/download.rb
+- lib/footballdata-12xpert/import.rb
 - lib/footballdata-12xpert/version.rb
 - lib/footballdata/12xpert.rb
 - test/helper.rb