sportdb-catalogs 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b593473df2d17fc60175c907bf78b0794f3bc26a6234cc247d58e788f8850ec
-  data.tar.gz: 0a9f535f23da1d3da21173d1c7d7588188e287b299c448f47bb8fa0cf9e33aa7
+  metadata.gz: ed0f3720e4ff002df8ac2d14305f3ed147656d45ce4dc2c7770a3e8057f95439
+  data.tar.gz: 8c1a5d9f32172cffbe7b4376d00af7c3f0d463ee8bd3e979ec6cc2d7949168d9
 SHA512:
-  metadata.gz: 927b572cef955abbc720ce43b4fab2cff7ac3f1eaae1514069302421d4172dcb96d3b02e96d36141a900f19e12efe1a820e44881e9a43ad3eeae983c8166f060
-  data.tar.gz: 7058a7524a1381e28b46586db1fd0b93d35ebbd807d2b75a20b2ef6071bdf738ad3db0bb3f142c83632c0b4203c42da314e6e7b6bfbcfcbf9741c7ab3f89083d
+  metadata.gz: 50c14e72e5f993b4d66769da4190722b125db6ba1dbd914526c7bdb01f546d13f4a498fd8fd70d251e6898aa08692e000c8e5be7dd69e1d2fc42066d8ce91e1a
+  data.tar.gz: d7a5f124e35a59b7daa72b0b99947ee4b6f6d0a5e15138638ce18cc883e7f3507de07a54df2d11437ceafd6acaa81749dfdc481d112738da82560262b4394121

data/CHANGELOG.md

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

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/sportdb/catalogs/country.rb
 lib/sportdb/catalogs/event_info.rb
 lib/sportdb/catalogs/ground.rb
 lib/sportdb/catalogs/league.rb
+lib/sportdb/catalogs/league_period.rb
 lib/sportdb/catalogs/national_team.rb
 lib/sportdb/catalogs/player.rb
 lib/sportdb/catalogs/version.rb

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/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/league_period.rb

@@ -0,0 +1,151 @@
+module CatalogDb
+module Metal
+
+class LeaguePeriod < Record
+    self.tablename = 'league_periods'
+
+    self.columns = ['id',
+                    'key',   ## league foreign refkey!!!
+                    'tier_key',   ## change to code - why? why not?
+                    'name',
+                    'qname',
+                    'slug',
+                    'start_season',
+                    'end_season']
+
+
+    def self.cache() @cache ||= Hash.new; end
+
+
+     def self._record( id )  ## use _record! as name - why? why not?
+        if (rec = cache[ id ])
+          rec   ## return cached
+        else  ## query and cache and return
+        rows = execute( <<-SQL )
+      SELECT #{self.columns.join(', ')}
+      FROM league_periods
+      WHERE leagues_periods.id = #{id}
+SQL
+
+          ## todo/fix: also assert for rows == 1 AND NOT MULTIPLE records - why? why not?
+          if rows.empty?
+            raise ArgumentError, "league period record with id #{id} not found"
+          else
+            _build_league_period( rows[0] )
+          end
+        end
+     end
+
+
+     def self._build_league_period( row )
+        ## get league record by ky
+        ## league = League._record( row[1] )
+
+        ## note: cache structs by key (do NOT rebuild duplicates; reuse)
+        cache[ row[0] ] ||= Sports::LeaguePeriod.new(
+                                key: row[2],  ## tier key
+                                name: row[3],
+                                qname: row[4],
+                                slug: row[5],
+                                start_season: row[6] ? Season.parse( row[6]) : nil,
+                                end_season:   row[7] ? Season.parse( row[7]) : nil
+                             )
+     end
+
+
+      def self._calc_yyyymm( season )
+        start_yyyymm =     if season.calendar?
+                              "#{season.start_year}01".to_i
+                           else
+                              "#{season.start_year}07".to_i
+                           end
+
+        end_yyyymm   =     if season.calendar?
+                              "#{season.end_year}12".to_i
+                           else
+                              "#{season.end_year}06".to_i
+                           end
+
+      [start_yyyymm, end_yyyymm]
+      end
+
+
+      def self.match_by_code( code, season: )
+        code = normalize( code )
+
+        season = Season( season )
+        start_yyyymm, end_yyyymm = _calc_yyyymm( season )
+
+        rows = nil
+            ## note: returns empty array if no match and NOT nil
+             rows =  execute( <<-SQL )
+        SELECT #{self.columns.join(', ')}
+        FROM league_periods
+        INNER JOIN league_period_codes ON league_periods.id  = league_period_codes.league_period_id
+        WHERE league_period_codes.code = '#{code}' AND
+              league_period_codes.start_yyyymm <=  #{start_yyyymm} AND
+              league_period_codes.end_yyyymm  >= #{end_yyyymm}
+SQL
+
+         ## wrap results array into struct records
+         rows.map {|row| _build_league_period( row )}
+      end
+
+
+      def self.match_by_name( name, season: )
+        ## note: match must for now always include name
+        name = normalize( unaccent(name) )
+
+        season = Season( season )
+        start_yyyymm, end_yyyymm = _calc_yyyymm( season )
+
+        rows = nil
+            ## note: returns empty array if no match and NOT nil
+             rows =  execute( <<-SQL )
+        SELECT #{self.columns.join(', ')}
+        FROM league_periods
+        INNER JOIN league_period_names ON league_periods.id  = league_period_names.league_period_id
+        WHERE league_period_names.name = '#{name}'  AND
+              league_period_names.start_yyyymm <=  #{start_yyyymm} AND
+              league_period_names.end_yyyymm  >= #{end_yyyymm}
+SQL
+
+         ## wrap results array into struct records
+         rows.map {|row| _build_league_period( row )}
+      end
+
+
+     def self.match_by_name_or_code( q, season: )
+        name = normalize( unaccent(q) )
+        code = normalize( q )
+
+        season = Season( season )
+        start_yyyymm, end_yyyymm = _calc_yyyymm( season )
+
+        rows = nil
+            ## note: returns empty array if no match and NOT nil
+             rows =  execute( <<-SQL )
+        SELECT #{self.columns.join(', ')}
+        FROM league_periods
+        INNER JOIN league_period_names ON league_periods.id  = league_period_names.league_period_id
+        WHERE league_period_names.name = '#{name}'  AND
+              league_period_names.start_yyyymm <=  #{start_yyyymm} AND
+              league_period_names.end_yyyymm  >= #{end_yyyymm}
+        UNION
+        SELECT #{self.columns.join(', ')}
+        FROM league_periods
+        INNER JOIN league_period_codes ON league_periods.id  = league_period_codes.league_period_id
+        WHERE league_period_codes.code = '#{code}' AND
+              league_period_codes.start_yyyymm <=  #{start_yyyymm} AND
+              league_period_codes.end_yyyymm  >= #{end_yyyymm}
+SQL
+
+         ## wrap results array into struct records
+         rows.map {|row| _build_league_period( row )}
+      end
+
+end  # class LeaguePeriod
+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 = 3
+  PATCH = 5
   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.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -108,6 +108,7 @@ files:
 - lib/sportdb/catalogs/event_info.rb
 - lib/sportdb/catalogs/ground.rb
 - lib/sportdb/catalogs/league.rb
+- lib/sportdb/catalogs/league_period.rb
 - lib/sportdb/catalogs/national_team.rb
 - lib/sportdb/catalogs/player.rb
 - lib/sportdb/catalogs/version.rb