sportdb-structs 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fb10b4bb83d5146eb004d6c3143045e0efa430095a091429c51695a15461c6
-  data.tar.gz: b8377ca328aec94770b9d7e90fc60b83cbf2264a4b9ce295af7acd4846586f78
+  metadata.gz: 4603607b4234fbe74e0b57ed548a61a7d899041497d2e0e7f3104396b00e943a
+  data.tar.gz: 24945611ea43fca109b2a4b993ad6bf913daee4e034762d3797799d5a8a7bea5
 SHA512:
-  metadata.gz: edb013626541448b4f4211d2afc779f018fe27a7b2b33af99bfce9a0876d243d4ba4079677ce7e14e5911ad7e013992632600dd5bee0958db7fc37900ded7a55
-  data.tar.gz: '08964910e951e7c92ef3a46a5348b1111109d326d9aed0a41311a63047de63f6a11c21bffbe8cb0f5becdb78240b66ab17817e89b2eca53059ea7b8ed601756a'
+  metadata.gz: 236bb3e8ac4e58e16b398e2fd9bdceabbd74e527a4aa1ef2af823976f31ef7b63f7342b640829218a2c9c08effd060675db67c4ec24d17497cee8071db4df0db
+  data.tar.gz: 7bdc16e2b06599fad689166a06bcd6b9aa4ef9ba4ddd0bb6c47a0d6aa68f6b20d9e2184ba0f211d9d9d455da6a7832ec14e9b5455aafe0e3c2c2e0c43f14dd5c

data/CHANGELOG.md

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

data/lib/sportdb/structs/country.rb

@@ -11,7 +11,7 @@ class City
   attr_reader   :key, :name, :country
   attr_accessor :alt_names
 
