sportdb-formats 1.1.6 → 1.2.1

data/lib/sportdb/formats.rb

@@ -9,15 +9,49 @@ require 'zip'     ## todo/check: if zip is alreay included in a required module
 
 ###
 # our own code
-require 'sportdb/formats/version' # let version always go first
+require_relative 'formats/version' # let version always go first
+
+require_relative 'formats/outline_reader'
+require_relative 'formats/datafile'
+require_relative 'formats/datafile_package'
+require_relative 'formats/package'
+
+
+require_relative 'formats/parser_helper'
+
+require_relative 'formats/lines_reader'
+
+
+###
+# define search services apis  (move to its own gem later - why? why not?)
+
+module SportDb
+module Import
+
+class Configuration
+  ## note: add more configs (open class), see sportdb-structs for original config!!!
+
+  ## add 
+  def world()        @world ||= WorldSearch.new( countries: DummyCountrySearch.new ); end
+  def world=(world)  @world = world; end
+
+  ## tood/fix - add/move catalog here from   sportdb-catalogs!!!
+  ## def catalog()         @catalog ||= Catalog.new;  end
+  ## def catalog(catalog)  @catalog = catalog; 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
+  def self.world()   config.world;    end
+end   # module Import
+end   # module SportDb
+
+require_relative 'formats/search/world'
+require_relative 'formats/search/sport'
+
 
-require 'sportdb/formats/outline_reader'
-require 'sportdb/formats/datafile'
-require 'sportdb/formats/datafile_package'
-require 'sportdb/formats/package'
 
 
-require 'sportdb/formats/parser_helper'
 
 
 module SportDb
@@ -39,7 +73,11 @@ module SportDb
     Standings    = ::Sports::Standings
     TeamUsage    = ::Sports::TeamUsage
 
+    Ground       = ::Sports::Ground
+
+    Player       = ::Sports::Player
 
+    
     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?
@@ -53,20 +91,19 @@ module SportDb
 end     # module SportDb
 
 
-require 'sportdb/formats/goals'
+require_relative 'formats/goals'
 
 
 
-require 'sportdb/formats/match/mapper'
-require 'sportdb/formats/match/mapper_teams'
-require 'sportdb/formats/match/match_parser'
-require 'sportdb/formats/match/match_parser_auto_conf'
-require 'sportdb/formats/match/conf_parser'
+require_relative 'formats/match/mapper'
+require_relative 'formats/match/mapper_teams'
+require_relative 'formats/match/match_parser'
+require_relative 'formats/match/match_parser_auto_conf'
+require_relative 'formats/match/conf_parser'
 
 
 
-require 'sportdb/formats/country/country_reader'
-require 'sportdb/formats/country/country_index'
+require_relative 'formats/country/country_reader'
 
 
 ## add convenience helper
@@ -80,9 +117,8 @@ end   # module Import
 end   # module SportDb
 
 
-require 'sportdb/formats/league/league_reader'
-require 'sportdb/formats/league/league_index'
-require 'sportdb/formats/league/league_outline_reader'
+require_relative 'formats/league/league_reader'
+require_relative 'formats/league/league_outline_reader'
 
 ##
 ## add convenience helper / short-cuts
@@ -96,15 +132,12 @@ end   # module Import
 end   # module SportDb
 
 
-require 'sportdb/formats/team/club_reader'
-require 'sportdb/formats/team/club_reader_props'
-require 'sportdb/formats/team/club_index'
-require 'sportdb/formats/team/wiki_reader'
-require 'sportdb/formats/team/national_team_index'
-require 'sportdb/formats/team/team_index'
+require_relative 'formats/team/club_reader'
+require_relative 'formats/team/club_reader_props'
+require_relative 'formats/team/wiki_reader'
 
-require 'sportdb/formats/team/club_reader_history'
-require 'sportdb/formats/team/club_index_history'
+require_relative 'formats/team/club_reader_history'
+require_relative 'formats/team/club_index_history'
 
 
 ###
@@ -125,8 +158,7 @@ end   # module Import
 end   # module SportDb
 
 
-require 'sportdb/formats/event/event_reader'
-require 'sportdb/formats/event/event_index'
+require_relative 'formats/event/event_reader'
 
 ## add convenience helper
 module SportDb
@@ -140,6 +172,7 @@ end   # module SportDb
 
 
 
+require_relative 'formats/ground/ground_reader'
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.1
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -64,16 +64,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
 description: sportdb-formats - sport.db format and text utilities
-email: opensport@googlegroups.com
+email: gerald.bauer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -86,16 +86,15 @@ files:
 - README.md
 - Rakefile
 - lib/sportdb/formats.rb
-- lib/sportdb/formats/country/country_index.rb
 - lib/sportdb/formats/country/country_reader.rb
 - lib/sportdb/formats/datafile.rb
 - lib/sportdb/formats/datafile_package.rb
-- lib/sportdb/formats/event/event_index.rb
 - lib/sportdb/formats/event/event_reader.rb
 - lib/sportdb/formats/goals.rb
-- lib/sportdb/formats/league/league_index.rb
+- lib/sportdb/formats/ground/ground_reader.rb
 - lib/sportdb/formats/league/league_outline_reader.rb
 - lib/sportdb/formats/league/league_reader.rb
+- lib/sportdb/formats/lines_reader.rb
 - lib/sportdb/formats/match/conf_parser.rb
 - lib/sportdb/formats/match/mapper.rb
 - lib/sportdb/formats/match/mapper_teams.rb
@@ -104,39 +103,19 @@ files:
 - lib/sportdb/formats/outline_reader.rb
 - lib/sportdb/formats/package.rb
 - lib/sportdb/formats/parser_helper.rb
-- lib/sportdb/formats/team/club_index.rb
+- lib/sportdb/formats/search/sport.rb
+- lib/sportdb/formats/search/world.rb
 - lib/sportdb/formats/team/club_index_history.rb
 - lib/sportdb/formats/team/club_reader.rb
 - lib/sportdb/formats/team/club_reader_history.rb
 - lib/sportdb/formats/team/club_reader_props.rb
-- lib/sportdb/formats/team/national_team_index.rb
-- lib/sportdb/formats/team/team_index.rb
 - lib/sportdb/formats/team/wiki_reader.rb
 - lib/sportdb/formats/version.rb
-- test/helper.rb
-- test/test_club_index.rb
-- test/test_club_index_history.rb
-- test/test_club_reader.rb
-- test/test_club_reader_history.rb
-- test/test_club_reader_props.rb
-- test/test_country_index.rb
-- test/test_country_reader.rb
-- test/test_datafile.rb
-- test/test_datafile_package.rb
-- test/test_goals.rb
-- test/test_league_index.rb
-- test/test_league_outline_reader.rb
-- test/test_league_reader.rb
-- test/test_outline_reader.rb
-- test/test_package.rb
-- test/test_package_match.rb
-- test/test_regex.rb
-- test/test_wiki_reader.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -153,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: sportdb-formats - sport.db format and text utilities
 test_files: []

data/lib/sportdb/formats/country/country_index.rb

