sportdb-formats 2.0.1 → 2.1.0

data/lib/sportdb/formats.rb

@@ -1,17 +1,15 @@
 ## 3rd party gems
-require 'sportdb/structs'
-require 'sportdb/parser'
-require 'date/formats'
+# require 'sportdb/structs'
+# require 'sportdb/parser'
+require 'sportdb/quick'
 
 
 require 'zip'     ## todo/check: if zip is alreay included in a required module
 
 
-## note -  add cocos (code commons)
-##
-##  pulls in read_csv & parse_csv etc.
-require 'cocos'
 
+## todo/check
+##  - logutils already added via quick!!
 
 require 'logutils'
 module SportDb
@@ -26,10 +24,8 @@ end
 # our own code
 require_relative 'formats/version' # let version always go first
 
-require_relative 'formats/datafile'
-require_relative 'formats/datafile_package'
 require_relative 'formats/package'
-
+require_relative 'formats/datafile_package'
 
 
 ## let's put test configuration in its own namespace / module
@@ -46,271 +42,16 @@ end   # module SportDb
 
 
 
-###
-# define search services apis  (move to its own gem later - why? why not?)
-
-module SportDb
-module Import
-
-class Configuration
-  def world()        @world ||= WorldSearch.new( countries: DummyCountrySearch.new ); end
-  def world=(world)  @world = world; end
-
-  ## todo/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
-
-  ## 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
-end   # module SportDb
-
-
-require_relative 'formats/search/world'
-require_relative 'formats/search/sport'
-require_relative 'formats/search/structs'
-
-
-
-module Sports
-  ## note: just forward to SportDb::Import configuration!!!!!
-  ##  keep Sports module / namespace "clean" - why? why not?
-  ##    that is, only include data structures (e.g. Match,League,etc) for now - why? why not?
-  def self.configure()  yield( config ); end
-  def self.config()  SportDb::Import.config; end
-end   # module Sports
-
-
-###
-#  csv (tabular dataset) support / machinery
-require_relative 'formats/csv/match_status_parser'
-require_relative 'formats/csv/goal'
-require_relative 'formats/csv/goal_parser_csv'
-require_relative 'formats/csv/match_parser_csv'
-
-
-### add convenience shortcut helpers
-module Sports
-  class Match
-    def self.read_csv( path, headers: nil, filters: nil, converters: nil, sep: nil )
-       SportDb::CsvMatchParser.read( path,
-                                       headers:    headers,
-                                       filters:    filters,
-                                       converters: converters,
-                                       sep:        sep )
-    end
-
-    def self.parse_csv( txt, headers: nil, filters: nil, converters: nil, sep: nil )
-       SportDb::CsvMatchParser.parse( txt,
-                                        headers:    headers,
-                                        filters:    filters,
-                                        converters: converters,
-                                        sep:        sep )
-    end
-  end # class Match
-end # module Sports
-
-
-
-
-
-
-
-
-module SportDb
-  module Import
-    Season = ::Season   ## add a convenience alias for top-level Season class
-
-    ## add "old" convenience aliases for structs - why? why not?
-    ##   todo/check: just use include Sports !!!!
-    Country      = ::Sports::Country
-    League       = ::Sports::League
-    Group        = ::Sports::Group
-    Round        = ::Sports::Round
-    Match        = ::Sports::Match
-    Matchlist    = ::Sports::Matchlist
-    Goal         = ::Sports::Goal
-    Team         = ::Sports::Team
-    NationalTeam = ::Sports::NationalTeam
-    Club         = ::Sports::Club
-    Standings    = ::Sports::Standings
-    TeamUsage    = ::Sports::TeamUsage
-
-    Ground       = ::Sports::Ground
-
-    Player       = ::Sports::Player
-
-    EventInfo    = ::Sports::EventInfo
-
-
-    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
-
-
-require_relative 'formats/match/match_parser'
-require_relative 'formats/match/conf_parser'
-
-
-
-require_relative 'formats/country/country_reader'
-
-
-## add convenience helper
-module SportDb
-module Import
-class Country
-  def self.read( path )  CountryReader.read( path ); end
-  def self.parse( txt )  CountryReader.parse( txt ); end
-end   # class Country
-end   # module Import
-end   # module SportDb
-
-
-require_relative 'formats/league/league_reader'
-require_relative 'formats/league/league_outline_reader'
-
-##
-## add convenience helper / short-cuts
-module SportDb
-module Import
-class League
-  def self.read( path ) LeagueReader.read( path ); end
-  def self.parse( txt ) LeagueReader.parse( txt ); end
-end   # class League
-end   # module Import
-end   # module SportDb
-
-
-require_relative 'formats/team/club_reader'
-require_relative 'formats/team/club_reader_props'
-require_relative 'formats/team/wiki_reader'
-
-require_relative 'formats/team/club_reader_history'
-require_relative 'formats/team/club_index_history'
-
-
-###
-# add convenience helpers / shortcuts
-module SportDb
-  module Import
-
-class Club
-  def self.read( path )  ClubReader.read( path ); end
-  def self.parse( txt )  ClubReader.parse( txt ); end
-
-  def self.read_props( path )  ClubPropsReader.read( path ); end
-  def self.parse_props( txt )  ClubPropsReader.parse( txt ); end
-  ##  todo/check: use ClubProps.read and ClubProps.parse convenience alternate shortcuts - why? why not?
-end # class Club
-
-end   # module Import
-end   # module SportDb
-
-
-require_relative 'formats/event/event_reader'
-
-## add convenience helper
-module SportDb
-module Import
-class EventInfo
-  def self.read( path )  EventInfoReader.read( path ); end
-  def self.parse( txt )  EventInfoReader.parse( txt ); end
-end   # class EventInfo
-end   # module Import
-end   # module SportDb
-
-
-
-require_relative 'formats/ground/ground_reader'
+require_relative 'formats/quick_match_linter'
 
 
+# require_relative 'formats/team/club_reader_history'
+# require_relative 'formats/team/club_index_history'
 
 
 
 ### auto-configure builtin lookups via catalog.db(s)
