footballdb-clubs 2019.12.16 → 2020.7.7

data/config/clubs.wiki.txt

@@ -1,6 +1,6 @@
 ##########################################
 # auto-generated all-in-one single datafile clubs.wiki.txt bundle
-#    on 2019-12-16 10:13:22 +0100 from 5 datafile(s)
+#    on 2020-07-07 21:39:24 +0200 from 5 datafile(s)
 #  please, do NOT edit here; use the source
 #    see https://github.com/openfootball/clubs - updates welcome!
 
@@ -53,6 +53,8 @@ Urawa Red Diamonds
 Vegalta Sendai
 Vissel Kobe
 Yokohama F. Marinos
+
+
 ===================================
 =  Albania
 
@@ -585,6 +587,8 @@ Yeni Malatyaspor
 Cardiff City F.C.
 Swansea City A.F.C.
 Newport County A.F.C.
+
+
 =================================
 =  Israel
 
@@ -602,6 +606,8 @@ Maccabi Haifa F.C.
 Maccabi Netanya F.C.
 Maccabi Petah Tikva F.C.
 Maccabi Tel Aviv F.C.
+
+
 ============================
 =  Canada
 
@@ -662,6 +668,8 @@ Sporting Kansas City
 Chivas USA
 Miami Fusion
 Tampa Bay Mutiny
+
+
 ===========================
 =  Argentina
 
@@ -677,7 +685,13 @@ Defensa y Justicia
 Estudiantes de La Plata
 Club de Gimnasia y Esgrima La Plata
 Godoy Cruz Antonio Tomba
-Club Atlético Huracán
+
+# Club Atlético Huracán
+## todo/fix: add city!!!!  e.g.    Club Atlético Huracán,   Tres Arroyos  or  Club Atlético Huracán › Tres Arroyos
+# todo/fix:  ERROR !!! - too many (greater than one) matching clubs found for wiki(pedia) name >Club Atlético Huracán, Argentina (ar)
+#  - Huracán de Tres Arroyos
+#  - Huracán de Buenos Aires
+
 Club Atlético Independiente
 Club Atlético Lanús
 Newell's Old Boys
@@ -736,3 +750,5 @@ Cuiabá Esporte Clube
 América Futebol Clube (MG)
 Sport Club do Recife
 Grêmio Esportivo Brasil
+
+

data/lib/footballdb/clubs.rb

@@ -1,10 +1,6 @@
-# encoding: utf-8
-
-
 ###
-#  sport.db gems / libraries
+#  sport.db gems / libraries via fifa
 require 'fifa'
-require 'sportdb/clubs'
 
 
 ###
@@ -13,66 +9,20 @@ require 'footballdb/clubs/version' # let version always go first
 
 
 module FootballDb
-module Import
-
-## add "fake" configuration for stand-alone usage
-class Configuration
-  def initialize
-    recs       = Fifa.countries
-    @countries = SportDb::Import::CountryIndex.new( recs )
-  end
-
-  def countries() @countries; end
-end
-
-
-
-
-class Club    ## todo/check: use a module instead of class - why? why not?
-  def self.clubs()      club_index.clubs; end   ## return all clubs (struct-like) records
-  def self.all()   clubs; end  ## use ActiveRecord-like alias for clubs
-
-  def self.mappings()   club_index.mappings; end
+  module Import
 
-  def self.[]( name )   club_index[ name ]; end  ## lookup by canoncial name only
-  def self.match( name ) club_index.match( name ); end
-  def self.match_by( name:, country: ) club_index.match_by( name: name, country: country ); end
-
-
-  def self.club_index
-    @club_index ||= build_club_index
-    @club_index
-  end
-
-private
   def self.build_club_index
-    if defined?( SportDb::Import::Configuration )
-       # assume running "inside" sportdb - (re)use sportdb configuration
-    else
-       # assume running "stand-alone" - setup configuration for countries / country mapping
-       config = Configuration.new
-       SportDb::Import::ClubReader.config = config
-       SportDb::Import::ClubIndex.config  = config
-       SportDb::Import::WikiReader.config = config
-    end
-
-    recs = SportDb::Import::ClubReader.read( "#{FootballDb::Clubs.data_dir}/clubs.txt" )
+    recs = SportDb::Import::Club.read( "#{FootballDb::Clubs.data_dir}/clubs.txt" )
     club_index = SportDb::Import::ClubIndex.new
     club_index.add( recs )
     recs = SportDb::Import::WikiReader.read( "#{FootballDb::Clubs.data_dir}/clubs.wiki.txt" )
     club_index.add_wiki( recs )
     club_index
   end
-end # class Club
 
-end # module Import
+  end # module Import
 end # module FootballDb
 
 
-
-### add top-level (global) convenience alias
-Club = FootballDb::Import::Club
-
-
-
 puts FootballDb::Clubs.banner   # say hello
+

data/lib/footballdb/clubs/auto.rb

@@ -0,0 +1,29 @@
+
+## our own code (without "top-level" shortcuts e.g. "modular version")
+require 'footballdb/clubs'
+
+
+###
+#  add convenience top-level shortcuts / aliases
+
+module SportDb
+  module Import
+
+  class Catalog
+    def build_country_index()  CountryIndex.new( Fifa.countries ); end
+    def build_club_index()     FootballDb::Import.build_club_index; end
+
+    def countries() @countries ||= build_country_index; end
+    def clubs()     @clubs     ||= build_club_index; end
+  end
+
+  configure do |config|
+    config.catalog = Catalog.new
+  end
+
+  end # module Import
+end # module SportDb
+
+
+### add top-level (global) convenience alias
+Club = SportDb::Import.catalog.clubs

data/lib/footballdb/clubs/version.rb

@@ -4,9 +4,9 @@
 module FootballDb
 module Clubs
 
-  MAJOR = 2019    ## todo: namespace inside version or something - why? why not??
-  MINOR = 12
-  PATCH = 16
+  MAJOR = 2020    ## todo: namespace inside version or something - why? why not??
+  MINOR = 7
+  PATCH = 7
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -1,10 +1,7 @@
-## $:.unshift(File.dirname(__FILE__))
-
 ## minitest setup
 
 require 'minitest/autorun'
 
 
 ## our own code
-
-require 'footballdb/clubs'
+require 'footballdb/clubs/auto'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: footballdb-clubs
 version: !ruby/object:Gem::Version
-  version: 2019.12.16
+  version: 2020.7.7
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-clubs
+  name: sportdb-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: fifa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.27
+        version: 2020.5.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.27
+        version: 2020.5.18
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -84,10 +84,11 @@ files:
 - config/clubs.txt
 - config/clubs.wiki.txt
 - lib/footballdb/clubs.rb
+- lib/footballdb/clubs/auto.rb
 - lib/footballdb/clubs/version.rb
 - test/helper.rb
 - test/test_club.rb
-homepage: https://github.com/sportdb/sport.db
+homepage: https://github.com/sportdb/football.db
 licenses:
 - Public Domain
 metadata: {}