sportdb-config 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab3af5caf98d2b479ec761e631a11fd7cea1fbf2
-  data.tar.gz: 8b9d6b1124ee2ed1736461c570ccc0c413e7fc5c
+  metadata.gz: 852d0106724079d3a82da39eee4c35c2c8223444
+  data.tar.gz: 829732d0ed84b32ce414e2eda2853c124363412c
 SHA512:
-  metadata.gz: c530137fc8d0998e51d87894809cb181a1771f980294a8f443c06daeeba7fc7db69fe66bcc769c60a8f4e635f3aee5485034c9bd1e79330f4f72dd82e3894fe2
-  data.tar.gz: 7df6258cf6cb2a8b48701786fe67c1f336e1af59a636207cd98bef3762c67a04812bcdb0fa3dfff92b84c6acdb022249e4076ed196fb5bd89513a7906195fb04
+  metadata.gz: ea39a32a35b38ada3df0f0189683c1d18817c9e9e1e02b948dd3619b0511dcea53d4c391f2a28fb43ce10df09e29b88d8e602bf2825c3441d7cd42a1bb9eb328
+  data.tar.gz: 85fe045bcadba1577dad41c1732f564479f88795e8bc3d3335d4c57598167e57163fab65bfa4b3c78eed3559c9a451947df2f97fb4119166367221deb1c53bee

data/Manifest.txt

@@ -5,13 +5,10 @@ README.md
 Rakefile
 lib/sportdb/config.rb
 lib/sportdb/config/config.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_countries.rb
-test/test_find_datafiles.rb
 test/test_leagues.rb
-test/test_season_utils.rb
 test/test_wiki_index.rb

data/Rakefile

@@ -20,9 +20,9 @@ Hoe.spec 'sportdb-config' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-countries', '>= 0.4.0'],
-    ['sportdb-clubs',     '>= 0.2.2'],
-    ['sportdb-leagues',   '>= 0.1.1'],
+    ['sportdb-countries',  '>= 0.5.1'],
+    ['sportdb-clubs',      '>= 0.2.3'],
+    ['sportdb-leagues',    '>= 0.2.1'],
     ## dataset libs / gems
     ['fifa',               '>= 1.2.1'],    ## for (builtin/default) countries
     ['footballdb-clubs',   '>= 1.0.0'],      ## for (builtin/default) clubs

data/lib/sportdb/config.rb

@@ -15,8 +15,6 @@ require 'footballdb/leagues'
 ###
 # our own code
 require 'sportdb/config/version' # let version always go first
-
-require 'sportdb/config/season_utils'
 require 'sportdb/config/wiki_index'
 require 'sportdb/config/config'
 

data/lib/sportdb/config/config.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+
 module SportDb
   module Import
 
@@ -8,9 +9,9 @@ class ClubIndex
 
   def self.build( path )
     recs = []
-    datafiles = Configuration.find_datafiles_clubs( path )
+    datafiles = Datafile.find_clubs( path )
     datafiles.each do |datafile|
-      recs += ClubReader.read( datafile )
+      recs += Club.read( datafile )
     end
     recs
 
@@ -19,7 +20,7 @@ class ClubIndex
 
     ## add wiki(pedia) anchored links
     recs = []
-    datafiles = Configuration.find_datafiles_clubs_wiki( path )
+    datafiles = Datafile.find_clubs_wiki( path )
     datafiles.each do |datafile|
        recs += WikiReader.read( datafile )
     end
@@ -35,9 +36,9 @@ class LeagueIndex
 
   def self.build( path )
     recs = []
-    datafiles = Configuration.find_datafiles_leagues( path )
+    datafiles = Datafile.find_leagues( path )
     datafiles.each do |datafile|
-      recs += LeagueReader.read( datafile )
+      recs += League.read( datafile )
     end
     recs
 
@@ -87,41 +88,6 @@ class Configuration
   def leagues_dir()    @leagues_dir; end
 
 
-  CLUBS_REGEX = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
-                       (?:[a-z]{1,3}\.)?   # optional country code/key e.g. eng.clubs.txt
-                       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
-
-     ## check all txt files as candidates  (MUST include country code for now)
-     candidates = Dir.glob( "#{path}/**/*.txt" )
-     pp candidates
-     candidates.each do |candidate|
-       datafiles << candidate    if pattern.match( candidate )
-     end
-
-     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
     ## unify team names; team (builtin/known/shared) name mappings

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 = 8
-  PATCH = 1
+  MINOR = 9
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/config/wiki_index.rb

