sportdb-search 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25ed40d388f7a3ce09acc8a67a5a16aec359696141c3260bda097b5d221c130
-  data.tar.gz: ec681b64b842e733d874ab9c264e65797356129a0beccf11d9d40d55d1ea34fa
+  metadata.gz: c135a538a3ebe251b9506a6a31e0dcad7b3a456ed863a1a56ae3235a00129fd5
+  data.tar.gz: 145edb5ec66df797b8361f82da6c493417354ab408e19fa1a74fbb6f39d87d1f
 SHA512:
-  metadata.gz: 78d1cbcea722b03bbb6d6986fda9837b3d15e1aaf9dd8b5085d382435e56a67bf62c228f0b33ff4ff01845e5a78e4ea86163ba1a150e8e9166ac66e0d5a81867
-  data.tar.gz: 7e17104eb185b9c4f82e12eff407e9df4c352c6884194ae04036dd4bae690d0671c10ff723387bb12da54212a6033a3490a1763dfdbb55fd91cb916025d7199d
+  metadata.gz: 8e6604db8b3fb94a5fd1aa6656bb074ea6486765c0018eab262af941ec294323a3dd496d3782c8a735ce36b25650ef56e39bf7b536c8f059159a82c3d54e4ad6
+  data.tar.gz: 4dddf10fd601263a12f4ea7845e61261e6983a8d9c8f7420bc927d2149081c1420bd7e2793ab1a8e50a8b3aab18a9d21f411c135caab09ce1c72d0a9035c8270

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.1
+### 0.2.0
 
 ### 0.0.1 / 2024-08-25
 

data/Manifest.txt

@@ -2,8 +2,13 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+bin/fbq
 lib/sportdb/search.rb
-lib/sportdb/search/sport.rb
-lib/sportdb/search/structs.rb
-lib/sportdb/search/structs_world.rb
+lib/sportdb/search/sport-clubs.rb
+lib/sportdb/search/sport-events.rb
+lib/sportdb/search/sport-history.rb
+lib/sportdb/search/sport-leagues.rb
+lib/sportdb/search/sport-more.rb
+lib/sportdb/search/sport-teams.rb
 lib/sportdb/search/version.rb
+lib/sportdb/search/world.rb

data/bin/fbq

@@ -0,0 +1,128 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbq
+
+## our own code
+require 'sportdb/search'
+
+
+
+require 'optparse'
+
+
+
+## local hack
+##   if exists up-to-date catalog db (use local version NOT built-in)
+catalog_path = '../catalog/catalog.db'
+if File.exist?( catalog_path )
+  SportDb::Import.config.catalog_path = catalog_path
+end
+
+
+ args = ARGV
+ opts = { debug: false,
+        }
+
+ parser = OptionParser.new do |parser|
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options] QUERY"
+
+##
+## check if git has a offline option?? (use same)
+##             check for other tools - why? why not?
+#    parser.on( "-q", "--quiet",
+#                 "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+#      opts[:debug] = false
+#    end
+   parser.on( "--verbose", "--debug",
+               "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
+     opts[:debug] = true
+   end
+end
+parser.parse!( args )
+
+puts "OPTS:"
+p opts
+puts "ARGV:"
+p args
+
+
+## add convenience shortcuts
+Club          = Sports::Club
+NationalTeam  = Sports::NationalTeam
+League        = Sports::League
+Ground        = Sports::Ground
+
+City    = Sports::City
+Country = Sports::Country
+
+
+queries = args
+queries.each_with_index do |query,i|
+  puts "==> [#{i+1}/#{queries.size}] >>>  #{query}  <<< ..."
+
+  ## check for clubs
+  m = Club.match_by( name: query )
+  if m.size > 0
+     puts "  #{m.size} CLUB match(es):"
+     print "    "
+     print m.pretty_inspect
+  end
+
+  ## check for leagues
+  m = League.match_by( code: query )
+  if m.size > 0
+    puts "  #{m.size} LEAGUE (by code) match(es):"
+    print "    "
+    print m.pretty_inspect
+  end
+  m = League.match_by( name: query )
+  if m.size > 0
+    puts "  #{m.size} LEAGUE (by name) match(es):"
+    print "    "
+    print m.pretty_inspect
+  end
+
+  ## check for grounds/stadiums
+  m = Ground.match_by( name: query )
+  if m.size > 0
+    puts "  #{m.size} GROUND match(es):"
+    print "    "
+    print m.pretty_inspect
+  end
+
+
+  ### check for national team
+  rec = NationalTeam.find( query )
+  if rec
+    puts "  1 NATIONAL_TEAM match / found:"
+    print "    "
+    print rec.pretty_inspect
+  end
+
+  ####
+  #  check geos
+  #   note - country for now must be unique match (thus, find)
+  rec = Country.find_by( code: query )
+  if rec
+    puts "  1 COUNTRY (by code) match / found:"
+    print "    "
+    print rec.pretty_inspect
+  end
+  rec = Country.find_by( name: query )
+  if rec
+    puts "  1 COUNTRY (by name) match / found:"
+    print "    "
+    print rec.pretty_inspect
+  end
+
+  m = City.match_by( name: query )
+  if m.size > 0
+    puts "  #{m.size} CITY match(es):"
+    print "    "
+    print m.pretty_inspect
+  end
+end
+
+
+puts "bye"

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

@@ -0,0 +1,132 @@
+
+module Sports
+
+
+class Club
+    def self._search() CatalogDb::Metal::Club; end
+
+  ###################
+  ## core required delegates  - use delegate generator - why? why not?
+
+  ## add mods here - why? why not?
+  def self.match_by( name:, country: nil,
+                       league:  nil,
+                       mods:    nil )
+    ## for now assume "global" mods  - checks only for name
+    ##
+    if mods && mods[ name ]
+      club = mods[ name ]
+      return [club]   # note: wrap (single record) in array
+    end
+
+    ## note: add "auto-magic" country calculation via league record
+    ##            if league is a national league for football clubs
+    if league
+        raise ArgumentError, "match_by - league AND country NOT supported; sorry"  if country
+### find countries via league
+###     support league.intl? too - why? why not?
+###       or only nationa league
+        raise ArgumentError, "match_by - league - only national club leagues supported (not int'l or national teams for now); sorry"   unless league.national? && league.clubs?
+
+        ### calc countries
+        ### uses "global" func in sports-catalogs for now
+        ##   move code here - why? why not?
+        country = find_countries_for_league( league )
+        _search.match_by( name:    name,
+                           country: country )
+    else
+        _search.match_by( name:    name,
+                           country: country )
+    end
+  end
+
+
+  ## todo/fix/check: use rename to find_canon  or find_canonical() or something??
+  ##  remove (getting used?) - why? why not?
+  # def []( name )    ## lookup by canoncial name only;  todo/fix: add find alias why? why not?
+  #  puts "WARN!! do not use ClubIndex#[] for lookup >#{name}< - will get removed!!!"
+  #  @clubs[ name ]
+  # end
+
+
+  ###############
+  ### more deriv support functions / helpers
+  def self.match( name ) match_by( name: name ); end
+
+  ##########
+  #  "legacy" finders - return zero or one club
+  ##    (if more than one match, exit/raise error/exception)
+  def self.find( name )   find_by( name: name ); end
+  def self.find!( name )  find_by!( name: name ); end
+
+  ## find - always returns a single record / match or nil
+  ##   if there is more than one match than find aborts / fails
+  def self.find_by!( name:, country: nil,
+                            league:  nil )    ## todo/fix: add international or league flag?
+    club = find_by( name:    name,
+                    country: country,
+                    league:  league )
+
+    if club.nil?
+      puts "** !!! ERROR - no match for club >#{name}<"
+      exit 1
+    end
+
+    club
+  end
+
+
+  def self.find_by( name:, country: nil,
+                      league:  nil )    ## todo/fix: add international or league flag?
+    ## note: allow passing in of country key too (auto-counvert)
+    ##       and country struct too
+    ##     - country assumes / allows the country key or fifa code for now
+    recs = match_by( name:    name,
+                     country: country,
+                     league:  league )
+
+    club = nil
+    if recs.empty?
+      ## puts "** !!! WARN !!! no match for club >#{name}<"
+    elsif recs.size > 1
+      puts "** !!! ERROR - too many matches (#{recs.size}) for club >#{name}<:"
+      pp recs
+      exit 1
+    else   # bingo; match - assume size == 1
+      club = recs[0]
+    end
+
+    club
+  end
+
+
+#######
+# more support methods
+  def self.build_mods( mods )
+    ## e.g.
+    ##  { 'Arsenal   | Arsenal FC'    => 'Arsenal, ENG',
+    ##    'Liverpool | Liverpool FC'  => 'Liverpool, ENG',
+    ##    'Barcelona'                 => 'Barcelona, ESP',
+    ##    'Valencia'                  => 'Valencia, ESP' }
+
+    mods.reduce({}) do |h,(club_names, club_line)|
+
+      values = club_line.split( ',' )
+      values = values.map { |value| value.strip }  ## strip all spaces
+
+      ## todo/fix: make sure country is present !!!!
+      club_name, country_name = values
+      club = find_by!( name: club_name, country: country_name )
+
+      values = club_names.split( '|' )
+      values = values.map { |value| value.strip }  ## strip all spaces
+
+      values.each do |club_name|
+        h[club_name] = club
+      end
+      h
+    end
+  end
+  end # class Club
+
+end  # module Sports

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

@@ -0,0 +1,50 @@
+module Sports
+
+class EventInfo
+  def self._search() CatalogDb::Metal::EventInfo; end
+
+  def self.find_by( league:, season: )
+        _search.find_by( league: league,
+                         season: season )
+  end
+
+  def self.seasons( league )
+        _search.seasons( league )
+  end
+end # class EventInfo
+
+end  # module Sports
+
+
+__END__
+
+
+####
+## virtual table for season lookup
+##   note - use EventSeaon  to avoid name conflict with (global) Season class
+##      find a better name SeasonInfo or SeasonFinder or SeasonStore
+##                       or SeasonQ or ??
+class EventSeasonSearch
+    def initialize( events: )
+        @events = events
+    end
+
+  ###############
+  ## todo/fix:  find a better algo to guess season for date!!!
+  ##
+  def find_by( date:, league: )
+    date = Date.strptime( date, '%Y-%m-%d' )   if date.is_a?( String )
+
+    infos = @events.seasons( league )
+
+    infos.each do |info|
+       return info.season   if info.include?( date )
+    end
+    nil
+  end
+end # class EventSeasonSearch
+end  # class SportSearch
+
+
+
+

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

@@ -0,0 +1,16 @@
+###
+#   more to be done - is a dummy for now !!!!!
+
+
+module Sports
+class Team
+  ## add convenience lookup helper / method for name by season for now
+  ##   use clubs history - for now kept separate from struct - why? why not?
+  def name_by_season( season )
+        ## note: returns / fallback to "regular" name if no records found in history
+        club_history = SportDb::Import.catalog.clubs_history
+        club_history.find_name_by( name: name, season: season ) || name
+  end
+end  # class Team
+end  # module Sports
+

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

@@ -0,0 +1,56 @@
+
+module Sports
+
+class League
+    def self._search() CatalogDb::Metal::League; end
+
+  ###################
+  ## 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?
+     _search.match_by_name( name, country: country )
+   else
+     raise ArgumentError, "LeagueSearch#match_by - one (and only one arg) required - code: or name:"
+   end
+  end
+
+
+ ## all-in-one query (name or code)
+ def self.match( q, country: nil )
+    _search.match_by_name_or_code( q, country: country )
+ end
+
+  ###############
+  ### more deriv support functions / helpers
+  def self.find!( q )
+    league = find( q )
+    if league.nil?
+      puts "** !!! ERROR - no league match found for >#{q}<, add to leagues table; sorry"
+      exit 1
+    end
+    league
+  end
+
+  def self.find( q )
+    league = nil
+    recs = match( q )
+    # pp m
+
+    if recs.empty?
+      ## fall through/do nothing
+    elsif recs.size > 1
+      puts "** !!! ERROR - too many matches (#{recs.size}) for league #{q}:"
+      pp recs
+      exit 1
+    else
+      league = recs[0]
+    end
+
+    league
+  end
+end # class League
+end   # module Sports

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

@@ -0,0 +1,40 @@
+
+module Sports
+
+  class Ground
+    def self._search() CatalogDb::Metal::Ground; end
+
+  ###################
+  ## core required delegates  - use delegate generator - why? why not?
+  def self.match_by( name:, country: nil, city: nil )
+    _search.match_by( name:    name,
+                       country: country,
+                       city:    city )
+  end
+
+  ###############
+  ### more deriv support functions / helpers
+  def self.match( name ) match_by( name: name ); end
+  ## add more here - why? why not?
+  end # class Ground
+
+
+
+  class Player
+    def self._search() CatalogDb::Metal::Player; end
+
+  ###################
+  ## core required delegates  - use delegate generator - why? why not?
+  def self.match_by( name:, country: nil, year: nil )
+    _search.match_by( name:    name,
+                       country: country,
+                       year:    year )
+  end
+
+  ###############
+  ### more deriv support functions / helpers
+  def self.match( name ) match_by( name: name ); end
+  ## add more here - why? why not?
+  end   # class Player
+
+end   # module Sports

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

@@ -0,0 +1,98 @@
+
+module Sports
+
+
+class NationalTeam
+    def self._search() CatalogDb::Metal::NationalTeam; end
+
+  ###################
+  ## core required delegates  - use delegate generator - why? why not?
+
+
+  ### todo/fix
+  ###   upstream only support/require find !!!!!!!
+
+  ## change core api to match( q ) only - why? why not?
+  ##   and make find and find! derivs???
+  def self.find( q )    _search.find( q ); end
+  def self.find!( q )   _search.find!( q ); end
+end # class NationalTeam
+
+
+  class Team
+    ## note: "virtual" index lets you search clubs and/or national_teams (don't care)
+
+        ## todo/check: rename to/use map_by! for array version - why? why not?
+        def self.find_by!( name:, league:, mods: nil )
+          if name.is_a?( Array )
+            recs = []
+            name.each do |q|
+              recs << _find_by!( name: q, league: league, mods: mods )
+            end
+            recs
+          else  ## assume single name
+            _find_by!( name: name, league: league, mods: mods )
+          end
+        end
+
+
+      CLUB_NAME_RE =  %r{^
+              (?<name>[^()]+?)     ## non-greedy
+              (?:
+                 \s+
+                 \(
+                   (?<code>[A-Z][A-Za-z]{2,3})    ## optional (country) code; support single code e.g. (A) - why? why not?
+                 \)
+              )?
+            $}x   ## note - allow (URU) and (Uru) - why? why not
+
+
+        ###
+        #  note:  missing teams will get
+        ##            auto-created if possible
+        ##         only ambigious results (too many matches) raise expection!!!
+        def self._find_by!( name:, league:, mods: nil )
+          if mods && mods[ league.key ] && mods[ league.key ][ name ]
+            mods[ league.key ][ name ]
+          else
+            if league.clubs?
+              if league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
+                     ###
+                     ##  get country code from name
+                     ##    e.g. Liverpool FC (ENG) or
+                     ##         Liverpool FC (URU) etc.
+
+                     ## check for country code
+                     if m=CLUB_NAME_RE.match( name )
+                       if m[:code]
+                         Club.find_by!( name: m[:name],
+                                                country: m[:code] )
+                       else
+                          Club.find!( name )
+                       end
+                     else
+                       puts "!! PARSE ERROR - invalid club name; cannot match with CLUB_NAME_RE >#{team}<"
+                       exit 1
+                     end
+              else  ## assume clubs in domestic/national league tournament
+                 ## note - search by league countries (may incl. more than one country
+                 ##             e.g. us incl. ca, fr incl. mc, ch incl. li, etc.
+                rec = Club.find_by( name: name, league: league )
+                if rec.nil?
+                    puts "auto-create (missing) club #{name}"
+                    ##  todo/fix: add auto flag!!!!
+                    ###              like in rounds!!!
+                    ##   to track auto-created clubs
+                    rec = Club.new( name: name )
+                    rec.country = league.country  ## fix: country kwarg not yet supported!!
+                    pp rec
+                end
+                rec
+              end
+            else   ## assume national teams (not clubs)
+              NationalTeam.find!( name )
+            end
+          end
+        end # method _find_by!
+  end # class Team
+end  # module Sports

data/lib/sportdb/search/version.rb

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

data/lib/sportdb/search/{structs_world.rb → world.rb}

@@ -1,9 +1,8 @@
 module Sports
 
+
 class City
-    def self._search #### use service/api or such - why? why not?
-        SportDb::Import.world.cities
-    end
+    def self._search() CatalogDb::Metal::City; end
 
     def self.match_by( name: )
        _search.match_by( name: name )
@@ -12,9 +11,7 @@ end   # class City
 
 
 class Country
-    def self._search #### use service/api or such - why? why not?
-        SportDb::Import.world.countries
-    end
+    def self._search() CatalogDb::Metal::Country; end
 
     def self.find_by( code: nil, name: nil )
         ## todo/fix upstream - change to find_by( code:, name:, ) too - why? why not?
@@ -23,7 +20,7 @@ class Country
         elsif name && code.nil?
           _search.find_by_name( name )
         else
-          raise ArgumentError, "CountrySearch#find_by - one (and only one arg) required - code: or name:"
+          raise ArgumentError, "Country#find_by - one (and only one arg) required - code: or name:"
         end
     end
 

data/lib/sportdb/search.rb

@@ -3,110 +3,27 @@ require 'sportdb/catalogs'
 
 
 
-## move to base?
-###  shared basics for search
-class SportSearch
-  class Search    ## base search service - use/keep - why? why not?
-    attr_reader :service
-    def initialize( service ) @service = service; end
-  end  # class Search
-end
-
-
-
-
 ## our own code
 require_relative 'search/version'
-require_relative 'search/sport'
-
-
-########
-###  setup sport search apis
-class SportSearch
-   def initialize( leagues:,
-                   national_teams:,
-                   clubs:,
-                   grounds:,
-                   events:,
-                   players:
-                   )
-       @leagues        = LeagueSearch.new( leagues )
-       @national_teams = NationalTeamSearch.new( national_teams )
-       @clubs          = ClubSearch.new( clubs )
-       @events         = EventSearch.new( events )
-
-       @grounds        = GroundSearch.new( grounds )
-
-       @players        = PlayerSearch.new( players )
-
-       ## virtual deriv ("composite") search services
-       @teams          = TeamSearch.new( clubs:          @clubs,
-                                         national_teams: @national_teams )
-       @event_seasons  = EventSeasonSearch.new( events: @events )
 
-   end
-
- def leagues()        @leagues; end
- def national_teams() @national_teams; end
- def clubs()          @clubs; end
- def events()         @events; end
- def grounds()         @grounds; end
-
- def players()        @players; end
-
- def teams()          @teams; end         ## note - virtual table
- def seasons()        @event_seasons; end ## note - virtual table
-
- def countries
-    puts
-    puts "[WARN] do NOT use catalog.countries, deprecated!!!"
-    puts "   please, switch to new world.countries search service"
-    puts
-    exit 1
- end
-end # class SportSearch
-
-
-class WorldSearch
-    def initialize( countries:, cities: )
-        ## change service to country_service or such - why? why not?
-        ##  add city_service and such later
-
-        @countries =  countries
-        @cities    =  cities
-    end
+###
+##   add/augment core classes with search services
+require_relative 'search/world'
+require_relative 'search/sport-leagues'
+require_relative 'search/sport-clubs'
+require_relative 'search/sport-teams'
+require_relative 'search/sport-events'
+require_relative 'search/sport-more'
 
-    ####
-    #  note: for now setup only for countries & cities
-    def countries() @countries;  end
-    def cities()    @cities;  end
-end  # class WorldSearch
+##
+##  require_relative 'search/sport-history'  ## to be done
 
 
 #######
 ## add configuration
-
 module SportDb
 module Import
 class Configuration
-  def world
-    @world ||= WorldSearch.new(
-                      countries: CatalogDb::Metal::Country,
-                      cities:    CatalogDb::Metal::City,
-                   )
-  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 catalogdb or ???
@@ -131,18 +48,12 @@ class Configuration
 
       @players_path
   end
-
-
 end # class Configuration
 
-    ##  e.g. use config.catalog  -- keep Import.catalog as a shortcut (for "read-only" access)
-    def self.world()   config.world;    end
-    def self.catalog() config.catalog;  end
-
-      ## lets you use
-      ##   SportDb::Import.configure do |config|
-      ##      config.catalog_path = './catalog.db'
-      ##   end
+    ## lets you use
+    ##   SportDb::Import.configure do |config|
+    ##      config.catalog_path = './catalog.db'
+    ##   end
     def self.configure()  yield( config ); end
     def self.config()  @config ||= Configuration.new;  end
 end   # module Import
@@ -160,28 +71,6 @@ end   # module Sports
 
 
 
-
-###
-##   add/augment core classes with search services
-require_relative 'search/structs'
-require_relative 'search/structs_world'
-
-
-
-module SportDb
-  module Import
-    class Team
-      ## add convenience lookup helper / method for name by season for now
-      ##   use clubs history - for now kept separate from struct - why? why not?
-      def name_by_season( season )
-        ## note: returns / fallback to "regular" name if no records found in history
-        SportDb::Import.catalog.clubs_history.find_name_by( name: name, season: season ) || name
-      end
-    end  # class Team
-  end   # module Import
-end     # module SportDb
-
-
 ###
 ## add default/built-in catalog here - why? why not?
 ##  todo/fix  - set catalog_path on demand

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-search
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-catalogs
@@ -60,7 +60,8 @@ dependencies:
         version: '4.1'
 description: sportdb-search - find national teams, clubs, leagues & more
 email: gerald.bauer@gmail.com
-executables: []
+executables:
+- fbq
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -71,11 +72,16 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- bin/fbq
 - lib/sportdb/search.rb
-- lib/sportdb/search/sport.rb
-- lib/sportdb/search/structs.rb
-- lib/sportdb/search/structs_world.rb
+- lib/sportdb/search/sport-clubs.rb
+- lib/sportdb/search/sport-events.rb
+- lib/sportdb/search/sport-history.rb
+- lib/sportdb/search/sport-leagues.rb
+- lib/sportdb/search/sport-more.rb
+- lib/sportdb/search/sport-teams.rb
 - lib/sportdb/search/version.rb
+- lib/sportdb/search/world.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain

data/lib/sportdb/search/sport.rb

@@ -1,384 +0,0 @@
-###
-#  sport search service api for leagues, clubs and more
-#
-# core api is:
-
-
-class SportSearch
-
-class PlayerSearch < Search
-  ###################
-  ## core required delegates  - use delegate generator - why? why not?
-  def match_by( name:, country: nil, year: nil )
-    @service.match_by( name:    name,
-                       country: country,
-                       year:    year )
-  end
-
-  ###############
-  ### more deriv support functions / helpers
-  def match( name ) match_by( name: name ); end
-  ## add more here - why? why not?
-end   # class PlayerSearch
-
-
-class LeagueSearch < Search
-
-  ###################
-  ## core required delegates  - use delegate generator - why? why not?
-  def match_by( name: nil, code: nil, country: nil )
-     ## todo/fix upstream - remove "generic" match_by() - why? why not?
-     ###
-     if code && name.nil?
-      @service.match_by_code( code, country: country )
-    elsif name && code.nil?
-      @service.match_by_name( name, country: country )
-    else
-      raise ArgumentError, "LeagueSearch#match_by - one (and only one arg) required - code: or name:"
-    end
-    ## @service.match_by( name: name,
-    ##                   country: country )
-  end
-
-  ## all-in-one query (name or code)
-  def match( q, country: nil )
-     @service.match_by_name_or_code( q, country: country )
-  end
-
-
-  ###############
-  ### more deriv support functions / helpers
-  def find!( q )
-    league = find( q )
-    if league.nil?
-      puts "** !!! ERROR - no league match found for >#{q}<, add to leagues table; sorry"
-      exit 1
-    end
-    league
-  end
-
-  def find( q )
-    league = nil
-    recs = match( q )
-    # pp m
-
-    if recs.empty?
-      ## fall through/do nothing
-    elsif recs.size > 1
-      puts "** !!! ERROR - ambigious league query; too many leagues (#{recs.size}) found:"
-      pp recs
-      exit 1
-    else
-      league = recs[0]
-    end
-
-    league
-  end
-end # class LeagueSearch
-
-
-
-class GroundSearch  < Search
-  ###################
-  ## core required delegates  - use delegate generator - why? why not?
-  def match_by( name:, country: nil, city: nil )
-    @service.match_by( name:    name,
-                       country: country,
-                       city:    city )
-  end
-
-  ###############
-  ### more deriv support functions / helpers
-  def match( name ) match_by( name: name ); end
-  ## add more here - why? why not?
-end  # class GroundSearch
-
-
-
-class NationalTeamSearch  < Search
-  ###################
-  ## core required delegates  - use delegate generator - why? why not?
-
-  ## changle core api to match( q ) only - why? why not?
-  ##   and make find and find! derivs???
-  def find( q )    @service.find( q ); end
-  def find!( q )   @service.find!( q ); end
-end # class NationalTeamSearch
-
-
-class ClubSearch  < Search
-  ###################
-  ## core required delegates  - use delegate generator - why? why not?
-
-  ## add mods here - why? why not?
-
-  def match_by( name:, country: nil,
-                       league:  nil,
-                       mods:    nil )
-    ## for now assume "global" mods  - checks only for name
-    ##
-    if mods && mods[ name ]
-      club = mods[ name ]
-      return [club]   # note: wrap (single record) in array
-    end
-
-    ## note: add "auto-magic" country calculation via league record
-    ##            if league is a national league for football clubs
-    if league
-        raise ArgumentError, "match_by - league AND country NOT supported; sorry"  if country
-### find countries via league
-###     support league.intl? too - why? why not?
-###       or only nationa league
-        raise ArgumentError, "match_by - league - only national club leagues supported (not int'l or national teams for now); sorry"   unless league.national? && league.clubs?
-
-        ### calc countries
-        ### uses "global" func in sports-catalogs for now
-        ##   move code here - why? why not?
-        country = find_countries_for_league( league )
-        @service.match_by( name:    name,
-                           country: country )
-    else
-        @service.match_by( name:    name,
-                           country: country )
-    end
-  end
-
-
-  ## todo/fix/check: use rename to find_canon  or find_canonical() or something??
-  ##  remove (getting used?) - why? why not?
-  # def []( name )    ## lookup by canoncial name only;  todo/fix: add find alias why? why not?
-  #  puts "WARN!! do not use ClubIndex#[] for lookup >#{name}< - will get removed!!!"
-  #  @clubs[ name ]
-  # end
-
-
-  ###############
-  ### more deriv support functions / helpers
-  def match( name ) match_by( name: name ); end
-
-  ##########
-  #  "legacy" finders - return zero or one club
-  ##    (if more than one match, exit/raise error/exception)
-  def find( name )   find_by( name: name ); end
-  def find!( name )  find_by!( name: name ); end
-
-  ## find - always returns a single record / match or nil
-  ##   if there is more than one match than find aborts / fails
-  def find_by!( name:, country: nil,
-                       league:  nil )    ## todo/fix: add international or league flag?
-    club = find_by( name:    name,
-                    country: country,
-                    league:  league )
-
-    if club.nil?
-      puts "** !!! ERROR - no match for club >#{name}<"
-      exit 1
-    end
-
-    club
-  end
-
-
-  def find_by( name:, country: nil,
-                      league:  nil )    ## todo/fix: add international or league flag?
-    ## note: allow passing in of country key too (auto-counvert)
-    ##       and country struct too
-    ##     - country assumes / allows the country key or fifa code for now
-    recs = match_by( name:    name,
-                     country: country,
-                     league:  league )
-
-    club = nil
-    if recs.empty?
-      ## puts "** !!! WARN !!! no match for club >#{name}<"
-    elsif recs.size > 1
-      puts "** !!! ERROR - too many matches (#{recs.size}) for club >#{name}<:"
-      pp recs
-      exit 1
-    else   # bingo; match - assume size == 1
-      club = recs[0]
-    end
-
-    club
-  end
-
-
-#######
-# more support methods
-  def build_mods( mods )
-    ## e.g.
-    ##  { 'Arsenal   | Arsenal FC'    => 'Arsenal, ENG',
-    ##    'Liverpool | Liverpool FC'  => 'Liverpool, ENG',
-    ##    'Barcelona'                 => 'Barcelona, ESP',
-    ##    'Valencia'                  => 'Valencia, ESP' }
-
-    mods.reduce({}) do |h,(club_names, club_line)|
-
-      values = club_line.split( ',' )
-      values = values.map { |value| value.strip }  ## strip all spaces
-
-      ## todo/fix: make sure country is present !!!!
-      club_name, country_name = values
-      club = find_by!( name: club_name, country: country_name )
-
-      values = club_names.split( '|' )
-      values = values.map { |value| value.strip }  ## strip all spaces
-
-      values.each do |club_name|
-        h[club_name] = club
-      end
-      h
-    end
-  end
-end # class ClubSearch
-
-
-
-## todo/check - change to EventInfoSearch - why? why not?
-class EventSearch < Search
-  ##
-  ## todo - eventinfo search still open / up for change
-
-  ###################
-  ## core required delegates  - use delegate generator - why? why not?
-  def seasons( league )
-      @service.seasons( league )
-  end
-  def find_by( league:, season: )
-      @service.find_by( league: league,
-                        season: season )
-  end
-end # class EventSearch
-
-
-####
-## virtual table for season lookup
-##   note - use EventSeaon  to avoid name conflict with (global) Season class
-##      find a better name SeasonInfo or SeasonFinder or SeasonStore
-##                       or SeasonQ or ??
-class EventSeasonSearch
-    def initialize( events: )
-        @events = events
-    end
-
-  ###############
-  ## todo/fix:  find a better algo to guess season for date!!!
-  ##
-  def find_by( date:, league: )
-    date = Date.strptime( date, '%Y-%m-%d' )   if date.is_a?( String )
-
-    infos = @events.seasons( league )
-
-    infos.each do |info|
-       return info.season   if info.include?( date )
-    end
-    nil
-  end
-end # class EventSeasonSearch
-
-
-######
-### add virtual team search ( clubs + national teams)
-##   note: no record base!!!!!
-class TeamSearch
-    ## note: "virtual" index lets you search clubs and/or national_teams (don't care)
-
-  def initialize( clubs:, national_teams: )
-    @clubs          = clubs
-    @national_teams = national_teams
-  end
-
-    ## todo/check: rename to/use map_by! for array version - why? why not?
-    def find_by!( name:, league:, mods: nil )
-      if name.is_a?( Array )
-        recs = []
-        name.each do |q|
-          recs << _find_by!( name: q, league: league, mods: mods )
-        end
-        recs
-      else  ## assume single name
-        _find_by!( name: name, league: league, mods: mods )
-      end
-    end
-
-
-
-  CLUB_NAME_RE =  %r{^
-          (?<name>[^()]+?)     ## non-greedy
-          (?:
-             \s+
-             \(
-               (?<code>[A-Z][A-Za-z]{2,3})    ## optional (country) code; support single code e.g. (A) - why? why not?
-             \)
-          )?
-        $}x   ## note - allow (URU) and (Uru) - why? why not
-
-
-    ###
-    #  note:  missing teams will get
-    ##            auto-created if possible
-    ##         only ambigious results (too many matches) raise expection!!!
-    def _find_by!( name:, league:, mods: nil )
-      if mods && mods[ league.key ] && mods[ league.key ][ name ]
-        mods[ league.key ][ name ]
-      else
-        if league.clubs?
-          if league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
-                 ###
-                 ##  get country code from name
-                 ##    e.g. Liverpool FC (ENG) or
-                 ##         Liverpool FC (URU) etc.
-
-                 ## check for country code
-                 if m=CLUB_NAME_RE.match( name )
-                   if m[:code]
-                     @clubs.find_by!( name: m[:name],
-                                            country: m[:code] )
-                   else
-                      @clubs.find!( name )
-                   end
-                 else
-                   puts "!! PARSE ERROR - invalid club name; cannot match with CLUB_NAME_RE >#{team}<"
-                   exit 1
-                 end
-          else  ## assume clubs in domestic/national league tournament
-             ## note - search by league countries (may incl. more than one country
-             ##             e.g. us incl. ca, fr incl. mc, ch incl. li, etc.
-            rec = @clubs.find_by( name: name, league: league )
-            if rec.nil?
-                puts "auto-create (missing) club #{name}"
-                ##  todo/fix: add auto flag!!!!
-                ###              like in rounds!!!
-                ##   to track auto-created clubs
-                rec = SportDb::Import::Club.new( name: name )
-                rec.country = league.country  ## fix: country kwarg not yet supported!!
-                pp rec
-            end
-            rec
-          end
-        else   ## assume national teams (not clubs)
-          @national_teams.find!( name )
-        end
-      end
-    end # method _find_by!
-
-
-    def _find_by_v0!( name:, league:, mods: nil )
-      if mods && mods[ league.key ] && mods[ league.key ][ name ]
-        mods[ league.key ][ name ]
-      else
-        if league.clubs?
-          if league.intl?    ## todo/fix: add intl? to ActiveRecord league!!!
-            @clubs.find!( name )
-          else  ## assume clubs in domestic/national league tournament
-             ## note - search by league countries (may incl. more than one country
-             ##             e.g. us incl. ca, fr incl. mc, ch incl. li, etc.
-            @clubs.find_by!( name: name, league: league )
-          end
-        else   ## assume national teams (not clubs)
-          @national_teams.find!( name )
-        end
-      end
-    end # method _find_by!
-  end  # class TeamSearch
-end  # class SportSearch

data/lib/sportdb/search/structs.rb

@@ -1,118 +0,0 @@
-###
-#  note - extend all structs for with search api
-#
-#  todo - add more helpers!!!!
-#
-#
-#  todo - fix - move all non-core search functionality/machinery
-#                  over here - why? why not?
-
-
-
-module Sports
-###
-## todo/fix - add find_by( code: ), find_by( name: )
-##                   split - why? why not?
-
-
-class League
-    def self._search #### use service/api or such - why? why not?
-        SportDb::Import.catalog.leagues
-    end
-    def self.match_by( name: nil, code: nil,
-                        country: nil )
-       _search.match_by( name: name, code: code,
-                         country: country )
-    end
-    def self.match( q, country: nil )
-        _search.match( q, country: country )
-    end
-
-    def self.find!( q ) _search.find!( q ); end
-    def self.find( q )  _search_find( q ); end
-end # class League
-
-
-class NationalTeam
-    def self._search #### use service/api or such - why? why not?
-        SportDb::Import.catalog.national_teams
-    end
-
-    def self.find( q )   _search.find( q ); end
-    def self.find!( q )  _search_find!( q ); end
-end # class NationalTeam
-
-
-
-class Club
-    def self._search #### use service/api or such - why? why not?
-        SportDb::Import.catalog.clubs
-    end
-
-    def self.match_by( name:, country: nil,
-                         league:  nil,
-                         mods:    nil )
-        _search.match_by( name: name, country: country,
-                          league: league, mods: mods )
-    end
-    def self.match( name ) match_by( name: name ); end
-
-    def self.find( name )   _search.find_by( name: name ); end
-    def self.find!( name )  _search.find_by!( name: name ); end
-
-    def self.find_by!( name:, country: nil,
-                              league:  nil )
-       _search.find_by!( name: name, country: country,
-                                     league: league )
-    end
-    def self.find_by( name:, country: nil,
-                             league:  nil )
-       _search.find_by( name: name, country: country,
-                                    league: league )
-    end
-
-   def self.build_mods( mods )
-       _search.build_mods( mods )
-    end
-  end # class Club
-
-
-  class Team
-    def self._search
-        SportDb::Import.catalog.teams
-    end
-
-    ## todo/check: rename to/use map_by! for array version - why? why not?
-    def self.find_by!( name:, league:, mods: nil )
-        _search.find_by!( name: name,
-                          league: league,
-                          mods: mods )
-    end
-  end # class Team
-
-
-  class EventInfo
-    def self._search
-        SportDb::Import.catalog.events
-    end
-
-    def self.find_by( league:, season: )
-        _search.find_by( league: league,
-                         season: season )
-    end
-  end # class EventInfo
-
-
-
-  class Ground
-    def self._search
-        SportDb::Import.catalog.grounds
-    end
-
-    def self.match_by( name:, country: nil, city: nil )
-      _search.match_by( name:    name,
-                        country: country,
-                        city:    city )
-    end
-  end # class Ground
-end   # module Sports