sportdb-structs 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 558329ee3ae366f713dc5e20cdd61de62d5f190d
-  data.tar.gz: 05a89470a83b3ded621a2c0ef0125be847e4e14a
+SHA256:
+  metadata.gz: '009da80615ac77d643529d2feee7692ca31ce2c07c5f1dd45cf2667558af4b90'
+  data.tar.gz: 7368f410cfc3b4fa0af288c20399c1244841518cf5598ff443dcf17aaa881501
 SHA512:
-  metadata.gz: dcad6e831a704229f9e7926a22b64d0b54f5855e320ef77fa48972dcd2759f241c7db837e6320981857b66cd109155385e21e92d65caf105b6296bd22751b97a
-  data.tar.gz: 36b338d8654a1d9ffda30ea85e77caa099a71a411e38bcb69c1a11bacf0f30c6ed9daaf77bbba66e8849726a0e827844fc4ac6b4d74ae9ab9ec73e33e5175bd5
+  metadata.gz: 56acdb1dc22c5b70f51c398e1ae912ff6bcbf50f021391efa5eba75d3ddeb4c1d069255fd715a891f6c4451f25f4c0212eb8769bd129755ede88ca322cd4e4e6
+  data.tar.gz: 35dcad60e6c784859d5c7218e4771ec5979cb4a07b1e07ba6f598e64fc968c1cfd75ee5e48f2c22996fa570a37292051b8f4f4e195ea2b9527ecfceef4753b6c

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 0.2.0
+
 ### 0.0.1 / 2020-08-24
 
 * Everything is new. First release.

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/sportdb/structs/match_status_parser.rb
 lib/sportdb/structs/name_helper.rb
 lib/sportdb/structs/structs/country.rb
 lib/sportdb/structs/structs/goal.rb
+lib/sportdb/structs/structs/ground.rb
 lib/sportdb/structs/structs/group.rb
 lib/sportdb/structs/structs/league.rb
 lib/sportdb/structs/structs/match.rb
@@ -19,9 +20,3 @@ lib/sportdb/structs/structs/standings.rb
 lib/sportdb/structs/structs/team.rb
 lib/sportdb/structs/structs/team_usage.rb
 lib/sportdb/structs/version.rb
-test/helper.rb
-test/test_clubs.rb
-test/test_csv_reader.rb
-test/test_match.rb
-test/test_match_status_parser.rb
-test/test_name_helper.rb

data/README.md

@@ -22,8 +22,8 @@ The `sportdb-structs` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
 