-require 'sportdb/catalogs'
-
-
-module SportDb
-module Import
-
-class Configuration
-  ## note: add more configs (open class), see sportdb-structs for original config!!!
-
-  ###
-  #  find a better name for setting - why? why not?
-  #     how about catalogdb or ???
-  attr_reader   :catalog_path
-  def catalog_path=(path)
-      @catalog_path = path
-      ########
-      # reset database here to new path
-      CatalogDb::Metal::Record.database = path
-
-      ##  plus automagically set world search too (to use CatalogDb)
-      self.world = WorldSearch.new(
-                          countries: CatalogDb::Metal::Country,
-                          cities:    CatalogDb::Metal::City,
-                        )
-
-      @catalog_path
-  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 playersdb or ???
-  attr_reader   :players_path
-  def players_path=(path)
-      @players_path = path
-      ########
-      # reset database here to new path
-      CatalogDb::Metal::PlayerRecord.database = path
-
-      @players_path
-  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
-end   # module Import
-end   # module SportDb
-
-
-###
-## add default/built-in catalog here - why? why not?
-##  todo/fix  - set catalog_path on demand
-##   note:  for now required for world search setup etc.
-SportDb::Import.config.catalog_path = "#{FootballDb::Data.data_dir}/catalog.db"
+require 'sportdb/search'
 
 
 

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-structs
+  name: sportdb-search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: sportdb-parser
+  name: sportdb-quick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,62 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: sportdb-catalogs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: date-formats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: cocos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +88,8 @@ dependencies:
         version: '4.1'
 description: sportdb-formats - sport.db format and text utilities
 email: gerald.bauer@gmail.com
-executables: []
+executables:
+- fbchk
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -155,29 +100,12 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- bin/fbchk
 - lib/sportdb/formats.rb
-- lib/sportdb/formats/country/country_reader.rb
-- lib/sportdb/formats/csv/goal.rb
-- lib/sportdb/formats/csv/goal_parser_csv.rb
-- lib/sportdb/formats/csv/match_parser_csv.rb
-- lib/sportdb/formats/csv/match_status_parser.rb
-- lib/sportdb/formats/datafile.rb
 - lib/sportdb/formats/datafile_package.rb
-- lib/sportdb/formats/event/event_reader.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/match/conf_parser.rb
-- lib/sportdb/formats/match/match_parser.rb
 - lib/sportdb/formats/package.rb
-- lib/sportdb/formats/search/sport.rb
-- lib/sportdb/formats/search/structs.rb
-- lib/sportdb/formats/search/world.rb
+- lib/sportdb/formats/quick_match_linter.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/wiki_reader.rb
 - lib/sportdb/formats/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:

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

@@ -1,142 +0,0 @@
-# encoding: utf-8
-
-
-module SportDb
-module Import
-
-
-class CountryReader
-
-
-def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
-  txt = File.open( path, 'r:utf-8' ) { |f| f.read }
-  parse( txt )
-end
-
-def self.parse( txt )
-  new( txt ).parse
-end
-
-
-def initialize( txt )
-  @txt = txt
-end
-
-def parse
-  countries    = []
-  last_country = nil    ## note/check/fix: use countries[-1] - why? why not?
-
-  OutlineReader.parse( @txt ).each do |node|
-
-     node_type = node[0]
-
-     if [:h1, :h2].include?( node_type )
-       ## skip headings (and headings) for now too
-     elsif node_type == :p    ## paragraph
-      lines = node[1]
-      lines.each do |line|
-      if line.start_with?( '|' )
-        ## assume continuation with line of alternative names
-        ##  note: skip leading pipe
-        values = line[1..-1].split( '|' )   # team names - allow/use pipe(|)
-        ## strip and squish (white)spaces
-        #   e.g. East Germany        (-1989)  => East Germany (-1989)
-        values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
-        last_country.alt_names += values
-      elsif line =~ /^-[ ]*(\d{4})
-                        [ ]+
-                       (.+)$
-                    /x     ## check for historic lines e.g. -1989
-         year   = $1.to_i
-         parts  = $2.split( /=>|⇒/ )
-         values = parts[0].split( ',' )
-         values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
-
-         name = values[0]
-         code = values[1]
-
-         last_country = country = Country.new( name: "#{name} (-#{year})",
-                                               code: code )
-         ## country.alt_names << name    ## note: for now do NOT add name without year to alt_names - gets auto-add by index!!!
-
-         countries << country
-         ## todo/fix: add reference to country today (in parts[1] !!!!)
-      else
-        ## assume "regular" line
-        ##  check if starts with id  (todo/check: use a more "strict"/better regex capture pattern!!!)
-        ##   note: allow country codes upto 4 (!!) e.g. Northern Cyprus
-        if line =~ /^([a-z]{2,4})
-                        [ ]+
-                       (.+)$/x
-          key    = $1
-          values = $2.split( ',' )
-          ## strip and squish (white)spaces
-          #   e.g. East Germany        (-1989)  => East Germany (-1989)
-          values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
-
-          ## note: remove "overlords" from geo-tree marked territories  e.g. UK, US, etc. from name
-          ##    e.g. England › UK      => England
-          ##         Puerto Rico › US  => Puerto Rico
-          geos = split_geo( values[0] )
-          name = geos[0]    ## note: ignore all other geos for now
-
-          ##   note: allow country codes up to 4 (!!) e.g. Northern Cyprus
-          code = if values[1] && values[1] =~ /^[A-Z]{3,4}$/   ## note: also check format
-                   values[1]
-                 else
-                   if values[1]
-                     puts "** !!! ERROR !!! wrong code format >#{values[1]}<; expected three (or four)-letter all up-case"
-                   else
-                     puts "** !!! ERROR !!! missing code for (canonical) country name"
-                   end
-                   exit 1
-                 end
-
-          tags = if values[2]   ## check if tags presents
-                   split_tags( values[2] )
-                 else
-                   []
-                 end
-
-          last_country = country = Country.new( key: key,
-                                                name: name,
-                                                code: code,
-                                                tags: tags )
-          countries << country
-        else
-          puts "** !! ERROR - missing key for (canonical) country name"
-          exit 1
-        end
-      end
-      end  # each line
-    else
-      puts "** !! ERROR - unknown node type / (input) source line:"
-      pp node
-      exit 1
-    end
-  end    # each node
-
-  countries
-end  # method parse
-
-
-
-#######################################
-##  helpers
-def split_tags( str )
-  tags = str.split( /[|<>‹›]/ )   ## allow pipe (|) and (<>‹›) as divider for now - add more? why? why not?
-  tags = tags.map { |tag| tag.strip }
-  tags
-end
-
-def split_geo( str )   ## todo/check: rename to parse_geo(s) - why? why not?
-  ## split into geo tree
-  geos = str.split( /[<>‹›]/ )          ## note: allow > < or › ‹ for now
-  geos = geos.map { |geo| geo.strip }   ## remove all whitespaces
-  geos
-end
-
-end  # class CountryReader
-
-end   # module Import
-end   # module SportDb