@@ -8,7 +8,7 @@ class WikiIndex
 
   def self.build( path )
     recs = []
-    datafiles = Configuration.find_datafiles_clubs_wiki( path )
+    datafiles = Datafile.find_clubs_wiki( path )
     datafiles.each do |datafile|
         recs += WikiReader.read( datafile )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-countries
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: sportdb-clubs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: sportdb-leagues
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: fifa
   requirement: !ruby/object:Gem::Requirement
@@ -139,15 +139,12 @@ files:
 - Rakefile
 - lib/sportdb/config.rb
 - lib/sportdb/config/config.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_countries.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
 licenses:

data/lib/sportdb/config/season_utils.rb

@@ -1,116 +0,0 @@
-# encoding: utf-8
-
-
-module SeasonHelper ## use Helpers why? why not?
-  def prev( season )
-    ## todo: add 1964-1965 format too!!!
-    if season =~ /^(\d{4})-(\d{2})$/    ## season format is  1964-65
-      fst = $1.to_i - 1
-      snd = (100 + $2.to_i - 1) % 100    ## note: add 100 to turn 00 => 99
-      "%4d-%02d" % [fst,snd]
-    elsif season =~ /^(\d{4})$/
-      fst = $1.to_i - 1
-      "%4d" % [fst]
-    else
-      puts "*** !!!! wrong season format >>#{season}<<; exit; sorry"
-      exit 1
-    end
-  end  # method prev
-
-
-  def key( basename )
-    if basename =~ /^(\d{4})[\-\/](\d{4})$/      ## e.g. 2011-2012 or 2011/2012 => 2011/12
-      "%4d/%02d" % [$1.to_i, $2.to_i % 100]
-    elsif basename =~ /^(\d{4})[\-\/](\d{2})$/   ## e.g. 2011-12 or 2011/12  => 2011/12
-      "#{$1}/#{$2}"
-    elsif basename =~ /^(\d{4})$/
-      $1
-    else
-      puts "*** !!!! wrong season format >>#{basename}<<; exit; sorry"
-      exit 1
-    end
-  end  # method key
-
-
-  def directory( season, format: nil )
-    ##  todo: find better names for formats - why? why not?:
-    ##    long | archive | decade(?)   =>   1980s/1988-89, 2010s/2017-18, ...
-    ##    short | std(?)   =>   1988-89, 2017-18, ...
-
-    ## convert season name to "standard" season name for directory
-
-    ## todo/fix: move to parse / validate season (for (re)use)!!!! - why? why not?
-    if season =~ /^(\d{4})[\-\/](\d{4})$/   ## e.g. 2011-2012 or 2011/2012 => 2011-12
-      years = [$1.to_i, $2.to_i]
-    elsif season =~ /^(\d{4})[\-\/](\d{2})$/   ## e.g. 2011-12 or 2011/12  => 2011-12
-      years = [$1.to_i, $1.to_i+1]
-      ## note: check that season end year is (always) season start year + 1
-      if ($1.to_i+1) % 100 != $2.to_i
-        puts "*** !!!! wrong season format >>#{season}<<; season end year MUST (always) equal season start year + 1; exit; sorry"
-        exit 1
-      end
-    elsif season =~ /^(\d{4})$/
-      years = [$1.to_i]
-    else
-      puts "*** !!!! wrong season format >>#{season}<<; exit; sorry"
-      exit 1
-    end
-
-
-    if ['l', 'long', 'archive' ].include?( format.to_s )   ## note: allow passing in of symbol to e.g. 'long' or :long
-      if years.size == 2
-        "%3d0s/%4d-%02d" % [years[0] / 10, years[0], years[1] % 100]   ## e.g. 2000s/2001-02
-      else  ## assume size 1 (single year season)
-        "%3d0s/%4d" % [years[0] / 10, years[0]]
-      end
-    else  ## default 'short' format / fallback
-      if years.size == 2
-        "%4d-%02d" % [years[0], years[1] % 100]   ## e.g. 2001-02
-      else  ## assume size 1 (single year season)
-        "%4d" % years[0]
-      end
-    end
-  end # method directory
-
-
-
-  def start_year( season ) ## get start year
-    ## convert season name to "standard" season name for directory
-
-    ## todo/check:  just return year from first for chars - keep it simple - why? why not?
-    if season =~ /^(\d{4})[\-\/](\d{4})$/   ## e.g. 2011-2010 or 2011/2011 => 2011-10
-      $1
-    elsif season =~ /^(\d{4})[\-\/](\d{2})$/
-      $1
-    elsif season =~ /^(\d{4})$/
-      $1
-    else
-      puts "*** !!!! wrong season format >>#{season}<<; exit; sorry"
-      exit 1
-    end
-  end
-
-  def end_year( season ) ## get end year
-    ## convert season name to "standard" season name for directory
-    if season =~ /^(\d{4})[\-\/](\d{4})$/   ## e.g. 2011-2010 or 2011/2011 => 2011-10
-      $2
-    elsif season =~ /^(\d{4})[\-\/](\d{2})$/
-      ## note: assume second year is always +1
-      ##    todo/fix: add assert/check - why? why not?
-      ## eg. 1999-00 => 2000 or 1899-00 => 1900
-      ($1.to_i+1).to_s
-    elsif season =~ /^(\d{4})$/
-      $1
-    else
-      puts "*** !!!! wrong season format >>#{season}<<; exit; sorry"
-      exit 1
-    end
-  end
-end  # module SeasonHelper
-
-
-module SeasonUtils
-  extend SeasonHelper
-  ##  lets you use SeasonHelper as "globals" eg.
-  ##     SeasonUtils.prev( season ) etc.
-end # SeasonUtils

