sportdb-catalogs 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09d5c1b4a2fea093abfc294ccbf6149315a335a07a5e934d25fb652215e0ab23'
-  data.tar.gz: 991f6cd9ee018fa4f7d84be847c5868a024ac240ec5d29cb60636addbd1984c5
+  metadata.gz: 6fc1b8889790b051b658712c11580c31972e49b1efd04e3bd5fad1fefaec44b1
+  data.tar.gz: 5036274f73ee73e8275a49fbbc5f9192eee317baf4f63d70f1dd6ca48def86c8
 SHA512:
-  metadata.gz: ffaca4423b4dc8adba0db61187dfcf2cc0b1fb5c47255953ed08e8e13bc1a0e2967673d7f1a60f5d6a7045b93ff3575fc27114ed86be15c27f72041287e59a91
-  data.tar.gz: ded797ffeae2ce160c1d6477416fa90d8b26433e78aca4bdc61c82bf0bdf8eef95f346c2f2fe95e070be962d8789d511d222379057245a9d649388b0a40d93c1
+  metadata.gz: 7f104ef1fa0f0711403386a9a23313055fd67288eeeba564baf52e03c86d1f6851136b8bdde95b462b97bc5756dc06c5ed298776b61b66ca25edab248c4ea7da
+  data.tar.gz: 3ad50ff5c3fe022ff5e36ec3d3e03503bffe8c1c1475559a7e84cdc8929bb5fd0a88b3fd095b57192cd306937b10194b7c66f250c2b11a0b4d7c80f224e041b2

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.2.2
+### 1.2.4
 ### 0.0.1 / 2019-06-29
 
 * Everything is new. First release.

data/README.md

@@ -11,66 +11,8 @@
 
 ## Usage
 
-Let's use the [/clubs datasets](https://github.com/openfootball/clubs)
-(3000+ football clubs from around the world)
-to match name "variants" e.g. `Arsenal`  to canonical global unique
-names e.g. `Arsenal FC, London, England`:
 
-``` ruby
-require 'sportdb/catalogs'
-
-Club = CatalogDb::Metal::Club
-
-m = Club.match_by( name: 'Arsenal' )
-m.size     # 3 club matches found
-#=> 3
-m[0].name; m[0].city; m[0].country
-#=> "Arsenal FC", "London", "England"
-m[1].name; m[1].city; m[1].country
-#=> "Arsenal Tula", "Tula", "Russia"
-m[2].name; m[2].city; m[2].country
-#=> "Arsenal de Sarandí", "Sarandí", "Argentina"
-
-
-m = Club.match_by( name: 'Arsenal', country: 'eng' )
-# -or- try alternative names (and auto-generated spelling variants)
-m = Club.match_by( name: 'Arsenal FC', country: 'eng' )
-m = Club.match_by( name: 'Arsenal F.C.', country: 'eng' )
-m = Club.match_by( name: '...A.r.s.e.n.a.l... F.C...', country: 'eng' )
-m.size     # 1 club match found
-#=> 1
-m[0].name; m[0].city; m[0].country
-#=> "Arsenal FC", "London", "England"
-
-m = Club.match_by( name: 'Arsenal', country: 'ar' )
-# -or- try alternative names (and auto-generated spelling variants)
-m = Club.match_by( name: 'Arsenal Sarandí', country: 'ar' )
-m = Club.match_by( name: 'Arsenal Sarandi', country: 'ar' )
-m.size     # 1 club match found
-#=> 1
-m[0].name; m[0].city; m[0].country
-#=> "Arsenal de Sarandí", "Sarandí", "Argentina"
-
-
-# try some more
-m = Club.match_by( name: 'AZ' )
-m[0].name; m[0].city; m[0].country
-#=> "AZ Alkmaar", "Alkmaar", "Netherlands"
-
-m = Club.match_by( name: 'Bayern' )
-# -or- try alternative names (and auto-generated spelling variants)
-m = Club.match_by( name: 'Bayern München' )
-m = Club.match_by( name: 'Bayern Munchen' )
-m = Club.match_by( name: 'Bayern Muenchen' )
-m[0].name; m[0].city; m[0].country
-#=> "Bayern München", "München", "Germany"
-
-# and so on
-# ...
-```
-
-
-That's it.
+to be done
 
 
 

data/Rakefile

@@ -22,7 +22,7 @@ Hoe.spec 'sportdb-catalogs' do
   self.extra_deps = [
     ['sportdb-structs', '>= 0.3.1'],
     ['sqlite3'],          ## add sqlite for "metal" use (no activerecord etc.)
-    ['footballdb-data']   ## add builtin default db
+    ['footballdb-data', '>= 2024.8.23']   ## add builtin default db
   ]
 
   self.spec_extras = {

data/lib/sportdb/catalogs/base.rb

@@ -155,6 +155,29 @@ def self._city( city )
      city  ## (re)use city struct - no need to run lookup again
    end
 end
+
+
+def self._league( league )
+   if league.is_a?( String ) || league.is_a?( Symbol )
+     # note: query/find country via catalog db
+     ##   only query by code - why? why not?
+     recs = League.match_by_name_or_code( league )
+     if recs.empty?
+       puts "** !!! ERROR !!! - unknown league >#{league}< - no match found, sorry"
+       exit 1
+     elsif recs.size > 1
+       puts "** !!! ERROR !!! - league >#{league}< - too many matches found (#{recs.size}), sorry"
+       pp recs
+       exit 1
+     end
+     recs[0]
+   else   ## assume league struct
+     league  ## (re)use league struct - no need to run lookup again
+   end
+end
+
+
+
 end  # class Record
 
 

data/lib/sportdb/catalogs/event_info.rb

@@ -16,7 +16,10 @@ class EventInfo < Record
      def self._build_event_info( row )
         ## note: cache structs by key (do NOT rebuild duplicates; reuse)
         @cache ||= Hash.new
-        @cache[ row[0] ] ||= Sports::EventInfo.new(
+        ## note cache key MUST be unique!
+        ##   use league PLUS season   (row[0] season only will NOT work)
+        key = "#{row[0]}_#{row[1]}"
+        @cache[ key ] ||= Sports::EventInfo.new(
                                 league: _to_league( row[0] ),
                                 season: Season.parse(row[1]),
                                 teams: row[2],
@@ -29,8 +32,7 @@ class EventInfo < Record
 
 
     def self.seasons( league )
-      league_key = league.is_a?( String ) ? League.find!( league ).key
-                                          : league.key
+      league_key = _league( league ).key
 
              rows =  execute( <<-SQL )
         SELECT #{self.columns.join(', ')}
@@ -43,8 +45,7 @@ SQL
 
 
     def self.find_by( league:, season: )
-      league_key = league.is_a?( String ) ? League.find!( league ).key
-                                          : league.key
+      league_key = _league( league ).key
       season_key = season.is_a?( String ) ? Season.parse(season).key
                                           : season.key
 

data/lib/sportdb/catalogs/league.rb

@@ -50,7 +50,7 @@ SQL
         ###  todo/fix: allow special normalize formula for
         ##                 code - why? why not?
         ##              e.g. allow ö1 or ö or such - why? why not?
-        code = normalize( unaccent(code) )
+        code = normalize( code )
 
         rows = nil
         if country.nil?
@@ -120,7 +120,7 @@ SQL
      def self.match_by_name_or_code( q,
                                country: nil )
         name = normalize( unaccent(q) )
-        code = normalize( unaccent(q) )
+        code = normalize( q )
 
         rows = nil
         if country.nil?

data/lib/sportdb/catalogs/version.rb

@@ -5,7 +5,7 @@ module Catalogs
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 2
-  PATCH = 2
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/catalogs.rb

@@ -15,6 +15,7 @@ require_relative 'catalogs/city'
 require_relative 'catalogs/club'
 require_relative 'catalogs/national_team'
 require_relative 'catalogs/league'
+require_relative 'catalogs/league_period'
 require_relative 'catalogs/event_info'
 require_relative 'catalogs/ground'
 
@@ -44,7 +45,7 @@ def self.tables
     ## puts
     puts "    #{Country.count} countries / #{City.count} cities"
     puts "    #{NationalTeam.count} national teams"
-    puts "    #{League.count} leagues"
+    puts "    #{League.count} leagues / #{LeaguePeriod.count} periods"
     puts "    #{Club.count} clubs"
     puts "    #{Ground.count} grounds"
       ## add more

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-catalogs
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2024.8.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2024.8.23
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement