sportdb-search 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e52e9d8288b15116dfeec9a2dd1255a10d52b478378040e6f503d314b21d63f2
-  data.tar.gz: 21d4c8335205ab2c38ebd7c5919500d1a4c4181edfc6a4dfb0ed5aa434eaf58e
+  metadata.gz: d4032ac46170ffc3f434ccc3682f94b8668bf0b64c7106fde1a07283ebc181a0
+  data.tar.gz: 65682e318410b6c3ca88814463e1650a18480a19de61c0b3cabd5b50ae30f9bc
 SHA512:
-  metadata.gz: ac5ebf7ea6e41ab2466bb70dd96db6cb2ef07c92539d7c3131be57bdbd600120d6a41927e493ed5a5069276b876398058be3c10a09c804498f07e57d450832a3
-  data.tar.gz: 193911ab634b2435c63979a14164a1b5e46a1cd9288a7459dc5e1e54c0e7e81bb0001e494226878f25d98345157632f5d7c34baaf6a240de0b40a9d0d1bd9a63
+  metadata.gz: cd189b4381573306de40eec4047288f6ee1b1ee560211759c68c91a6ad93c327bec54fc328922c1a182423184a895c59d3df881cc96a95fda190055490cd7a6d
+  data.tar.gz: f368f483bf43acb2faf2454008fdcc164d83948fdc286876c07888f1e2580d5f0c4b9d1eb5a20daec145a98c350200c46fdf588500ba6652e1c783570f7ccc03

data/CHANGELOG.md

@@ -1,5 +1,4 @@
-### 0.2.1
-
+### 0.2.3
 ### 0.0.1 / 2024-08-25
 
 * Everything is new. First release.

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.spec 'sportdb-search' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-catalogs',   '>= 1.2.3'],
+    ['sportdb-catalogs',   '>= 1.2.6'],
   ]
 
   self.spec_extras = {

data/bin/fbq

@@ -14,7 +14,7 @@ require 'optparse'
 
 ## local hack
 ##   if exists up-to-date catalog db (use local version NOT built-in)
-catalog_path = '../catalog/catalog.db'
+catalog_path = '/sports/sportdb/sport.db/catalog/catalog.db'
 if File.exist?( catalog_path )
   SportDb::Import.config.catalog_path = catalog_path
 end

data/lib/sportdb/search/sport-leagues.rb

@@ -1,6 +1,13 @@
 
 module Sports
 
+###
+## todo - move LeaguePeriod to its own file!!!
+##  add note - do NOT use match/find_by_name for now
+##                      might get romoved? why? why not?
+##                for name lookup use League.find_by( name: ) !!!
+##         use find_by( code:, season: )  !!!
+
 
 class LeaguePeriod
    def self._search() CatalogDb::Metal::LeaguePeriod; end
@@ -18,23 +25,61 @@ class LeaguePeriod
    end
   end
 
-
  ## all-in-one query (name or code)
  def self.match( q, season: )
     _search.match_by_name_or_code( q, season: season )
  end
 
+
   ###############
   ### more deriv support functions / helpers
-  def self.find!( q, season: )
-    period = find( q, season: season )
-    if period.nil?
-      puts "** !!! ERROR - no league period found for >#{q}+#{season}<, add to leagues table; sorry"
+  def self.find_by_code( code, season: )
+    period = nil
+    recs  = _search.match_by_code( code, season: season )
+    # pp m
+
+    if recs.empty?
+      ## fall through/do nothing
+    elsif recs.size > 1
+      puts "** !!! ERROR - too many (code) matches (#{recs.size}) for league period >#{code}+#{season}<:"
+      pp recs
       exit 1
+    else
+      period = recs[0]
     end
+
     period
   end
 
+  def self.find_by_name( name, season: )
+    period = nil
+    recs  = _search.match_by_name( name, season: season )
+    # pp m
+
+    if recs.empty?
+      ## fall through/do nothing
+    elsif recs.size > 1
+      puts "** !!! ERROR - too many (name) matches (#{recs.size}) for league period >#{name}+#{season}<:"
+      pp recs
+      exit 1
+    else
+      period = recs[0]
+    end
+
+    period
+  end
+
+  def self.find_by( name: nil, code: nil, season: )
+    if code && name.nil?
+      find_by_code( code, season: season )
+    elsif name && code.nil?
+      find_by_name( name, season: season )
+    else
+      raise ArgumentError, "LeaguePeriod.find_by - one (and only one arg) required - code: or name:"
+    end
+  end
+
+
   def self.find( q, season: )
     period = nil
     recs = match( q, season: season )
@@ -52,6 +97,15 @@ class LeaguePeriod
 
     period
   end
+
+  def self.find!( q, season: )
+    period = find( q, season: season )
+    if period.nil?
+      puts "** !!! ERROR - no league period found for >#{q}+#{season}<, add to leagues table; sorry"
+      exit 1
+    end
+    period
+  end
 end  # class LeaguePeriod
 
 
@@ -60,12 +114,25 @@ class League
 
   ###################
   ## core required delegates  - use delegate generator - why? why not?
-  def self.match_by( name: nil, code: nil, country: nil )
-    ## todo/fix upstream - remove "generic" match_by() - why? why not?
-    ###
-    if code && name.nil?
-     _search.match_by_code( code, country: country )
-   elsif name && code.nil?
+  def self.match_by( name: nil, code: nil, 
+                       country: nil,
+                       season:  nil )
+   ## todo/fix upstream - remove "generic" match_by() - why? why not?
+   ##
+   if code && name.nil? 
+    ### todo/fix -  simplify - why? why not?
+    ##   remove country from code match query
+    ##               assume use country prefixes or are unique
+    ##     e.g. Premier Leaguge  is eng.1 or eng.pl etc. not just pl
+    ##           Bundesliga      is de.1 or de.bl etc not just bl
+    ##          and so on 
+      if country
+        ## add deprecated warning - why? why not?
+        puts "[deprecated] do NOT use country param for League.match_by_code; will get reomved"
+      end
+     _search.match_by_code( code, country: country, 
+                                  season: season )
+   elsif name && code.nil? && season.nil?  # note - season only supported for code for now
      _search.match_by_name( name, country: country )
    else
      raise ArgumentError, "League.match_by - one (and only one arg) required - code: or name:"

data/lib/sportdb/search/sport-teams.rb

@@ -55,8 +55,18 @@ end # class NationalTeam
           if mods && mods[ league.key ] && mods[ league.key ][ name ]
             mods[ league.key ][ name ]
           else
+            ### quick hack
+            ##    rename more placeholder teams to N.N.
+            name = 'N.N.'  if ['Verlierer HF 1',
+                               'Verlierer HF 2'].include?(name)
+
             if league.clubs?
-              if league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
+
+             ## check for placeholder/global dummy clubs first
+             if ['N.N.', 'N. N.'].include?( name )
+                 Club.find!( name )
+             else
+               if league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
                      ###
                      ##  get country code from name
                      ##    e.g. Liverpool FC (ENG) or
@@ -72,7 +82,7 @@ end # class NationalTeam
                            ##  todo/fix: add auto flag!!!!
                            ###              like in rounds!!!
                            ##   to track auto-created clubs
-                           rec = Club.new( name: m[:name] )
+                           rec = Club.new( name: m[:name], auto: true )
                            rec.country = Country.find_by( code: m[:code] )   ## fix: country kwarg not yet supported!!
                            pp rec
                          end
@@ -93,11 +103,12 @@ end # class NationalTeam
                     ##  todo/fix: add auto flag!!!!
                     ###              like in rounds!!!
                     ##   to track auto-created clubs
-                    rec = Club.new( name: name )
+                    rec = Club.new( name: name, auto: true )
                     rec.country = league.country  ## fix: country kwarg not yet supported!!
                     pp rec
                 end
                 rec
+                end
               end
             else   ## assume national teams (not clubs)
               NationalTeam.find!( name )

data/lib/sportdb/search/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-search
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 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-catalogs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,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-search - find national teams, clubs, leagues & more
 email: gerald.bauer@gmail.com
 executables:
@@ -103,7 +103,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-search - find national teams, clubs, leagues & more