sportdb-catalogs 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5912ceb7d640f68512000d72620ff285eb8aaba12758fb6eda9db0f2bba6c3c8
-  data.tar.gz: 6a1022811416867e7ae9fc7bb4519a4fa6cd42cc6ad12a32b1675a26a3d51ab6
+  metadata.gz: '09d5c1b4a2fea093abfc294ccbf6149315a335a07a5e934d25fb652215e0ab23'
+  data.tar.gz: 991f6cd9ee018fa4f7d84be847c5868a024ac240ec5d29cb60636addbd1984c5
 SHA512:
-  metadata.gz: 33efb321b2fa039a836f037acd4c57367bea8f2f5d9faeffa77b5eec047590feaa405eb230c15cf073c7e42a6818f60d73914d4d0bd576b7f5baec1c85686722
-  data.tar.gz: 3d2862394fad3aa68e0c970e9b6e74b6ed7f2a34eb04a28e8578ff83ce2379651eb146580593d7b13f75705a7ee55b643e73cce2aee8725391e2fea2e787b684
+  metadata.gz: ffaca4423b4dc8adba0db61187dfcf2cc0b1fb5c47255953ed08e8e13bc1a0e2967673d7f1a60f5d6a7045b93ff3575fc27114ed86be15c27f72041287e59a91
+  data.tar.gz: ded797ffeae2ce160c1d6477416fa90d8b26433e78aca4bdc61c82bf0bdf8eef95f346c2f2fe95e070be962d8789d511d222379057245a9d649388b0a40d93c1

data/CHANGELOG.md

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

data/README.md

@@ -9,23 +9,19 @@
 
 
 
-## Usage  
+## Usage
 
 Let's use the [/clubs datasets](https://github.com/openfootball/clubs)
-(1500+ football clubs from around the world)
+(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'
 
-## note: requires a local copy of the football.db clubs datasets
-##          see https://github.com/openfootball/clubs
-SportDb::Import.config.clubs_dir = './clubs'
+Club = CatalogDb::Metal::Club
 
-CLUBS = SportDb::Import.catalog.clubs
-
-m = CLUBS.match( 'Arsenal' )
+m = Club.match_by( name: 'Arsenal' )
 m.size     # 3 club matches found
 #=> 3
 m[0].name; m[0].city; m[0].country
@@ -36,20 +32,20 @@ m[2].name; m[2].city; m[2].country
 #=> "Arsenal de Sarandí", "Sarandí", "Argentina"
 
 
-m = CLUBS.match_by( name: 'Arsenal', country: 'eng' )
+m = Club.match_by( name: 'Arsenal', country: 'eng' )
 # -or- try alternative names (and auto-generated spelling variants)
-m = CLUBS.match_by( name: 'Arsenal FC', country: 'eng' )
-m = CLUBS.match_by( name: 'Arsenal F.C.', country: 'eng' )
-m = CLUBS.match_by( name: '...A.r.s.e.n.a.l... F.C...', country: 'eng' )
+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 = CLUBS.match_by( name: 'Arsenal', country: 'ar' )
+m = Club.match_by( name: 'Arsenal', country: 'ar' )
 # -or- try alternative names (and auto-generated spelling variants)
-m = CLUBS.match_by( name: 'Arsenal Sarandí', country: 'ar' )
-m = CLUBS.match_by( name: 'Arsenal Sarandi', country: 'ar' )
+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
@@ -57,15 +53,15 @@ m[0].name; m[0].city; m[0].country
 
 
 # try some more
-m = CLUBS.match( 'AZ' )
+m = Club.match_by( name: 'AZ' )
 m[0].name; m[0].city; m[0].country
 #=> "AZ Alkmaar", "Alkmaar", "Netherlands"
 
-m = CLUBS.match( 'Bayern' )
+m = Club.match_by( name: 'Bayern' )
 # -or- try alternative names (and auto-generated spelling variants)
-m = CLUBS.match( 'Bayern München' )
-m = CLUBS.match( 'Bayern Munchen' )
-m = CLUBS.match( 'Bayern Muenchen' )
+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"
 

data/Rakefile

@@ -20,13 +20,13 @@ Hoe.spec 'sportdb-catalogs' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-formats'],
+    ['sportdb-structs', '>= 0.3.1'],
     ['sqlite3'],          ## add sqlite for "metal" use (no activerecord etc.)
-    ['footballdb-data']   ## add builtin default db  
+    ['footballdb-data']   ## add builtin default db
   ]
 
   self.spec_extras = {
-   required_ruby_version: '>= 2.2.2'
+   required_ruby_version: '>= 3.1.0'
   }
 
 end

data/lib/sportdb/catalogs/base.rb

@@ -8,29 +8,29 @@ module Metal
 
 
 class BaseRecord   ## or just use Base or such - why? why not?
- 
-      def self.execute( sql ) 
+
+      def self.execute( sql )
          ## puts "==> sql query [#{self.name}]"
          ## puts sql
-         database.execute( sql ) 
+         database.execute( sql )
       end
- 
+
       def self.tablename=(name) @tablename = name; end
       def self.tablename() @tablename; end
- 
-      def self.columns=(names) 
+
+      def self.columns=(names)
          ## note: auto-add table name to qualify
-         @columns = names.map {|name| "#{self.tablename}.#{name}" } 
+         @columns = names.map {|name| "#{self.tablename}.#{name}" }
          @columns
       end
       def self.columns() @columns; end
- 
+
       def self.count
          sql = "SELECT count(*) FROM #{self.tablename}"
          rows = execute( sql )
          rows[0][0]    # e.g. returns [[241]]
       end
- 
+
   ## helpers from country - use a helper module for includes (share with clubs etc.) - why? why not?
   # include NameHelper
   extend SportDb::NameHelper
@@ -48,7 +48,7 @@ class BaseRecord   ## or just use Base or such - why? why not?
        ## use TypeError - why? why not? or if exits ValueError?
        raise ArgumentError, "0 or 1 expected for bool in sqlite; got #{value}"
      end
-   end             
+   end
 
 
    ##
@@ -58,7 +58,7 @@ class BaseRecord   ## or just use Base or such - why? why not?
       if country.is_a?( String ) || country.is_a?( Symbol )
         # note: query/find country via catalog db
         rec = Country.find_by_code( country )
-        rec = Country.find_by_name( country )  if rec.nil?  
+        rec = Country.find_by_name( country )  if rec.nil?
         if rec.nil?
           puts "** !!! ERROR !!! - unknown country >#{country}< - no match found, sorry - add to world/countries.txt in config"
           exit 1
@@ -72,41 +72,50 @@ end  # class BaseRecord
 
 
 class PlayerRecord  < BaseRecord
+
+      ## lets you query if datbase setup
+      def self.database?() defined?( @@db ); end
+
       def self.database
          ### note: only one database for all derived records/tables!!!
          ##   thus MUST use @@ and not @!!!!!
          ##  todo - change later to built-in database
          ##   or download on request???
-         @@db ||= SQLite3::Database.new( './players.db' ) 
+         @@db ||= SQLite3::Database.new( './players.db', readonly: true )
          @@db
       end
- 
+
       def self.database=(path)
          puts "==> setting (internal) players db to: >#{path}<"
-         @@db = SQLite3::Database.new( path )
+         @@db = SQLite3::Database.new( path, readonly: true )
          pp @@db
          @@db
-      end 
+      end
 end   # class PlayerRecord
 
 
 
 ##############
 ### todo (fix) / rename to CatalogRecord - why? why not?
-class Record  < BaseRecord    
+class Record  < BaseRecord
     ## add db alias why? why not?
+
+     ## lets you query if datbase setup
+     def self.database?() defined?( @@db ); end
+
      def self.database
         ### note: only one database for all derived records/tables!!!
         ##   thus MUST use @@ and not @!!!!!
         ##
         ##  default to built-in via footballdb-data gem for now!!!
-        @@db ||= SQLite3::Database.new( './catalog.db' ) 
+        @@db ||= SQLite3::Database.new( "#{FootballDb::Data.data_dir}/catalog.db",
+                                        readonly: true )
         @@db
      end
 
      def self.database=(path)
         puts "==> setting (internal) catalog db to: >#{path}<"
-        @@db = SQLite3::Database.new( path )
+        @@db = SQLite3::Database.new( path, readonly: true )
         pp @@db
         @@db
      end
