sportdb-sync 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942eecead4fedb4294a6d73db750063aa253ec14
-  data.tar.gz: 30ba069b6309c65d8e8ba979d315e5c31d2ecbec
+  metadata.gz: 348a66cb30ccc072d2f6e0a82f61af6234e193d2
+  data.tar.gz: cae64f1ab5a09c9b0cd930d49a62f4b3a565eceb
 SHA512:
-  metadata.gz: 5bd714ea1d982ba37ba6b5490e58894b16bd0ca0b81fa44e2d56fca4e772c1ca395a6423b24b40c243a9d124ac4bba38c76cdf0e739c5148109d0f7b533221b4
-  data.tar.gz: fc54ed580b7a5ea80fd0c053343c5c2bd6c34b5e2d5744a09e018a708f6fef56badb53014751dd0043740acf37b005b9eb422f12f1ba18caca0ff40cf088a91d
+  metadata.gz: a864409290725d1ed3d6cf529ae7bf30c6091f28e76ce01fe427b1ff0cf31349d049a07e7de39c599f8e8db1b0136c2e2d7e1750aac1eab90b43e78a4153d4b4
+  data.tar.gz: b28d7dd3b5202cb3d58e1afb7e24c21f45e6b74c19391717257e16332c93470f17a78810314252bd4ce24758bc50af1d6d533ccbc41d712bb6d1282943533797

data/Rakefile

@@ -3,7 +3,7 @@ require './lib/sportdb/sync/version.rb'
 
 Hoe.spec 'sportdb-sync' do
 
-  self.version = SportDb::Sync::VERSION
+  self.version = SportDb::Module::Sync::VERSION
 
   self.summary = "sportdb-sync - sport.db sync helpers for leagues, seasons, clubs, match schedules and results, and more"
   self.description = summary
@@ -20,7 +20,7 @@ Hoe.spec 'sportdb-sync' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['sportdb-config',  '>= 1.0.1'],
+    ['sportdb-config',  '>= 1.0.4'],
     ['sportdb-models',  '>= 1.19.0'],
   ]
 

data/lib/sportdb/sync.rb

@@ -4,6 +4,17 @@ require 'sportdb/config'
 require 'sportdb/models'   ## add sql database support
 
 
+##
+# fix!!!
+#   patches for worlddb/models  - move upstream!!!!
+module WorldDb
+  COUNTRY_KEY_PATTERN = '\A[a-z]{2,}\z'    # allow two AND three letter keys e.g. at, mx, eng, sco, etc.
+  COUNTRY_KEY_PATTERN_MESSAGE = "expected two or more lowercase letters a-z /#{COUNTRY_KEY_PATTERN}/"
+
+  COUNTRY_CODE_PATTERN = '\A[A-Z_]{2,}\z'
+  COUNTRY_CODE_PATTERN_MESSAGE = "expected two or more uppercase letters A-Z (and _) /#{COUNTRY_CODE_PATTERN}/"
+end  # module WorldDb
+
 
 ###
 # our own code
@@ -16,4 +27,4 @@ require 'sportdb/sync/club'
 require 'sportdb/sync/sync'
 
 
-puts SportDb::Sync.banner   # say hello
+puts SportDb::Module::Sync.banner   # say hello

data/lib/sportdb/sync/country.rb

@@ -57,8 +57,8 @@ module SportDb
         attribs = {
           key:  country.key,
           name: country.name,
-          code: country.fifa,  ## fix:  uses fifa code now (should be iso-alpha3 if available)
-          fifa: country.fifa,
+          code: country.code,  ## fix:  uses fifa code now (should be iso-alpha3 if available)
+          ## fifa: country.fifa,
           area: 1,
           pop:  1
         }

data/lib/sportdb/sync/version.rb

@@ -2,11 +2,12 @@
 
 
 module SportDb
+module Module
 module Sync
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 0
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -22,4 +23,5 @@ module Sync
   end
 
 end # module Sync
+end # module Module
 end # module SportDb

data/test/test_country.rb

@@ -13,8 +13,8 @@ class TestCountry < MiniTest::Test
   Country = SportDb::Sync::Country
 
   def test_find  # note: find uses "data" structs
-    at  = SportDb::Import::Country.new( key: 'at',  name: 'Austria', fifa: 'AUT' )
-    eng = SportDb::Import::Country.new( key: 'eng', name: 'England', fifa: 'ENG' )
+    at  = SportDb::Import::Country.new( key: 'at',  name: 'Austria', code: 'AUT' )
+    eng = SportDb::Import::Country.new( key: 'eng', name: 'England', code: 'ENG' )
 
     rec  = Country.find_or_create( at )
     rec2 = Country.find_or_create( at )
@@ -28,23 +28,23 @@ class TestCountry < MiniTest::Test
     rec = Country.search_or_create!( 'at' )  ## try (iso-alpha2) key
     assert_equal 'Austria', rec.name
     assert_equal 'at',      rec.key
-    assert_equal 'AUT',     rec.fifa
+    assert_equal 'AUT',     rec.code
 
     rec = Country.search_or_create!( 'aut' )  ## try fifa code
     assert_equal 'Austria', rec.name
     assert_equal 'at',      rec.key
-    assert_equal 'AUT',     rec.fifa
+    assert_equal 'AUT',     rec.code
 
 
     rec = Country.search_or_create!( 'eng' )
     assert_equal 'England', rec.name
     assert_equal 'eng',     rec.key
-    assert_equal 'ENG',     rec.fifa
+    assert_equal 'ENG',     rec.code
 
     rec = Country.search_or_create!( 'eng' )
     assert_equal 'England', rec.name
     assert_equal 'eng',     rec.key
-    assert_equal 'ENG',     rec.fifa
+    assert_equal 'ENG',     rec.code
   end
 
 end  # class TestCountry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: sportdb-models
   requirement: !ruby/object:Gem::Requirement