sportdb 1.8.17 → 1.8.18
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/sportdb +0 -0
- data/lib/sportdb/models/event.rb +7 -2
- data/lib/sportdb/models/group.rb +6 -1
- data/lib/sportdb/models/round.rb +8 -3
- data/lib/sportdb/readers/game.rb +13 -1
- data/lib/sportdb/version.rb +1 -1
- metadata +44 -72
- checksums.yaml +0 -7
data/bin/sportdb
CHANGED
File without changes
|
data/lib/sportdb/models/event.rb
CHANGED
@@ -8,10 +8,15 @@ class Event < ActiveRecord::Base
|
|
8
8
|
belongs_to :league
|
9
9
|
belongs_to :season
|
10
10
|
|
11
|
+
if ActiveRecord::VERSION::MAJOR == 3
|
11
12
|
has_many :rounds, :order => 'pos' # all (fix and flex) rounds
|
12
|
-
has_many :games, :through => :rounds
|
13
|
-
|
14
13
|
has_many :groups, :order => 'pos'
|
14
|
+
else
|
15
|
+
has_many :rounds, -> { order('pos') } # all (fix and flex) rounds
|
16
|
+
has_many :groups, -> { order('pos') }
|
17
|
+
end
|
18
|
+
|
19
|
+
has_many :games, :through => :rounds
|
15
20
|
|
16
21
|
has_many :event_teams, :class_name => 'EventTeam'
|
17
22
|
has_many :teams, :through => :event_teams
|
data/lib/sportdb/models/group.rb
CHANGED
@@ -4,8 +4,13 @@ module SportDb
|
|
4
4
|
|
5
5
|
|
6
6
|
class Group < ActiveRecord::Base
|
7
|
-
|
7
|
+
|
8
|
+
if ActiveRecord::VERSION::MAJOR == 3
|
8
9
|
has_many :games, :order => 'pos'
|
10
|
+
else
|
11
|
+
has_many :games, -> { order('pos') }
|
12
|
+
end
|
13
|
+
|
9
14
|
belongs_to :event
|
10
15
|
|
11
16
|
has_many :group_teams, :class_name => 'GroupTeam'
|
data/lib/sportdb/models/round.rb
CHANGED
@@ -4,12 +4,17 @@ module SportDb
|
|
4
4
|
|
5
5
|
|
6
6
|
class Round < ActiveRecord::Base
|
7
|
-
|
7
|
+
|
8
|
+
if ActiveRecord::VERSION::MAJOR == 3
|
8
9
|
has_many :games, :order => 'pos'
|
10
|
+
else
|
11
|
+
has_many :games, -> { order('pos') }
|
12
|
+
end
|
13
|
+
|
9
14
|
belongs_to :event
|
10
|
-
|
15
|
+
|
11
16
|
end # class Round
|
12
|
-
|
17
|
+
|
13
18
|
|
14
19
|
end # module Model
|
15
20
|
end # module SportDb
|
data/lib/sportdb/readers/game.rb
CHANGED
@@ -172,6 +172,12 @@ class GameReader
|
|
172
172
|
# note: if end_at missing -- assume start_at is (==) end_at
|
173
173
|
end_at = start_at if end_at.nil?
|
174
174
|
|
175
|
+
# note: - NOT needed; start_at and end_at are saved as date only (NOT datetime)
|
176
|
+
# set hours,minutes,secs to beginning and end of day (do NOT use default 12.00)
|
177
|
+
# e.g. use 00.00 and 23.59
|
178
|
+
# start_at = start_at.beginning_of_day
|
179
|
+
# end_at = end_at.end_of_day
|
180
|
+
|
175
181
|
|
176
182
|
pos = find_round_pos!( line )
|
177
183
|
title = find_round_def_title!( line )
|
@@ -365,10 +371,16 @@ class GameReader
|
|
365
371
|
# fix: check - what to do with hours e.g. start_at use 00:00 and for end_at use 23.59 ??
|
366
372
|
# -- for now - remove hours (e.g. use end_of_day and beginnig_of_day)
|
367
373
|
|
374
|
+
##
|
375
|
+
# note: start_at and end_at are dates ONLY (note datetime)
|
376
|
+
# - do NOT pass in hours etc. in query
|
377
|
+
# old: date.end_of_day, date.beginning_of_day
|
378
|
+
# new: date.to_date, date.to_date
|
379
|
+
|
368
380
|
## pp Round.all
|
369
381
|
|
370
382
|
round = Round.where( 'event_id = ? AND (start_at <= ? AND end_at >= ?)',
|
371
|
-
@event.id, date.
|
383
|
+
@event.id, date.to_date, date.to_date).first
|
372
384
|
## pp round
|
373
385
|
logger.debug( " using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
|
374
386
|
else
|
data/lib/sportdb/version.rb
CHANGED
metadata
CHANGED
@@ -1,155 +1,126 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sportdb
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.8.
|
4
|
+
version: 1.8.18
|
5
|
+
prerelease:
|
5
6
|
platform: ruby
|
6
7
|
authors:
|
7
8
|
- Gerald Bauer
|
8
9
|
autorequire:
|
9
10
|
bindir: bin
|
10
11
|
cert_chain: []
|
11
|
-
date: 2014-05-
|
12
|
+
date: 2014-05-14 00:00:00.000000000 Z
|
12
13
|
dependencies:
|
13
14
|
- !ruby/object:Gem::Dependency
|
14
15
|
name: props
|
15
|
-
requirement: !ruby/object:Gem::Requirement
|
16
|
+
requirement: &74539620 !ruby/object:Gem::Requirement
|
17
|
+
none: false
|
16
18
|
requirements:
|
17
19
|
- - ! '>='
|
18
20
|
- !ruby/object:Gem::Version
|
19
21
|
version: '0'
|
20
22
|
type: :runtime
|
21
23
|
prerelease: false
|
22
|
-
version_requirements:
|
23
|
-
requirements:
|
24
|
-
- - ! '>='
|
25
|
-
- !ruby/object:Gem::Version
|
26
|
-
version: '0'
|
24
|
+
version_requirements: *74539620
|
27
25
|
- !ruby/object:Gem::Dependency
|
28
26
|
name: logutils
|
29
|
-
requirement: !ruby/object:Gem::Requirement
|
27
|
+
requirement: &74538650 !ruby/object:Gem::Requirement
|
28
|
+
none: false
|
30
29
|
requirements:
|
31
30
|
- - ! '>='
|
32
31
|
- !ruby/object:Gem::Version
|
33
32
|
version: '0'
|
34
33
|
type: :runtime
|
35
34
|
prerelease: false
|
36
|
-
version_requirements:
|
37
|
-
requirements:
|
38
|
-
- - ! '>='
|
39
|
-
- !ruby/object:Gem::Version
|
40
|
-
version: '0'
|
35
|
+
version_requirements: *74538650
|
41
36
|
- !ruby/object:Gem::Dependency
|
42
37
|
name: textutils
|
43
|
-
requirement: !ruby/object:Gem::Requirement
|
38
|
+
requirement: &74537420 !ruby/object:Gem::Requirement
|
39
|
+
none: false
|
44
40
|
requirements:
|
45
41
|
- - ! '>='
|
46
42
|
- !ruby/object:Gem::Version
|
47
43
|
version: '0'
|
48
44
|
type: :runtime
|
49
45
|
prerelease: false
|
50
|
-
version_requirements:
|
51
|
-
requirements:
|
52
|
-
- - ! '>='
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: '0'
|
46
|
+
version_requirements: *74537420
|
55
47
|
- !ruby/object:Gem::Dependency
|
56
48
|
name: worlddb
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
49
|
+
requirement: &74534960 !ruby/object:Gem::Requirement
|
50
|
+
none: false
|
58
51
|
requirements:
|
59
52
|
- - ! '>='
|
60
53
|
- !ruby/object:Gem::Version
|
61
54
|
version: 2.0.2
|
62
55
|
type: :runtime
|
63
56
|
prerelease: false
|
64
|
-
version_requirements:
|
65
|
-
requirements:
|
66
|
-
- - ! '>='
|
67
|
-
- !ruby/object:Gem::Version
|
68
|
-
version: 2.0.2
|
57
|
+
version_requirements: *74534960
|
69
58
|
- !ruby/object:Gem::Dependency
|
70
59
|
name: tagutils
|
71
|
-
requirement: !ruby/object:Gem::Requirement
|
60
|
+
requirement: &74532380 !ruby/object:Gem::Requirement
|
61
|
+
none: false
|
72
62
|
requirements:
|
73
63
|
- - ! '>='
|
74
64
|
- !ruby/object:Gem::Version
|
75
65
|
version: '0'
|
76
66
|
type: :runtime
|
77
67
|
prerelease: false
|
78
|
-
version_requirements:
|
79
|
-
requirements:
|
80
|
-
- - ! '>='
|
81
|
-
- !ruby/object:Gem::Version
|
82
|
-
version: '0'
|
68
|
+
version_requirements: *74532380
|
83
69
|
- !ruby/object:Gem::Dependency
|
84
70
|
name: fetcher
|
85
|
-
requirement: !ruby/object:Gem::Requirement
|
71
|
+
requirement: &74526380 !ruby/object:Gem::Requirement
|
72
|
+
none: false
|
86
73
|
requirements:
|
87
74
|
- - ! '>='
|
88
75
|
- !ruby/object:Gem::Version
|
89
76
|
version: '0.3'
|
90
77
|
type: :runtime
|
91
78
|
prerelease: false
|
92
|
-
version_requirements:
|
93
|
-
requirements:
|
94
|
-
- - ! '>='
|
95
|
-
- !ruby/object:Gem::Version
|
96
|
-
version: '0.3'
|
79
|
+
version_requirements: *74526380
|
97
80
|
- !ruby/object:Gem::Dependency
|
98
81
|
name: gli
|
99
|
-
requirement: !ruby/object:Gem::Requirement
|
82
|
+
requirement: &74524870 !ruby/object:Gem::Requirement
|
83
|
+
none: false
|
100
84
|
requirements:
|
101
85
|
- - ! '>='
|
102
86
|
- !ruby/object:Gem::Version
|
103
87
|
version: 2.5.6
|
104
88
|
type: :runtime
|
105
89
|
prerelease: false
|
106
|
-
version_requirements:
|
107
|
-
requirements:
|
108
|
-
- - ! '>='
|
109
|
-
- !ruby/object:Gem::Version
|
110
|
-
version: 2.5.6
|
90
|
+
version_requirements: *74524870
|
111
91
|
- !ruby/object:Gem::Dependency
|
112
92
|
name: activerecord
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
93
|
+
requirement: &74524290 !ruby/object:Gem::Requirement
|
94
|
+
none: false
|
114
95
|
requirements:
|
115
96
|
- - ! '>='
|
116
97
|
- !ruby/object:Gem::Version
|
117
98
|
version: '0'
|
118
99
|
type: :runtime
|
119
100
|
prerelease: false
|
120
|
-
version_requirements:
|
121
|
-
requirements:
|
122
|
-
- - ! '>='
|
123
|
-
- !ruby/object:Gem::Version
|
124
|
-
version: '0'
|
101
|
+
version_requirements: *74524290
|
125
102
|
- !ruby/object:Gem::Dependency
|
126
103
|
name: rdoc
|
127
|
-
requirement: !ruby/object:Gem::Requirement
|
104
|
+
requirement: &74522390 !ruby/object:Gem::Requirement
|
105
|
+
none: false
|
128
106
|
requirements:
|
129
107
|
- - ~>
|
130
108
|
- !ruby/object:Gem::Version
|
131
109
|
version: '4.0'
|
132
110
|
type: :development
|
133
111
|
prerelease: false
|
134
|
-
version_requirements:
|
135
|
-
requirements:
|
136
|
-
- - ~>
|
137
|
-
- !ruby/object:Gem::Version
|
138
|
-
version: '4.0'
|
112
|
+
version_requirements: *74522390
|
139
113
|
- !ruby/object:Gem::Dependency
|
140
114
|
name: hoe
|
141
|
-
requirement: !ruby/object:Gem::Requirement
|
115
|
+
requirement: &74519770 !ruby/object:Gem::Requirement
|
116
|
+
none: false
|
142
117
|
requirements:
|
143
118
|
- - ~>
|
144
119
|
- !ruby/object:Gem::Version
|
145
|
-
version: '3.
|
120
|
+
version: '3.11'
|
146
121
|
type: :development
|
147
122
|
prerelease: false
|
148
|
-
version_requirements:
|
149
|
-
requirements:
|
150
|
-
- - ~>
|
151
|
-
- !ruby/object:Gem::Version
|
152
|
-
version: '3.10'
|
123
|
+
version_requirements: *74519770
|
153
124
|
description: sportdb - sport.db command line tool
|
154
125
|
email: opensport@googlegroups.com
|
155
126
|
executables:
|
@@ -290,7 +261,6 @@ files:
|
|
290
261
|
homepage: https://github.com/geraldb/sport.db.ruby
|
291
262
|
licenses:
|
292
263
|
- Public Domain
|
293
|
-
metadata: {}
|
294
264
|
post_install_message: ! '******************************************************************************
|
295
265
|
|
296
266
|
|
@@ -308,29 +278,31 @@ rdoc_options:
|
|
308
278
|
require_paths:
|
309
279
|
- lib
|
310
280
|
required_ruby_version: !ruby/object:Gem::Requirement
|
281
|
+
none: false
|
311
282
|
requirements:
|
312
283
|
- - ! '>='
|
313
284
|
- !ruby/object:Gem::Version
|
314
285
|
version: 1.9.2
|
315
286
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
287
|
+
none: false
|
316
288
|
requirements:
|
317
289
|
- - ! '>='
|
318
290
|
- !ruby/object:Gem::Version
|
319
291
|
version: '0'
|
320
292
|
requirements: []
|
321
293
|
rubyforge_project:
|
322
|
-
rubygems_version:
|
294
|
+
rubygems_version: 1.8.17
|
323
295
|
signing_key:
|
324
|
-
specification_version:
|
296
|
+
specification_version: 3
|
325
297
|
summary: sportdb - sport.db command line tool
|
326
298
|
test_files:
|
327
|
-
- test/test_changes.rb
|
328
|
-
- test/test_cursor.rb
|
329
299
|
- test/test_date.rb
|
330
300
|
- test/test_lang.rb
|
331
|
-
- test/
|
332
|
-
- test/test_round_def.rb
|
333
|
-
- test/test_round_header.rb
|
301
|
+
- test/test_cursor.rb
|
334
302
|
- test/test_scores.rb
|
335
|
-
- test/test_utils.rb
|
336
303
|
- test/test_winner.rb
|
304
|
+
- test/test_round_def.rb
|
305
|
+
- test/test_utils.rb
|
306
|
+
- test/test_round_header.rb
|
307
|
+
- test/test_reader.rb
|
308
|
+
- test/test_changes.rb
|
checksums.yaml
DELETED
@@ -1,7 +0,0 @@
|
|
1
|
-
---
|
2
|
-
SHA1:
|
3
|
-
metadata.gz: 0b4e0cbf4dbbf1a4b505edada00c4368b2bc1233
|
4
|
-
data.tar.gz: b0b4f89e838232753640714dba0f08aeeff29853
|
5
|
-
SHA512:
|
6
|
-
metadata.gz: aa7636a7a61ae541079cbdeabed5ebaae1b104c682700a0018eb0033139ae0074389f3ef9da901f1019fa9ce681b1da3bc3c418da01bfba5cc33eb6928d6841b
|
7
|
-
data.tar.gz: 0c1eebb17d41fa62fd12be72ce336158bca7d89adc1bd18b85c782106a54edf408029b6caab94150ad1d127888bd126ad54471523a18fa4aad68ec832831d3c6
|