data/test/test_find_datafiles.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_find_datafiles.rb
-
-
-require 'helper'
-
-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' )
-      assert match_clubs( 'europe/de-deutschland/clubs.txt' )
-      assert match_clubs( 'de-deutschland/clubs.txt' )
-      assert match_clubs( 'clubs.txt' )
-      assert match_clubs( 'deutschland/clubs.txt' )
-
-      assert !match_clubs( 'de.clubs.wiki.txt' )
-      assert !match_clubs( 'deutschland/de.clubs.wiki.txt' )
-      assert !match_clubs( 'europe/de-deutschland/clubs.wiki.txt' )
-      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
-      assert !match_clubs_wiki( 'de.clubs.txt' )
-      assert !match_clubs_wiki( 'deutschland/de.clubs.txt' )
-      assert !match_clubs_wiki( 'europe/de-deutschland/clubs.txt' )
-      assert !match_clubs_wiki( 'de-deutschland/clubs.txt' )
-      assert !match_clubs_wiki( 'clubs.txt' )
-      assert !match_clubs_wiki( 'deutschland/clubs.txt' )
-
-      assert match_clubs_wiki( 'de.clubs.wiki.txt' )
-      assert match_clubs_wiki( 'deutschland/de.clubs.wiki.txt' )
-      assert match_clubs_wiki( 'europe/de-deutschland/clubs.wiki.txt' )
-      assert match_clubs_wiki( 'de-deutschland/clubs.wiki.txt' )
-      assert match_clubs_wiki( 'clubs.wiki.txt' )
-      assert match_clubs_wiki( 'deutschland/clubs.wiki.txt' )
-  end
-
-  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_season_utils.rb

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_season_utils.rb
-
-
-require 'helper'
-
-class TestSeasonUtils < MiniTest::Test
-
-  def test_directory
-    assert_equal '2010-11',       SeasonUtils.directory( '2010-11' )
-    assert_equal '2010-11',       SeasonUtils.directory( '2010-2011' )
-    assert_equal '2010-11',       SeasonUtils.directory( '2010/11' )
-    assert_equal '2010-11',       SeasonUtils.directory( '2010/2011' )
-    assert_equal '2010',          SeasonUtils.directory( '2010' )
-
-    assert_equal '2010s/2010-11', SeasonUtils.directory( '2010-11',   format: 'long' )
-    assert_equal '2010s/2010-11', SeasonUtils.directory( '2010-2011', format: 'long' )
-    assert_equal '2010s/2010',    SeasonUtils.directory( '2010',      format: 'long' )
-
-    assert_equal '1999-00',       SeasonUtils.directory( '1999-00' )
-    assert_equal '1999-00',       SeasonUtils.directory( '1999-2000' )
-    assert_equal '1990s/1999-00', SeasonUtils.directory( '1999-00',   format: 'long' )
-    assert_equal '1990s/1999-00', SeasonUtils.directory( '1999-2000', format: 'long' )
-  end  # method test_diretory
-
-end # class TestSeasonlUtils