sportdb-formats 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1645b8fed586be03207b65e25866473f3124c3d
-  data.tar.gz: c50d164b1cf1fe79e5dc5c8ac9e946fc6ba96f31
+  metadata.gz: 35a7be066d82d59b2cf35c8dc5676c0d5118479b
+  data.tar.gz: eeceea13624ae5c795bc2b2709e7bef6727dd184
 SHA512:
-  metadata.gz: bed9e662901b25660899f1b3df3f6a9f506f88422a50db23d119d7f55a4e94ac84e82474879926b5f6db079a13600ebe093ae3ea39d351e758b25e3904789edf
-  data.tar.gz: c2aff73cf2ba9ea04fddde788076bd72b983681ba2e492a665f3e104f76712ce1708d32abc1eb64e0dece966f34d30bda3724acaf53598d487b51307f735cc4e
+  metadata.gz: 732d53cf84db4d87449c9fe86e4c0b1109a277b8442a7fd15cf61a5318555e6a53c61c08ab1b66187429fc770f89e4a72ef48b9bde616e2736a96bb8d1a47324
+  data.tar.gz: 60b46bf871ffd180bec2a3a96403ecceebc5689dde1d0c6181ecf1b22fdaf9b8aaf49bd8e15a8ba886cf9751e62fc89658376b27d983e8871003f498d6498c0e

data/lib/sportdb/formats/match/mapper.rb

@@ -7,21 +7,21 @@ module SportDb
 ##   see https://github.com/textkit/textutils/blob/master/textutils/lib/textutils/title_mapper2.rb
 
 
-class MapperV2      ## todo/check: rename to NameMapper/TitleMapper ? why? why not??
+class MapperV2      ## todo/check: rename to NameMapper ? why? why not??
 
   include Logging
 
-  attr_reader :known_titles   ## rename to mapping or mappings or just titles - why? why not?
+  attr_reader :known_names   ## rename to mapping or mappings or just names - why? why not?
 
   ########
   ##  key:      e.g. augsburg
-  ##  title:    e.g. FC Augsburg
-  ##  length (of title(!!) - not regex pattern):   e.g. 11   -- do not count dots (e.g. U.S.A. => 3 or 6) why? why not?
-  MappingStruct =  Struct.new( :key, :title, :length, :pattern)     ## todo/check: use (rename to) TitleStruct - why? why not??
+  ##  name:     e.g. FC Augsburg
+  ##  length (of name(!!) - not regex pattern):   e.g. 11   -- do not count dots (e.g. U.S.A. => 3 or 6) why? why not?
+  MappingStruct =  Struct.new( :key, :name, :length, :pattern)     ## todo/check: use (rename to) NameStruct - why? why not??
 
   ######
   ## convenience helper - (auto)build ActiveRecord-like team records/structs
-  Record = Struct.new( :key, :title, :synonyms )
+  Record = Struct.new( :key, :name, :alt_names )
   def build_records( txt_or_lines )
     recs = []
 
@@ -44,12 +44,12 @@ class MapperV2      ## todo/check: rename to NameMapper/TitleMapper ? why? why n
       values = line.split( '|' )
       values = values.map { |value| value.strip }
 
-      title    = values[0]
+      name      = values[0]
       ## note: quick hack - auto-generate key, that is, remove all non-ascii chars and downcase
-      key      = title.downcase.gsub( /[^a-z]/, '' )
-      synonyms = values.size > 1 ? values[1..-1].join( '|' ) : nil
+      key       = name.downcase.gsub( /[^a-z]/, '' )
+      alt_names = values.size > 1 ? values[1..-1].join( '|' ) : nil
 
-      recs << Record.new( key, title, synonyms )
+      recs << Record.new( key, name, alt_names )
     end
     recs
   end
@@ -63,10 +63,10 @@ class MapperV2      ## todo/check: rename to NameMapper/TitleMapper ? why? why n
                                                                   (records_or_mapping.is_a?( Array ) && records_or_mapping[0].is_a?( String ))
 
     ## build mapping lookup table
