sportdb-formats 0.4.0 → 1.0.0

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

@@ -11,7 +11,7 @@ class Country
 
   ## note: is read-only/immutable for now - why? why not?
   ##          add cities (array/list) - why? why not?
-  attr_reader :key, :name, :fifa, :tags
+  attr_reader   :key, :name, :fifa, :tags
   attr_accessor :alt_names
 
   def initialize( key:, name:, fifa:, tags: [] )
@@ -20,48 +20,6 @@ class Country
     @tags           = tags
   end
 
-  ## add csv-like access by hash key for compatibility - why? why not? - check where used? remove!!!
-  def []( key ) send( key ); end
-
-
-  ###################################
-  # "global" helper - move to ___ ? why? why not?
-  ##   todo/fix: use shared helpers for country, club, etc. (do NOT duplicate)!!!
-  YEAR_REGEX = /\([0-9,\- ]+?\)/
-  def self.strip_year( name )
-    ## check for year(s) e.g. (1887-1911), (-2013),
-    ##                        (1946-2001, 2013-) etc.
-    name.gsub( YEAR_REGEX, '' ).strip
-  end
-
-  def self.has_year?( name ) name =~ YEAR_REGEX; end
-
-  LANG_REGEX = /\[[a-z]{1,2}\]/   ## note also allow [a] or [d] or [e] - why? why not?
-  def self.strip_lang( name )
-    name.gsub( LANG_REGEX, '' ).strip
-  end
-
-  def self.has_lang?( name ) name =~ LANG_REGEX; end
-
-
-   NORM_REGEX =  /[.'º\-\/]/
-   ## note: remove all dots (.), dash (-), ', º, /, etc.
-   ##         for norm(alizing) names
-   def self.strip_norm( name )
-     name.gsub( NORM_REGEX, '' )
-   end
-
-   def self.normalize( name )
-     # note: do NOT call sanitize here (keep normalize "atomic" for reuse)
-
-     ## remove all dots (.), dash (-), º, /, etc.
-     name = strip_norm( name )
-     name = name.gsub( ' ', '' )  # note: also remove all spaces!!!
-
-     ## todo/fix: use our own downcase - why? why not?
-     name = downcase_i18n( name )     ## do NOT care about upper and lowercase for now
-     name
-   end
 end  # class Country
 
 

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

@@ -0,0 +1,25 @@
+module SportDb
+  module Import
+
+    class Group
+      attr_reader   :title, :pos, :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:,
+                      teams: )
+        @title  = title
+        @pos    = pos
+        @teams  = teams
+      end
+    end  # class Group
+
+  end # module Import
+end # module SportDb
+

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

@@ -11,45 +11,26 @@ class League
   attr_accessor :alt_names_auto    ## auto-generated alt names
 
   def initialize( key:, name:, alt_names: [], alt_names_auto: [],
-                  country: nil, intl: false )
+                  country: nil, intl: false, clubs: true )
     @key            = key
     @name           = name
     @alt_names      = alt_names
     @alt_names_auto = alt_names_auto
+
     @country        = country
     @intl           = intl
+    @clubs          = clubs
   end
 
   def intl?()      @intl == true; end
   def national?()  @intl == false; end
   alias_method   :domestic?, :national?
 
+  def clubs?()            @clubs == true; end
+  def national_teams?()   @clubs == false; end
+  alias_method   :club?,          :clubs?
+  alias_method   :national_team?, :national_teams?
 
-
-  ## todo/fix: (re)use helpers from clubs - how? why? why not?
-  LANG_REGEX = /\[[a-z]{1,2}\]/   ## note also allow [a] or [d] or [e] - why? why not?
-  def self.strip_lang( name )
-    name.gsub( LANG_REGEX, '' ).strip
-  end
-
-  NORM_REGEX =  /[.'º\-\/]/
-  ## note: remove all dots (.), dash (-), ', º, /, etc.
-  ##         for norm(alizing) names
-  def self.strip_norm( name )
-    name.gsub( NORM_REGEX, '' )
-  end
-
-  def self.normalize( name )
-    # note: do NOT call sanitize here (keep normalize "atomic" for reuse)
-
-    ## remove all dots (.), dash (-), º, /, etc.
-    name = strip_norm( name )
-    name = name.gsub( ' ', '' )  # note: also remove all spaces!!!
-
-    ## todo/fix: use our own downcase - why? why not?
-    name = downcase_i18n( name )     ## do NOT care about upper and lowercase for now
-    name
-  end
 end   # class League
 
 end   # module Import

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

@@ -6,8 +6,24 @@ module SportDb
 
 class Match
 
-  def self.create( **kwargs )    ## keep using create why? why not?
-    new.update( kwargs )
+  attr_reader :date,
+              :team1,     :team2,      ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
+              :score1,    :score2,     ## full time
+              :score1i,   :score2i,    ## half time (first (i) part)
+              :score1et,  :score2et,   ## extra time
+              :score1p,   :score2p,    ## penalty
+              :score1agg, :score2agg,  ## full time (all legs) aggregated
+              :winner,    # return 1,2,0   1 => team1, 2 => team2, 0 => draw/tie
+              :round,     ## todo/fix:  use round_num or similar - for compat with db activerecord version? why? why not?
+              :leg,      ## e.g. '1','2','3','replay', etc.   - use leg for marking **replay** too - keep/make leg numeric?! - why? why not?
+              :stage,
+              :group,
+              :conf1,    :conf2,      ## special case for mls e.g. conference1, conference2 (e.g. west, east, central)
+              :country1, :country2,    ## special case for champions league etc. - uses FIFA country code
+              :comments
+
+  def initialize( **kwargs )
+    update( kwargs )  unless kwargs.empty?
   end
 
   def update( **kwargs )
@@ -31,32 +47,59 @@ class Match
     @group    = kwargs[:group]    if kwargs.has_key? :group
     @comments = kwargs[:comments] if kwargs.has_key? :comments
 
-
-    @score1     = kwargs[:score1]      if kwargs.has_key? :score1
-    @score1i    = kwargs[:score1i]     if kwargs.has_key? :score1i
-    @score1et   = kwargs[:score1et]    if kwargs.has_key? :score1et
-    @score1p    = kwargs[:score1p]     if kwargs.has_key? :score1p
-    @score1agg  = kwargs[:score1agg]   if kwargs.has_key? :score1agg
-
-    @score2     = kwargs[:score2]      if kwargs.has_key? :score2
-    @score2i    = kwargs[:score2i]     if kwargs.has_key? :score2i
-    @score2et   = kwargs[:score2et]    if kwargs.has_key? :score2et
-    @score2p    = kwargs[:score2p]     if kwargs.has_key? :score2p
-    @score2agg  = kwargs[:score2agg]   if kwargs.has_key? :score2agg
-
-    ## note: (always) (auto-)convert scores to integers
-    @score1     = @score1.to_i      if @score1
-    @score1i    = @score1i.to_i     if @score1i
-    @score1et   = @score1et.to_i    if @score1et
-    @score1p    = @score1p.to_i     if @score1p
-    @score1agg  = @score1agg.to_i   if @score1agg
-
-    @score2     = @score2.to_i      if @score2
-    @score2i    = @score2i.to_i     if @score2i
-    @score2et   = @score2et.to_i    if @score2et
-    @score2p    = @score2p.to_i     if @score2p
-    @score2agg  = @score2agg.to_i   if @score2agg
-
+    if kwargs.has_key?( :score )   ## check all-in-one score struct for convenience!!!
+      score = kwargs[:score]
+      if score.nil?   ## reset all score attribs to nil!!
+        @score1     = nil
+        @score1i    = nil
+        @score1et   = nil
+        @score1p    = nil
+        ## @score1agg  = nil
+
+        @score2     = nil
+        @score2i    = nil
+        @score2et   = nil
+        @score2p    = nil
+        ## @score2agg  = nil
+      else
+        @score1     = score.score1
+        @score1i    = score.score1i
+        @score1et   = score.score1et
+        @score1p    = score.score1p
+        ## @score1agg  = score.score1agg
+
+        @score2     = score.score2
+        @score2i    = score.score2i
+        @score2et   = score.score2et
+        @score2p    = score.score2p
+        ## @score2agg  = score.score2agg
+      end
+    else
+      @score1     = kwargs[:score1]      if kwargs.has_key? :score1
+      @score1i    = kwargs[:score1i]     if kwargs.has_key? :score1i
+      @score1et   = kwargs[:score1et]    if kwargs.has_key? :score1et
+      @score1p    = kwargs[:score1p]     if kwargs.has_key? :score1p
+      @score1agg  = kwargs[:score1agg]   if kwargs.has_key? :score1agg
+
+      @score2     = kwargs[:score2]      if kwargs.has_key? :score2
+      @score2i    = kwargs[:score2i]     if kwargs.has_key? :score2i
+      @score2et   = kwargs[:score2et]    if kwargs.has_key? :score2et
+      @score2p    = kwargs[:score2p]     if kwargs.has_key? :score2p
+      @score2agg  = kwargs[:score2agg]   if kwargs.has_key? :score2agg
+
+      ## note: (always) (auto-)convert scores to integers
+      @score1     = @score1.to_i      if @score1
+      @score1i    = @score1i.to_i     if @score1i
+      @score1et   = @score1et.to_i    if @score1et
+      @score1p    = @score1p.to_i     if @score1p
+      @score1agg  = @score1agg.to_i   if @score1agg
+
+      @score2     = @score2.to_i      if @score2
+      @score2i    = @score2i.to_i     if @score2i
+      @score2et   = @score2et.to_i    if @score2et
+      @score2p    = @score2p.to_i     if @score2p
+      @score2agg  = @score2agg.to_i   if @score2agg
+    end
 
     ## todo/fix:
     ##  gr-greece/2014-15/G1.csv:
@@ -65,7 +108,7 @@ class Match
 
     ##  for now score1 and score2 must be present
     if @score1.nil? || @score2.nil?
-      puts "*** missing scores for match:"
+      puts "** WARN: missing scores for match:"
       pp kwargs
       ## exit 1
     end
@@ -90,28 +133,6 @@ class Match
   end
 
 
-  attr_reader :date,
-              :team1,     :team2,      ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
-              :score1,    :score2,     ## full time
-              :score1i,   :score2i,    ## half time (first (i) part)
-              :score1et,  :score2et,   ## extra time
-              :score1p,   :score2p,    ## penalty
-              :score1agg, :score2agg,  ## full time (all legs) aggregated
-              :winner,    # return 1,2,0   1 => team1, 2 => team2, 0 => draw/tie
-              :round,     ## todo/fix:  use round_num or similar - for compat with db activerecord version? why? why not?
-              :leg,      ## e.g. '1','2','3','replay', etc.   - use leg for marking **replay** too - keep/make leg numeric?! - why? why not?
-              :stage,
-              :group,
-              :conf1,    :conf2,      ## special case for mls e.g. conference1, conference2 (e.g. west, east, central)
-              :country1, :country2,    ## special case for champions league etc. - uses FIFA country code
-              :comments
-
-
-
-  def initialize( **kwargs )
-    update( kwargs )  unless kwargs.empty?
-  end
-
 
   def over?()      true; end  ## for now all matches are over - in the future check date!!!
   def complete?()  true; end  ## for now all scores are complete - in the future check scores; might be missing - not yet entered

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

@@ -2,7 +2,8 @@ module SportDb
   module Import
 
     class Round
-      attr_reader :pos, :title
+      attr_reader   :title, :start_date, :end_date, :knockout
+      attr_accessor :pos   # note: make read & writable
 
       ##
       ##  todo:  change db schema
@@ -11,9 +12,18 @@ module SportDb
       ##    make pos/num optional too
       ##
       ##    sort round by scheduled/planed start date
-      def initialize( pos:, title: )
-        @pos   = pos
-        @title = title
+      def initialize( title:,
+                      pos: nil,
+                      start_date: nil,
+                      end_date: nil,
+                      knockout: false,
+                      auto: true )
+        @title      = title
+        @pos        = pos
+        @start_date = start_date
+        @end_date   = end_date
+        @knockout   = knockout
+        @auto       = auto        # auto-created (inline reference/header without proper definition before)
       end
     end  # class Round
 

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

@@ -87,6 +87,9 @@ class Season
   alias_method :to_key, :key
   alias_method :to_s,   :key
 
+  alias_method :name,   :key
+  alias_method :title,  :key
+
 
   def path( format: nil )
     ##  todo: find better names for formats - why? why not?:

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

@@ -0,0 +1,144 @@
+# encoding: utf-8
+
+module SportDb
+  module Import
+
+
+##
+##  todo/fix:  remove self.create in structs!!!  use just new!!!
+
+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)!!!
+                :country
+
+  alias_method :title, :name  ## add alias/compat - why? why not
+
+  def names
+    ## todo/check: add alt_names_auto too? - why? why not?
+    [@name] + @alt_names
+  end   ## all names
+
+  ## special import only attribs
+  attr_accessor :alt_names_auto    ## auto-generated alt names
+  attr_accessor :wikipedia   # wikipedia page name (for english (en))
+
+
+  def historic?()  @year_end ? true : false; end
+  alias_method  :past?, :historic?
+
+  def wikipedia?()  @wikipedia; end
+  def wikipedia_url
+    if @wikipedia
+      ##  note: replace spaces with underscore (-)
+      ##  e.g. Club Brugge KV => Club_Brugge_KV
+      ##  todo/check/fix:
+      ##    check if "plain" dash (-) needs to get replaced with typographic dash??
+      "https://en.wikipedia.org/wiki/#{@wikipedia.gsub(' ','_')}"
+    else
+      nil
+    end
+  end
+
+
+  def initialize( **kwargs )
+    @alt_names      = []
+    @alt_names_auto = []
+
+    update( kwargs )  unless kwargs.empty?
+  end
+
+  def update( **kwargs )
+    @key         = kwargs[:key]        if kwargs.has_key? :key
+    @name        = kwargs[:name]       if kwargs.has_key? :name
+    @code        = kwargs[:code]       if kwargs.has_key? :code
+    @alt_names   = kwargs[:alt_names]  if kwargs.has_key? :alt_names
+    self   ## note - MUST return self for chaining
+  end
+
+
+  ## helper methods for import only
+  ## check for duplicates
+  include NameHelper
+
+  def duplicates?
+    names = [name] + alt_names + alt_names_auto
+    names = names.map { |name| normalize( sanitize(name) ) }
+
+    names.size != names.uniq.size
+  end
+
+  def duplicates
+    names = [name] + alt_names + alt_names_auto
+
+    ## calculate (count) frequency and select if greater than one
+    names.reduce( {} ) do |h,name|
+       norm = normalize( sanitize(name) )
+       h[norm] ||= []
+       h[norm] << name; h
+    end.select { |norm,names| names.size > 1 }
+  end
+
+
+  def add_variants( name_or_names )
+    names = name_or_names.is_a?(Array) ? name_or_names : [name_or_names]
+    names.each do |name|
+      name = sanitize( name )
+      self.alt_names_auto += variants( name )
+    end
+  end
+end   # class Team
+
+
+
+class NationalTeam < Team
+  def initialize( **kwargs )
+    super
+  end
+
+  def update( **kwargs )
+    super
+    self   ## note - MUST return self for chaining
+  end
+
+end  # class NationalTeam
+
+
+########
+# more attribs - todo/fix - also add "upstream" to struct & model!!!!!
+#   district, geos, year_end, country, etc.
+
+class Club < Team
+  attr_accessor  :ground
+
+  attr_accessor :a, :b
+  def a?()  @a == nil; end  ## is a (1st) team / club (i)?            if a is NOT set
+  def b?()  @a != nil; end  ## is b (2nd/reserve/jr) team / club (ii) if a is     set
+
+  ## note: delegate/forward all geo attributes for team b for now (to team a) - keep - why? why not?
+  attr_writer  :city, :district, :geos
+  def city()      @a == nil ?  @city     : @a.city;     end
+  def district()  @a == nil ?  @district : @a.district; end
+  def country()   @a == nil ?  @country  : @a.country;  end
+  def geos()      @a == nil ?  @geos     : @a.geos;     end
+
+
+  def initialize( **kwargs )
+    super
+  end
+
+  def update( **kwargs )
+    super
+    @city        = kwargs[:city]       if kwargs.has_key? :city
+    ## todo/fix:  use city struct - why? why not?
+    ## todo/fix: add country too  or report unused keywords / attributes - why? why not?
+
+    self   ## note - MUST return self for chaining
+  end
+end # class Club
+
+
+end   # module Import
+end   # module SportDb