sportdb-structs 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c966a814cdade0a21ea6453fc1900bfc8c384a8ceecaa34dc158e6d60bfd39b5
-  data.tar.gz: 5086fb02b42d15da5f93780121de2ba77012de34be0ff51134a06b97136c5f00
+  metadata.gz: 70fb10b4bb83d5146eb004d6c3143045e0efa430095a091429c51695a15461c6
+  data.tar.gz: b8377ca328aec94770b9d7e90fc60b83cbf2264a4b9ce295af7acd4846586f78
 SHA512:
-  metadata.gz: fb26346fb4a76ced79e7bbb4518e5bcdb26b7128583a17ff963e3b1bc8c2198d41115babfadb06fc9331fb21c5b06059162510961f330cce58dee96aa7e16c17
-  data.tar.gz: b2d9c498d7cd119637e71b546e84d586329dd6e9186ffaaf8c93d27d5a9e3b2f4b8e1c37a69f09cbdfbc98f94ffb695b632c91c81c35c6c6dddae3c0d60e3c06
+  metadata.gz: edb013626541448b4f4211d2afc779f018fe27a7b2b33af99bfce9a0876d243d4ba4079677ce7e14e5911ad7e013992632600dd5bee0958db7fc37900ded7a55
+  data.tar.gz: '08964910e951e7c92ef3a46a5348b1111109d326d9aed0a41311a63047de63f6a11c21bffbe8cb0f5becdb78240b66ab17817e89b2eca53059ea7b8ed601756a'

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.0
+### 0.4.0
 
 ### 0.0.1 / 2020-08-24
 

data/Manifest.txt

@@ -4,12 +4,14 @@ README.md
 Rakefile
 lib/sportdb/structs.rb
 lib/sportdb/structs/country.rb
+lib/sportdb/structs/event_info.rb
 lib/sportdb/structs/goal.rb
 lib/sportdb/structs/ground.rb
 lib/sportdb/structs/group.rb
 lib/sportdb/structs/league.rb
 lib/sportdb/structs/match.rb
 lib/sportdb/structs/matchlist.rb
+lib/sportdb/structs/name_helper.rb
 lib/sportdb/structs/round.rb
 lib/sportdb/structs/standings.rb
 lib/sportdb/structs/team.rb

data/README.md

@@ -5,7 +5,6 @@
 * bugs  :: [github.com/sportdb/sport.db/issues](https://github.com/sportdb/sport.db/issues)
 * gem   :: [rubygems.org/gems/sportdb-structs](https://rubygems.org/gems/sportdb-structs)
 * rdoc  :: [rubydoc.info/gems/sportdb-structs](http://rubydoc.info/gems/sportdb-structs)
-* forum :: [opensport](http://groups.google.com/group/opensport)
 
 
 

data/Rakefile

@@ -26,6 +26,6 @@ Hoe.spec 'sportdb-structs' do
   ]
 
   self.spec_extras = {
-    required_ruby_version: '>= 2.2.2'
+    required_ruby_version: '>= 3.1.0'
   }
 end

data/lib/sportdb/structs/event_info.rb

@@ -0,0 +1,65 @@
+module Sports
+
+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
+
+end  # module Sports

data/lib/sportdb/structs/match.rb

@@ -178,8 +178,59 @@ class Match
   # def scorei_str    # pretty print (half time) scores; convenience method
   #  "#{@score1i}-#{@score2i}"
   # end
-end  # class Match
 
+
+def as_json
+  ##
+  data = {}
+
+  ## check round
+  if @round
+    data[:round ] = if round.is_a?( Integer )
+                      "Matchday #{@round}"
+                    else ## assume string
+                      @round
+                    end
+  end
+
+
+  data[:num] = @num    if @num
+  if @date
+    ## assume 2020-09-19 date format!!
+    data[:date]  = @date.is_a?( String ) ? @date : @date.strftime('%Y-%m-%d')
+
+    data[:time] = @time  if @time
+  end
+
+  data[:team1] =  @team1.is_a?( String ) ? @team1 : @team1.name
+  data[:team2] =  @team2.is_a?( String ) ? @team2 : @team2.name
+
+  data[:score] = {}
+
+  data[:score][:ht] = [@score1i,   @score2i]     if @score1i && @score2i
+  data[:score][:ft] = [@score1,    @score2]      if @score1 && @score2
+  data[:score][:et] = [@score1et,  @score2et]    if @score1et && @score2et
+  data[:score][:p]  = [@score1p,   @score2p]     if @score1p && @score2p
+
+  data[:group]  = @group   if @group
+
+=begin
+      "round": "Spieltag 1",
+      "date": "2020-09-19",
+      "team1": "Eintracht Frankfurt",
+      "team2": "Arminia Bielefeld",
+      "score": {
+        "ft": [
+          1,
+          1
+        ]
+      }
+=end
+  data
+end
+
+
+end  # class Match
 end # module Sports
 
 

data/lib/sportdb/structs/name_helper.rb

@@ -0,0 +1,87 @@
+
+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
+

data/lib/sportdb/structs/round.rb

@@ -18,18 +18,19 @@ module Sports
         @auto       = auto        # auto-created (inline reference/header without proper definition before)
       end
 
-      def pretty_print( printer ) 
-        ## todo/check - how to display/format key - use () or not - why? why not? 
+      def pretty_print( printer )
+        ## todo/check - how to display/format key - use () or not - why? why not?
         buf = String.new
         buf << "<Round: "
         buf << "(#{@num}) "  if @num
         buf << "#{@name}, "
-        buf << "#{@start_date} - #{@end_date}"
+        buf << "#{@start_date}"
+        buf << " - #{@end_date}"  if @start_date != @end_date
         buf << "  (knockout)" if @knockout
         buf << "  (auto)"     if @auto
         buf << ">"
-    
-        printer.text( buf ) 
+
+        printer.text( buf )
       end
 end  # class Round
 end # module Sports

data/lib/sportdb/structs/version.rb

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

data/lib/sportdb/structs.rb

@@ -21,6 +21,12 @@ require_relative 'structs/matchlist'
 require_relative 'structs/standings'
 require_relative 'structs/team_usage'
 
+require_relative 'structs/event_info'
+
+
+## shared support helpers/machinery
+require_relative 'structs/name_helper'
+
 
 ##
 ## todo/fix  - move "inline" player to structs/player file !!!!
@@ -59,13 +65,45 @@ end  # module Sports
 
 
 
+
+
+##
+##  add all structs in SportDb::Import namespace too
+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
+  end   # module Import
+end     # module SportDb
+
+
+
+
 #####
 # note: add Sport and Football convenience alias - why? why not?
 Sport    = Sports
 Football = Sports
 
 
-
-
 puts SportDb::Module::Structs.banner   # say hello
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -102,12 +102,14 @@ files:
 - Rakefile
 - lib/sportdb/structs.rb
 - lib/sportdb/structs/country.rb
+- lib/sportdb/structs/event_info.rb
 - lib/sportdb/structs/goal.rb
 - lib/sportdb/structs/ground.rb
 - lib/sportdb/structs/group.rb
 - lib/sportdb/structs/league.rb
 - lib/sportdb/structs/match.rb
 - lib/sportdb/structs/matchlist.rb
+- lib/sportdb/structs/name_helper.rb
 - lib/sportdb/structs/round.rb
 - lib/sportdb/structs/standings.rb
 - lib/sportdb/structs/team.rb
@@ -127,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="