sportdb-formats 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1efe8dd989cd71d6a1860f9b0845b9aa96fadab5abe9e381bcae2cb3da77d5a
-  data.tar.gz: d03be83401dec8b4ad1c09455d11c307bb4bd83e706d47c2ce8950dae1744e10
+  metadata.gz: 349708bb8a9fc26f5bc6ce47fd8b9b08b37f243e04e017fc22fa1057a165b733
+  data.tar.gz: 9fb3ba56070b20d14aff9f8804c2201a0fb5599ff111fa8b454ddf32fe81e264
 SHA512:
-  metadata.gz: 64e3013796d515b02564e179bb3b0eed1bc12a671f9f0615d613c9f86dc3eea465a0ff6680904c5f1465dc7b252791bc8ae4012c914599bbcddf1534aa77d705
-  data.tar.gz: f1f9ed7ec7fc1fb6af8fb143f7510e503d70d0e7ab6114763b2bdc3aef545d9dde6b0a6bdff4064e273268d5ba0b01e865aaeeebeee3d1c42ffd6767c47b2db8
+  metadata.gz: e3ffff589ba03e431c46d9244cb660572b94aa1f95ceb3d7d1b71182048d7c024bddeeaec6b43e36ddf0353071d4cb85b5db62f0a427677ce5e20a40cd347691
+  data.tar.gz: 8a75b96b980429392dd9e909ba4f8441b96b129ec2cb6745eef65cf481889fb77ab426340ee277a28f6def7ae42e6de20f6d307aed082bea0df357d79d014ad0

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 2.0.0
+### 2.0.1
 
 ### 0.0.1 / 2019-10-28
 

data/Manifest.txt

@@ -16,7 +16,6 @@ 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/name_helper.rb
 lib/sportdb/formats/package.rb
 lib/sportdb/formats/search/sport.rb
 lib/sportdb/formats/search/structs.rb

data/README.md

@@ -1,11 +1,10 @@
-# sportdb-formats - sport.db format and text utilities  
+# sportdb-formats - sport.db format and text utilities
 
 
 * home  :: [github.com/sportdb/sport.db](https://github.com/sportdb/sport.db)
 * bugs  :: [github.com/sportdb/sport.db/issues](https://github.com/sportdb/sport.db/issues)
 * gem   :: [rubygems.org/gems/sportdb-formats](https://rubygems.org/gems/sportdb-formats)
 * rdoc  :: [rubydoc.info/gems/sportdb-formats](http://rubydoc.info/gems/sportdb-formats)
-* forum :: [opensport](http://groups.google.com/group/opensport)
 
 
 
@@ -19,8 +18,10 @@ The `sportdb-formats` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
 
+
 ## Questions? Comments?
 
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+Yes, you can. More than welcome.
+See [Help & Support »](https://github.com/openfootball/help)
+
+

data/Rakefile

@@ -20,13 +20,14 @@ Hoe.spec 'sportdb-formats' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-structs', '>= 0.3.0'],
-    ['sportdb-parser',  '>= 0.2.0'],
-    ['date-formats',    '>= 1.0.2'],
-    ['cocos',           '>= 0.4.0'],
-    ['logutils',        '>= 0.6.1'],
-
-    ['rubyzip',         '>= 2.3.2' ],
+    ['sportdb-structs',  '>= 0.3.1'],
+    ['sportdb-parser',   '>= 0.2.0'],
+    ['sportdb-catalogs', '>= 1.2.2'],
+    ['date-formats',     '>= 1.0.2'],
+    ['cocos',            '>= 0.4.0'],
+    ['logutils',         '>= 0.6.1'],
+
+    ['rubyzip',          '>= 2.3.2' ],
   ]
 
   self.spec_extras = {

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

@@ -1,71 +1,6 @@
 
 module SportDb
 module Import
-
-
-class EventInfo
-    ##  "high level" info (summary) about event 
-    ##    (like a "wikipedia infobox")
-    ##    use for checking dataset imports; lets you check e.g.
-    ##    - dates within range
-    ##    - number of teams e.g. 20
-    ##    - matches played e.g. 380
-    ##    - goals scored e.g. 937
-    ##    etc.
-
-    attr_reader :league,
-                :season,
-                :teams,
-                :matches,
-                :goals,
-                :start_date,
-                :end_date
-
-    def initialize( league:, season:,
-                    start_date: nil, end_date: nil,
-                    teams:   nil,
-                    matches: nil,
-                    goals:   nil )
-
-      @league      = league
-      @season      = season
-
-      @start_date  = start_date
-      @end_date    = end_date
-
-      @teams       = teams    ## todo/check: rename/use teams_count ??
-      @matches     = matches  ## todo/check: rename/use match_count ??
-      @goals       = goals
-    end
-
-    def include?( date )
-       ## todo/fix: add options e.g.
-       ##  - add delta/off_by_one or such?
-       ##  - add strict (for) only return true if date range (really) defined (no generic auto-rules)
-
-      ### note: for now allow off by one error (via timezone/local time errors)
-      ##    todo/fix: issue warning if off by one!!!!
-      if @start_date && @end_date
-        date >= (@start_date-1) &&
-        date <= (@end_date+1)
-      else
-        if @season.year?
-           # assume generic rule
-           ## same year e.g. Jan 1 - Dec 31; always true for now
-           date.year == @season.start_year
-        else
-           # assume generic rule
-           ##  July 1 - June 30 (Y+1)
-           ##  - todo/check -start for some countries/leagues in June 1 or August 1 ????
-           date >= Date.new( @season.start_year, 7, 1 ) &&
-           date <= Date.new( @season.end_year, 6, 30 )
-        end
-      end
-    end  # method include?
-    alias_method :between?, :include?
-  end # class EventInfo
-
-
   class EventInfoReader
     def catalog() Import.catalog; end
 

data/lib/sportdb/formats/version.rb

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

data/lib/sportdb/formats.rb

@@ -30,8 +30,6 @@ require_relative 'formats/datafile'
 require_relative 'formats/datafile_package'
 require_relative 'formats/package'
 
-require_relative 'formats/name_helper'
-
 
 
 ## let's put test configuration in its own namespace / module
@@ -151,6 +149,8 @@ module SportDb
 
     Player       = ::Sports::Player
 
+    EventInfo    = ::Sports::EventInfo
+
 
     class Team
       ## add convenience lookup helper / method for name by season for now
@@ -243,4 +243,75 @@ require_relative 'formats/ground/ground_reader'
 
 
 
+
+
+### 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"
+
+
+
 puts SportDb::Module::Formats.banner   # say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ 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
@@ -155,7 +169,6 @@ files:
 - lib/sportdb/formats/league/league_reader.rb
 - lib/sportdb/formats/match/conf_parser.rb
 - lib/sportdb/formats/match/match_parser.rb
-- lib/sportdb/formats/name_helper.rb
 - lib/sportdb/formats/package.rb
 - lib/sportdb/formats/search/sport.rb
 - lib/sportdb/formats/search/structs.rb

data/lib/sportdb/formats/name_helper.rb

@@ -1,87 +0,0 @@
-
-module SportDb
-  module NameHelper
-
-
-  ## note: allow placeholder years to e.g. (-___) or (-????)
-  ##    for marking missing (to be filled in) years
-  ##  e.g. (1887-1911), (-2013),
-  ##      (1946-2001, 2013-) etc.
-  ##  todo/check: make more strict  e.g. only accept 4-digit years? - why? why not?
-  YEAR_RE =  %r{\(
-                  [0-9, ?_-]+?     # note: non-greedy (minimum/first) match
-              \)}x
-
-  def strip_year( name )
-    ## check for year(s) e.g. (1887-1911), (-2013),
-    ##                        (1946-2001, 2013-) etc.
-    ##  todo/check: only sub once (not global) - why? why not?
-    name.gsub( YEAR_RE, '' ).strip
-  end
-
-  def has_year?( name ) name =~ YEAR_RE; end
-
-
-  LANG_RE =  %r{\[
-                [a-z]{1,2}    # note also allow single-letter [a] or [d] or [e] - why? why not?
-                \]}x
-  def strip_lang( name )
-     name.gsub( LANG_RE, '' ).strip
-  end
-
-  def has_lang?( name ) name =~ LANG_RE; end
-
-
-  def sanitize( name )
-    ## check for year(s) e.g. (1887-1911), (-2013),
-    ##                        (1946-2001,2013-) etc.
-    name = strip_year( name )
-    ## check lang codes e.g. [en], [fr], etc.
-    name = strip_lang( name )
-    name
-  end
-
-
-  ## note: also add (),’,−  etc. e.g.
-  ##   Estudiantes (LP) => Estudiantes LP
-  ##   Saint Patrick’s Athletic FC => Saint Patricks Athletic FC
-  ##   Myllykosken Pallo −47 => Myllykosken Pallo 47
-  ##
-  ##  add & too!!
-  ##   e.g. Brighton & Hove Albion => Brighton Hove Albion  -- and others in England
-
-  NORM_RE =  %r{
-                    [.'’º/()&_−-]
-                  }x   # note: in [] dash (-) if last doesn't need to get escaped
-  ## note: remove all dots (.), dash (-), ', º, /, etc.
-  #   .  U+002E (46) - FULL STOP
-  #   '  U+0027 (39) - APOSTROPHE
-  #   ’  U+2019 (8217) - RIGHT SINGLE QUOTATION MARK
-  #   º  U+00BA (186) - MASCULINE ORDINAL INDICATOR
-  #   /  U+002F (47) - SOLIDUS
-  #   (  U+0028 (40) - LEFT PARENTHESIS
-  #   )  U+0029 (41) - RIGHT PARENTHESIS
-  #   −  U+2212 (8722) - MINUS SIGN
-  #   -  U+002D (45) - HYPHEN-MINUS
-
-  ##         for norm(alizing) names
-  def strip_norm( name )
-    name.gsub( NORM_RE, '' )
-  end
-
-  def normalize( name )
-    # note: do NOT call sanitize here (keep normalize "atomic" for reuse)
-    name = strip_norm( name )
-    name = name.gsub( ' ', '' )  # note: also remove all spaces!!!
-
-    ## todo/check: use our own downcase - why? why not?
-    name = downcase_i18n( name )     ## do NOT care about upper and lowercase for now
-    name
-  end
-
-
-  def variants( name )  Variant.find( name ); end
-
-  end  # module NameHelper
-end   # module SportDb
-