sportdb-config 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d84070a1a63efe77220f0be88991956c6696a7
-  data.tar.gz: 4b3c0a3a728065b648f52083f32eba1ebaeab43f
+  metadata.gz: 0c2c01fdd2e8ff942c611f48d710ab0ccd6ddb88
+  data.tar.gz: 86bf655cde4e2474bc1ac31448494e5381a73622
 SHA512:
-  metadata.gz: 2461e383c70749bfc398de2561a057ab087a1d366644b4cf20d11530c19858d70974e0852b96db71041a6a1f7ebdabb34492a5874785227beea0140911f48f77
-  data.tar.gz: 72e12603145d651a9a2b6266755d1838d962513be478d3f1dbcfb2025b649a8bf4adcea875cdb9bc9424e95cdcb8511c433493125d90f1e5ce1c7e49dfec9993
+  metadata.gz: 0ddb39ee84dd3481384092114e80012b653cd7928c58c47c3f55ad2642d3e8bab2df4cc85f1c14b300d893cc640e4c74e333950cfa9fd1e8d4f02a92223f63d7
+  data.tar.gz: fd4e20c0cf5b5bff7ad2c740816e3f97a567dcf0e1ee8d902e4961aa71686e138a46f575fe7538d0121224519d2056342635f2b15f2a55eee7c5c90339f1f0c7

data/Manifest.txt

@@ -1,5 +1,6 @@
 HISTORY.md
 Manifest.txt
+NOTES.md
 README.md
 Rakefile
 config/leagues/eng.txt
@@ -9,7 +10,6 @@ config/leagues/sco.txt
 config/world/ar.txt
 config/world/at.txt
 config/world/be.txt
-config/world/countries.txt
 config/world/de.txt
 config/world/eng.txt
 lib/sportdb/config.rb

data/NOTES.md

