sportdb-structs 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6efbd5615829502f2960305080f413c167a199b0c5be71fd2ca46882633bb447
-  data.tar.gz: 7d9025f5ac565666527eb87b67a6f94e6607b4d8cca023a5478d601b523144d1
+  metadata.gz: 6f93a521b7edcab10afea6cb26770b1924b23cb0c8a1b1d25080c57132b0e21b
+  data.tar.gz: f0099bb428f29a92f1419096d0f693671d035718ec816dbca4a9d4ca5376e497
 SHA512:
-  metadata.gz: 78e8dea8c1842fe14e57ecc4794263c2ab29a17d43bd45c9131aa8889c4e05f026506d43768293679c88ebb563caf47dfca9610f0a1736bb964f325fa945886d
-  data.tar.gz: b950d1600926c9c6394c6267a874dcc6fe17ce5cd7f06cfe34244474aaa8bce535ce598142b98b8ef3f8e17cb31c1f6d1003b1eca8331451bdc75fb3542a0ccf
+  metadata.gz: 6ee368ed13cfb5c2ea432404eb7a7171bbfb82a3d543773ff0ec66a5840f91301c719e9a373cb49826080e9c811f391566d2d5608fe4f8cb56d6a4f601babccc
+  data.tar.gz: d81f2090d34dc149a6667a09a89016d1c89a9b3f34b2876ce2b2f973843756102b1dfcfb275f0e0d0f4540dace8b0f6f5fe2b474764e5884eac9b0a3fb7ae719

data/CHANGELOG.md

@@ -1,5 +1,4 @@
-### 0.5.0
-
+### 0.5.1
 ### 0.0.1 / 2020-08-24
 
 * Everything is new. First release.

data/lib/sportdb/structs/league.rb

@@ -5,6 +5,9 @@ module Sports
 class LeaguePeriod
   attr_reader   :key, :name, :qname, :slug,
                 :prev_name,  :start_season, :end_season
+
+  attr_accessor :alt_names
+               
   def initialize( key:, name:, qname:, slug:,
                         prev_name: nil,
                         start_season: nil, end_season: nil )
@@ -15,6 +18,91 @@ class LeaguePeriod
     @prev_name = prev_name
     @start_season = start_season
     @end_season  = end_season
+
+    @alt_names = []
+  end
+
+
+####
+## todo/fix - share code for names and codes with League and LeaguePeriod!!!
+##         for now cut-n-paste copy
+
+ #############################
+  ### 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)
+  ##
+
+## 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 (why? why not?)
+##  excludes Ö1 or such (what else?)
+##   allow space and dot - why? why not?
+##     e.g. HNL 1
+##          NB I or NB II etc.
+IS_CODE_N_NAME_RE = %r{^
+                           [\p{Lu}0-9. ]+
+                       $}x
+## add space (or /) - why? why not?
+IS_CODE_RE           = %r{^
+                            [\p{Ll}0-9.]+
+                        $}x
+
+
+  def codes
+       ## change/rename to more_codes - why? why?
+       ##    get reference (tier/canonicial) codes via periods!!!!
+
+       ## note - "auto-magically" downcase code (and code'n'name matches)!!
+      ##  note - do NOT include key as code for now!!!
+      ##
+      ## todo/check - auto-remove space from code - why? why not?
+      ##         e.g. NB I, NB II, HNL 1 => NBI, NBII, HBNL1, etc -
+      codes = []
+      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
+
+##  report duplicate names - why? why not
+     ## 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 self
+       exit 1
+     end
+
+   names.uniq
   end
 
 

data/lib/sportdb/structs/match.rb

@@ -23,7 +23,8 @@ class Match
               :country1, :country2,    ## special case for champions league etc. - uses FIFA country code
               :comments,
               :league,      ## (optinal) added as text for now (use struct?)
-              :ground       ## (optional) add as text line for now (incl. city, timezone etc.)
+              :ground,       ## (optional) add as text line for now (incl. city, timezone etc.)
+              :timezone      ## (optional) as a string
 
   attr_accessor :goals  ## todo/fix: make goals like all other attribs!!
 
@@ -66,6 +67,7 @@ class Match
 
     @league   = kwargs[:league]   if kwargs.has_key?( :league )
     @ground   = kwargs[:ground]   if kwargs.has_key?( :ground )
+    @timezone = kwargs[:timezone] if kwargs.has_key?( :timezone )
 
 
     if kwargs.has_key?( :score )   ## check all-in-one score struct for convenience!!!
@@ -214,23 +216,40 @@ def as_json
   data['score']['et'] = [@score1et,  @score2et]    if @score1et && @score2et
   data['score']['p']  = [@score1p,   @score2p]     if @score1p && @score2p
 
+  ### check for goals
+  if @goals && @goals.size > 0
+    data['goals1'] = []
+    data['goals2'] = []
+
+    @goals.each do |goal|
+          node = {}
+          node['name']    = goal.player
+          node['minute']  = goal.minute
+          node['offset']  = goal.offset  if goal.offset
+          node['owngoal'] = true         if goal.owngoal
+          node['penalty'] = true         if goal.penalty
+          
+          if goal.team == 1
+            data['goals1']  << node   
+          else  ## assume 2
+            data['goals2']  << node
+          end
+     end  # each goal
+  end
+
+
   data['status'] = @status  if @status
 
   data['group']  = @group   if @group
   data['stage']  = @stage   if @stage
 
-=begin
-      "round": "Spieltag 1",
-      "date": "2020-09-19",
-      "team1": "Eintracht Frankfurt",
-      "team2": "Arminia Bielefeld",
-      "score": {
-        "ft": [
-          1,
-          1
-        ]
-      }
-=end
+  if @ground
+       ## note: might be array of string e.g. ['Wembley', 'London']
+       data['ground'] = {}
+       data['ground']['name']      = @ground
+       data['ground']['timezone']  = @timezone   if @timezone
+  end
+  
   data
 end
 

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 = 5
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos