sportdb 1.6.8 → 1.6.9
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/sportdb/models/person.rb +15 -0
- data/lib/sportdb/schema.rb +3 -2
- data/lib/sportdb/version.rb +1 -1
- metadata +10 -10
@@ -2,12 +2,22 @@ module SportDb::Models
|
|
2
2
|
|
3
3
|
|
4
4
|
class Person < ActiveRecord::Base
|
5
|
+
self.table_name = 'persons' # avoids possible "smart" plural inflection to people
|
5
6
|
|
6
7
|
has_many :goals
|
7
8
|
|
8
9
|
belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
|
9
10
|
|
10
11
|
|
12
|
+
def title # alias for name
|
13
|
+
name
|
14
|
+
end
|
15
|
+
|
16
|
+
def title=(value) # alias for name
|
17
|
+
self.name = value
|
18
|
+
end
|
19
|
+
|
20
|
+
|
11
21
|
def self.create_or_update_from_values( new_attributes, values )
|
12
22
|
|
13
23
|
## fix: add/configure logger for ActiveRecord!!!
|
@@ -27,6 +37,11 @@ class Person < ActiveRecord::Base
|
|
27
37
|
end
|
28
38
|
end
|
29
39
|
|
40
|
+
## quick hack: set nationality_id if not present to country_id
|
41
|
+
if new_attributes[ :nationality_id ].blank?
|
42
|
+
new_attributes[ :nationality_id ] = new_attributes[ :country_id ]
|
43
|
+
end
|
44
|
+
|
30
45
|
rec = Person.find_by_key( new_attributes[ :key ] )
|
31
46
|
if rec.present?
|
32
47
|
logger.debug "update Person #{rec.id}-#{rec.key}:"
|
data/lib/sportdb/schema.rb
CHANGED
@@ -34,8 +34,9 @@ create_table :persons do |t| # use people ? instead of persons (person/person
|
|
34
34
|
|
35
35
|
t.references :city
|
36
36
|
t.references :region
|
37
|
-
t.references :country, :null => false
|
37
|
+
t.references :country, :null => false
|
38
38
|
|
39
|
+
t.references :nationality, :null => false # by default assume same as country of birth (see above)
|
39
40
|
|
40
41
|
t.timestamps
|
41
42
|
end
|
@@ -59,7 +60,7 @@ end
|
|
59
60
|
|
60
61
|
create_table :tracks do |t| # e.g. Formula 1 circuits or Apline Ski resorts/slops/pistes
|
61
62
|
t.string :key, :null => false # import/export key
|
62
|
-
t.string :
|
63
|
+
t.string :title, :null => false
|
63
64
|
t.string :synonyms # comma separated list of synonyms
|
64
65
|
|
65
66
|
t.references :city
|
data/lib/sportdb/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sportdb
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.9
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-06-
|
12
|
+
date: 2013-06-03 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: worlddb
|
16
|
-
requirement: &
|
16
|
+
requirement: &85010780 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '1.7'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *85010780
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: commander
|
27
|
-
requirement: &
|
27
|
+
requirement: &85010560 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 4.1.3
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *85010560
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rdoc
|
38
|
-
requirement: &
|
38
|
+
requirement: &85010340 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '3.10'
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *85010340
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: hoe
|
49
|
-
requirement: &
|
49
|
+
requirement: &85010120 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,7 +54,7 @@ dependencies:
|
|
54
54
|
version: '3.3'
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *85010120
|
58
58
|
description: sportdb - sport.db command line tool
|
59
59
|
email: opensport@googlegroups.com
|
60
60
|
executables:
|