@@ -118,14 +127,14 @@ def self._to_league( key )
    League._record( key )
 end
 
-def self._to_country( key ) 
+def self._to_country( key )
    # note: use cached record or (faster) key lookup on fallback
-   Country._record( key )   
+   Country._record( key )
 end
 
 def self._to_city( key )   ### rename; use find_by_key / find_by( key: )
    # note: use cached record or (faster) key lookup on fallback
-   City._record( key )   
+   City._record( key )
 end
 
 

data/lib/sportdb/catalogs/country.rb

@@ -5,8 +5,8 @@ module Metal
 class Country  < Record
      self.tablename = 'countries'
 
-     self.columns = ['key', 
-                     'name', 
+     self.columns = ['key',
+                     'name',
                      'code',
                      'tags',
                      'alt_names']
@@ -20,42 +20,42 @@ class Country  < Record
         else  ## query and cache and return
         rows = execute( <<-SQL )
       SELECT #{self.columns.join(', ')}
-      FROM countries 
-      WHERE countries.key = '#{key}' 
+      FROM countries
+      WHERE countries.key = '#{key}'
 SQL
- 
+
           ## todo/fix: also assert for rows == 1 AND NOT MULTIPLE records - why? why not?
-          if rows.empty? 
-            raise ArgumentError, "country record with key #{key} not found" 
-          else 
+          if rows.empty?
+            raise ArgumentError, "country record with key #{key} not found"
+          else
             _build_country( rows[0] )
           end
         end
      end
 
-  
+
      def self._build_country( row )
         ## note: cache structs by key (do NOT rebuild duplicates; reuse)
         cache[ row[0] ] ||= begin
                               ## note: split tags & alt names (PLUS remove leading//trailing spaces)
                               tags      = row[3].split(',').map {|tag| tag.strip }
-                              alt_names = row[4].split('|').map {|alt_name| alt_name.strip } 
+                              alt_names = row[4].split('|').map {|alt_name| alt_name.strip }
                               country = Sports::Country.new(
                                  key: row[0],
                                  name: row[1],
                                  code: row[2],
-                                 tags: tags   
+                                 tags: tags
                               )
                               country.alt_names = alt_names
                               country
                             end
-     end                
-                     
+     end
+
 
   ##  fix/todo: add  find_by (alias for find_by_name/find_by_code)
   def self.find_by_code( code )
    q = code.to_s.downcase   ## allow symbols (and always downcase e.g. AUT to aut etc.)
-   
+
    ## note: results in
    ##    Côte d'Ivoire  => côte d'ivoire
    ##  quote will break sql!!!
@@ -69,15 +69,16 @@ SQL
 
    rows = execute( <<-SQL )
    SELECT #{self.columns.join(', ')}
-   FROM countries 
+   FROM countries
    INNER JOIN country_codes ON countries.key  = country_codes.key
-   WHERE country_codes.code = '#{q}' 
+   WHERE country_codes.code = '#{q}'
 SQL
-   
-     if rows.empty? 
-        nil 
-     else 
-         _build_country( rows[0] )
+
+     if rows.empty?
+        nil
+     else
+        ## todo/fix - raise error if more than once record found!!!
+        _build_country( rows[0] )
      end
   end
 
@@ -85,26 +86,62 @@ SQL
  ##
  ##
  ## note - need to escape name ?
- ##  e.g.  Côte d'Ivoire 
+ ##  e.g.  Côte d'Ivoire
  ##  make sure normalize removes single quotes (')!!!
 
  def self.find_by_name( name )
    q = normalize( unaccent( name.to_s ))  ## allow symbols too (e.g. use to.s first)
-   
+
    rows = execute( <<-SQL )
    SELECT #{self.columns.join(', ')}
-   FROM countries 
+   FROM countries
    INNER JOIN country_names ON countries.key  = country_names.key
-   WHERE country_names.name = '#{q}' 
+   WHERE country_names.name = '#{q}'
 SQL
 
-     if rows.empty? 
-        nil 
-     else 
+     if rows.empty?
+        nil
+     else
+        ## todo/fix - raise error if more than once record found!!!
          _build_country( rows[0] )
-     end   
+     end
  end
+
+
+ def self.find_by_name_or_code( q )
+   name = normalize( unaccent( q.to_s ))  ## allow symbols too (e.g. use to.s first)
+
+   code = q.to_s.downcase   ## allow symbols (and always downcase e.g. AUT to aut etc.)
+   ## note: results in
+   ##    Côte d'Ivoire  => côte d'ivoire
+   ##  quote will break sql!!!
+   ##   remove - spaces etc.
+   ##     for now remove only single quote (will break sql) - add more?
+   ##
+   ## or use escape_sql_string - possible??
+   code = code.gsub( /[']/, '' )
+
+
+   rows = execute( <<-SQL )
+   SELECT #{self.columns.join(', ')}
+   FROM countries
+   INNER JOIN country_names ON countries.key  = country_names.key
+   WHERE country_names.name = '#{name}'
+   UNION
+   SELECT #{self.columns.join(', ')}
+   FROM countries
+   INNER JOIN country_codes ON countries.key  = country_codes.key
+   WHERE country_codes.code = '#{code}'
+SQL
+
+     if rows.empty?
+        nil
+     else
+        ## todo/fix - raise error if more than once record found!!!
+        _build_country( rows[0] )
+     end
+ end
+
 end  # class Country
 end  # module Metal
 end  # module CatalogDb
- 

data/lib/sportdb/catalogs/event_info.rb

@@ -4,20 +4,19 @@ module Metal
 class EventInfo < Record
     self.tablename = 'event_infos'
 
-    self.columns = ['league_key', 
-                    'season', 
-                    'teams',    
+    self.columns = ['league_key',
+                    'season',
+                    'teams',
                     'matches',
                     'goals',
-                    'start_date',  
+                    'start_date',
                     'end_date']
-          
+
 
      def self._build_event_info( row )
         ## note: cache structs by key (do NOT rebuild duplicates; reuse)
         @cache ||= Hash.new
-        ## note: move EventInfo from sports/format to structs - why? why not?
-        @cache[ row[0] ] ||= SportDb::Import::EventInfo.new(
+        @cache[ row[0] ] ||= Sports::EventInfo.new(
                                 league: _to_league( row[0] ),
                                 season: Season.parse(row[1]),
                                 teams: row[2],
@@ -25,35 +24,35 @@ class EventInfo < Record
                                 goals: row[4],
                                 start_date: row[5] ? Date.strptime( row[5], '%Y-%m-%d' ) : nil,
                                 end_date: row[6]   ? Date.strptime( row[6], '%Y-%m-%d' ) : nil,
-                              )   
-     end                
-          
+                              )
+     end
+
 
     def self.seasons( league )
-      league_key = league.is_a?( String ) ? League.find!( league ).key 
+      league_key = league.is_a?( String ) ? League.find!( league ).key
                                           : league.key
 
              rows =  execute( <<-SQL )
         SELECT #{self.columns.join(', ')}
-        FROM event_infos 
-        WHERE event_infos.league_key = '#{league_key}' 
+        FROM event_infos
+        WHERE event_infos.league_key = '#{league_key}'
 SQL
 
          rows.map {|row| _build_event_info( row ) }
     end
 
-    
+
     def self.find_by( league:, season: )
-      league_key = league.is_a?( String ) ? League.find!( league ).key 
+      league_key = league.is_a?( String ) ? League.find!( league ).key
                                           : league.key
-      season_key = season.is_a?( String ) ? Season.parse(season).key 
+      season_key = season.is_a?( String ) ? Season.parse(season).key
                                           : season.key
 
              rows =  execute( <<-SQL )
         SELECT #{self.columns.join(', ')}
-        FROM event_infos 
+        FROM event_infos
         WHERE event_infos.league_key = '#{league_key}' AND
-              event_infos.season     = '#{season_key}' 
+              event_infos.season     = '#{season_key}'
 SQL
 
       if rows.empty?

data/lib/sportdb/catalogs/league.rb

@@ -4,12 +4,12 @@ module Metal
 class League < Record
     self.tablename = 'leagues'
 
-    self.columns = ['key', 
-                    'name', 
+    self.columns = ['key',
+                    'name',
                     'intl',  # international tournament?
-                    'clubs', # clubs or national teams? 
+                    'clubs', # clubs or national teams?
                     'country_key']
-          
+
 
     def self.cache() @cache ||= Hash.new; end
 
@@ -20,14 +20,14 @@ class League < Record
         else  ## query and cache and return
         rows = execute( <<-SQL )
       SELECT #{self.columns.join(', ')}
-      FROM leagues 
-      WHERE leagues.key = '#{key}' 
+      FROM leagues
+      WHERE leagues.key = '#{key}'
 SQL
- 
+
           ## todo/fix: also assert for rows == 1 AND NOT MULTIPLE records - why? why not?
-          if rows.empty? 
-            raise ArgumentError, "league record with key #{key} not found" 
-          else 
+          if rows.empty?
+            raise ArgumentError, "league record with key #{key} not found"
+          else
             _build_league( rows[0] )
           end
         end
@@ -38,37 +38,74 @@ SQL
         cache[ row[0] ] ||= Sports::League.new(
                                 key: row[0],
                                 name: row[1],
-                                intl: _to_bool( row[2] ),   
+                                intl: _to_bool( row[2] ),
                                 clubs: _to_bool( row[3] ),
                                 country: row[4] ? _to_country( row[4] ) : nil,
                              )
-     end                
-          
+     end
 
-      def self.match_by( name:, 
-                         country: nil )
+      def self.match_by_code( code,
+                               country: nil )
+        ## note: match must for now always include name
+        ###  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) )
+
+        rows = nil
+        if country.nil?
+            ## note: returns empty array if no match and NOT nil
+             rows =  execute( <<-SQL )
+        SELECT #{self.columns.join(', ')}
+        FROM leagues
+        INNER JOIN league_codes ON leagues.key  = league_codes.key
+        WHERE league_codes.code = '#{code}'
+SQL
+        else  ## filter by country
+          ## note: also skip international leagues & cups (e.g. champions league etc.) for now - why? why not?
+
+          ## note: country assumes / allows the country key or fifa code for now
+          ## note: allow passing in of country struct too
+          country_rec = _country( country )
+
+          rows = execute( <<-SQL )
+          SELECT #{self.columns.join(', ')}
+          FROM leagues
+          INNER JOIN league_codes ON leagues.key  = league_codes.key
+          WHERE league_codes.code = '#{code}' AND
+                leagues.country_key = '#{country_rec.key}'
+
+SQL
+        end
+
+         ## wrap results array into struct records
+         rows.map {|row| _build_league( row )}
+      end
+
+      def self.match_by_name( name,
+                               country: nil )
         ## note: match must for now always include name
         name = normalize( unaccent(name) )
 
-        rows = nil 
-        if country.nil? 
+        rows = nil
+        if country.nil?
             ## note: returns empty array if no match and NOT nil
              rows =  execute( <<-SQL )
         SELECT #{self.columns.join(', ')}
-        FROM leagues 
+        FROM leagues
         INNER JOIN league_names ON leagues.key  = league_names.key
-        WHERE league_names.name = '#{name}' 
+        WHERE league_names.name = '#{name}'
 SQL
         else  ## filter by country
           ## note: also skip international leagues & cups (e.g. champions league etc.) for now - why? why not?
- 
+
           ## note: country assumes / allows the country key or fifa code for now
           ## note: allow passing in of country struct too
           country_rec = _country( country )
 
           rows = execute( <<-SQL )
           SELECT #{self.columns.join(', ')}
-          FROM leagues 
+          FROM leagues
           INNER JOIN league_names ON leagues.key  = league_names.key
           WHERE league_names.name = '#{name}' AND
                 leagues.country_key = '#{country_rec.key}'
@@ -80,6 +117,52 @@ SQL
          rows.map {|row| _build_league( row )}
       end
 
+     def self.match_by_name_or_code( q,
+                               country: nil )
+        name = normalize( unaccent(q) )
+        code = normalize( unaccent(q) )
+
+        rows = nil
+        if country.nil?
+            ## note: returns empty array if no match and NOT nil
+             rows =  execute( <<-SQL )
+        SELECT #{self.columns.join(', ')}
+        FROM leagues
+        INNER JOIN league_names ON leagues.key  = league_names.key
+        WHERE league_names.name = '#{name}'
+        UNION
+        SELECT #{self.columns.join(', ')}
+        FROM leagues
+        INNER JOIN league_codes ON leagues.key  = league_codes.key
+        WHERE league_codes.code = '#{code}'
+SQL
+        else  ## filter by country
+          ## note: also skip international leagues & cups (e.g. champions league etc.) for now - why? why not?
+
+          ## note: country assumes / allows the country key or fifa code for now
+          ## note: allow passing in of country struct too
+          country_rec = _country( country )
+
+          rows = execute( <<-SQL )
+          SELECT #{self.columns.join(', ')}
+          FROM leagues
+          INNER JOIN league_names ON leagues.key  = league_names.key
+          WHERE league_names.name = '#{name}' AND
+                leagues.country_key = '#{country_rec.key}'
+          UNION
+          SELECT #{self.columns.join(', ')}
+          FROM leagues
+          INNER JOIN league_codes ON leagues.key  = league_codes.key
+          WHERE league_codes.code = '#{code}' AND
+                leagues.country_key = '#{country_rec.key}'
+SQL
+        end
+
+         ## wrap results array into struct records
+         rows.map {|row| _build_league( row )}
+      end
+
+
 end  # class League
 end  # module Metal
 end  # module CatalogDb

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

data/lib/sportdb/catalogs.rb

@@ -1,7 +1,4 @@
-### our own sportdb libs / gems
-###  try min. dependencies  - change to structs only (NOT formats) - why? why not?
-## require 'sportdb/structs'
-require 'sportdb/formats'
+require 'sportdb/structs'
 
 require 'sqlite3'
 
@@ -15,77 +12,17 @@ require_relative 'catalogs/base'       ## base record
 require_relative 'catalogs/country'
 require_relative 'catalogs/city'
 
-require_relative 'catalogs/club'   
+require_relative 'catalogs/club'
 require_relative 'catalogs/national_team'
 require_relative 'catalogs/league'
 require_relative 'catalogs/event_info'
-require_relative 'catalogs/ground'   
+require_relative 'catalogs/ground'
 
 ## more
 require_relative 'catalogs/player'
 
 
 
-module SportDb
-module Import
-
-class Configuration
-  ## note: add more configs (open class), see sportdb-structs for original config!!!
-
-  ###   
-  #  find a better name for setting - why? why not?
-  #     how about catalogdb or ???
-  attr_reader   :catalog_path 
-  def catalog_path=(path)
-      @catalog_path = path
-      ######## 
-      # reset database here to new path
-      CatalogDb::Metal::Record.database = path
-
-      ##  plus automagically set world search too (to use CatalogDb)
-      self.world = WorldSearch.new( 
-                          countries: CatalogDb::Metal::Country,
-                          cities:    CatalogDb::Metal::City, 
-                        ) 
-
-      @catalog_path
-  end
-
-  def catalog      
-       @catalog ||= SportSearch.new( 
-                           leagues:        CatalogDb::Metal::League,
-                           national_teams: CatalogDb::Metal::NationalTeam,
-                           clubs:          CatalogDb::Metal::Club,
-                           grounds:        CatalogDb::Metal::Ground,
-                           events:         CatalogDb::Metal::EventInfo,
-                           players:        CatalogDb::Metal::Player,    # note - via players.db !!!
-                        )
-  end
-
-  ###   
-  #  find a better name for setting - why? why not?
-  #     how about playersdb or ???
-  attr_reader   :players_path 
-  def players_path=(path)
-      @players_path = path
-      ######## 
-      # reset database here to new path
-      CatalogDb::Metal::PlayerRecord.database = path
-
-      @players_path
-  end
-end # class Configuration
-
-
-  ##  e.g. use config.catalog  -- keep Import.catalog as a shortcut (for "read-only" access)
-  def self.catalog() config.catalog;  end
-end   # module Import
-end   # module SportDb
-
-
-
-
-
 ###
 # add status
 module CatalogDb
@@ -94,34 +31,48 @@ module Metal
 def self.tables
 
   puts "==> table stats"
-  catalog_path = SportDb::Import.config.catalog_path 
-  if catalog_path
-    puts "  #{File.basename(catalog_path)} in (#{File.dirname(catalog_path)})"
-    puts "    #{Country.count} countries / #{City.count} cities" 
+  if Record.database?
+    db = Record.database
+    filename = db.filename
+    if filename  # note - nil for memory or tempary db?
+      puts "  #{File.basename(filename)} in (#{File.dirname(filename)})"
+    else
+      puts  "no filename; memory or temporary db?"
+    end
+
+    ## pp Record.database
+    ## puts
+    puts "    #{Country.count} countries / #{City.count} cities"
     puts "    #{NationalTeam.count} national teams"
     puts "    #{League.count} leagues"
     puts "    #{Club.count} clubs"
     puts "    #{Ground.count} grounds"
       ## add more
-
   else
     puts "  - no catalog.db set - "
   end
 
-  ## todo/fix:
-  ##   check if players_path configured???
-  players_path = SportDb::Import.config.players_path 
-  if players_path
-    puts "  #{File.basename(players_path)} in (#{File.dirname(players_path)})"
+
+  if PlayerRecord.database?
+    db = PlayerRecord.database
+    filename = db.filename
+    if filename  # note - nil for memory or tempary db?
+      puts "  #{File.basename(filename)} in (#{File.dirname(filename)})"
+    else
+      puts  "no filename; memory or temporary db?"
+    end
+
+    ## pp PlayerRecord.database
+    ## puts
     puts "    #{Player.count} players"
   else
-    puts " - no players.db set -"
+    puts "  - no players.db set -"
   end
 end
 
 end # module Metal
 end # module CatalogDb
-        
+
 
 
 ###
@@ -131,34 +82,34 @@ end # module CatalogDb
 ##  what name to use?
 ##    find_countries_for_league_clubs or such
 ##     find_countries_for_league  - why? why not?
-##     note -  returns array of countries OR single country 
+##     note -  returns array of countries OR single country
 
 def find_countries_for_league( league )
-    ## todo/fix: assert league is a League with country record/struct !!!!! 
+    ## todo/fix: assert league is a League with country record/struct !!!!!
 
-    countries = [] 
+    countries = []
     countries << league.country   ### assume league.country is already db record/struct - why? why not?
-    ## check for 2nd countries for known leagues 
+    ## check for 2nd countries for known leagues
     ## (re)try with second country - quick hacks for known leagues
     ##  e.g. Swanse, cardiff  in premier league
     ##       san mariono in serie a (italy)
     ##       monaco  in ligue 1 (france)
     ##       etc.
     ##   add  andorra to spanish la liga (e.g. andorra fc???)
- 
+
     case league.country.key
-    when 'eng' then countries << CatalogDb::Metal::Country._record('wal') 
+    when 'eng' then countries << CatalogDb::Metal::Country._record('wal')
     when 'sco' then countries << CatalogDb::Metal::Country._record('eng')
-    when 'ie'  then countries << CatalogDb::Metal::Country._record('nir')   
-    when 'fr'  then countries << CatalogDb::Metal::Country._record('mc') 
-    when 'es'  then countries << CatalogDb::Metal::Country._record('ad') 
+    when 'ie'  then countries << CatalogDb::Metal::Country._record('nir')
+    when 'fr'  then countries << CatalogDb::Metal::Country._record('mc')
+    when 'es'  then countries << CatalogDb::Metal::Country._record('ad')
     when 'it'  then countries << CatalogDb::Metal::Country._record('sm')
-    when 'ch'  then countries << CatalogDb::Metal::Country._record('li') 
+    when 'ch'  then countries << CatalogDb::Metal::Country._record('li')
     when 'us'  then countries << CatalogDb::Metal::Country._record('ca')
     when 'au'  then countries << CatalogDb::Metal::Country._record('nz')
-    end 
+    end
 
-    ## use single ("unwrapped") item for one country 
+    ## use single ("unwrapped") item for one country
     ##    otherwise use array
     country =  countries.size == 1 ? countries[0] : countries
     country
@@ -168,15 +119,8 @@ end
 
 
 
-
 require 'footballdb/data'   ## pull in catalog.db (built-in/default data/db)
 
-###
-## add default/built-in catalog here - why? why not?
-##  todo/fix  - set catalog_path on demand 
-##   note:  for now required for world search setup etc.
-SportDb::Import.config.catalog_path = "#{FootballDb::Data.data_dir}/catalog.db"
-
 
 
 puts SportDb::Module::Catalogs.banner   # say hello

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-catalogs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-formats
+  name: sportdb-structs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="