sportdb-config 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae1c9a151f0ae45288637a313a7e931add98d41
-  data.tar.gz: 630ce245f08fb76a88d90366cc2b0c4ae1145fae
+  metadata.gz: 352f71db80d07acc04fd4cb42c2bac55b1dd68c6
+  data.tar.gz: cc12464ae93f39bbc31b6f8afe0b01f7c090529d
 SHA512:
-  metadata.gz: f0c92d020a856963d9eb77b8d58dc52c1b59a0fcec4cedf9786ee016d667460527ce62a01114cc181a6bd721692f93fd4e659f8bc6c8ed8b3a8360153749ddd4
-  data.tar.gz: cbb79330d79b539240c1298f504a2bc46729dbf967dd7c1b9e60226d1e09539068cdccc8af288ab127d94423c1c65173ed9a63c90a8d6317e6e4506639c47ad0
+  metadata.gz: d35cefa295d716caa25da70a39b73132d508075b2bfaee66d11f4f12a448005744e4d460df0718406e51a0e214acc371b8169c99ffd2b3b6dd98d1707e3c7d46
+  data.tar.gz: 7e1f607de7b27bfdc95897abe7eab6358115ff0b30d8029ce83eb937cdbe24c540e6bd78dc0e0977e5db80f4563653655d5553a9853ec86c0d34fadd5a5f5024

data/lib/sportdb/config/config.rb

@@ -34,6 +34,38 @@ class Configuration
 
   def clubs_dir()   @clubs_dir ||= './clubs'; end
 
+
+
+  CLUBS_REGEX1 = %r{  (?:^|/)            # beginning (^) or beginning of path (/)
+                       (?<country>[a-z]{1,3})\.clubs\.txt$
+                   }x
+
+  CLUBS_REGEX2 = %r{  (?:^|/)            # beginning (^) or beginning of path (/)
+                       (?<country>[a-z]{2,3})-[^/]+?
+                         /clubs\.txt$
+                   }x
+
+  CLUBS_REGEX = Regexp.union( CLUBS_REGEX1, CLUBS_REGEX2 )
+
+
+  def find_clubs_datafiles( path )
+     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|
+       m = CLUBS_REGEX.match( candidate )
+       if m
+         datafiles << [m[:country], candidate]
+       end
+     end
+
+     pp datafiles
+     datafiles
+  end
+
+=begin
   CLUBS_DATAFILES = {   ## path by country to clubs.txt
       de:  'europe/de-deutschland',
       fr:  'europe/fr-france',
@@ -82,6 +114,8 @@ class Configuration
       br:  'south-america/br-brazil',
       jp:  'asia/jp-japan',
       cn:  'asia/cn-china' }
+=end
+
 
   def read_teams
     ## unify team names; team (builtin/known/shared) name mappings
@@ -90,8 +124,11 @@ class Configuration
     @errors = []    ## reset errors
 
     ## todo/fix: pass along / use country code too
-    CLUBS_DATAFILES.each do |country, path|
-       recs += TeamReader.read( "#{clubs_dir}/#{path}/clubs.txt" )
+    datafiles = find_clubs_datafiles( clubs_dir )
+    datafiles.each do |datafile|
+       country  = datafile[0]    ## country code e.g. eng, at, de, etc.
+       path     = datafile[1]
+       recs += TeamReader.read( path )
     end
 
     ############################

data/lib/sportdb/config/version.rb

@@ -8,7 +8,7 @@ module Boot      ## note: use a different module than Config to avoid confusion
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 3
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_config.rb

@@ -9,7 +9,32 @@ require 'helper'
 
 class TestConfig < MiniTest::Test
 
-  def test_teams
+
+  def match1( txt ) SportDb::Import::Configuration::CLUBS_REGEX1.match( txt ); end
+  def match2( txt ) SportDb::Import::Configuration::CLUBS_REGEX2.match( txt ); end
+
+  def test_find_clubs
+    m = match1( 'de.clubs.txt' )
+    assert_equal 'de', m[:country]
+
+    m = match1( 'deutschland/de.clubs.txt' )
+    assert_equal 'de', m[:country]
+
+    m = match2( 'europe/de-deutschland/clubs.txt' )
+    assert_equal 'de', m[:country]
+
+    m = match2( 'de-deutschland/clubs.txt' )
+    assert_equal 'de', m[:country]
+
+
+    assert match1( 'clubs.txt' ) == nil
+    assert match2( 'clubs.txt' ) == nil
+    assert match1( 'deutschland/clubs.txt' ) == nil
+    assert match2( 'deutschland/clubs.txt' ) == nil
+  end
+
+
+  def test_clubs
     SportDb::Import.config.clubs_dir = '../../../openfootball/clubs'
 
     pp SportDb::Import.config.teams

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc