sportdb-config 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c2c01fdd2e8ff942c611f48d710ab0ccd6ddb88
-  data.tar.gz: 86bf655cde4e2474bc1ac31448494e5381a73622
+  metadata.gz: 764ca27d3655813274fb75c7ccbb8f1d4e1dcb71
+  data.tar.gz: eef58b830eda10906d497555c681aab449436be0
 SHA512:
-  metadata.gz: 0ddb39ee84dd3481384092114e80012b653cd7928c58c47c3f55ad2642d3e8bab2df4cc85f1c14b300d893cc640e4c74e333950cfa9fd1e8d4f02a92223f63d7
-  data.tar.gz: fd4e20c0cf5b5bff7ad2c740816e3f97a567dcf0e1ee8d902e4961aa71686e138a46f575fe7538d0121224519d2056342635f2b15f2a55eee7c5c90339f1f0c7
+  metadata.gz: de0e7967586e5e1ef5b90bbcc0eba6b780d56d089a951dc3dab767b4c0b229b2c92afa4768c452702b23f5c8c17dd99b65254672e9534ab29a6987c629f1023d
+  data.tar.gz: 299672688171ddd354c55ee42a98eef867d90a5af345fa1885d23934a5811bd4610cab371f24c293fc77cc22178f1c901d74282a7fee862c58288285794dd02f

data/Manifest.txt

@@ -1,4 +1,4 @@
-HISTORY.md
+CHANGELOG.md
 Manifest.txt
 NOTES.md
 README.md
@@ -13,28 +13,18 @@ config/world/be.txt
 config/world/de.txt
 config/world/eng.txt
 lib/sportdb/config.rb
-lib/sportdb/config/club.rb
-lib/sportdb/config/club_index.rb
-lib/sportdb/config/club_reader.rb
 lib/sportdb/config/config.rb
-lib/sportdb/config/countries.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/variants.rb
 lib/sportdb/config/version.rb
 lib/sportdb/config/wiki_index.rb
-lib/sportdb/config/wiki_reader.rb
 test/helper.rb
-test/test_club_index.rb
-test/test_club_reader.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_season_utils.rb
-test/test_variants.rb
 test/test_wiki_index.rb
-test/test_wiki_reader.rb

data/Rakefile

@@ -11,16 +11,20 @@ Hoe.spec 'sportdb-config' do
   self.urls = ['https://github.com/sportdb/sport.db']
 
   self.author = 'Gerald Bauer'
-  self.email = 'opensport@googlegroups.com'
+  self.email  = 'opensport@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
-  self.readme_file = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.readme_file  = 'README.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['fifa',   '>= 0.1.1'],
+    ['sportdb-countries', '>= 0.2.0'],
+    ['sportdb-clubs',     '>= 0.2.0'],
+    ## dataset libs / gems
+    ['fifa',              '>= 1.0.0'],    ## for (builtin/default) countries
+    ['footballdb-clubs',  '>= 0.2.0'],      ## for (builtin/default) clubs
   ]
 
   self.spec_extras = {

data/lib/sportdb/config.rb

@@ -1,20 +1,12 @@
 # encoding: utf-8
 
+### our own sportdb libs / gems
+require 'sportdb/countries'
+require 'sportdb/clubs'
 
-require 'pp'
-require 'date'
-require 'fileutils'
-
-
-## 3rd party gems
-require 'csvreader'
-
-def read_csv( path )
-  CsvHash.read( path, :header_converters => :symbol )
-end
-
-
+### "built-in" default dataset libs / gems
 require 'fifa'    ## get a list of all fifa countries with (three letter) codes
+require 'footballdb/clubs'
 
 
 ###
@@ -25,31 +17,15 @@ require 'sportdb/config/season_utils'
 require 'sportdb/config/league_utils'
 require 'sportdb/config/league'
 require 'sportdb/config/league_reader'
-
-require 'sportdb/config/variants'
-require 'sportdb/config/countries'
-require 'sportdb/config/club'
-require 'sportdb/config/club_reader'
-require 'sportdb/config/club_index'
-require 'sportdb/config/wiki_reader'
 require 'sportdb/config/wiki_index'
 require 'sportdb/config/config'
 
 
 
-
-## let's put test configuration in its own namespace / module
-module SportDb
-
-class Test    ## todo/check: works with module too? use a module - why? why not?
-
-  ####
-  #  todo/fix:  find a better way to configure shared test datasets - why? why not?
-  def self.data_dir()        @data_dir ||= './test'; end
-  def self.data_dir=( path ) @data_dir = path; end
-end
-
-end   # module SportDb
+## 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
 
 
 

data/lib/sportdb/config/config.rb

@@ -3,6 +3,33 @@
 module SportDb
   module Import
 
+# add builder convenience helper to ClubIndex
+class ClubIndex
+
+  def self.build( path )
+    recs = []
+    datafiles = Configuration.find_datafiles_clubs( path )
+    datafiles.each do |datafile|
+      recs += ClubReader.read( datafile )
+    end
+    recs
+
+    clubs = self.new
+    clubs.add( recs )
+
+    ## add wiki(pedia) anchored links
+    recs = []
+    datafiles = Configuration.find_datafiles_clubs_wiki( path )
+    datafiles.each do |datafile|
+       recs += WikiReader.read( datafile )
+    end
+
+    pp recs
+    clubs.add_wiki( recs )
+    clubs
+  end
+end # class ClubIndex
+
 
 class Configuration
 
@@ -31,7 +58,7 @@ class Configuration
   ####
   #  todo/fix:  find a better way to configure club / team datasets
   attr_accessor   :clubs_dir
-  def clubs_dir()   @clubs_dir ||= './clubs'; end
+  def clubs_dir()   @clubs_dir; end   ### note: return nil if NOT set on purpose for now - why? why not?
 
 
   CLUBS_REGEX = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
@@ -63,13 +90,20 @@ class Configuration
   def self.find_datafiles_clubs_wiki( path )  find_datafiles( path, CLUBS_WIKI_REGEX ); end
 
 
+
   def build_club_index
     ## unify team names; team (builtin/known/shared) name mappings
     ## cleanup team names - use local ("native") name with umlaut etc.
     ## todo/fix: add to teamreader
     ##              check that name and alt_names for a club are all unique (not duplicates)
 
-    clubs = ClubIndex.build( clubs_dir )
+    clubs = if clubs_dir   ## check if clubs_dir is defined / set (otherwise it's nil)
+              ClubIndex.build( clubs_dir )
+            else   ## no clubs_dir set - try using builtin from footballdb-clubs
+              ## todo/fix:  use build_club_index make public (remove private)!!!!
+              FootballDb::Club.club_index
+            end
+
     if clubs.errors?
       puts ""
       puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@@ -82,8 +116,6 @@ class Configuration
 end # method build_club_index
 
 
-
-
 def leagues
   read_leagues()      if @leagues.nil?
   @leagues

data/lib/sportdb/config/version.rb

@@ -7,7 +7,7 @@ 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 = 6
+  MINOR = 7
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/test_clubs.rb

@@ -9,35 +9,91 @@ require 'helper'
 
 class TestClubs < MiniTest::Test
 
-  def strip_lang( name ) SportDb::Import::Club.strip_lang( name ); end
-  def strip_year( name ) SportDb::Import::Club.strip_year( name ); end
+  def test_match
+    pp SportDb::Import.config.clubs.errors
 
+    SportDb::Import.config.clubs.dump_duplicates
 
-  def test_lang
-    assert_equal 'Bayern Munich', strip_lang( 'Bayern Munich [en]' )
-  end
+    m = SportDb::Import.config.clubs.match( 'Rapid Wien' )
+    assert_equal 'SK Rapid Wien', m[0].name
+    assert_equal 'Austria',       m[0].country.name
+    assert_equal 'Wien',          m[0].city
+
+    m = SportDb::Import.config.clubs.match( 'rapid wien' )
+    assert_equal 'SK Rapid Wien', m[0].name
+    assert_equal 'Austria',       m[0].country.name
+    assert_equal 'Wien',          m[0].city
+
+    ## note: all dots (.) get always removed
+    m = SportDb::Import.config.clubs.match( '...r.a.p.i.d w.i.e.n...' )
+    assert_equal 'SK Rapid Wien', m[0].name
+    assert_equal 'Austria',       m[0].country.name
+    assert_equal 'Wien',          m[0].city
+
+    ## note: all spaces and dashes (-) get always removed
+    m = SportDb::Import.config.clubs.match( '--- r a p i d  w i e n ---' )
+    assert_equal 'SK Rapid Wien', m[0].name
+    assert_equal 'Austria',       m[0].country.name
+    assert_equal 'Wien',          m[0].city
+
+    m = SportDb::Import.config.clubs.match( 'RAPID WIEN' )
+    assert_equal 'SK Rapid Wien', m[0].name
+    assert_equal 'Austria',       m[0].country.name
+    assert_equal 'Wien',          m[0].city
+
+
+    c = SportDb::Import.config.clubs[ 'SK Rapid Wien' ]   ## check canoncial name match (only)
+    assert_equal 'SK Rapid Wien', c.name
+    assert_equal 'Austria',       c.country.name
+    assert_equal 'Wien',          c.city
 
-  def test_year
-    assert_equal 'FC Linz', strip_year( 'FC Linz (1946-2001, 2013-)' )
-  end
 
+    m = SportDb::Import.config.clubs.match( 'Arsenal' )
+    assert_equal 3, m.size
 
-  def test_duplicats
-    club = SportDb::Import::Club.new
-    club.name = "Rapid Wien"
+    m = SportDb::Import.config.clubs.match( 'ARSENAL' )
+    assert_equal 3, m.size
 
-    assert_equal false, club.duplicates?
-    duplicates = {}
-    assert_equal duplicates,  club.duplicates
+    m = SportDb::Import.config.clubs.match_by( name: 'Arsenal', country: 'eng' )
+    assert_equal 1, m.size
+    assert_equal 'Arsenal FC', m[0].name
+    assert_equal 'England',    m[0].country.name
+    assert_equal 'London',     m[0].city
+
+    m = SportDb::Import.config.clubs.match_by( name: 'Arsenal', country: 'ar' )
+    assert_equal 1, m.size
+    assert_equal 'Arsenal de Sarandí', m[0].name
+    assert_equal 'Argentina',          m[0].country.name
+    assert_equal 'Sarandí',            m[0].city
+
+    m = SportDb::Import.config.clubs.match_by( name: 'Arsenal', country: 'ru' )
+    assert_equal 1, m.size
+    assert_equal 'Arsenal Tula', m[0].name
+    assert_equal 'Russia',       m[0].country.name
+    assert_equal 'Tula',         m[0].city
+
+
+    m = SportDb::Import.config.clubs.match( 'Arsenal FC' )
+    assert_equal 2, m.size
+
+    m = SportDb::Import.config.clubs.match( 'Arsenal F.C.' )
+    assert_equal 2, m.size
+
+    m = SportDb::Import.config.clubs.match( '...A.r.s.e.n.a.l... F.C...' )
+    assert_equal 2, m.size
+  end
 
-    club.alt_names_auto += ['Rapid', 'Rapid Wien', 'SK Rapid Wien']
+  def test_wikipedia    ## test wikipedia names and links/urls
 
-    pp club
+    m = SportDb::Import.config.clubs.match( 'Club Brugge KV' )
+    assert_equal 1, m.size
+    assert_equal 'Club Brugge KV', m[0].wikipedia
+    assert_equal 'https://en.wikipedia.org/wiki/Club_Brugge_KV', m[0].wikipedia_url
 
-    assert_equal true,              club.duplicates?
-    duplicates = {'rapidwien'=>['Rapid Wien','Rapid Wien']}
-    pp club.duplicates
-    assert_equal duplicates, club.duplicates
+    m = SportDb::Import.config.clubs.match( 'RSC Anderlecht' )
+    assert_equal 1, m.size
+    assert_equal 'R.S.C. Anderlecht', m[0].wikipedia
+    assert_equal 'https://en.wikipedia.org/wiki/R.S.C._Anderlecht', m[0].wikipedia_url
   end
 
 end # class TestClubs

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sportdb-countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: sportdb-clubs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: fifa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: footballdb-clubs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -57,7 +99,7 @@ email: opensport@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - NOTES.md
 - README.md
@@ -71,7 +113,7 @@ extra_rdoc_files:
 - config/world/de.txt
 - config/world/eng.txt
 files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - NOTES.md
 - README.md
@@ -86,31 +128,21 @@ files:
 - config/world/de.txt
 - config/world/eng.txt
 - lib/sportdb/config.rb
-- lib/sportdb/config/club.rb
-- lib/sportdb/config/club_index.rb
-- lib/sportdb/config/club_reader.rb
 - lib/sportdb/config/config.rb
-- lib/sportdb/config/countries.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/variants.rb
 - lib/sportdb/config/version.rb
 - lib/sportdb/config/wiki_index.rb
-- lib/sportdb/config/wiki_reader.rb
 - test/helper.rb
-- test/test_club_index.rb
-- test/test_club_reader.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_season_utils.rb
-- test/test_variants.rb
 - test/test_wiki_index.rb
-- test/test_wiki_reader.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain