sportdb-catalogs 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed0f3720e4ff002df8ac2d14305f3ed147656d45ce4dc2c7770a3e8057f95439
-  data.tar.gz: 8c1a5d9f32172cffbe7b4376d00af7c3f0d463ee8bd3e979ec6cc2d7949168d9
+  metadata.gz: 578a7aa88076914972bfeecf0bf244bcd33c2b14e22ba2032419d7d90aedd2d2
+  data.tar.gz: 755ff971b5e0dd2f63a91ffe6ed09dbaf96e856327c1a66f4531e55f91dd8e3f
 SHA512:
-  metadata.gz: 50c14e72e5f993b4d66769da4190722b125db6ba1dbd914526c7bdb01f546d13f4a498fd8fd70d251e6898aa08692e000c8e5be7dd69e1d2fc42066d8ce91e1a
-  data.tar.gz: d7a5f124e35a59b7daa72b0b99947ee4b6f6d0a5e15138638ce18cc883e7f3507de07a54df2d11437ceafd6acaa81749dfdc481d112738da82560262b4394121
+  metadata.gz: 1883983c41e1cc509e0a2b939bc59c70896602d6fb1e3c3f8943fc4c67115f680d09d5813a37d6215c61062352a2fad13169255d7df032ecd6beb91730ab52fd
+  data.tar.gz: 3ffa1b429634885daad9e7f46e61c9c3d81f4b799edbe6591a9c49c5c8260d5ed5b37799825d720f3aff27ab420f0f65fdf6621a14cd8f978199839def029094

data/CHANGELOG.md

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

data/Rakefile

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

data/lib/sportdb/catalogs/league.rb

@@ -44,44 +44,78 @@ SQL
                              )
      end
 
+
+     def self._query_by_code( code: )
+      execute( <<-SQL )
+      SELECT #{self.columns.join(', ')}
+      FROM leagues
+      INNER JOIN league_codes ON leagues.key  = league_codes.key
+      WHERE league_codes.code = '#{code}'
+SQL
+     end
+
+     def self._query_by_code_and_country( code:, country: )
+      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}'                     
+SQL
+     end
+
+     def self._query_by_code_and_season( code:, start_yyyymm:,
+                                                end_yyyymm: )
+       execute( <<-SQL )
+       SELECT #{self.columns.join(', ')}
+       FROM leagues
+       WHERE leagues.key IN 
+       (SELECT league_periods.key
+        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
+     end 
+
+
+
       def self.match_by_code( code,
-                               country: nil )
+                               country: nil,
+                               season:  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( 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
+   
+        rows = if country.nil? && season.nil?
+                 ## note: returns empty array if no match and NOT nil
+                 _query_by_code( code: code )
+               elsif country && season.nil?   ## 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 )
+                  _query_by_code_and_country( code: code, country: country_rec.key )
+               elsif season && country.nil?               
+                  season = Season( season )
+                  start_yyyymm, end_yyyymm = _calc_yyyymm( season )
+                  _query_by_code_and_season( code: code, start_yyyymm: start_yyyymm,
+                                                         end_yyyymm: end_yyyymm )
+               else
+                   raise ArgumentError, "match_by_code - code and optional country or season expected"
+               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
@@ -163,6 +197,28 @@ SQL
       end
 
 
+
+##############################################
+#   try match by code and seaons (via league_periods)
+##     todo/fix - move up for reuse (duplicated in league_period etc) - why? why not?
+
+     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
+
+
 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 = 5
+  PATCH = 6
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-catalogs
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: footballdb-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2025.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2025.1.3
 - !ruby/object:Gem::Dependency
-  name: footballdb-data
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2024.8.23
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2024.8.23
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 description: sportdb-catalogs - sport.db (search 'n' find) catalogs for countries,
   leagues, clubs, national teams, and more
 email: gerald.bauer@gmail.com
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: sportdb-catalogs - sport.db (search 'n' find) catalogs for countries, leagues,