+
 ## Questions? Comments?
 
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+Yes, you can. More than welcome.
+See [Help & Support »](https://github.com/openfootball/help)

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'sportdb-structs' do
   self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
-  self.email  = 'opensport@googlegroups.com'
+  self.email  = 'gerald.bauer@gmail.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'

data/lib/sportdb/structs/config.rb

@@ -1,39 +1,39 @@
-module SportDb
-  module Import
-
-class Configuration
-  ##
-  ##  todo: allow configure of countries_dir like clubs_dir
-  ##         "fallback" and use a default built-in world/countries.txt
-
-  attr_accessor   :catalog
-
-  attr_reader   :lang
-  def lang=(value)
-    ## check/todo: always use to_sym - why? needed?
-    DateFormats.lang  = value
-    ScoreFormats.lang = value
-    SportDb.lang.lang = value
-
-    ## todo/fix:  change SportDb.lang to SportDb.parser.lang or lang_parser or utils or someting !!!!
-    ##   use Sport.lang only as a read-only shortcut a la catalog for config.lang!!!!
-  end
-
-end # class Configuration
-
-
-## lets you use
-##   SportDb::Import.configure do |config|
-##      config.lang = 'it'
-##   end
-
-def self.configure()  yield( config ); end
-
-def self.config()  @config ||= Configuration.new;  end
-
-##  e.g. use config.catalog  -- keep Import.catalog as a shortcut (for "read-only" access)
-def self.catalog() config.catalog;  end
-
-end   # module Import
-end   # module SportDb
-
+module SportDb
+module Import
+
+class Configuration
+  ##
+  ##  todo: allow configure of countries_dir like clubs_dir
+  ##         "fallback" and use a default built-in world/countries.txt
+
+  ##  note: catalog defined/added in sports-catalogs gem!!! 
+  ## attr_accessor   :catalog
+
+  attr_reader   :lang
+  def lang=(value)
+    ## check/todo: always use to_sym - why? needed?
+    DateFormats.lang  = value
+    ScoreFormats.lang = value
+    SportDb.lang.lang = value
+
+    ## todo/fix:  change SportDb.lang to SportDb.parser.lang
+    ##             or lang_parser or utils or someting !!!!
+    ##   use Sport.lang only as a read-only shortcut 
+    #        a la catalog for config.lang!!!!
+  end
+
+end # class Configuration
+
+
+## lets you use
+##   SportDb::Import.configure do |config|
+##      config.lang = 'it'
+##   end
+def self.configure()  yield( config ); end
+
+def self.config()  @config ||= Configuration.new;  end
+
+
+end   # module Import
+end   # module SportDb
+

data/lib/sportdb/structs/goal_parser_csv.rb

@@ -1,28 +1,28 @@
-
-module SportDb
-  class CsvGoalParser
-
-
-  def self.read( path )
-     txt = File.open( path, 'r:utf-8' ) {|f| f.read }   ## note: make sure to use (assume) utf-8
-     parse( txt )
-  end
-
-  def self.parse( txt )
-     new( txt ).parse
-  end
-
-
-  def initialize( txt )
-    @txt = txt
-  end
-
-  def parse
-    rows = parse_csv( @txt )
-    recs = rows.map { |row| Sports::GoalEvent.build( row ) }
-    ## pp recs[0]
-    recs
-  end
-
-  end # class CsvGoalParser
-end # module Sports
+
+module SportDb
+  class CsvGoalParser
+
+
+  def self.read( path )
+     txt = File.open( path, 'r:utf-8' ) {|f| f.read }   ## note: make sure to use (assume) utf-8
+     parse( txt )
+  end
+
+  def self.parse( txt )
+     new( txt ).parse
+  end
+
+
+  def initialize( txt )
+    @txt = txt
+  end
+
+  def parse
+    rows = parse_csv( @txt )
+    recs = rows.map { |row| Sports::GoalEvent.build( row ) }
+    ## pp recs[0]
+    recs
+  end
+
+  end # class CsvGoalParser
+end # module Sports

data/lib/sportdb/structs/match_parser_csv.rb

@@ -116,7 +116,7 @@ module SportDb
 
          header_league = find_header( headers, ['League'] )
          headers_mapping[:league] = header_league   if header_league
-        else
+      else
          ## else try footballdata.uk and others
          headers_mapping[:team1]  = find_header( headers, ['HomeTeam', 'HT', 'Home'] )
          headers_mapping[:team2]  = find_header( headers, ['AwayTeam', 'AT', 'Away'] )

data/lib/sportdb/structs/match_status_parser.rb

@@ -1,90 +1,90 @@
-#####################
-# helpers for parsing & finding match status e.g.
-#    - cancelled / canceled
-#    - awarded
-#    - abandoned
-#    - replay
-#    etc.
-
-
-module SportDb
-
-
-  ### todo/fix: move Status inside Match struct - why? why not?
-
-  class Status
-# note: use a class as an "enum"-like namespace for now - why? why not?
-#   move class into Match e.g. Match::Status  - why? why not?
-    CANCELLED = 'CANCELLED'   # canceled (US spelling), cancelled (UK spelling) - what to use?
-    AWARDED   = 'AWARDED'
-    POSTPONED = 'POSTPONED'
-    ABANDONED = 'ABANDONED'
-    REPLAY    = 'REPLAY'
-  end # class Status
-
-
-
-  class StatusParser
-
-    def self.parse( str )
-      ## note: returns nil if no match found
-      ## note: english usage - cancelled (in UK), canceled (in US)
-      if str =~ /^(cancelled|
-                   canceled|
-                   can\.
-                  )/xi
-        Status::CANCELLED
-      elsif str =~ /^(awarded|
-                       awd\.
-                      )/xi
-        Status::AWARDED
-      elsif str =~ /^(postponed
-                      )/xi
-        Status::POSTPONED
-      elsif str =~ /^(abandoned|
-                       abd\.
-                      )/xi
-        Status::ABANDONED
-      elsif str =~ /^(replay
-                      )/xi
-        Status::REPLAY
-      else
-        # no match
-        nil
-      end
-    end
-
-
-    RUN_RE = /\[
-                 (?<text>[^\]]+)
-               \]
-             /x
-    def self.find!( line )
-      ## for now check all "protected" text run blocks e.g. []
-      ##  puts "line: >#{line}<"
-
-      status = nil
-
-      str = line
-      while m = str.match( RUN_RE )
-        str = m.post_match  ## keep on processing rest of line/str (a.k.a. post match string)
-
-        ## check for status match
-        match_str = m[0]  ## keep a copy of the match string (for later sub)
-        text = m[:text].strip
-        ## puts "  text: >#{text}<"
-
-        status = parse( text )
-
-        if status
-           line.sub!( match_str, "[STATUS.#{status}]" )
-           break
-        end
-      end  # while match
-
-      status
-    end # method find!
-  end # class StatusParser
-
-end # module SportDb
-
+#####################
+# helpers for parsing & finding match status e.g.
+#    - cancelled / canceled
+#    - awarded
+#    - abandoned
+#    - replay
+#    etc.
+
+
+module SportDb
+
+
+  ### todo/fix: move Status inside Match struct - why? why not?
+
+  class Status
+# note: use a class as an "enum"-like namespace for now - why? why not?
+#   move class into Match e.g. Match::Status  - why? why not?
+    CANCELLED = 'CANCELLED'   # canceled (US spelling), cancelled (UK spelling) - what to use?
+    AWARDED   = 'AWARDED'
+    POSTPONED = 'POSTPONED'
+    ABANDONED = 'ABANDONED'
+    REPLAY    = 'REPLAY'
+  end # class Status
+
+
+
+  class StatusParser
+
+    def self.parse( str )
+      ## note: returns nil if no match found
+      ## note: english usage - cancelled (in UK), canceled (in US)
+      if str =~ /^(cancelled|
+                   canceled|
+                   can\.
+                  )/xi
+        Status::CANCELLED
+      elsif str =~ /^(awarded|
+                       awd\.
+                      )/xi
+        Status::AWARDED
+      elsif str =~ /^(postponed
+                      )/xi
+        Status::POSTPONED
+      elsif str =~ /^(abandoned|
+                       abd\.
+                      )/xi
+        Status::ABANDONED
+      elsif str =~ /^(replay
+                      )/xi
+        Status::REPLAY
+      else
+        # no match
+        nil
+      end
+    end
+
+
+    RUN_RE = /\[
+                 (?<text>[^\]]+)
+               \]
+             /x
+    def self.find!( line )
+      ## for now check all "protected" text run blocks e.g. []
+      ##  puts "line: >#{line}<"
+
+      status = nil
+
+      str = line
+      while m = str.match( RUN_RE )
+        str = m.post_match  ## keep on processing rest of line/str (a.k.a. post match string)
+
+        ## check for status match
+        match_str = m[0]  ## keep a copy of the match string (for later sub)
+        text = m[:text].strip
+        ## puts "  text: >#{text}<"
+
+        status = parse( text )
+
+        if status
+           line.sub!( match_str, "[STATUS.#{status}]" )
+           break
+        end
+      end  # while match
+
+      status
+    end # method find!
+  end # class StatusParser
+
+end # module SportDb
+