@@ -1,192 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-module Import
-
-## built-in countries for (quick starter) auto-add
-class CountryIndex
-
-  attr_reader :countries     ## all country records
-
-  def initialize( recs )
-    @countries         = []
-    @countries_by_code = {}
-    @countries_by_name = {}
-
-    add( recs )
-  end
-
-
-  ## helpers from country - use a helper module for includes (share with clubs etc.) - why? why not?
-  include NameHelper
-  ## incl. strip_year( name )
-  ##       has_year?( name)
-  ##       strip_lang( name )
-  ##       normalize( name )
-
-
-  def add( recs )
-    ###########################################
-    ## auto-fill countries
-    ## pp recs
-    recs.each do |rec|
-      ## rec e.g. { key:'af', code:'AFG', name:'Afghanistan'}
-
-      @countries << rec
-
-      ## add codes lookups - key, code, ...
-      if @countries_by_code[ rec.key ]
-        puts "** !! ERROR !! country code (key) >#{rec.key}< already exits!!"
-        exit 1
-      else
-        @countries_by_code[ rec.key ] = rec
-      end
-
-      ## add  code (only) if different from key
-      if rec.key != rec.code.downcase
-        if @countries_by_code[ rec.code.downcase ]
-          puts "** !! ERROR !! country code  >#{rec.code.downcase}< already exits!!"
-          exit 1
-        else
-          @countries_by_code[ rec.code.downcase ] = rec
-        end
-      end
-
-
-      ##  add all names (canonical name + alt names
-      names = [rec.name] + rec.alt_names
-      more_names = []
-      ## check "hand-typed" names for year (auto-add)
-      ## check for year(s) e.g. (1887-1911), (-2013),
-      ##                        (1946-2001,2013-) etc.
-      names.each do |name|
-        if has_year?( name )
-          more_names <<  strip_year( name )
-        end
-      end
-
-      names += more_names
-      ## check for duplicates - simple check for now - fix/improve
-      ## todo/fix: (auto)remove duplicates - why? why not?
-      count      = names.size
-      count_uniq = names.uniq.size
-      if count != count_uniq
-        puts "** !!! ERROR !!! - #{count-count_uniq} duplicate name(s):"
-        pp names
-        pp rec
-        exit 1
-      end
-
-      names.each_with_index do |name,i|
-        ## check lang codes e.g. [en], [fr], etc.
-        ##  todo/check/fix:  move strip_lang up in the chain - check for duplicates (e.g. only lang code marker different etc.) - why? why not?
-        name = strip_lang( name )
-        norm = normalize( name )
-        old_rec = @countries_by_name[ norm ]
-        if old_rec
-          ## check if country name already is included or is new country rec
-            msg = "** !!! ERROR !!! - name conflict/duplicate - >#{name}< will overwrite >#{old_rec.name}< with >#{rec.name}<"
-            puts msg
-            exit 1
-        else
-          @countries_by_name[ norm ] = rec
-        end
-      end
-
-    end  ## each record
-  end # method initialize
-
-
-
-  ##  fix/todo: add  find_by (alias for find_by_name/find_by_code)
-  def find_by_code( code )
-    code = code.to_s.downcase   ## allow symbols (and always downcase e.g. AUT to aut etc.)
-    @countries_by_code[ code ]
-  end
-
-  def find_by_name( name )
-    name = normalize( name.to_s )  ## allow symbols too (e.g. use to.s first)
-    @countries_by_name[ name ]
-  end
-
-  def find( key )
-    country = find_by_code( key )
-    country = find_by_name( key )  if country.nil?     ## try lookup / find by (normalized) name
-    country
-  end
-  alias_method :[], :find
-
-
-  ###
-  ##   split/parse country line
-  ##
-  ##  split on bullet e.g.
-  ##   split into name and code with regex - make code optional
-  ##
-  ##  Examples:
-  ##    Österreich • Austria (at)
-  ##    Österreich • Austria
-  ##    Austria
-  ##    Deutschland (de) • Germany
-  ##
-  ##   todo/check: support more formats - why? why not?
-  ##       e.g.  Austria, AUT  (e.g. with comma - why? why not?)
-  def parse( line )
-    values = line.split( '•' )   ## use/support multi-lingual separator
-    country = nil
-    values.each do |value|
-       value = value.strip
-       ## check for trailing country code e.g. (at), (eng), etc.
-       if value =~ /[ ]+\((?<code>[a-z]{1,4})\)$/  ## e.g. Austria (at)
-         code =  $~[:code]
-         name = value[0...(value.size-code.size-2)].strip  ## note: add -2 for brackets
-         candidates = [ find_by_code( code ), find_by_name( name ) ]
-         if candidates[0].nil?
-           puts "** !!! ERROR !!! country - unknown code >#{code}< in line: #{line}"
-           pp line
-           exit 1
-         end
-         if candidates[1].nil?
-           puts "** !!! ERROR !!! country - unknown name >#{code}< in line: #{line}"
-           pp line
-           exit 1
-         end
-         if candidates[0] != candidates[1]
-           puts "** !!! ERROR !!! country - name and code do NOT match the same country:"
-           pp line
-           pp candidates
-           exit 1
-         end
-         if country && country != candidates[0]
-           puts "** !!! ERROR !!! country - names do NOT match the same country:"
-           pp line
-           pp country
-           pp candidates
-           exit 1
-         end
-         country = candidates[0]
-       else
-         ## just assume value is name or code
-         candidate = find( value )
-         if candidate.nil?
-           puts "** !!! ERROR !!! country - unknown name or code >#{value}< in line: #{line}"
-           pp line
-           exit 1
-         end
-         if country && country != candidate
-           puts "** !!! ERROR !!! country - names do NOT match the same country:"
-           pp line
-           pp country
-           pp candidate
-           exit 1
-         end
-         country = candidate
-       end
-    end
-    country
-  end # method parse
-end # class CountryIndex
-
-
-end   # module Import
-end   # module SportDb

data/lib/sportdb/formats/event/event_index.rb

@@ -1,141 +0,0 @@
-module SportDb
-module Import
-
-
-
-class EventIndex
-
-    def self.build( path )
-      pack = Package.new( path )   ## lets us use direcotry or zip archive
-
-      recs = []
-      pack.each_seasons do |entry|
-        recs += EventInfoReader.parse( entry.read )
-      end
-      recs
-
-      index = new
-      index.add( recs )
-      index
-    end
-
-
-
-    attr_reader :events
-    def initialize
-      @events  = []
-      @leagues = {}
-    end
-
-    def add( recs )
-      @events += recs  ## add to "linear" records
-
-      recs.each do |rec|
-        league = rec.league
-        season = rec.season
-
-        seasons = @leagues[ league.key ] ||= {}
-        seasons[season.key] = rec
-      end
-      ## build search index by leagues (and season)
-    end
-
-    def find_by( league:, season: )
-      league_key = league.is_a?( String ) ? league : league.key
-      season_key = season.is_a?( String ) ? season : season.key
-
-      seasons = @leagues[ league_key ]
-      if seasons
-        seasons[ season_key ]
-      else
-        nil
-      end
-    end # method find_by
-end  ## class EventIndex
-
-
-
-class SeasonIndex
-    def initialize( *args )
-       @leagues = {}   ## use a league hash by years for now; change later
-
-       if args.size == 1 && args[0].is_a?( EventIndex )
-         ## convenience setup/hookup
-         ##  (auto-)add all events from event index
-         add( args[0].events )
-       else
-         pp args
-         raise ArgumentError.new( 'unsupported arguments' )
-       end
-    end
-
-    def add( recs )
-      ## use a lookup index by year for now
-      ##  todo - find something better/more generic for searching/matching date periods!!!
-      recs.each do |rec|
-        league = rec.league
-        season = rec.season
-
-        years = @leagues[ league.key ] ||= {}
-        if season.year?
-          years[season.start_year] ||= []
-          years[season.start_year] << rec
-        else
-          years[season.start_year] ||= []
-          years[season.end_year]   ||= []
-          years[season.start_year] << rec
-          years[season.end_year]   << rec
-        end
-      end
-    end # method add
-
-    def find_by( date:, league: )
-       date = Date.strptime( date, '%Y-%m-%d' )   if date.is_a?( String )
-       league_key = league.is_a?( String ) ? league : league.key
-
-       years = @leagues[ league_key ]
-       if years
-           year = years[ date.year ]
-           if year
-               season_key = nil
-               year.each do |event|
-                 ##  todo/check: rename/use between? instead of include? - why? why not?
-                 if event.include?( date )
-                   season_key = event.season.key
-                   break
-                 end
-               end
-               if season_key.nil?
-                 puts "!! WARN: date >#{date}< out-of-seasons for year #{date.year} in league #{league_key}:"
-                 year.each do |event|
-                   puts "  #{event.season.key} |  #{event.start_date} - #{event.end_date}"
-                 end
-                 ## retry again and pick season with "overflow" at the end (date is great end_date)
-                 year.each do |event|
-                   if date > event.end_date
-                     diff_in_days = date.to_date.jd - event.end_date.to_date.jd
-                     puts "    +#{diff_in_days} days - adding overflow to #{event.season.key} ending on #{event.end_date} ++ #{date}"
-                     season_key = event.season.key
-                     break
-                   end
-                 end
-                 ## exit now for sure - if still empty!!!!
-                 if season_key.nil?
-                   puts "!! ERROR: CANNOT auto-fix / (auto-)append date at the end of an event; check season setup - sorry"
-                   exit 1
-                 end
-               end
-               season_key
-           else
-             nil   ## no year defined / found for league
-           end
-       else
-          nil   ## no league defined / found
-       end
-   end  # method find
-
-end # class SeasonIndex
-
-
-end   # module Import
-end   # module SportDb