-  def initialize( key: nil, 
+  def initialize( key: nil,
                   name:, country: )
     ## note: auto-generate key "on-the-fly" if missing for now - why? why not?
     ## note: quick hack - auto-generate key, that is, remove all non-ascii chars and downcase
@@ -23,6 +23,7 @@ class City
 end  # class City
 
 
+
 class Country
 
   ## note: is read-only/immutable for now - why? why not?
@@ -33,9 +34,9 @@ class Country
   def initialize( key: nil, name:, code:, tags: [] )
     ## note: auto-generate key "on-the-fly" if missing for now - why? why not?
     ## note: quick hack - auto-generate key, that is, remove all non-ascii chars and downcase
-    @key = begin 
+    @key = begin
               if key
-                key 
+                key
               elsif code
                  code.downcase
               else
@@ -47,14 +48,109 @@ class Country
     @tags           = tags
   end
 
-  def pretty_print( printer ) 
+
+  #############################
+  ### virtual helpers
+  ##    1) codes  (returns uniq array of all codes in lowercase
+  ##               incl. key, code and alt_codes in alt_names)
+  ##    2) names  (returns uniq array of all names - with language tags stripped)
+  ##
+  ##    3a) adjective/adj   - might be nil??
+  ##     b) adjectives/adjs
+
+  ##  note - alt_names - returns all-in-one alt names (& codes)
+
+## note: split names into names AND codes
+##      1)  key plus all lower case names are codes
+##      2)    all upper case names are names AND codes
+##      3)    all other names are names
+
+## only allow asci a to z in code & name for now - why? why not?
+##   e.g. USA, etc.
+IS_CODE_N_NAME_RE = %r{^
+                        [A-Z]+
+                       $}x
+## must be all lowercase (unicode letters allowed for now -  why? why not?
+##   e.g. nirl, a, ö, etc.
+IS_CODE_RE           = %r{^
+                            [\p{Ll}]+
+                        $}x
+
+  def codes
+       ## note - "auto-magically" downcase code (and code'n'name matches)!!!
+      codes = [@key, @code.downcase]
+      alt_names.each do |name|
+        if IS_CODE_N_NAME_RE.match?( name )
+          codes << name.downcase
+        elsif IS_CODE_RE.match?( name )
+          codes << name
+        else ## assume name
+          ## do nothing - skip/ignore
+        end
+      end
+      codes.uniq
+  end
+
+
+   include SportDb::NameHelper   # pulls-in strip_lang
+
+  def names
+     names = [@name]
+     alt_names.each do |name|
+        if IS_CODE_N_NAME_RE.match?( name )
+          names << name
+        elsif IS_CODE_RE.match?( name )
+          ## do nothing - skip/ignore
+        else ## assume name
+          names <<  strip_lang( name )
+        end
+    end
+    names.uniq
+  end
+
+## country adjectives  - quick hack for now inline here
+##
+##  todo - add language marker - why? why not`
+##          e.g.   Österr.   => Österr. [de]
+##                 Deutsche` => Deutsche [de]
+##
+##
+## todo/fix - add more - see
+##     https://en.wikipedia.org/wiki/List_of_adjectival_and_demonymic_forms_for_countries_and_nations
+ADJ = {
+  'at'  => ['Österr.', 'Austrian'],
+  'de'  => ['Deutsche', 'German'],
+  'eng' => ['English'],
+  'sco' => ['Scottish'],
+  'wal' => ['Welsh'],
+  'nir' => ['Northern Irish'],
+  'ie'  => ['Irish'],
+
+  'it'  => ['Italian'],
+  'sm'  => ['San Marinese'],
+  'fr'  => ['French'],
+  'hu'  => ['Hungarian'],
+  'gr'  => ['Greek'],
+  'pt'  => ['Portuguese'],
+  'ch'  => ['Swiss'],
+  'tr'  => ['Turkish'],
+}
+
+  ## note - adjective might be nil!!!
+  def adjective()  adjectives[0]; end
+  def adjectives() ADJ[@key] || []; end
+
+  alias_method :adj, :adjective
+  alias_method :adjs, :adjectives
+
+  def pretty_print( printer )
     buf = String.new
     buf << "<Country: #{@key} - #{@name} (#{@code})"
     buf << "|#{@alt_names.join('|')}"  if @alt_names && !@alt_names.empty?
     buf << ", #{@tags.join('|')})"     if @tags && !@tags.empty?
     buf << ">"
 
-    printer.text( buf ) 
+    printer.text( buf )
   end
 end  # class Country
 

data/lib/sportdb/structs/league.rb

@@ -2,9 +2,27 @@
 module Sports
 
 
+class LeaguePeriod
+  attr_reader   :key, :name, :qname, :slug,
+                :prev_name,  :start_season, :end_season
+  def initialize( key:, name:, qname:, slug:,
+                        prev_name: nil,
+                        start_season: nil, end_season: nil )
+    @key = key
+    @name = name
+    @qname = qname
+    @slug = slug
+    @prev_name = prev_name
+    @start_season = start_season
+    @end_season  = end_season
+  end
+end # class LeaguePeriod
+
+
 class League
   attr_reader   :key, :name, :country, :intl
   attr_accessor :alt_names
+  attr_accessor :periods
 
 
   def initialize( key:, name:, alt_names: [],
@@ -12,12 +30,15 @@ class League
     @key            = key
     @name           = name
     @alt_names      = alt_names
- 
+
     @country        = country
     @intl           = intl
     @clubs          = clubs
+
+    @periods        = []   ## change/rename to history - why? why not?
   end
 
+
   def intl?()      @intl == true; end
   def national?()  @intl == false; end
   alias_method   :domestic?, :national?
@@ -27,30 +48,40 @@ class League
   alias_method   :club?,          :clubs?
   alias_method   :national_team?, :national_teams?
 
-=begin 
+=begin
  @alt_names=[],
   @clubs=true,
   @country=<Country: at - Austria (AUT)|Österreich [de], fifa|uefa)>,
   @intl=false,
   @key="at.1",
-  @name="Bundesliga">, 
+  @name="Bundesliga">,
 =end
 
-  def pretty_print( printer ) 
+  def pretty_print( printer )
     buf = String.new
     buf << "<League"
     buf << " INTL"   if @intl
-    buf <<   if @clubs 
-                 " CLUBS" 
-             else 
+    buf <<   if @clubs
+                 " CLUBS"
+             else
                  " NATIONAL TEAMS"
-             end  
+             end
     buf << ": #{@key} - #{@name}"
-    buf << "|#{@alt_names.join('|')}"  if @alt_names && !@alt_names.empty?
+
+    if @alt_names && !@alt_names.empty?
+      buf << "|"
+      buf << @alt_names.join('|')
+    end
+
     buf << ", #{@country.name} (#{@country.code})"     if @country
+
+    if @periods && !@periods.empty?
+      buf << ", "
+      buf << @periods.map{|period| period.key }.uniq.join('|')
+    end
     buf << ">"
 
-    printer.text( buf ) 
+    printer.text( buf )
   end
 
 

data/lib/sportdb/structs/match.rb

@@ -212,7 +212,10 @@ def as_json
   data[:score][:et] = [@score1et,  @score2et]    if @score1et && @score2et
   data[:score][:p]  = [@score1p,   @score2p]     if @score1p && @score2p
 
+  data[:status] = @status  if @status
+
   data[:group]  = @group   if @group
+  data[:stage]  = @stage   if @stage
 
 =begin
       "round": "Spieltag 1",

data/lib/sportdb/structs/version.rb

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

data/lib/sportdb/structs.rb

@@ -8,6 +8,9 @@ require 'score/formats'
 # our own code
 require_relative 'structs/version' # let version always go first
 
+## shared support helpers/machinery
+require_relative 'structs/name_helper'
+
 require_relative 'structs/country'
 require_relative 'structs/league'
 require_relative 'structs/team'
@@ -24,9 +27,6 @@ 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 !!!!
@@ -76,7 +76,10 @@ module SportDb
     ## add "old" convenience aliases for structs - why? why not?
     ##   todo/check: just use include Sports !!!!
     Country      = ::Sports::Country
+    City         = ::Sports::City
+
     League       = ::Sports::League
+    LeaguePeriod = ::Sports::LeaguePeriod
     Group        = ::Sports::Group
     Round        = ::Sports::Round
     Match        = ::Sports::Match

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets