sportdb-formats 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ebc60eb9651185cf5aa0ba1c7707fc8678f7803
-  data.tar.gz: 67d24f30f4a8586f54ea73135fd58239420e1e22
+  metadata.gz: 7bd2657cda87fd1024bec068f79453d73b0bbac5
+  data.tar.gz: 7c35301f832b66bf691c9d1964de00c9a9b2371d
 SHA512:
-  metadata.gz: 6c2fdcdf34f4ea95ee765d1b1cfedd9aef84787836fb7fb2c21c10d4000e3b8417109f5ec9ce4d5ae552a0a63d5e91a9c976847fd33b175cccad5aa4d5ea4762
-  data.tar.gz: 4ef8c4ba7538c738e2c44b6f16aafbdc11d640485ecf99a603a764c069b038e290ea320918ec16ecd3405f321e6b4bba5f8b350c6835c5f3a70808954da93350
+  metadata.gz: 90ef6ad29934fc9bb692045d9f5e2a447a2dcaf80ab8ca0a3e1b50ae34e95bae7a139e88ef454314c0a26bc978784abb6abd117bf1961e71c65a95046d21efe1
+  data.tar.gz: 73e55608b287d974d40c4529c3f104496acde866dc3908509adcee6ed8a40dc0f10f8e48f193cd6184ef29c31bdfa3ebd9eb38a38c85924dde207cc0433ea318

data/Manifest.txt

@@ -10,8 +10,11 @@ lib/sportdb/formats/package.rb
 lib/sportdb/formats/scores.rb
 lib/sportdb/formats/season_utils.rb
 lib/sportdb/formats/structs/club.rb
+lib/sportdb/formats/structs/country.rb
+lib/sportdb/formats/structs/league.rb
 lib/sportdb/formats/structs/match.rb
 lib/sportdb/formats/structs/matchlist.rb
+lib/sportdb/formats/structs/round.rb
 lib/sportdb/formats/structs/season.rb
 lib/sportdb/formats/structs/standings.rb
 lib/sportdb/formats/structs/team_usage.rb

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

@@ -3,18 +3,10 @@
 module SportDb
   module Import
 
-##
-#  note: use our own (internal) club struct for now - why? why not?
-#    - check that shape/structure/fields/attributes match
-#      the Team struct in sportdb-text (in SportDb::Struct::Team)  !!!!
-
-
-## more attribs - todo/fix - also add "upstream" to struct & model!!!!!
+########
+# more attribs - todo/fix - also add "upstream" to struct & model!!!!!
 #   district, geos, year_end, country, etc.
 
-
-
-
 class Club
 
   def self.create( **kwargs )
@@ -22,9 +14,9 @@ class Club
   end
 
   def update( **kwargs )
-    @name        = kwargs[:name]       if kwargs.has_key?( :name )
-    @alt_names   = kwargs[:alt_names]  if kwargs.has_key?( :alt_names )
-    @city        = kwargs[:city]       if kwargs.has_key?( :city )
+    @name        = kwargs[:name]       if kwargs.has_key? :name
+    @alt_names   = kwargs[:alt_names]  if kwargs.has_key? :alt_names
+    @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?
 

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

@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+module SportDb
+  module Import
+
+##
+#  note: check that shape/structure/fields/attributes match
+#            the ActiveRecord model !!!!
+
+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_accessor :alt_names
+
+  def initialize( key:, name:, fifa:, tags: [] )
+    @key, @name, @fifa = key, name, fifa
+    @alt_names      = []
+    @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
+
+
+end   # module Import
+end   # module SportDb
+

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

@@ -0,0 +1,56 @@
+# encoding: utf-8
+
+module SportDb
+  module Import
+
+class League
+  attr_reader   :key, :name, :country, :intl
+  attr_accessor :alt_names
+
+  ## special import only attribs
+  attr_accessor :alt_names_auto    ## auto-generated alt names
+
+  def initialize( key:, name:, alt_names: [], alt_names_auto: [],
+                  country: nil, intl: false )
+    @key            = key
+    @name           = name
+    @alt_names      = alt_names
+    @alt_names_auto = alt_names_auto
+    @country        = country
+    @intl           = intl
+  end
+
+  def intl?()      @intl == true; end
+  def national?()  @intl == false; end
+  alias_method   :domestic?, :national?
+
+
+
+  ## 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
+end   # module SportDb

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

@@ -1,8 +1,5 @@
 # encoding: utf-8
 
-##
-# note: add all "former" structs to the SportDb::Import module / namespace
-
 module SportDb
   module Import
 
@@ -16,8 +13,11 @@ class Match
   def update( **kwargs )
     ## note: check with has_key?  because value might be nil!!!
     @date     = kwargs[:date]     if kwargs.has_key? :date
+
+    ## todo/fix: use team1_name, team2_name or similar - for compat with db activerecord version? why? why not?
     @team1    = kwargs[:team1]    if kwargs.has_key? :team1
     @team2    = kwargs[:team2]    if kwargs.has_key? :team2
+
     @conf1    = kwargs[:conf1]    if kwargs.has_key? :conf1
     @conf2    = kwargs[:conf2]    if kwargs.has_key? :conf2
     @country1 = kwargs[:country1]  if kwargs.has_key? :country1
@@ -124,8 +124,7 @@ class Match
   def scorei_str    # pretty print (half time) scores; convenience method
     "#{@score1i}-#{@score2i}"
   end
-
 end  # class Match
-end # module Import
 
+end # module Import
 end # module SportDb

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

@@ -1,9 +1,6 @@
 # encoding: utf-8
 
 
-##
-# note: add all "former" structs to the SportDb::Import module / namespace
-
 module SportDb
   module Import
 

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

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

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

@@ -1,9 +1,6 @@
 # encoding: utf-8
 
 
-##
-# note: add all "former" structs to the SportDb::Import module / namespace
-
 module SportDb
   module Import
 

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

@@ -6,9 +6,6 @@
 ##   do NOT duplicate
 
 
-##
-# note: add all "former" structs to the SportDb::Import module / namespace
-
 module SportDb
   module Import
 

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

@@ -1,9 +1,6 @@
 # encoding: utf-8
 
 
-##
-# note: add all "former" structs to the SportDb::Import module / namespace
-
 module SportDb
   module Import
 

data/lib/sportdb/formats/version.rb

@@ -5,7 +5,7 @@ module SportDb
 module Formats
 
   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/formats.rb

@@ -31,8 +31,11 @@ require 'sportdb/formats/datafile'
 require 'sportdb/formats/package'
 require 'sportdb/formats/season_utils'
 
+require 'sportdb/formats/structs/country'
 require 'sportdb/formats/structs/season'
+require 'sportdb/formats/structs/league'
 require 'sportdb/formats/structs/club'
+require 'sportdb/formats/structs/round'
 require 'sportdb/formats/structs/match'
 require 'sportdb/formats/structs/matchlist'
 require 'sportdb/formats/structs/standings'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -129,8 +129,11 @@ files:
 - lib/sportdb/formats/scores.rb
 - lib/sportdb/formats/season_utils.rb
 - lib/sportdb/formats/structs/club.rb
+- lib/sportdb/formats/structs/country.rb
+- lib/sportdb/formats/structs/league.rb
 - lib/sportdb/formats/structs/match.rb
 - lib/sportdb/formats/structs/matchlist.rb
+- lib/sportdb/formats/structs/round.rb
 - lib/sportdb/formats/structs/season.rb
 - lib/sportdb/formats/structs/standings.rb
 - lib/sportdb/formats/structs/team_usage.rb