data/lib/sportdb/structs/name_helper.rb

@@ -1,87 +1,87 @@
-
-module SportDb
-  module NameHelper
-
-
-  ## note: allow placeholder years to e.g. (-___) or (-????)
-  ##    for marking missing (to be filled in) years
-  ##  e.g. (1887-1911), (-2013),
-  ##      (1946-2001, 2013-) etc.
-  ##  todo/check: make more strict  e.g. only accept 4-digit years? - why? why not?
-  YEAR_RE =  %r{\(
-                  [0-9, ?_-]+?     # note: non-greedy (minimum/first) match
-              \)}x
-
-  def strip_year( name )
-    ## check for year(s) e.g. (1887-1911), (-2013),
-    ##                        (1946-2001, 2013-) etc.
-    ##  todo/check: only sub once (not global) - why? why not?
-    name.gsub( YEAR_RE, '' ).strip
-  end
-
-  def has_year?( name ) name =~ YEAR_RE; end
-
-
-  LANG_RE =  %r{\[
-                [a-z]{1,2}    # note also allow single-letter [a] or [d] or [e] - why? why not?
-                \]}x
-  def strip_lang( name )
-     name.gsub( LANG_RE, '' ).strip
-  end
-
-  def has_lang?( name ) name =~ LANG_RE; end
-
-
-  def sanitize( name )
-    ## check for year(s) e.g. (1887-1911), (-2013),
-    ##                        (1946-2001,2013-) etc.
-    name = strip_year( name )
-    ## check lang codes e.g. [en], [fr], etc.
-    name = strip_lang( name )
-    name
-  end
-
-
-  ## note: also add (),’,−  etc. e.g.
-  ##   Estudiantes (LP) => Estudiantes LP
-  ##   Saint Patrick’s Athletic FC => Saint Patricks Athletic FC
-  ##   Myllykosken Pallo −47 => Myllykosken Pallo 47
-  ##
-  ##  add & too!!
-  ##   e.g. Brighton & Hove Albion => Brighton Hove Albion  -- and others in England
-
-  NORM_RE =  %r{
-                    [.'’º/()&_−-]
-                  }x   # note: in [] dash (-) if last doesn't need to get escaped
-  ## note: remove all dots (.), dash (-), ', º, /, etc.
-  #   .  U+002E (46) - FULL STOP
-  #   '  U+0027 (39) - APOSTROPHE
-  #   ’  U+2019 (8217) - RIGHT SINGLE QUOTATION MARK
-  #   º  U+00BA (186) - MASCULINE ORDINAL INDICATOR
-  #   /  U+002F (47) - SOLIDUS
-  #   (  U+0028 (40) - LEFT PARENTHESIS
-  #   )  U+0029 (41) - RIGHT PARENTHESIS
-  #   −  U+2212 (8722) - MINUS SIGN
-  #   -  U+002D (45) - HYPHEN-MINUS
-
-  ##         for norm(alizing) names
-  def strip_norm( name )
-    name.gsub( NORM_RE, '' )
-  end
-
-  def normalize( name )
-    # note: do NOT call sanitize here (keep normalize "atomic" for reuse)
-    name = strip_norm( name )
-    name = name.gsub( ' ', '' )  # note: also remove all spaces!!!
-
-    ## todo/check: use our own downcase - why? why not?
-    name = downcase_i18n( name )     ## do NOT care about upper and lowercase for now
-    name
-  end
-
-
-  def variants( name )  Variant.find( name ); end
-
-  end  # module NameHelper
-end   # module SportDb
-
+
+module SportDb
+  module NameHelper
+
+
+  ## note: allow placeholder years to e.g. (-___) or (-????)
+  ##    for marking missing (to be filled in) years
+  ##  e.g. (1887-1911), (-2013),
+  ##      (1946-2001, 2013-) etc.
+  ##  todo/check: make more strict  e.g. only accept 4-digit years? - why? why not?
+  YEAR_RE =  %r{\(
+                  [0-9, ?_-]+?     # note: non-greedy (minimum/first) match
+              \)}x
+
+  def strip_year( name )
+    ## check for year(s) e.g. (1887-1911), (-2013),
+    ##                        (1946-2001, 2013-) etc.
+    ##  todo/check: only sub once (not global) - why? why not?
+    name.gsub( YEAR_RE, '' ).strip
+  end
+
+  def has_year?( name ) name =~ YEAR_RE; end
+
+
+  LANG_RE =  %r{\[
+                [a-z]{1,2}    # note also allow single-letter [a] or [d] or [e] - why? why not?
+                \]}x
+  def strip_lang( name )
+     name.gsub( LANG_RE, '' ).strip
+  end
+
+  def has_lang?( name ) name =~ LANG_RE; end
+
+
+  def sanitize( name )
+    ## check for year(s) e.g. (1887-1911), (-2013),
+    ##                        (1946-2001,2013-) etc.
+    name = strip_year( name )
+    ## check lang codes e.g. [en], [fr], etc.
+    name = strip_lang( name )
+    name
+  end
+
+
+  ## note: also add (),’,−  etc. e.g.
+  ##   Estudiantes (LP) => Estudiantes LP
+  ##   Saint Patrick’s Athletic FC => Saint Patricks Athletic FC
+  ##   Myllykosken Pallo −47 => Myllykosken Pallo 47
+  ##
+  ##  add & too!!
+  ##   e.g. Brighton & Hove Albion => Brighton Hove Albion  -- and others in England
+
+  NORM_RE =  %r{
+                    [.'’º/()&_−-]
+                  }x   # note: in [] dash (-) if last doesn't need to get escaped
+  ## note: remove all dots (.), dash (-), ', º, /, etc.
+  #   .  U+002E (46) - FULL STOP
+  #   '  U+0027 (39) - APOSTROPHE
+  #   ’  U+2019 (8217) - RIGHT SINGLE QUOTATION MARK
+  #   º  U+00BA (186) - MASCULINE ORDINAL INDICATOR
+  #   /  U+002F (47) - SOLIDUS
+  #   (  U+0028 (40) - LEFT PARENTHESIS
+  #   )  U+0029 (41) - RIGHT PARENTHESIS
+  #   −  U+2212 (8722) - MINUS SIGN
+  #   -  U+002D (45) - HYPHEN-MINUS
+
+  ##         for norm(alizing) names
+  def strip_norm( name )
+    name.gsub( NORM_RE, '' )
+  end
+
+  def normalize( name )
+    # note: do NOT call sanitize here (keep normalize "atomic" for reuse)
+    name = strip_norm( name )
+    name = name.gsub( ' ', '' )  # note: also remove all spaces!!!
+
+    ## todo/check: use our own downcase - why? why not?
+    name = downcase_i18n( name )     ## do NOT care about upper and lowercase for now
+    name
+  end
+
+
+  def variants( name )  Variant.find( name ); end
+
+  end  # module NameHelper
+end   # module SportDb
+

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

@@ -4,6 +4,25 @@ module Sports
 #  note: check that shape/structure/fields/attributes match
 #            the ActiveRecord model !!!!
 
+## add city here
+##   use module World - why? why not?
+
+class City
+  attr_reader   :key, :name, :country
+  attr_accessor :alt_names
+
+  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
+    @key       = key || unaccent(name).downcase.gsub( /[^a-z]/, '' ) + "_" + country.key
+    @name      = name
+    @country   = country
+    @alt_names = []
+  end
+end  # class City
+
+
 class Country
 
   ## note: is read-only/immutable for now - why? why not?
@@ -14,7 +33,15 @@ 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 = key || name.downcase.gsub( /[^a-z]/, '' )
+    @key = begin 
+              if key
+                key 
+              elsif code
+                 code.downcase
+              else
+                 unaccent( name ).downcase.gsub( /[^a-z]/, '' )
+              end
+            end
     @name, @code = name, code
     @alt_names      = []
     @tags           = tags