sportdb-sync 0.1.0 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Manifest.txt +8 -1
- data/Rakefile +2 -3
- data/lib/sportdb/sync.rb +6 -5
- data/lib/sportdb/sync/club.rb +87 -0
- data/lib/sportdb/sync/country.rb +72 -0
- data/lib/sportdb/sync/event.rb +97 -0
- data/lib/sportdb/sync/league.rb +61 -0
- data/lib/sportdb/sync/season.rb +54 -0
- data/lib/sportdb/sync/sync.rb +95 -158
- data/lib/sportdb/sync/version.rb +2 -2
- data/test/helper.rb +25 -1
- data/test/test_country.rb +50 -0
- data/test/test_league.rb +38 -0
- data/test/test_misc.rb +29 -0
- metadata +15 -22
- data/test/test_sync.rb +0 -29
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 942eecead4fedb4294a6d73db750063aa253ec14
|
4
|
+
data.tar.gz: 30ba069b6309c65d8e8ba979d315e5c31d2ecbec
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5bd714ea1d982ba37ba6b5490e58894b16bd0ca0b81fa44e2d56fca4e772c1ca395a6423b24b40c243a9d124ac4bba38c76cdf0e739c5148109d0f7b533221b4
|
7
|
+
data.tar.gz: fc54ed580b7a5ea80fd0c053343c5c2bd6c34b5e2d5744a09e018a708f6fef56badb53014751dd0043740acf37b005b9eb422f12f1ba18caca0ff40cf088a91d
|
data/Manifest.txt
CHANGED
@@ -3,7 +3,14 @@ Manifest.txt
|
|
3
3
|
README.md
|
4
4
|
Rakefile
|
5
5
|
lib/sportdb/sync.rb
|
6
|
+
lib/sportdb/sync/club.rb
|
7
|
+
lib/sportdb/sync/country.rb
|
8
|
+
lib/sportdb/sync/event.rb
|
9
|
+
lib/sportdb/sync/league.rb
|
10
|
+
lib/sportdb/sync/season.rb
|
6
11
|
lib/sportdb/sync/sync.rb
|
7
12
|
lib/sportdb/sync/version.rb
|
8
13
|
test/helper.rb
|
9
|
-
test/
|
14
|
+
test/test_country.rb
|
15
|
+
test/test_league.rb
|
16
|
+
test/test_misc.rb
|
data/Rakefile
CHANGED
@@ -20,9 +20,8 @@ Hoe.spec 'sportdb-sync' do
|
|
20
20
|
self.licenses = ['Public Domain']
|
21
21
|
|
22
22
|
self.extra_deps = [
|
23
|
-
['sportdb-
|
24
|
-
['sportdb-
|
25
|
-
['sportdb-models', '>= 1.18.2'],
|
23
|
+
['sportdb-config', '>= 1.0.1'],
|
24
|
+
['sportdb-models', '>= 1.19.0'],
|
26
25
|
]
|
27
26
|
|
28
27
|
self.spec_extras = {
|
data/lib/sportdb/sync.rb
CHANGED
@@ -1,10 +1,6 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
|
3
|
-
|
4
|
-
require 'sportdb/clubs'
|
5
|
-
require 'sportdb/leagues'
|
6
|
-
|
7
|
-
|
3
|
+
require 'sportdb/config'
|
8
4
|
require 'sportdb/models' ## add sql database support
|
9
5
|
|
10
6
|
|
@@ -12,6 +8,11 @@ require 'sportdb/models' ## add sql database support
|
|
12
8
|
###
|
13
9
|
# our own code
|
14
10
|
require 'sportdb/sync/version' # let version always go first
|
11
|
+
require 'sportdb/sync/country'
|
12
|
+
require 'sportdb/sync/league'
|
13
|
+
require 'sportdb/sync/season'
|
14
|
+
require 'sportdb/sync/event'
|
15
|
+
require 'sportdb/sync/club'
|
15
16
|
require 'sportdb/sync/sync'
|
16
17
|
|
17
18
|
|
@@ -0,0 +1,87 @@
|
|
1
|
+
module SportDb
|
2
|
+
module Sync
|
3
|
+
class Club
|
4
|
+
|
5
|
+
## auto-cache all clubs by find_or_create for later mapping / lookup
|
6
|
+
def self.cache() @cache ||= {}; end
|
7
|
+
|
8
|
+
|
9
|
+
def self.club( q, league: nil) ## "internal" search helper using catalog
|
10
|
+
## note: league.country might return nil (e.g. for intl leagues)
|
11
|
+
country = league ? league.country : nil
|
12
|
+
club = Import.catalog.clubs.find_by( name: q, country: country )
|
13
|
+
|
14
|
+
if club.nil?
|
15
|
+
## todo/check: exit if no match - why? why not?
|
16
|
+
puts "!!! *** ERROR *** no matching club found for >#{q}< - add to clubs setup"
|
17
|
+
exit 1
|
18
|
+
end
|
19
|
+
club
|
20
|
+
end
|
21
|
+
|
22
|
+
#############################
|
23
|
+
# searchers
|
24
|
+
|
25
|
+
## todo/fix - move array support for now to attic!!!
|
26
|
+
|
27
|
+
def self.search_or_create_by!( name:, league: nil, season: nil )
|
28
|
+
## note: season is for now optional (and unused) - add/use in the future!!!
|
29
|
+
|
30
|
+
## note: allow search by single name/q
|
31
|
+
## or allow search by list/array of names/qs tooo!!!
|
32
|
+
if name.is_a?( Array )
|
33
|
+
## assume batch search return array of mappings
|
34
|
+
club_recs = []
|
35
|
+
name.each do |q|
|
36
|
+
club = club( q, league: league )
|
37
|
+
clubs_recs << find_or_create( club )
|
38
|
+
end
|
39
|
+
club_recs
|
40
|
+
else
|
41
|
+
## assume single search
|
42
|
+
q = name
|
43
|
+
club = club( q, league: league )
|
44
|
+
find_or_create( club )
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
48
|
+
|
49
|
+
##################################
|
50
|
+
# finders
|
51
|
+
|
52
|
+
def self.find_or_create( club )
|
53
|
+
## note: assume "canonical uniquie" names/titles for now for clubs
|
54
|
+
rec = Model::Team.find_by( title: club.name )
|
55
|
+
if rec.nil?
|
56
|
+
|
57
|
+
## todo/fix: move auto-key gen to structs for re(use)!!!!!!
|
58
|
+
## check if key is present otherwise generate e.g. remove all non-ascii a-z chars
|
59
|
+
key = club.key || club.name.downcase.gsub( /[^a-z]/, '' )
|
60
|
+
puts "add club: #{key}, #{club.name}, #{club.country.name} (#{club.country.key})"
|
61
|
+
|
62
|
+
attribs = {
|
63
|
+
key: key,
|
64
|
+
title: club.name,
|
65
|
+
country_id: Sync::Country.find_or_create( club.country ).id,
|
66
|
+
club: true,
|
67
|
+
national: false ## check -is default anyway - use - why? why not?
|
68
|
+
## todo/fix: add city if present - why? why not?
|
69
|
+
}
|
70
|
+
|
71
|
+
attribs[:code] = club.code if club.code ## add code (abbreviation) if present
|
72
|
+
|
73
|
+
if club.alt_names.empty? == false
|
74
|
+
attribs[:synonyms] = club.alt_names.join('|')
|
75
|
+
end
|
76
|
+
|
77
|
+
rec = Model::Team.create!( attribs )
|
78
|
+
end
|
79
|
+
## auto-add to cache
|
80
|
+
cache[club.name] = rec
|
81
|
+
|
82
|
+
rec
|
83
|
+
end
|
84
|
+
|
85
|
+
end # class Club
|
86
|
+
end # module Sync
|
87
|
+
end # module SportDb
|
@@ -0,0 +1,72 @@
|
|
1
|
+
module SportDb
|
2
|
+
module Sync
|
3
|
+
class Country
|
4
|
+
|
5
|
+
### todo/fix:
|
6
|
+
## add ALTERNATE / ALTERNATIVE COUNTRY KEYS!!!!
|
7
|
+
## e.g. d => de, a => at, en => eng, etc.
|
8
|
+
## plus add all fifa codes too aut => at, etc. - why? why not?
|
9
|
+
|
10
|
+
def self.country( q )
|
11
|
+
## note: use built-in countries for mapping country keys/codes
|
12
|
+
country = Import.catalog.countries.find( q )
|
13
|
+
if country
|
14
|
+
## todo/check: keep key mapping warning - useful? why? why not?
|
15
|
+
if country.key != q.to_s
|
16
|
+
puts "** note: mapping (normalizing) country key >#{q}< to >#{country.key}<"
|
17
|
+
end
|
18
|
+
else
|
19
|
+
puts "** !!! ERROR !!! unknown / invalid country for key >#{q}<; sorry - add to COUNTRIES table"
|
20
|
+
exit 1
|
21
|
+
end
|
22
|
+
country
|
23
|
+
end
|
24
|
+
|
25
|
+
########################
|
26
|
+
# searchers
|
27
|
+
|
28
|
+
def self.search!( q )
|
29
|
+
country = country( q )
|
30
|
+
find!( country )
|
31
|
+
end
|
32
|
+
|
33
|
+
def self.search_or_create!( q )
|
34
|
+
country = country( q )
|
35
|
+
find_or_create( country )
|
36
|
+
end
|
37
|
+
|
38
|
+
#############################
|
39
|
+
# finders
|
40
|
+
|
41
|
+
def self.find( country )
|
42
|
+
WorldDb::Model::Country.find_by( key: country.key )
|
43
|
+
end
|
44
|
+
|
45
|
+
def self.find!( country )
|
46
|
+
rec = find( country )
|
47
|
+
if rec.nil?
|
48
|
+
puts "** !!! ERROR !!! - country for key >#{country.key}< not found; sorry - add to COUNTRIES table"
|
49
|
+
exit 1
|
50
|
+
end
|
51
|
+
rec
|
52
|
+
end
|
53
|
+
|
54
|
+
def self.find_or_create( country )
|
55
|
+
rec = find( country )
|
56
|
+
if rec.nil?
|
57
|
+
attribs = {
|
58
|
+
key: country.key,
|
59
|
+
name: country.name,
|
60
|
+
code: country.fifa, ## fix: uses fifa code now (should be iso-alpha3 if available)
|
61
|
+
fifa: country.fifa,
|
62
|
+
area: 1,
|
63
|
+
pop: 1
|
64
|
+
}
|
65
|
+
rec = WorldDb::Model::Country.create!( attribs )
|
66
|
+
end
|
67
|
+
rec
|
68
|
+
end
|
69
|
+
end # class Country
|
70
|
+
|
71
|
+
end # module Sync
|
72
|
+
end # module SportDb
|
@@ -0,0 +1,97 @@
|
|
1
|
+
module SportDb
|
2
|
+
module Sync
|
3
|
+
|
4
|
+
class Event
|
5
|
+
def self.league( q ) League.league( q ); end
|
6
|
+
def self.season( q ) Season.season( q ); end
|
7
|
+
|
8
|
+
############################################
|
9
|
+
# searchers
|
10
|
+
|
11
|
+
def self.search_by!( league:, season: )
|
12
|
+
raise ArgumentError.new( "league query string expected; got #{league.class.name}" ) unless league.is_a?( String )
|
13
|
+
raise ArgumentError.new( "season query string expected; got #{season.class.name}" ) unless season.is_a?( String )
|
14
|
+
|
15
|
+
league = league( league )
|
16
|
+
season = season( season )
|
17
|
+
|
18
|
+
find_by( league: league, season: season )
|
19
|
+
end
|
20
|
+
|
21
|
+
def self.search_or_create_by!( league:, season: )
|
22
|
+
raise ArgumentError.new( "league query string expected; got #{league.class.name}" ) unless league.is_a?( String )
|
23
|
+
raise ArgumentError.new( "season query string expected; got #{season.class.name}" ) unless season.is_a?( String )
|
24
|
+
|
25
|
+
league = league( league )
|
26
|
+
season = season( season )
|
27
|
+
|
28
|
+
find_or_create_by( league: league, season: season )
|
29
|
+
end
|
30
|
+
|
31
|
+
##################################################
|
32
|
+
# finders
|
33
|
+
|
34
|
+
def self.find_by( league:, season: )
|
35
|
+
## note: allow passing in of activerecord db records too - why? why not?
|
36
|
+
raise ArgumentError.new( "league struct record expected; got #{league.class.name}" ) unless league.is_a?( Import::League )
|
37
|
+
raise ArgumentError.new( "season struct record expected; got #{season.class.name}" ) unless season.is_a?( Import::Season )
|
38
|
+
|
39
|
+
## auto-create league and season (db) records if missing? - why? why not?
|
40
|
+
season_rec = Season.find( season )
|
41
|
+
league_rec = League.find( league )
|
42
|
+
|
43
|
+
rec = nil
|
44
|
+
rec = Model::Event.find_by( league_id: league_rec.id,
|
45
|
+
season_id: season_rec.id ) if season_rec && league_rec
|
46
|
+
rec
|
47
|
+
end
|
48
|
+
|
49
|
+
def self.find_by!( league:, season: )
|
50
|
+
rec = find_by( league: league, season: season )
|
51
|
+
if rec.nil?
|
52
|
+
puts "** !!!ERROR!!! db sync - no event match found for:"
|
53
|
+
pp league
|
54
|
+
pp season
|
55
|
+
exit 1
|
56
|
+
end
|
57
|
+
rec
|
58
|
+
end
|
59
|
+
|
60
|
+
def self.find_or_create_by( league:, season: )
|
61
|
+
## note: allow passing in of activerecord db records too - why? why not?
|
62
|
+
raise ArgumentError.new( "league struct record expected; got #{league.class.name}" ) unless league.is_a?( Import::League )
|
63
|
+
raise ArgumentError.new( "season struct record expected; got #{season.class.name}" ) unless season.is_a?( Import::Season )
|
64
|
+
|
65
|
+
## note: auto-creates league and season (db) records if missing - why? why not?
|
66
|
+
season_rec = Season.find_or_create( season )
|
67
|
+
league_rec = League.find_or_create( league )
|
68
|
+
|
69
|
+
rec = Model::Event.find_by( league_id: league_rec.id,
|
70
|
+
season_id: season_rec.id )
|
71
|
+
if rec.nil?
|
72
|
+
attribs = {
|
73
|
+
league_id: league_rec.id,
|
74
|
+
season_id: season_rec.id,
|
75
|
+
}
|
76
|
+
|
77
|
+
## quick hack/change later !!
|
78
|
+
## todo/fix: check season - if is length 4 (single year) use 2017, 1, 1
|
79
|
+
## otherwise use 2017, 7, 1
|
80
|
+
## start_at use year and 7,1 e.g. Date.new( 2017, 7, 1 )
|
81
|
+
## hack: fix/todo1!!
|
82
|
+
## add "fake" start_at date for now
|
83
|
+
attribs[:start_at] = if season.year? ## e.g. assume 2018 etc.
|
84
|
+
Date.new( season.start_year, 1, 1 )
|
85
|
+
else ## assume 2014/15 etc.
|
86
|
+
Date.new( season.start_year, 7, 1 )
|
87
|
+
end
|
88
|
+
|
89
|
+
rec = Model::Event.create!( attribs )
|
90
|
+
end
|
91
|
+
rec
|
92
|
+
end
|
93
|
+
end # class Event
|
94
|
+
|
95
|
+
end # module Sync
|
96
|
+
end # module SportDb
|
97
|
+
|
@@ -0,0 +1,61 @@
|
|
1
|
+
module SportDb
|
2
|
+
module Sync
|
3
|
+
class League
|
4
|
+
|
5
|
+
def self.league( q ) ## todo/check: find a better or "generic" alias name e.g. convert/builtin/etc. - why? why not?
|
6
|
+
Import.catalog.leagues.find!( q ) ## todo/fix: change find to search!!!
|
7
|
+
end
|
8
|
+
|
9
|
+
|
10
|
+
################################
|
11
|
+
# searchers
|
12
|
+
|
13
|
+
def self.search!( q ) ## note: use search for passing in string queries (and find for records/structs only)
|
14
|
+
league = league( q )
|
15
|
+
find( league )
|
16
|
+
end
|
17
|
+
|
18
|
+
def self.search_or_create!( q )
|
19
|
+
league = league( q )
|
20
|
+
find_or_create( league )
|
21
|
+
end
|
22
|
+
|
23
|
+
###################################
|
24
|
+
# finders
|
25
|
+
|
26
|
+
def self.find( league )
|
27
|
+
Model::League.find_by( key: league.key )
|
28
|
+
end
|
29
|
+
|
30
|
+
def self.find!( league )
|
31
|
+
rec = find( league )
|
32
|
+
if rec.nil?
|
33
|
+
puts "** !!!ERROR!!! db sync - no league match found for:"
|
34
|
+
pp league
|
35
|
+
exit 1
|
36
|
+
end
|
37
|
+
rec
|
38
|
+
end
|
39
|
+
|
40
|
+
def self.find_or_create( league )
|
41
|
+
rec = find( league )
|
42
|
+
if rec.nil?
|
43
|
+
## use title and not name - why? why not?
|
44
|
+
## quick fix: change name to title
|
45
|
+
|
46
|
+
attribs = { key: league.key,
|
47
|
+
title: league.name }
|
48
|
+
|
49
|
+
if league.country
|
50
|
+
attribs[ :country_id ] = Sync::Country.find_or_create( league.country ).id
|
51
|
+
end
|
52
|
+
|
53
|
+
rec = Model::League.create!( attribs )
|
54
|
+
end
|
55
|
+
rec
|
56
|
+
end
|
57
|
+
|
58
|
+
end # class League
|
59
|
+
end # module Sync
|
60
|
+
end # module SportDb
|
61
|
+
|
@@ -0,0 +1,54 @@
|
|
1
|
+
module SportDb
|
2
|
+
module Sync
|
3
|
+
class Season
|
4
|
+
def self.season( q ) ## helper for season key (rename to norm_key ???)
|
5
|
+
Import::Season.new( q )
|
6
|
+
end
|
7
|
+
|
8
|
+
|
9
|
+
###########
|
10
|
+
# searchers
|
11
|
+
|
12
|
+
def self.search( q ) ## e.g. '2017/18'
|
13
|
+
season = season( q )
|
14
|
+
find( season )
|
15
|
+
end
|
16
|
+
|
17
|
+
## todo/fix: remove builtin marker? - there are no "builtin" seasons like numbers all excepted for now
|
18
|
+
def self.search_or_create( q ) ## e.g. '2017-18'
|
19
|
+
season = season( q )
|
20
|
+
find_or_create( season )
|
21
|
+
end
|
22
|
+
|
23
|
+
################
|
24
|
+
# finders
|
25
|
+
|
26
|
+
def self.find( season )
|
27
|
+
season = season( season ) if season.is_a?( String ) ## auto-convert for now (for old compat) - why? why not?
|
28
|
+
Model::Season.find_by( key: season.key )
|
29
|
+
end
|
30
|
+
|
31
|
+
def self.find!( season )
|
32
|
+
season = season( season ) if season.is_a?( String ) ## auto-convert for now (for old compat) - why? why not?
|
33
|
+
rec = find( season )
|
34
|
+
if rec.nil?
|
35
|
+
puts "** !!!ERROR!!! db sync - no season match found for >#{season.key}<:"
|
36
|
+
exit 1
|
37
|
+
end
|
38
|
+
rec
|
39
|
+
end
|
40
|
+
|
41
|
+
def self.find_or_create( season )
|
42
|
+
season = season( season ) if season.is_a?( String ) ## auto-convert for now (for old compat) - why? why not?
|
43
|
+
rec = find( season )
|
44
|
+
if rec.nil?
|
45
|
+
attribs = { key: season.key,
|
46
|
+
title: season.name }
|
47
|
+
rec = Model::Season.create!( attribs )
|
48
|
+
end
|
49
|
+
rec
|
50
|
+
end
|
51
|
+
end # class Season
|
52
|
+
end # module Sync
|
53
|
+
end # module SportDb
|
54
|
+
|
data/lib/sportdb/sync/sync.rb
CHANGED
@@ -1,191 +1,102 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
|
3
|
-
|
4
3
|
module SportDb
|
5
|
-
|
6
|
-
module Sync
|
7
|
-
class Country
|
8
|
-
def self.find_or_create( country )
|
9
|
-
rec = WorldDb::Model::Country.find_by( key: country.key )
|
10
|
-
if rec.nil?
|
11
|
-
attribs = {
|
12
|
-
key: country.key,
|
13
|
-
name: country.name,
|
14
|
-
code: country.fifa, ## fix: uses fifa code now (should be iso-alpha3 if available)
|
15
|
-
fifa: country.fifa,
|
16
|
-
area: 1,
|
17
|
-
pop: 1
|
18
|
-
}
|
19
|
-
rec = WorldDb::Model::Country.create!( attribs )
|
20
|
-
end
|
21
|
-
rec
|
22
|
-
end
|
23
|
-
end # class Country
|
4
|
+
module Sync
|
24
5
|
|
25
6
|
|
26
|
-
class
|
27
|
-
def self.
|
28
|
-
|
29
|
-
end
|
30
|
-
def self.find!( league )
|
31
|
-
rec = find( league )
|
7
|
+
class NationalTeam
|
8
|
+
def self.find_or_create( team )
|
9
|
+
rec = Model::Team.find_by( title: team.name )
|
32
10
|
if rec.nil?
|
33
|
-
puts "
|
34
|
-
pp league
|
35
|
-
exit 1
|
36
|
-
end
|
37
|
-
rec
|
38
|
-
end
|
11
|
+
puts "add national team: #{team.key}, #{team.name}, #{team.country.name} (#{team.country.key})"
|
39
12
|
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
end
|
13
|
+
### note: key expected three or more lowercase letters a-z /\A[a-z]{3,}\z/
|
14
|
+
attribs = {
|
15
|
+
key: team.key, ## note: always use downcase fifa code for now!!!
|
16
|
+
title: team.name,
|
17
|
+
code: team.code,
|
18
|
+
country_id: Sync::Country.find_or_create( team.country ).id,
|
19
|
+
club: false,
|
20
|
+
national: true ## check -is default anyway - use - why? why not?
|
21
|
+
}
|
50
22
|
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
end
|
55
|
-
end # class League
|
56
|
-
|
57
|
-
|
58
|
-
class Season
|
59
|
-
def self.normalize_key( key ) ## helper for season key (rename to norm_key ???)
|
60
|
-
## note: "normalize" season key
|
61
|
-
## always use 2017/18 (and not 2017-18 or 2017-2018 or 2017/2018)
|
62
|
-
## 1) change 2017-18 to 2017/18
|
63
|
-
key = key.tr( '-', '/' )
|
64
|
-
## 2) check for 2017/2018 - change to 2017/18
|
65
|
-
if key.length == 9
|
66
|
-
key = "#{key[0..3]}/#{key[7..8]}"
|
67
|
-
end
|
68
|
-
key
|
69
|
-
end
|
23
|
+
if team.alt_names.empty? == false
|
24
|
+
attribs[:synonyms] = team.alt_names.join('|')
|
25
|
+
end
|
70
26
|
|
71
|
-
|
72
|
-
key = normalize_key( key )
|
73
|
-
SportDb::Model::Season.find_by( key: key )
|
74
|
-
end
|
75
|
-
def self.find!( key )
|
76
|
-
rec = find( key )
|
77
|
-
if rec.nil?
|
78
|
-
puts "** !!!ERROR!!! db sync - no season match found for >#{normalize_key(key)}<:"
|
79
|
-
pp key
|
80
|
-
exit 1
|
27
|
+
rec = Model::Team.create!( attribs )
|
81
28
|
end
|
82
29
|
rec
|
83
30
|
end
|
31
|
+
end # class NationalTeam
|
84
32
|
|
85
|
-
def self.find_or_create( key ) ## e.g. key = '2017/18'
|
86
|
-
rec = find( key )
|
87
|
-
if rec.nil?
|
88
|
-
key = normalize_key( key ) ## note: do NOT forget to normalize key e.g. always use slash (2019/20) etc.
|
89
|
-
attribs = { key: key,
|
90
|
-
title: key }
|
91
|
-
rec = SportDb::Model::Season.create!( attribs )
|
92
|
-
end
|
93
|
-
rec
|
94
|
-
end
|
95
|
-
end # class Season
|
96
33
|
|
97
|
-
class
|
98
|
-
|
99
|
-
|
100
|
-
if rec.nil?
|
101
|
-
## check if key is present otherwise generate e.g. remove all non-ascii a-z chars
|
102
|
-
key = club.key || club.name.downcase.gsub( /[^a-z]/, '' )
|
103
|
-
puts "add club: #{key}, #{club.name}, #{club.country.name} (#{club.country.key})"
|
34
|
+
class Team
|
35
|
+
## auto-cache all clubs by find_or_create for later mapping / lookup
|
36
|
+
def self.cache() @cache ||= {}; end
|
104
37
|
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
## todo/fix: add city if present - why? why not?
|
112
|
-
}
|
113
|
-
|
114
|
-
attribs[:code] = club.code if club.code ## add code (abbreviation) if present
|
115
|
-
|
116
|
-
|
117
|
-
if club.alt_names.empty? == false
|
118
|
-
attribs[:synonyms] = club.alt_names.join('|')
|
38
|
+
def self.find_or_create( team_or_teams )
|
39
|
+
if team_or_teams.is_a?( Array )
|
40
|
+
recs = []
|
41
|
+
teams = team_or_teams
|
42
|
+
teams.each do |team|
|
43
|
+
recs << __find_or_create( team )
|
119
44
|
end
|
120
|
-
|
121
|
-
|
45
|
+
recs
|
46
|
+
else # assome single rec
|
47
|
+
team = team_or_teams
|
48
|
+
__find_or_create( team )
|
122
49
|
end
|
123
|
-
rec
|
124
50
|
end
|
125
|
-
end # class Club
|
126
51
|
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
pp league
|
136
|
-
pp season
|
137
|
-
exit 1
|
138
|
-
end
|
139
|
-
rec
|
52
|
+
def self.__find_or_create( team ) ## todo/check: use find_or_create_worker instead of _find - why? why not?
|
53
|
+
rec = if team.is_a?( Import::NationalTeam )
|
54
|
+
NationalTeam.find_or_create( team )
|
55
|
+
else ## assume Club
|
56
|
+
Club.find_or_create( team )
|
57
|
+
end
|
58
|
+
cache[ team.name ] = rec ## note: assume "canonical" unique team name
|
59
|
+
rec
|
140
60
|
end
|
61
|
+
end # class Team
|
141
62
|
|
142
|
-
def self.find_or_create( league:, season: )
|
143
|
-
rec = find( league: league, season: season )
|
144
|
-
if rec.nil?
|
145
|
-
## quick hack/change later !!
|
146
|
-
## todo/fix: check season - if is length 4 (single year) use 2017, 1, 1
|
147
|
-
## otherwise use 2017, 7, 1
|
148
|
-
## start_at use year and 7,1 e.g. Date.new( 2017, 7, 1 )
|
149
|
-
## hack: fix/todo1!!
|
150
|
-
## add "fake" start_at date for now
|
151
|
-
if season.key.size == '4' ## e.g. assume 2018 etc.
|
152
|
-
year = season.key.to_i
|
153
|
-
start_at = Date.new( year, 1, 1 )
|
154
|
-
else ## assume 2014/15 etc.
|
155
|
-
year = season.key[0..3].to_i
|
156
|
-
start_at = Date.new( year, 7, 1 )
|
157
|
-
end
|
158
63
|
|
159
|
-
attribs = {
|
160
|
-
league_id: league.id,
|
161
|
-
season_id: season.id,
|
162
|
-
start_at: start_at }
|
163
|
-
|
164
|
-
rec = SportDb::Model::Event.create!( attribs )
|
165
|
-
end
|
166
|
-
rec
|
167
|
-
end
|
168
|
-
end # class Event
|
169
64
|
|
170
65
|
class Round
|
171
66
|
def self.find_or_create( round, event: )
|
172
|
-
rec =
|
67
|
+
rec = Model::Round.find_by( title: round.title, event_id: event.id )
|
173
68
|
if rec.nil?
|
174
69
|
attribs = { event_id: event.id,
|
175
70
|
title: round.title,
|
176
71
|
pos: round.pos,
|
177
72
|
start_at: event.start_at.to_date
|
178
73
|
}
|
179
|
-
rec =
|
74
|
+
rec = Model::Round.create!( attribs )
|
180
75
|
end
|
181
76
|
rec
|
182
77
|
end
|
183
78
|
end # class Round
|
184
79
|
|
185
80
|
|
81
|
+
class Group
|
82
|
+
def self.find_or_create( group, event: )
|
83
|
+
rec = Model::Group.find_by( title: group.title, event_id: event.id )
|
84
|
+
if rec.nil?
|
85
|
+
attribs = { event_id: event.id,
|
86
|
+
title: group.title,
|
87
|
+
pos: group.pos
|
88
|
+
}
|
89
|
+
rec = Model::Group.create!( attribs )
|
90
|
+
end
|
91
|
+
## todo/fix: add/update teams in group too!!!!!
|
92
|
+
rec
|
93
|
+
end
|
94
|
+
end # class Group
|
95
|
+
|
96
|
+
|
186
97
|
class Stage
|
187
98
|
def self.find( name, event: )
|
188
|
-
|
99
|
+
Model::Stage.find_by( title: name, event_id: event.id )
|
189
100
|
end
|
190
101
|
def self.find!( name, event: )
|
191
102
|
rec = find( name, event: event )
|
@@ -206,7 +117,7 @@ module Sync
|
|
206
117
|
attribs = { event_id: event.id,
|
207
118
|
title: name,
|
208
119
|
}
|
209
|
-
rec =
|
120
|
+
rec = Model::Stage.create!( attribs )
|
210
121
|
end
|
211
122
|
rec
|
212
123
|
end
|
@@ -217,23 +128,49 @@ module Sync
|
|
217
128
|
class Match ## todo/check: add alias for Game class - why? why not?
|
218
129
|
def self.create_or_update( match, event: )
|
219
130
|
## note: MUST find round, thus, use bang (!)
|
220
|
-
round_rec = SportDb::Model::Round.find_by!( event_id: event.id,
|
221
|
-
title: match.round.title )
|
222
131
|
|
223
|
-
|
224
|
-
|
225
|
-
|
132
|
+
## todo/check: allow strings too - why? why not?
|
133
|
+
|
134
|
+
## query for round - allow string or round rec
|
135
|
+
round_title = match.round.is_a?( String ) ? match.round : match.round.title
|
136
|
+
round_rec = Model::Round.find_by!( event_id: event.id,
|
137
|
+
title: round_title )
|
138
|
+
|
139
|
+
## todo/check: allow fallback with db lookup if NOT found in cache - why? why not?
|
140
|
+
## or better use Sync::Team.find_or_create( team ) !!!!!!! to auto-create on first hit!
|
141
|
+
## || Team.find_or_create( team1 ) -- note: does NOT work for string (only recs) - what to do?
|
142
|
+
## || Model::Team.find_by!( title: team1_name )
|
143
|
+
team1_name = match.team1.is_a?( String ) ? match.team1 : match.team1.name
|
144
|
+
team1_rec = Team.cache[ team1_name ]
|
145
|
+
team2_name = match.team2.is_a?( String ) ? match.team2 : match.team2.name
|
146
|
+
team2_rec = Team.cache[ team2_name ]
|
147
|
+
|
148
|
+
## check optional group (e.g. Group A, etc.)
|
149
|
+
group_rec = if match.group
|
150
|
+
group_title = match.group.is_a?( String ) ? match.group : match.group.title
|
151
|
+
Model::Group.find_by!( event_id: event.id,
|
152
|
+
title: group_title )
|
153
|
+
else
|
154
|
+
nil
|
155
|
+
end
|
156
|
+
|
157
|
+
|
158
|
+
rec = Model::Game.find_by( round_id: round_rec.id,
|
159
|
+
team1_id: team1_rec.id,
|
160
|
+
team2_id: team2_rec.id )
|
226
161
|
if rec.nil?
|
227
162
|
attribs = { round_id: round_rec.id,
|
228
|
-
team1_id:
|
229
|
-
team2_id:
|
163
|
+
team1_id: team1_rec.id,
|
164
|
+
team2_id: team2_rec.id,
|
230
165
|
pos: 999, ## make optional why? why not? - change to num?
|
231
166
|
play_at: match.date.to_date,
|
232
167
|
score1: match.score1,
|
233
168
|
score2: match.score2,
|
234
169
|
score1i: match.score1i,
|
235
170
|
score2i: match.score2i }
|
236
|
-
|
171
|
+
attribs[ :group_id ] = group_rec.id if group_rec
|
172
|
+
|
173
|
+
rec = Model::Game.create!( attribs )
|
237
174
|
else
|
238
175
|
# update - todo
|
239
176
|
end
|
data/lib/sportdb/sync/version.rb
CHANGED
@@ -4,8 +4,8 @@
|
|
4
4
|
module SportDb
|
5
5
|
module Sync
|
6
6
|
|
7
|
-
MAJOR =
|
8
|
-
MINOR =
|
7
|
+
MAJOR = 1 ## todo: namespace inside version or something - why? why not??
|
8
|
+
MINOR = 0
|
9
9
|
PATCH = 0
|
10
10
|
VERSION = [MAJOR,MINOR,PATCH].join('.')
|
11
11
|
|
data/test/helper.rb
CHANGED
@@ -1,4 +1,8 @@
|
|
1
|
-
##
|
1
|
+
## note: use the local version of sportdb gems
|
2
|
+
$LOAD_PATH.unshift( File.expand_path( '../sportdb-formats/lib' ))
|
3
|
+
$LOAD_PATH.unshift( File.expand_path( '../sportdb-config/lib' ))
|
4
|
+
$LOAD_PATH.unshift( File.expand_path( '../sportdb-models/lib' ))
|
5
|
+
|
2
6
|
|
3
7
|
## minitest setup
|
4
8
|
require 'minitest/autorun'
|
@@ -6,3 +10,23 @@ require 'minitest/autorun'
|
|
6
10
|
|
7
11
|
## our own code
|
8
12
|
require 'sportdb/sync'
|
13
|
+
|
14
|
+
|
15
|
+
## use (switch to) "external" datasets
|
16
|
+
SportDb::Import.config.leagues_dir = "../../../openfootball/leagues"
|
17
|
+
SportDb::Import.config.clubs_dir = "../../../openfootball/clubs"
|
18
|
+
|
19
|
+
|
20
|
+
COUNTRIES = SportDb::Import.catalog.countries
|
21
|
+
LEAGUES = SportDb::Import.catalog.leagues
|
22
|
+
CLUBS = SportDb::Import.catalog.clubs
|
23
|
+
|
24
|
+
|
25
|
+
SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
|
26
|
+
SportDb.create_all ## build schema
|
27
|
+
|
28
|
+
## turn on logging to console
|
29
|
+
## ActiveRecord::Base.logger = Logger.new(STDOUT)
|
30
|
+
|
31
|
+
|
32
|
+
|
@@ -0,0 +1,50 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
|
3
|
+
###
|
4
|
+
# to run use
|
5
|
+
# ruby -I ./lib -I ./test test/test_country.rb
|
6
|
+
|
7
|
+
|
8
|
+
require 'helper'
|
9
|
+
|
10
|
+
|
11
|
+
class TestCountry < MiniTest::Test
|
12
|
+
|
13
|
+
Country = SportDb::Sync::Country
|
14
|
+
|
15
|
+
def test_find # note: find uses "data" structs
|
16
|
+
at = SportDb::Import::Country.new( key: 'at', name: 'Austria', fifa: 'AUT' )
|
17
|
+
eng = SportDb::Import::Country.new( key: 'eng', name: 'England', fifa: 'ENG' )
|
18
|
+
|
19
|
+
rec = Country.find_or_create( at )
|
20
|
+
rec2 = Country.find_or_create( at )
|
21
|
+
|
22
|
+
rec = Country.find_or_create( eng )
|
23
|
+
rec2 = Country.find_or_create( eng )
|
24
|
+
end # method test_find
|
25
|
+
|
26
|
+
|
27
|
+
def test_search # note: search uses query strings
|
28
|
+
rec = Country.search_or_create!( 'at' ) ## try (iso-alpha2) key
|
29
|
+
assert_equal 'Austria', rec.name
|
30
|
+
assert_equal 'at', rec.key
|
31
|
+
assert_equal 'AUT', rec.fifa
|
32
|
+
|
33
|
+
rec = Country.search_or_create!( 'aut' ) ## try fifa code
|
34
|
+
assert_equal 'Austria', rec.name
|
35
|
+
assert_equal 'at', rec.key
|
36
|
+
assert_equal 'AUT', rec.fifa
|
37
|
+
|
38
|
+
|
39
|
+
rec = Country.search_or_create!( 'eng' )
|
40
|
+
assert_equal 'England', rec.name
|
41
|
+
assert_equal 'eng', rec.key
|
42
|
+
assert_equal 'ENG', rec.fifa
|
43
|
+
|
44
|
+
rec = Country.search_or_create!( 'eng' )
|
45
|
+
assert_equal 'England', rec.name
|
46
|
+
assert_equal 'eng', rec.key
|
47
|
+
assert_equal 'ENG', rec.fifa
|
48
|
+
end
|
49
|
+
|
50
|
+
end # class TestCountry
|
data/test/test_league.rb
ADDED
@@ -0,0 +1,38 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
|
3
|
+
###
|
4
|
+
# to run use
|
5
|
+
# ruby -I ./lib -I ./test test/test_league.rb
|
6
|
+
|
7
|
+
|
8
|
+
require 'helper'
|
9
|
+
|
10
|
+
class TestLeague < MiniTest::Test
|
11
|
+
|
12
|
+
League = SportDb::Sync::League
|
13
|
+
|
14
|
+
|
15
|
+
def test_search
|
16
|
+
rec = League.search_or_create!( 'eng' )
|
17
|
+
assert_equal 'Premier League', rec.title ## fix: add name alias (rename title to name!!)
|
18
|
+
assert_equal 'eng.1', rec.key
|
19
|
+
assert_equal 'eng', rec.country.key
|
20
|
+
assert_equal 'England', rec.country.name
|
21
|
+
# assert_equal true, rec.club
|
22
|
+
|
23
|
+
rec = League.search!( 'eng' )
|
24
|
+
assert_equal 'Premier League', rec.title ## fix: add name alias (rename title to name!!)
|
25
|
+
assert_equal 'eng.1', rec.key
|
26
|
+
assert_equal 'eng', rec.country.key
|
27
|
+
assert_equal 'England', rec.country.name
|
28
|
+
## assert_equal true, rec.club
|
29
|
+
|
30
|
+
## try 2nd call (just lookup)
|
31
|
+
rec = League.search_or_create!( 'eng' )
|
32
|
+
assert_equal 'Premier League', rec.title ## fix: add name alias (rename title to name!!)
|
33
|
+
assert_equal 'eng.1', rec.key
|
34
|
+
assert_equal 'eng', rec.country.key
|
35
|
+
assert_equal 'England', rec.country.name
|
36
|
+
## assert_equal true, rec.club
|
37
|
+
end
|
38
|
+
end # class TestLeague
|
data/test/test_misc.rb
ADDED
@@ -0,0 +1,29 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
|
3
|
+
###
|
4
|
+
# to run use
|
5
|
+
# ruby -I ./lib -I ./test test/test_misc.rb
|
6
|
+
|
7
|
+
|
8
|
+
require 'helper'
|
9
|
+
|
10
|
+
class TestMisc < MiniTest::Test
|
11
|
+
|
12
|
+
Season = SportDb::Sync::Season
|
13
|
+
|
14
|
+
|
15
|
+
def test_season
|
16
|
+
rec = Season.search_or_create( '2017-18' )
|
17
|
+
assert_equal '2017/18', rec.title ## fix: add name alias (rename title to name!!)
|
18
|
+
assert_equal '2017/18', rec.key
|
19
|
+
|
20
|
+
rec = Season.search_or_create( '2017/2018' )
|
21
|
+
assert_equal '2017/18', rec.title ## fix: add name alias (rename title to name!!)
|
22
|
+
assert_equal '2017/18', rec.key
|
23
|
+
|
24
|
+
rec = Season.search_or_create( '2017/8' )
|
25
|
+
assert_equal '2017/18', rec.title ## fix: add name alias (rename title to name!!)
|
26
|
+
assert_equal '2017/18', rec.key
|
27
|
+
end
|
28
|
+
|
29
|
+
end # class TestMisc
|
metadata
CHANGED
@@ -1,57 +1,43 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sportdb-sync
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 1.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gerald Bauer
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-05-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name: sportdb-
|
14
|
+
name: sportdb-config
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 1.0.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.
|
27
|
-
- !ruby/object:Gem::Dependency
|
28
|
-
name: sportdb-leagues
|
29
|
-
requirement: !ruby/object:Gem::Requirement
|
30
|
-
requirements:
|
31
|
-
- - ">="
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: 0.2.1
|
34
|
-
type: :runtime
|
35
|
-
prerelease: false
|
36
|
-
version_requirements: !ruby/object:Gem::Requirement
|
37
|
-
requirements:
|
38
|
-
- - ">="
|
39
|
-
- !ruby/object:Gem::Version
|
40
|
-
version: 0.2.1
|
26
|
+
version: 1.0.1
|
41
27
|
- !ruby/object:Gem::Dependency
|
42
28
|
name: sportdb-models
|
43
29
|
requirement: !ruby/object:Gem::Requirement
|
44
30
|
requirements:
|
45
31
|
- - ">="
|
46
32
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
33
|
+
version: 1.19.0
|
48
34
|
type: :runtime
|
49
35
|
prerelease: false
|
50
36
|
version_requirements: !ruby/object:Gem::Requirement
|
51
37
|
requirements:
|
52
38
|
- - ">="
|
53
39
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
40
|
+
version: 1.19.0
|
55
41
|
- !ruby/object:Gem::Dependency
|
56
42
|
name: rdoc
|
57
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -95,10 +81,17 @@ files:
|
|
95
81
|
- README.md
|
96
82
|
- Rakefile
|
97
83
|
- lib/sportdb/sync.rb
|
84
|
+
- lib/sportdb/sync/club.rb
|
85
|
+
- lib/sportdb/sync/country.rb
|
86
|
+
- lib/sportdb/sync/event.rb
|
87
|
+
- lib/sportdb/sync/league.rb
|
88
|
+
- lib/sportdb/sync/season.rb
|
98
89
|
- lib/sportdb/sync/sync.rb
|
99
90
|
- lib/sportdb/sync/version.rb
|
100
91
|
- test/helper.rb
|
101
|
-
- test/
|
92
|
+
- test/test_country.rb
|
93
|
+
- test/test_league.rb
|
94
|
+
- test/test_misc.rb
|
102
95
|
homepage: https://github.com/sportdb/sport.db
|
103
96
|
licenses:
|
104
97
|
- Public Domain
|
data/test/test_sync.rb
DELETED
@@ -1,29 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
|
3
|
-
###
|
4
|
-
# to run use
|
5
|
-
# ruby -I ./lib -I ./test test/test_sync.rb
|
6
|
-
|
7
|
-
|
8
|
-
require 'helper'
|
9
|
-
|
10
|
-
|
11
|
-
class TestSync < MiniTest::Test
|
12
|
-
|
13
|
-
def test_sync
|
14
|
-
SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
|
15
|
-
SportDb.create_all ## build schema
|
16
|
-
|
17
|
-
## turn on logging to console
|
18
|
-
ActiveRecord::Base.logger = Logger.new(STDOUT)
|
19
|
-
|
20
|
-
at_rec = SportDb::Import::Country.new( 'at', 'Austria', fifa: 'AUT' )
|
21
|
-
eng_rec = SportDb::Import::Country.new( 'eng', 'England', fifa: 'ENG' )
|
22
|
-
|
23
|
-
at = SportDb::Sync::Country.find_or_create( at_rec )
|
24
|
-
at2 = SportDb::Sync::Country.find_or_create( at_rec )
|
25
|
-
|
26
|
-
eng = SportDb::Sync::Country.find_or_create( eng_rec )
|
27
|
-
eng2 = SportDb::Sync::Country.find_or_create( eng_rec )
|
28
|
-
end # method test_sync
|
29
|
-
end # class TestSync
|