@@ -0,0 +1,8 @@
+# Notes
+
+## Todos
+
+- use a different name for sportdb-config
+  -  use sportdb-boot   and SportDb::Boot or
+  -  use sportdb-conf    - why? why not?
+  -   or sportdb-setup/startup/...

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.spec 'sportdb-config' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['csvreader',   '>= 1.2.4'],
+    ['fifa',   '>= 0.1.1'],
   ]
 
   self.spec_extras = {

data/lib/sportdb/config/config.rb

@@ -18,8 +18,7 @@ class Configuration
   end
 
   def build_country_index    ## todo/check: rename to setup_country_index or read_country_index - why? why not?
-    recs = read_csv( "#{SportDb::Boot.data_dir}/world/countries.txt" )
-    CountryIndex.new( recs )
+    CountryIndex.new( Fifa.countries )
   end
 
 

data/lib/sportdb/config/countries.rb

@@ -5,19 +5,8 @@ module SportDb
 
 ## built-in countries for (quick starter) auto-add
 
-##
-#  note: use our own (internal) country struct for now - why? why not?
-#    - check that shape/structure/fields/attributes match
-#      the Country struct in sportdb-text (in SportDb::Struct::Country)
-##       and 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
-  def initialize( key, name, fifa )
-    @key, @name, @fifa = key, name, fifa
-  end
-end  # class Country
+## note: (re)use the struct from the fifa country gem / library for now
+Country = ::Fifa::Country
 
 
 class CountryIndex
@@ -36,31 +25,23 @@ class CountryIndex
     recs.each do |rec|
       ## rec e.g. { key:'af', fifa:'AFG', name:'Afghanistan'}
 
-      key  = rec[:key]
-      ## note: remove territory of marker e.g. (UK), (US), etc. from name
-      ##    e.g. England (UK)     => England
-      ##         Puerto Rico (US) => Puerto Rico
-      name = rec[:name].sub( /\([A-Z]{2}\)/, '' ).strip
-      fifa = rec[:fifa]
-
-      country = Country.new( key, name, fifa )
-      @countries << country
+      @countries << rec
 
       ## add codes lookups - key, fifa, ...
-      if @countries_by_code[ country.key ]
-        puts "** !! ERROR !! country code (key) >#{country.key}< already exits!!"
+      if @countries_by_code[ rec.key ]
+        puts "** !! ERROR !! country code (key) >#{rec.key}< already exits!!"
         exit 1
       else
-        @countries_by_code[ country.key ] = country
+        @countries_by_code[ rec.key ] = rec
       end
 
       ## add fifa code (only) if different from key
-      if country.key != country.fifa.downcase
-        if @countries_by_code[ country.fifa.downcase ]
-          puts "** !! ERROR !! country code (fifa) >#{country.fifa.downcase}< already exits!!"
+      if rec.key != rec.fifa.downcase
+        if @countries_by_code[ rec.fifa.downcase ]
+          puts "** !! ERROR !! country code (fifa) >#{rec.fifa.downcase}< already exits!!"
           exit 1
         else
-          @countries_by_code[ country.fifa.downcase ] = country
+          @countries_by_code[ rec.fifa.downcase ] = rec
         end
       end
     end

data/lib/sportdb/config/version.rb

@@ -7,8 +7,8 @@ module Boot      ## note: use a different module than Config to avoid confusion
                  ##   maybe rename later gem itself to sportdb-boot - why? why not?
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 5
-  PATCH = 3
+  MINOR = 6
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/config.rb

@@ -13,6 +13,10 @@ def read_csv( path )
   CsvHash.read( path, :header_converters => :symbol )
 end
 
+
+require 'fifa'    ## get a list of all fifa countries with (three letter) codes
+
+
 ###
 # our own code
 require 'sportdb/config/version' # let version always go first
@@ -41,7 +45,7 @@ class Test    ## todo/check: works with module too? use a module - why? why not?
 
   ####
   #  todo/fix:  find a better way to configure shared test datasets - why? why not?
-  def self.data_dir()        @data_dir ||= './datasets'; end
+  def self.data_dir()        @data_dir ||= './test'; end
   def self.data_dir=( path ) @data_dir = path; end
 end
 
@@ -49,4 +53,5 @@ end   # module SportDb
 
 
 
+
 puts SportDb::Boot.banner   # say hello

data/test/test_countries.rb

@@ -9,15 +9,6 @@ require 'helper'
 
 class TestCountries < MiniTest::Test
 
-  def test_read_countries
-    recs = read_csv( "#{SportDb::Boot.data_dir}/world/countries.txt" )
-    ## pp recs
-
-    assert_equal  [{ key:'af', fifa:'AFG', name:'Afghanistan'},
-                   { key:'al', fifa:'ALB', name:'Albania'}], recs[0..1]
-  end
-
-
   def test_countries
     ## pp SportDb::Import.config.countries
 
@@ -31,12 +22,11 @@ class TestCountries < MiniTest::Test
     assert_equal 'Austria',  at.name
     assert_equal 'AUT',      at.fifa
 
-    aut  = SportDb::Import.config.countries[:aut]
-    assert_equal 'at',       aut.key
-    assert_equal 'Austria',  aut.name
-    assert_equal 'AUT',      aut.fifa
-
-    assert aut == at
+    assert at == SportDb::Import.config.countries['AT']
+    assert at == SportDb::Import.config.countries['at']
+    assert at == SportDb::Import.config.countries['AUT']
+    assert at == SportDb::Import.config.countries['aut']
+    assert at == SportDb::Import.config.countries[:aut]
   end
 
 end # class TestCountries

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-config
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: csvreader
+  name: fifa
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,7 @@ extensions: []
 extra_rdoc_files:
 - HISTORY.md
 - Manifest.txt
+- NOTES.md
 - README.md
 - config/leagues/eng.txt
 - config/leagues/fr.txt
@@ -67,12 +68,12 @@ extra_rdoc_files:
 - config/world/ar.txt
 - config/world/at.txt
 - config/world/be.txt
-- config/world/countries.txt
 - config/world/de.txt
 - config/world/eng.txt
 files:
 - HISTORY.md
 - Manifest.txt
+- NOTES.md
 - README.md
 - Rakefile
 - config/leagues/eng.txt
@@ -82,7 +83,6 @@ files:
 - config/world/ar.txt
 - config/world/at.txt
 - config/world/be.txt
-- config/world/countries.txt
 - config/world/de.txt
 - config/world/eng.txt
 - lib/sportdb/config.rb

data/config/world/countries.txt

@@ -1,307 +0,0 @@
-##########################
-# FIFA country codes
-#
-#  see   en.wikipedia.org/wiki/List_of_FIFA_country_codes
-#   and  github.com/openmundi/world.db/blob/master/1-codes/fifa.txt
-#   and  www.rsssf.com/miscellaneous/fifa-codes.html
-
-##
-# note: all dependencies n territories marked w/
-#            (UK), (FR), (NZ), (AU), (US), (NL), (DK), (CN) etc.
-
-
-###
-# todo: group by world.db "continents" - south america, africa, etc.
-
-
-
-#################
-## 209  (now in 2019 211(!) which two got added ??) regular FIFA members
-
-
-Key,  FIFA,  Name
-
-af,  AFG, Afghanistan
-al,  ALB, Albania
-dz,  ALG, Algeria
-as,  ASA, American Samoa (US)
-ad,  AND, Andorra
-ao,  ANG, Angola
-ai,  AIA, Anguilla (UK)
-ag,  ATG, Antigua and Barbuda
-ar,  ARG, Argentina
-am,  ARM, Armenia
-aw,  ARU, Aruba (NL)
-au,  AUS, Australia
-at,  AUT, Austria
-az,  AZE, Azerbaijan
-
-bs,  BAH, Bahamas
-bh,  BHR, Bahrain
-bd,  BAN, Bangladesh
-bb,  BRB, Barbados
-by,  BLR, Belarus
-be,  BEL, Belgium
-bz,  BLZ, Belize
-bj,  BEN, Benin
-bm,  BER, Bermuda (UK)
-bt,  BHU, Bhutan
-bo,  BOL, Bolivia
-ba,  BIH, Bosnia and Herzegovina      ## or use Bosnia-Herzegovina ?
-bw,  BOT, Botswana
-br,  BRA, Brazil
-bn,  BRU, Brunei
-bg,  BUL, Bulgaria
-bf,  BFA, Burkina Faso
-bi,  BDI, Burundi
-
-kh,  CAM, Cambodia
-cm,  CMR, Cameroon
-ca,  CAN, Canada
-cv,  CPV, Cabo Verde
-ky,  CAY, Cayman Islands (UK)
-cf,  CTA, Central African Republic
-td,  CHA, Chad
-cl,  CHI, Chile
-cn,  CHN, China
-co,  COL, Colombia
-km,  COM, Comoros
-cg,  CGO, Congo
-cd,  COD, Congo DR
-ck,  COK, Cook Islands (NZ)
-cr,  CRC, Costa Rica
-hr,  CRO, Croatia
-cu,  CUB, Cuba
-cw,  CUW, Curaçao (NL)
-cy,  CYP, Cyprus
-cz,  CZE, Czech Republic
-ci,  CIV, Côte d'Ivoire      # Ivory Coast
-
-dk,  DEN, Denmark
-dj,  DJI, Djibouti
-dm,  DMA, Dominica
-do,  DOM, Dominican Republic
-
-ec,  ECU, Ecuador
-eg,  EGY, Egypt
-eng, ENG, England (UK)
-gq,  EQG, Equatorial Guinea
-er,  ERI, Eritrea
-ee,  EST, Estonia
-et,  ETH, Ethiopia
-es,  ESP, Spain
-
-fo,  FRO, Faroe Islands (DK)
-fj,  FIJ, Fiji
-fi,  FIN, Finland
-fr,  FRA, France
-
-ga,  GAB, Gabon
-gm,  GAM, Gambia
-ge,  GEO, Georgia
-de,  GER, Germany
-gh,  GHA, Ghana
-gr,  GRE, Greece
-gd,  GRN, Grenada
-gu,  GUM, Guam (US)
-gt,  GUA, Guatemala
-gn,  GUI, Guinea
-gw,  GNB, Guinea-Bissau
-gy,  GUY, Guyana
-
-ht,  HAI, Haiti
-hn,  HON, Honduras
-hk,  HKG, Hong Kong (CN)
-hu,  HUN, Hungary
-
-is,  ISL, Iceland
-in,  IND, India
-id,  IDN, Indonesia
-ir,  IRN, Iran
-iq,  IRQ, Iraq
-il,  ISR, Israel
-it,  ITA, Italy
-ie,  IRL, Ireland
-
-jm,  JAM, Jamaica
-jp,  JPN, Japan
-jo,  JOR, Jordan
-
-kz,  KAZ, Kazakhstan
-ke,  KEN, Kenya
-kw,  KUW, Kuwait
-kg,  KGZ, Kyrgyzstan
-sa,  KSA, Saudi Arabia
-kr,  KOR, South Korea
-
-la,  LAO, Laos
-lv,  LVA, Latvia
-lb,  LIB, Lebanon
-ls,  LES, Lesotho
-lr,  LBR, Liberia
-ly,  LBY, Libya
-li,  LIE, Liechtenstein
-lt,  LTU, Lithuania
-lu,  LUX, Luxembourg
-lc,  LCA, Saint Lucia
-
-mo,  MAC, Macao (CN)
-mk,  MKD, Macedonia
-mg,  MAD, Madagascar
-mw,  MWI, Malawi
-my,  MAS, Malaysia
-mv,  MDV, Maldives
-ml,  MLI, Mali
-mt,  MLT, Malta
-mr,  MTN, Mauritania
-mu,  MRI, Mauritius
-mx,  MEX, Mexico
-md,  MDA, Moldova
-mn,  MNG, Mongolia
-me,  MNE, Montenegro
-ms,  MSR, Montserrat (UK)
-ma,  MAR, Morocco
-mz,  MOZ, Mozambique
-mm,  MYA, Myanmar
-
-na,  NAM, Namibia
-np,  NEP, Nepal
-nl,  NED, Netherlands
-nc,  NCL, New Caledonia (FR)
-nz,  NZL, New Zealand
-ni,  NCA, Nicaragua
-ne,  NIG, Niger
-ng,  NGA, Nigeria
-nir, NIR, Northern Ireland (UK)
-no,  NOR, Norway
-
-om,  OMA, Oman
-
-pk,  PAK, Pakistan
-ps,  PLE, Palestine
-pa,  PAN, Panama
-pg,  PNG, Papua New Guinea
-py,  PAR, Paraguay
-pe,  PER, Peru
-ph,  PHI, Philippines
-pl,  POL, Poland
-pt,  POR, Portugal
-pr,  PUR, Puerto Rico (US)
-kp,  PRK, North Korea
-
-qa,  QAT, Qatar
-
-ro,  ROU, Romania
-ru,  RUS, Russia
-rw,  RWA, Rwanda
-za,  RSA, South Africa
-
-kn,  SKN, Saint Kitts and Nevis
-ws,  SAM, Samoa
-sm,  SMR, San Marino
-st,  STP, São Tomé and Príncipe
-sco, SCO, Scotland (UK)
-sn,  SEN, Senegal
-rs,  SRB, Serbia
-sc,  SEY, Seychelles
-sl,  SLE, Sierra Leone
-sg,  SIN, Singapore
-sk,  SVK, Slovakia
-si,  SVN, Slovenia
-sb,  SOL, Solomon Islands
-so,  SOM, Somalia
-ss,  SSD, South Sudan
-lk,  SRI, Sri Lanka
-sd,  SDN, Sudan
-sr,  SUR, Suriname
-sz,  SWZ, Swaziland
-se,  SWE, Sweden
-ch,  SUI, Switzerland
-sy,  SYR, Syria
-sv,  SLV, El Salvador
-
-pf,  TAH, Tahiti (FR)   # todo/check: use French Polynesia (FR) as name - why? why not?
-tj,  TJK, Tajikistan
-tz,  TAN, Tanzania
-th,  THA, Thailand
-tl,  TLS, Timor-Leste
-tg,  TOG, Togo
-to,  TGA, Tonga
-tt,  TRI, Trinidad and Tobago
-tn,  TUN, Tunisia
-tr,  TUR, Turkey
-tm,  TKM, Turkmenistan
-tc,  TCA, Turks and Caicos Islands (UK)
-tw,  TPE, Taiwan              # Chinese Tapei
-
-ug,  UGA, Uganda
-ua,  UKR, Ukraine
-ae,  UAE, United Arab Emirates
-us,  USA, United States
-uy,  URU, Uruguay
-uz,  UZB, Uzbekistan
-
-vu,  VAN, Vanuatu
-ve,  VEN, Venezuela
-vn,  VIE, Vietnam
-vi,  VIR, US Virgin Islands (US)    # United States Virgin Islands; Virgin Islands (U.S.)
-vc,  VIN, Saint Vincent and the Grenadines
-vg,  VGB, British Virgin Islands (UK)
-
-wal, WAL, Wales (UK)
-
-ye,  YEM, Yemen
-
-zm,  ZAM, Zambia
-zw,  ZIM, Zimbabwe
-
-
-###################
-## Non-FIFA member codes
-
-bq,  BOE, Bonaire        # CONCACAF
-gf,  GYF, French Guiana (FR)  # CONCACAF
-gp,  GPE, Guadeloupe (FR)     # CONCACAF
-mq,  MTQ, Martinique (FR)     # CONCACAF
-sx,  SXM, Sint Maarten (NL)   # CONCACAF
-
-gi,  GIB, Gibraltar (UK)   # UEFA
-xk,  KOS, Kosovo         # UEFA     -- note: Kosovo is not listed as an ISO standard country. The unofficial 2 and 3-digit codes are used by the European Commission and others until Kosovo is assigned an ISO code
-
-re,  REU, Réunion (FR)        # CAF
-zan, ZAN, Zanzibar (TZ)       # CAF     -- note:  is a semi-autonomous region of Tanzania
-
-tv,  TUV, Tuvalu         # OFC
-
-
-####################
-## Irregular codes
-
-mp,  NMI, Northern Mariana Islands (US)  # AFC
-
-mf,  SMT, Saint Martin (FR)    # CONCACAF
-
-fm,  FSM, Micronesia      # OFC
-ki,  KIR, Kiribati        # OFC
-nu,  NIU, Niue (NZ)       # OFC
-pw,  PLW, Palau           # OFC
-
-
-#################
-# not members
-#
-# in europe:
-# - Great Britain - only all its member e.g. England/Wales/Scotland/Northern Irland
-
-va,  VAT,  Vatican City    ## no "official" fifa code - listed in "irregular" codes
-mc,  MCO,  Monaco          ## no "official" fifa code - listed in "irregular" codes
-
-
-#
-# in oceania:
-# - Kiribati
-# - Marshall Islands
-# - Micronesia
-# - Nauru
-# - Palau
-# - Tuvalu