-    @known_titles =  if records_or_mapping.is_a?( Hash )  ## assume "custom" mapping hash table (title/name=>record)
-                        build_title_table_for_mapping( records_or_mapping )
+    @known_names =  if records_or_mapping.is_a?( Hash )  ## assume "custom" mapping hash table (name=>record)
+                        build_name_table_for_mapping( records_or_mapping )
                      else  ## assume array of records
-                        build_title_table_for_records( records_or_mapping )
+                        build_name_table_for_records( records_or_mapping )
                      end
 
     ## build lookup hash by record (e.g. team/club/etc.) key
@@ -85,9 +85,9 @@ class MapperV2      ## todo/check: rename to NameMapper/TitleMapper ? why? why n
 
 
 
-  def map_titles!( line )   ## rename to just map! - why?? why not???
+  def map_names!( line )   ## rename to just map! - why?? why not???
     begin
-      found = map_title_for!( @tag, line, @known_titles )
+      found = map_name_for!( @tag, line, @known_names )
     end while found
   end
 
@@ -110,27 +110,27 @@ class MapperV2      ## todo/check: rename to NameMapper/TitleMapper ? why? why n
 
 
 private
-  def build_title_table_for_mapping( mapping )
-    known_titles = []
+  def build_name_table_for_mapping( mapping )
+    known_names = []
 
-    mapping.each do |title, rec|
+    mapping.each do |name, rec|
       m = MappingStruct.new
       m.key     = rec.key
-      m.title   = title
-      m.length  = title.length
-      m.pattern = Regexp.escape( title )   ## note: just use "standard" regex escape (e.g. no extras for umlauts,accents,etc.)
+      m.name    = name
+      m.length  = name.length
+      m.pattern = Regexp.escape( name )   ## note: just use "standard" regex escape (e.g. no extras for umlauts,accents,etc.)
 
-      known_titles << m
+      known_names << m
     end
 
     ## note: sort here by length (largest goes first - best match)
-    known_titles = known_titles.sort { |l,r| r.length <=> l.length }
-    known_titles
+    known_names = known_names.sort { |l,r| r.length <=> l.length }
+    known_names
   end
 
-  def build_title_table_for_records( records )
+  def build_name_table_for_records( records )
 
-    ## build known tracks table w/ synonyms e.g.
+    ## build known tracks table w/ alt names e.g.
     #
     # [[ 'wolfsbrug', 'VfL Wolfsburg'],
     #  [ 'augsburg',  'FC Augsburg'],
@@ -138,65 +138,65 @@ private
     #  [ 'augsburg',  'Augi3' ],
     #  [ 'stuttgart', 'VfB Stuttgart']]
 
-    known_titles = []
+    known_names = []
 
     records.each_with_index do |rec,index|
 
-      title_candidates = []
-      title_candidates << rec.title
+      name_candidates = []
+      name_candidates << rec.name
 
-      title_candidates += rec.synonyms.split('|') if rec.synonyms && !rec.synonyms.empty?
+      name_candidates += rec.alt_names.split('|') if rec.alt_names && !rec.alt_names.empty?
 
 
-      ## check if title includes subtitle e.g. Grand Prix Japan (Suzuka Circuit)
-      #  make subtitle optional by adding title w/o subtitle e.g. Grand Prix Japan
+      ## check if name includes subname e.g. Grand Prix Japan (Suzuka Circuit)
+      #  make subname optional by adding name w/o subname e.g. Grand Prix Japan
 
-      titles = []
-      title_candidates.each do |t|
-        titles << t
+      names = []
+      name_candidates.each do |t|
+        names << t
         if t =~ /\(.+\)/
-          extra_title = t.gsub( /\(.+\)/, '' ) # remove/delete subtitles
+          extra_name = t.gsub( /\(.+\)/, '' ) # remove/delete subnames
           # note: strip leading n trailing withspaces too!
           #  -- todo: add squish or something if () is inline e.g. leaves two spaces?
-          extra_title.strip!
-          titles << extra_title
+          extra_name.strip!
+          names << extra_name
         end
       end
 
-      titles.each do |t|
+      names.each do |name|
         m = MappingStruct.new
         m.key     = rec.key
-        m.title   = t
-        m.length  = t.length
+        m.name    = name
+        m.length  = name.length
         ## note: escape for regex plus allow subs for special chars/accents
-        m.pattern = title_esc_regex( t )
+        m.pattern = name_esc_regex( name )
 
-        known_titles << m
+        known_names << m
       end
 
-      logger.debug "  #{rec.class.name}[#{index+1}] #{rec.key} >#{titles.join('|')}<"
+      logger.debug "  #{rec.class.name}[#{index+1}] #{rec.key} >#{names.join('|')}<"
 
       ## note: only include code field - if defined
       if rec.respond_to?(:code) && rec.code && !rec.code.empty?
         m = MappingStruct.new
         m.key     = rec.key
-        m.title   = rec.code
+        m.name    = rec.code
         m.length  = rec.code.length
         m.pattern = rec.code   ## note: use code for now as is (no variants allowed fow now)
 
-        known_titles << m
+        known_names << m
       end
     end
 
     ## note: sort here by length (largest goes first - best match)
       #  exclude code and key (key should always go last)
-    known_titles = known_titles.sort { |l,r| r.length <=> l.length }
-    known_titles
+    known_names = known_names.sort { |l,r| r.length <=> l.length }
+    known_names
   end
 
 
 
-  def map_title_for!( tag, line, mappings )
+  def map_name_for!( tag, line, mappings )
     mappings.each do |mapping|
       key     = mapping.key
       pattern = mapping.pattern
@@ -234,9 +234,9 @@ private
 
 
 ####
-# title helper cut-n-paste copy from TextUtils
+# name helper cut-n-paste copy from TextUtils
 ##  see https://github.com/textkit/textutils/blob/master/textutils/lib/textutils/helper/title_helper.rb
-def title_esc_regex( title_unescaped )
+def name_esc_regex( name_unescaped )
 
       ##  escape regex special chars e.g.
       #    . to \. and
@@ -257,16 +257,16 @@ def title_esc_regex( title_unescaped )
       # e.g. Club Atlético Colón (Santa Fe)
       # e.g. Bauer Anton (????)
 
-      ## NB: cannot use Regexp.escape! will escape space '' to '\ '
-      ## title = Regexp.escape( title_unescaped )
-      title = title_unescaped.gsub( '.', '\.' )
-      title = title.gsub( '(', '\(' )
-      title = title.gsub( ')', '\)' )
-      title = title.gsub( '?', '\?' )
-      title = title.gsub( '*', '\*' )
-      title = title.gsub( '+', '\+' )
-      title = title.gsub( '$', '\$' )
-      title = title.gsub( '^', '\^' )
+      ## note: cannot use Regexp.escape! will escape space '' to '\ '
+      ## name = Regexp.escape( name_unescaped )
+      name = name_unescaped.gsub( '.', '\.' )
+      name = name.gsub( '(', '\(' )
+      name = name.gsub( ')', '\)' )
+      name = name.gsub( '?', '\?' )
+      name = name.gsub( '*', '\*' )
+      name = name.gsub( '+', '\+' )
+      name = name.gsub( '$', '\$' )
+      name = name.gsub( '^', '\^' )
 
       ##  match accented char with or without accents
       ##  add (ü|ue) etc.
@@ -309,10 +309,10 @@ def title_esc_regex( title_unescaped )
       ##   collect some more (real-world) examples first!!!!!
 
       alternatives.each do |alt|
-        title = title.gsub( alt[0], alt[1] )
+        name = name.gsub( alt[0], alt[1] )
       end
 
-      title
+      name
   end
 
 end # class MapperV2

data/lib/sportdb/formats/match/mapper_teams.rb

@@ -16,7 +16,7 @@ class TeamMapper
   end
 
   def map_teams!( line )
-    @mapper.map_titles!( line )
+    @mapper.map_names!( line )
   end
 end # class TeamMapper
 

data/lib/sportdb/formats/match/match_parser.rb

@@ -82,15 +82,15 @@ class MatchParser   ## simple match parser for team match schedules
     #    team1 team2 - match  (will get new auto-matchday! not last round)
     @last_round     = nil
 
-    title, pos = find_group_title_and_pos!( line )
+    name, pos = find_group_name_and_pos!( line )
 
-    logger.debug "    title: >#{title}<"
+    logger.debug "    name: >#{name}<"
     logger.debug "    pos: >#{pos}<"
     logger.debug "  line: >#{line}<"
 
-    group = @groups[ title ]
+    group = @groups[ name ]
     if group.nil?
-      puts "!! ERROR - no group def found for >#{title}<"
+      puts "!! ERROR - no group def found for >#{name}<"
       exit 1
     end
 
@@ -104,19 +104,19 @@ class MatchParser   ## simple match parser for team match schedules
     @mapper_teams.map_teams!( line )
     teams = @mapper_teams.find_teams!( line )
 
-    title, pos = find_group_title_and_pos!( line )
+    name, pos = find_group_name_and_pos!( line )
 
     logger.debug "  line: >#{line}<"
 
-    group = Import::Group.new( pos: pos,
-                               title: title,
-                               teams: teams.map {|team| team.title } )
+    ## todo/check/fix: add back group key - why? why not?
+    group = Import::Group.new( name:  name,
+                               teams: teams.map {|team| team.name } )
 
-    @groups[ title ] = group
+    @groups[ name ] = group
   end
 
 
-  def find_group_title_and_pos!( line )
+  def find_group_name_and_pos!( line )
     ## group pos - for now support single digit e.g 1,2,3 or letter e.g. A,B,C or HEX
     ## nb:  (?:)  = is for non-capturing group(ing)
 
@@ -148,14 +148,14 @@ class MatchParser   ## simple match parser for team match schedules
           else  m[1].to_i
           end
 
-    title = m[0]
+    name = m[0]
 
-    logger.debug "   title: >#{title}<"
+    logger.debug "   name: >#{name}<"
     logger.debug "   pos: >#{pos}<"
 
-    line.sub!( regex, '[GROUP.TITLE+POS]' )
+    line.sub!( regex, '[GROUP.NAME+POS]' )
 
-    [title,pos]
+    [name,pos]
   end
 
 
@@ -181,29 +181,29 @@ class MatchParser   ## simple match parser for team match schedules
 
 
     pos   = find_round_pos!( line )
-    title = find_round_def_title!( line )
-    # NB: use extracted round title for knockout check
-    knockout_flag = is_knockout_round?( title )
+    name  = find_round_def_name!( line )
+    # NB: use extracted round name for knockout check
+    knockout_flag = is_knockout_round?( name )
 
 
     logger.debug "    start_date: #{start_date}"
     logger.debug "    end_date:   #{end_date}"
     logger.debug "    pos:      #{pos}"
-    logger.debug "    title:    >#{title}<"
+    logger.debug "    name:    >#{name}<"
     logger.debug "    knockout_flag:   #{knockout_flag}"
 
     logger.debug "  line: >#{line}<"
 
     #######################################
     # todo/fix: add auto flag is false !!!! - why? why not?
-    round = Import::Round.new( pos:        pos,
-                               title:      title,
+    #   todo/fix/check: add num if present!!!!
+    round = Import::Round.new( name:       name,
                                start_date: start_date,
                                end_date:   end_date,
                                knockout:   knockout_flag,
                                auto:       false )
 
-    @rounds[ title ] = round
+    @rounds[ name ] = round
   end
 
 
@@ -227,8 +227,8 @@ class MatchParser   ## simple match parser for team match schedules
       line.sub!( regex_pos, '[ROUND.POS] ' )  ## NB: add back trailing space that got swallowed w/ regex -> [ \t]+
       return $1.to_i
     elsif line =~ regex_num
-      ## assume number in title is pos (e.g. Jornada 3, 3 Runde etc.)
-      ## NB: do NOT remove pos from string (will get removed by round title)
+      ## assume number in name is pos (e.g. Jornada 3, 3 Runde etc.)
+      ## NB: do NOT remove pos from string (will get removed by round name)
 
       num = $1.to_i  # note: clone capture; keep a copy (another regex follows; will redefine $1)
 
@@ -254,54 +254,54 @@ class MatchParser   ## simple match parser for team match schedules
     end
   end # method find_round_pos!
 
-  def find_round_def_title!( line )
-    # assume everything before pipe (\) is the round title
-    #  strip [ROUND.POS],  todo:?? [ROUND.TITLE2]
+  def find_round_def_name!( line )
+    # assume everything before pipe (\) is the round name
+    #  strip [ROUND.POS],  todo:?? [ROUND.NAME2]
 
-    # todo/fix: add title2 w/  // or /  why? why not?
+    # todo/fix: add name2 w/  // or /  why? why not?
     #  -- strip / or / chars
 
     buf = line.dup
-    logger.debug "  find_round_def_title! line-before: >>#{buf}<<"
+    logger.debug "  find_round_def_name! line-before: >>#{buf}<<"
 
     ## cut-off everything after (including) pipe (|)
     buf = buf[ 0...buf.index('|') ]
 
-    # e.g. remove [ROUND.POS], [ROUND.TITLE2], [GROUP.TITLE+POS] etc.
+    # e.g. remove [ROUND.POS], [ROUND.NAME2], [GROUP.NAME+POS] etc.
     buf.gsub!( /\[[^\]]+\]/, '' )    ## fix: use helper for (re)use e.g. remove_match_placeholder/marker or similar?
     # remove leading and trailing whitespace
     buf.strip!
 
-    logger.debug "  find_round_def_title! line-after: >>#{buf}<<"
+    logger.debug "  find_round_def_name! line-after: >>#{buf}<<"
 
-    logger.debug "   title: >>#{buf}<<"
-    line.sub!( buf, '[ROUND.TITLE]' )
+    logger.debug "   name: >>#{buf}<<"
+    line.sub!( buf, '[ROUND.NAME]' )
 
     buf
   end
 
-  def find_round_header_title!( line )
-    # assume everything left is the round title
-    #  extract all other items first (round title2, round pos, group title n pos, etc.)
+  def find_round_header_name!( line )
+    # assume everything left is the round name
+    #  extract all other items first (round name2, round pos, group name n pos, etc.)
 
     ## todo/fix:
     ##  cleanup method
     ##   use  buf.index( '//' ) to split string (see found_round_def)
     ##     why? simpler why not?
-    ##  - do we currently allow groups if title2 present? add example if it works?
+    ##  - do we currently allow groups if name2 present? add example if it works?
 
     buf = line.dup
-    logger.debug "  find_round_header_title! line-before: >>#{buf}<<"
+    logger.debug "  find_round_header_name! line-before: >>#{buf}<<"
 
-    buf.gsub!( /\[[^\]]+\]/, '' )   # e.g. remove [ROUND.POS], [ROUND.TITLE2], [GROUP.TITLE+POS] etc.
+    buf.gsub!( /\[[^\]]+\]/, '' )   # e.g. remove [ROUND.POS], [ROUND.NAME2], [GROUP.NAME+POS] etc.
     buf.strip!    # remove leading and trailing whitespace
 
-    logger.debug "  find_round_title! line-after: >>#{buf}<<"
+    logger.debug "  find_round_name! line-after: >>#{buf}<<"
 
-    ### bingo - assume what's left is the round title
+    ### bingo - assume what's left is the round name
 
-    logger.debug "   title: >>#{buf}<<"
-    line.sub!( buf, '[ROUND.TITLE]' )
+    logger.debug "   name: >>#{buf}<<"
+    line.sub!( buf, '[ROUND.NAME]' )
 
     buf
   end
@@ -315,63 +315,21 @@ class MatchParser   ## simple match parser for team match schedules
     #   add unit test too to verify
     pos = find_round_pos!( line )
 
-    title = find_round_header_title!( line )
+    name = find_round_header_name!( line )
 
     logger.debug "  line: >#{line}<"
 
 
-    round = @rounds[ title ]
+    round = @rounds[ name ]
     if round.nil?    ## auto-add / create if missing
-      round = Import::Round.new( pos:   pos,
-                                 title: title )
-      @rounds[ title ] = round
+      ## todo/check: add num (was pos) if present - why? why not?
+      round = Import::Round.new( name: name )
+      @rounds[ name ] = round
     end
 
     ## todo/check: if pos match (MUST always match for now)
     @last_round = round
     @last_group = nil   # note: reset group to no group - why? why not?
-
-
-    ## NB: dummy/placeholder start_at, end_at date
-    ##  replace/patch after adding all games for round
-
-=begin
-    round_attribs = {
-      title:  title,
-      title2: title2,
-      knockout: knockout_flag
-    }
-
-    if pos > 999000
-      # no pos (e.g. will get autonumbered later) - try match by title for now
-      #  e.g. lets us use title 'Group Replays', for example, multiple times
-      @round = Round.find_by_event_id_and_title( @event.id, title )
-    else
-      @round = Round.find_by_event_id_and_pos( @event.id, pos )
-    end
-
-    if @round.present?
-      logger.debug "update round #{@round.id}:"
-    else
-      logger.debug "create round:"
-      @round = Round.new
-
-      round_attribs = round_attribs.merge( {
-        event_id: @event.id,
-        pos:   pos,
-        start_at: Date.parse('1911-11-11'),
-        end_at:   Date.parse('1911-11-11')
-      })
-    end
-
-    logger.debug round_attribs.to_json
-
-    @round.update_attributes!( round_attribs )
-
-    @patch_round_ids_pos   << @round.id    if pos > 999000
-    ### store list of round ids for patching start_at/end_at at the end
-    @patch_round_ids_dates << @round.id   # todo/fix/check: check if round has definition (do NOT patch if definition (not auto-added) present)
-=end
   end
 
 
@@ -457,11 +415,11 @@ class MatchParser   ## simple match parser for team match schedules
     ## todo/check: pass along round and group refs or just string (canonical names) - why? why not?
 
     @matches << Import::Match.new( date:    date,
-                                   team1:   team1,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team1.title)
-                                   team2:   team2,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team2.title)
+                                   team1:   team1,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team1.name)
+                                   team2:   team2,  ## note: for now always use mapping value e.g. rec (NOT string e.g. team2.name)
                                    score:   score,
-                                   round:   round       ? round.title       : nil,   ## note: for now always use string (assume unique canonical name for event)
-                                   group:   @last_group ? @last_group.title : nil )  ## note: for now always use string (assume unique canonical name for event)
+                                   round:   round       ? round.name       : nil,   ## note: for now always use string (assume unique canonical name for event)
+                                   group:   @last_group ? @last_group.name : nil )  ## note: for now always use string (assume unique canonical name for event)
 
     ### todo: cache team lookups in hash?
 
@@ -517,7 +475,7 @@ class MatchParser   ## simple match parser for team match schedules
 
         round_attribs = {
           event_id: @event.id,
-          title: "Matchday #{date.to_date}",
+          name: "Matchday #{date.to_date}",
           pos: 999001+@patch_round_ids_pos.length,   # e.g. 999<count> - 999001,999002,etc.
           start_at:  date.to_date,
           end_at:    date.to_date
@@ -541,7 +499,7 @@ class MatchParser   ## simple match parser for team match schedules
       end
 
       ## note: will crash (round.pos) if round is nil
-      logger.debug( "  using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
+      logger.debug( "  using round #{round.pos} >#{round.name}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
     else
       ## use round from last round header
       round = @round

data/lib/sportdb/formats/score/score_parser.rb

@@ -90,6 +90,12 @@ class ScoreParser
 
 
   def parse( line )
+
+     ##########
+     ## todo/fix/check: add unicode to regular dash conversion - why? why not?
+     ##  e.g. – becomes -  (yes, the letters a different!!!)
+     #############
+
     score = nil
     @formats.each do |format|
       re = format[0]

data/lib/sportdb/formats/structs/group.rb

@@ -2,20 +2,13 @@ module SportDb
   module Import
 
     class Group
-      attr_reader   :title, :pos, :teams
+      attr_reader :key, :name, :teams
 
-      ##
-      ##  todo:  change db schema
-      ##    make start and end date optional
-      ##    change pos to num - why? why not?
-      ##    make pos/num optional too
-      ##
-      ##    sort round by scheduled/planed start date
-      def initialize( title:,
-                      pos:,
+      def initialize( key: nil,
+                      name:,
                       teams: )
-        @title  = title
-        @pos    = pos
+        @key    = key    ## e.g. A,B,C  or 1,2,3, - note: always a string or nil
+        @name   = name
         @teams  = teams
       end
     end  # class Group

data/lib/sportdb/formats/structs/round.rb

@@ -2,24 +2,17 @@ module SportDb
   module Import
 
     class Round
-      attr_reader   :title, :start_date, :end_date, :knockout
-      attr_accessor :pos   # note: make read & writable
+      attr_reader   :name, :start_date, :end_date, :knockout
+      attr_accessor :num   # note: make read & writable - why? why not?
 
-      ##
-      ##  todo:  change db schema
-      ##    make start and end date optional
-      ##    change pos to num - why? why not?
-      ##    make pos/num optional too
-      ##
-      ##    sort round by scheduled/planed start date
-      def initialize( title:,
-                      pos: nil,
+      def initialize( name:,
+                      num: nil,
                       start_date: nil,
                       end_date: nil,
                       knockout: false,
                       auto: true )
-        @title      = title
-        @pos        = pos
+        @name       = name
+        @num        = num
         @start_date = start_date
         @end_date   = end_date
         @knockout   = knockout

data/lib/sportdb/formats/structs/team.rb

@@ -11,10 +11,9 @@ class Team
   ##  todo: use just names for alt_names - why? why not?
   attr_accessor :key, :name, :alt_names,
                 :code,    ## code == abbreviation e.g. ARS etc.
-                :year, :year_end,   ## todo/fix: change year_end to end_year (like in season)!!!
+                :year, :year_end,   ## todo/fix: change year to start_year and year_end to end_year (like in season)!!!
                 :country
 
-  alias_method :title, :name  ## add alias/compat - why? why not
 
   def names
     ## todo/check: add alt_names_auto too? - why? why not?

data/lib/sportdb/formats/version.rb

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

data/test/test_country_reader.rb

@@ -75,13 +75,13 @@ TXT
     assert_equal 'Czechoslovakia (-1992)', recs[0].name
     assert_equal 'TCH',                    recs[0].code
     assert_equal 'czechoslovakia',         recs[0].key
-    assert_equal ['Czechoslovakia'],       recs[0].alt_names
+    assert_equal [],                       recs[0].alt_names
     assert_equal [],                       recs[0].tags
 
     assert_equal 'East Germany (-1989)',   recs[3].name
     assert_equal 'GDR',                    recs[3].code
     assert_equal 'eastgermany',            recs[3].key
-    assert_equal ['East Germany'],         recs[3].alt_names
+    assert_equal [],                       recs[3].alt_names
     assert_equal [],                       recs[3].tags
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets