osm 1.2.9 → 1.2.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +15 -0
- data/CHANGELOG.md +5 -0
- data/lib/osm/badge.rb +9 -9
- data/spec/osm/badge_spec.rb +17 -8
- data/version.rb +1 -1
- metadata +5 -31
checksums.yaml
ADDED
@@ -0,0 +1,15 @@
|
|
1
|
+
---
|
2
|
+
!binary "U0hBMQ==":
|
3
|
+
metadata.gz: !binary |-
|
4
|
+
ZWU5MjViOTkxMDVjZDlkYjkwM2EzZDNkNDg1YzRiZjk4OGQxMmU2Mg==
|
5
|
+
data.tar.gz: !binary |-
|
6
|
+
YjkzMjgzNGQyMjA2NjFkN2RhOTU1YjFkYzY1MzhkMzFlZTI5YTJjMA==
|
7
|
+
SHA512:
|
8
|
+
metadata.gz: !binary |-
|
9
|
+
ODRiY2RiNjE2NjUxMGJhY2U2MDZhYzI2ZjAwYzQxOWFiNjYxN2ZjNzI1NzUy
|
10
|
+
ZWI0NGFlNjk3Zjc4NTE3MTlkZmVhNzVkYzAxMDkzNDE0YmRiZjc1MGExM2U3
|
11
|
+
YzhmNjhlYTJjOWRmZmE5ZmFkNjI4NGU4YWRiMTA2NjE3YTk2NzU=
|
12
|
+
data.tar.gz: !binary |-
|
13
|
+
YTUxNzMzMTlhOTRhMDViNzNhYjU2MDNiYzM1YzQ2NjY4ZjFiMzQzMTRlYjc0
|
14
|
+
NDY1ZmU3MDRjMjI3ZTc2ODNhNjg2OWZkZjk1YmEzYWUyMWE3NGRlYmRiYjQw
|
15
|
+
ZWYwMjcxODcyYjY0ZGVhOTZhZWZjMTM3ZTg4YWE1YWQzNDA3ZTg=
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,8 @@
|
|
1
|
+
## Version 1.2.10
|
2
|
+
|
3
|
+
* Update levels for Hikes and Nights away staged badges (released April 2014)
|
4
|
+
* Add levels for new Time on the water staged badge (released April 2014)
|
5
|
+
|
1
6
|
## Version 1.2.9
|
2
7
|
|
3
8
|
* Add osm\_long\_key to badges to make getting badge stock easier
|
data/lib/osm/badge.rb
CHANGED
@@ -293,9 +293,11 @@ module Osm
|
|
293
293
|
validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
|
294
294
|
validates :requirements, :hash => {:key_type => String, :value_type => String}
|
295
295
|
|
296
|
-
|
297
|
-
|
298
|
-
|
296
|
+
STAGES = {
|
297
|
+
'nightsaway' => [1, 2, 3, 4, 5, 10, 15, 20, 35, 50, 75, 100, 125, 150, 175, 200],
|
298
|
+
'hikes' => [1, 2, 5, 10, 15, 20, 35, 50],
|
299
|
+
'timeonthewater' => [1, 2, 5, 10, 15, 20, 35, 50],
|
300
|
+
}
|
299
301
|
|
300
302
|
# @!method initialize
|
301
303
|
# Initialize a new Badge
|
@@ -382,10 +384,9 @@ module Osm
|
|
382
384
|
unless badge.type == :staged
|
383
385
|
return earnt? ? 1 : 0
|
384
386
|
end
|
385
|
-
if
|
387
|
+
if STAGES.keys.include?(badge.osm_key)
|
386
388
|
total_done = requirements['y_01']
|
387
|
-
stages =
|
388
|
-
stages = STAGES_HIKESAWAY if badge.osm_key.eql?('hikes')
|
389
|
+
stages = STAGES[badge.osm_key]
|
389
390
|
stages.reverse_each do |stage|
|
390
391
|
return stage if total_done >= stage
|
391
392
|
end
|
@@ -423,9 +424,8 @@ module Osm
|
|
423
424
|
return started? ? 1 : 0
|
424
425
|
else
|
425
426
|
# Staged badge
|
426
|
-
if
|
427
|
-
stages =
|
428
|
-
stages = STAGES_HIKESAWAY if badge.osm_key.eql?('hikes')
|
427
|
+
if STAGES.keys.include?(badge.osm_key) # Special staged badges
|
428
|
+
stages = STAGES[badge.osm_key]
|
429
429
|
done = requirements['y_01'].to_i
|
430
430
|
return 0 if done < stages[0] # Not started the first stage
|
431
431
|
return 0 if done >= stages[stages.size - 1] # No more stages can be started
|
data/spec/osm/badge_spec.rb
CHANGED
@@ -234,18 +234,27 @@ describe "Badge" do
|
|
234
234
|
it "Nights away" do
|
235
235
|
badge = Osm::StagedBadge.new(:osm_key => 'nightsaway')
|
236
236
|
|
237
|
-
Osm::Badge::Data.new(:requirements => {'y_01'=>
|
238
|
-
Osm::Badge::Data.new(:requirements => {'y_01'=>
|
239
|
-
Osm::Badge::Data.new(:requirements => {'y_01'=>
|
240
|
-
Osm::Badge::Data.new(:requirements => {'y_01'=>199}, :badge => badge).earnt.should == 175
|
241
|
-
Osm::Badge::Data.new(:requirements => {'y_01'=>200}, :badge => badge).earnt.should == 200
|
237
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>9}, :badge => badge).earnt.should == 5
|
238
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>10}, :badge => badge).earnt.should == 10
|
239
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>11}, :badge => badge).earnt.should == 10
|
242
240
|
Osm::Badge::Data.new(:requirements => {'y_01'=>999}, :badge => badge).earnt.should == 200
|
243
241
|
end
|
244
242
|
|
245
243
|
it "Hikes away" do
|
246
244
|
badge = Osm::StagedBadge.new(:osm_key => 'hikes')
|
247
245
|
|
248
|
-
Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should ==
|
246
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 2
|
247
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>5}, :badge => badge).earnt.should == 5
|
248
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>6}, :badge => badge).earnt.should == 5
|
249
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>49}, :badge => badge).earnt.should == 35
|
250
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>50}, :badge => badge).earnt.should == 50
|
251
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>999}, :badge => badge).earnt.should == 50
|
252
|
+
end
|
253
|
+
|
254
|
+
it "Time on the water" do
|
255
|
+
badge = Osm::StagedBadge.new(:osm_key => 'timeonthewater')
|
256
|
+
|
257
|
+
Osm::Badge::Data.new(:requirements => {'y_01'=>3}, :badge => badge).earnt.should == 2
|
249
258
|
Osm::Badge::Data.new(:requirements => {'y_01'=>5}, :badge => badge).earnt.should == 5
|
250
259
|
Osm::Badge::Data.new(:requirements => {'y_01'=>6}, :badge => badge).earnt.should == 5
|
251
260
|
Osm::Badge::Data.new(:requirements => {'y_01'=>49}, :badge => badge).earnt.should == 35
|
@@ -283,7 +292,7 @@ describe "Badge" do
|
|
283
292
|
).started?.should be_false
|
284
293
|
Osm::Badge::Data.new(
|
285
294
|
:badge => Osm::StagedBadge.new(:osm_key => 'hikes'),
|
286
|
-
:requirements => {'a_01' =>
|
295
|
+
:requirements => {'a_01' => 3, 'y_01' => '3', 'custom_26695' => ''},
|
287
296
|
:completed => 1,
|
288
297
|
).started?.should be_true
|
289
298
|
|
@@ -358,7 +367,7 @@ describe "Badge" do
|
|
358
367
|
).started.should == 10
|
359
368
|
Osm::Badge::Data.new(
|
360
369
|
:badge => Osm::StagedBadge.new(:osm_key => 'hikes'),
|
361
|
-
:requirements => {'a_01' =>
|
370
|
+
:requirements => {'a_01' => 3, 'y_01' => '3', 'custom_26695' => ''},
|
362
371
|
:completed => 1,
|
363
372
|
).started.should == 5
|
364
373
|
end
|
data/version.rb
CHANGED
metadata
CHANGED
@@ -1,20 +1,18 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: osm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
5
|
-
prerelease:
|
4
|
+
version: 1.2.10
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- Robert Gauld
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date: 2014-
|
11
|
+
date: 2014-04-14 00:00:00.000000000 Z
|
13
12
|
dependencies:
|
14
13
|
- !ruby/object:Gem::Dependency
|
15
14
|
name: activesupport
|
16
15
|
requirement: !ruby/object:Gem::Requirement
|
17
|
-
none: false
|
18
16
|
requirements:
|
19
17
|
- - ! '>='
|
20
18
|
- !ruby/object:Gem::Version
|
@@ -25,7 +23,6 @@ dependencies:
|
|
25
23
|
type: :runtime
|
26
24
|
prerelease: false
|
27
25
|
version_requirements: !ruby/object:Gem::Requirement
|
28
|
-
none: false
|
29
26
|
requirements:
|
30
27
|
- - ! '>='
|
31
28
|
- !ruby/object:Gem::Version
|
@@ -36,7 +33,6 @@ dependencies:
|
|
36
33
|
- !ruby/object:Gem::Dependency
|
37
34
|
name: httparty
|
38
35
|
requirement: !ruby/object:Gem::Requirement
|
39
|
-
none: false
|
40
36
|
requirements:
|
41
37
|
- - ~>
|
42
38
|
- !ruby/object:Gem::Version
|
@@ -44,7 +40,6 @@ dependencies:
|
|
44
40
|
type: :runtime
|
45
41
|
prerelease: false
|
46
42
|
version_requirements: !ruby/object:Gem::Requirement
|
47
|
-
none: false
|
48
43
|
requirements:
|
49
44
|
- - ~>
|
50
45
|
- !ruby/object:Gem::Version
|
@@ -52,7 +47,6 @@ dependencies:
|
|
52
47
|
- !ruby/object:Gem::Dependency
|
53
48
|
name: active_attr
|
54
49
|
requirement: !ruby/object:Gem::Requirement
|
55
|
-
none: false
|
56
50
|
requirements:
|
57
51
|
- - ~>
|
58
52
|
- !ruby/object:Gem::Version
|
@@ -60,7 +54,6 @@ dependencies:
|
|
60
54
|
type: :runtime
|
61
55
|
prerelease: false
|
62
56
|
version_requirements: !ruby/object:Gem::Requirement
|
63
|
-
none: false
|
64
57
|
requirements:
|
65
58
|
- - ~>
|
66
59
|
- !ruby/object:Gem::Version
|
@@ -68,7 +61,6 @@ dependencies:
|
|
68
61
|
- !ruby/object:Gem::Dependency
|
69
62
|
name: activemodel
|
70
63
|
requirement: !ruby/object:Gem::Requirement
|
71
|
-
none: false
|
72
64
|
requirements:
|
73
65
|
- - ! '>='
|
74
66
|
- !ruby/object:Gem::Version
|
@@ -79,7 +71,6 @@ dependencies:
|
|
79
71
|
type: :runtime
|
80
72
|
prerelease: false
|
81
73
|
version_requirements: !ruby/object:Gem::Requirement
|
82
|
-
none: false
|
83
74
|
requirements:
|
84
75
|
- - ! '>='
|
85
76
|
- !ruby/object:Gem::Version
|
@@ -90,7 +81,6 @@ dependencies:
|
|
90
81
|
- !ruby/object:Gem::Dependency
|
91
82
|
name: dirty_hashy
|
92
83
|
requirement: !ruby/object:Gem::Requirement
|
93
|
-
none: false
|
94
84
|
requirements:
|
95
85
|
- - ~>
|
96
86
|
- !ruby/object:Gem::Version
|
@@ -98,7 +88,6 @@ dependencies:
|
|
98
88
|
type: :runtime
|
99
89
|
prerelease: false
|
100
90
|
version_requirements: !ruby/object:Gem::Requirement
|
101
|
-
none: false
|
102
91
|
requirements:
|
103
92
|
- - ~>
|
104
93
|
- !ruby/object:Gem::Version
|
@@ -106,7 +95,6 @@ dependencies:
|
|
106
95
|
- !ruby/object:Gem::Dependency
|
107
96
|
name: rake
|
108
97
|
requirement: !ruby/object:Gem::Requirement
|
109
|
-
none: false
|
110
98
|
requirements:
|
111
99
|
- - ~>
|
112
100
|
- !ruby/object:Gem::Version
|
@@ -114,7 +102,6 @@ dependencies:
|
|
114
102
|
type: :development
|
115
103
|
prerelease: false
|
116
104
|
version_requirements: !ruby/object:Gem::Requirement
|
117
|
-
none: false
|
118
105
|
requirements:
|
119
106
|
- - ~>
|
120
107
|
- !ruby/object:Gem::Version
|
@@ -122,7 +109,6 @@ dependencies:
|
|
122
109
|
- !ruby/object:Gem::Dependency
|
123
110
|
name: rspec
|
124
111
|
requirement: !ruby/object:Gem::Requirement
|
125
|
-
none: false
|
126
112
|
requirements:
|
127
113
|
- - ~>
|
128
114
|
- !ruby/object:Gem::Version
|
@@ -133,7 +119,6 @@ dependencies:
|
|
133
119
|
type: :development
|
134
120
|
prerelease: false
|
135
121
|
version_requirements: !ruby/object:Gem::Requirement
|
136
|
-
none: false
|
137
122
|
requirements:
|
138
123
|
- - ~>
|
139
124
|
- !ruby/object:Gem::Version
|
@@ -144,7 +129,6 @@ dependencies:
|
|
144
129
|
- !ruby/object:Gem::Dependency
|
145
130
|
name: fakeweb
|
146
131
|
requirement: !ruby/object:Gem::Requirement
|
147
|
-
none: false
|
148
132
|
requirements:
|
149
133
|
- - ~>
|
150
134
|
- !ruby/object:Gem::Version
|
@@ -152,7 +136,6 @@ dependencies:
|
|
152
136
|
type: :development
|
153
137
|
prerelease: false
|
154
138
|
version_requirements: !ruby/object:Gem::Requirement
|
155
|
-
none: false
|
156
139
|
requirements:
|
157
140
|
- - ~>
|
158
141
|
- !ruby/object:Gem::Version
|
@@ -160,7 +143,6 @@ dependencies:
|
|
160
143
|
- !ruby/object:Gem::Dependency
|
161
144
|
name: guard-rspec
|
162
145
|
requirement: !ruby/object:Gem::Requirement
|
163
|
-
none: false
|
164
146
|
requirements:
|
165
147
|
- - ~>
|
166
148
|
- !ruby/object:Gem::Version
|
@@ -171,7 +153,6 @@ dependencies:
|
|
171
153
|
type: :development
|
172
154
|
prerelease: false
|
173
155
|
version_requirements: !ruby/object:Gem::Requirement
|
174
|
-
none: false
|
175
156
|
requirements:
|
176
157
|
- - ~>
|
177
158
|
- !ruby/object:Gem::Version
|
@@ -182,7 +163,6 @@ dependencies:
|
|
182
163
|
- !ruby/object:Gem::Dependency
|
183
164
|
name: rb-inotify
|
184
165
|
requirement: !ruby/object:Gem::Requirement
|
185
|
-
none: false
|
186
166
|
requirements:
|
187
167
|
- - ~>
|
188
168
|
- !ruby/object:Gem::Version
|
@@ -190,7 +170,6 @@ dependencies:
|
|
190
170
|
type: :development
|
191
171
|
prerelease: false
|
192
172
|
version_requirements: !ruby/object:Gem::Requirement
|
193
|
-
none: false
|
194
173
|
requirements:
|
195
174
|
- - ~>
|
196
175
|
- !ruby/object:Gem::Version
|
@@ -198,7 +177,6 @@ dependencies:
|
|
198
177
|
- !ruby/object:Gem::Dependency
|
199
178
|
name: coveralls
|
200
179
|
requirement: !ruby/object:Gem::Requirement
|
201
|
-
none: false
|
202
180
|
requirements:
|
203
181
|
- - ~>
|
204
182
|
- !ruby/object:Gem::Version
|
@@ -206,7 +184,6 @@ dependencies:
|
|
206
184
|
type: :development
|
207
185
|
prerelease: false
|
208
186
|
version_requirements: !ruby/object:Gem::Requirement
|
209
|
-
none: false
|
210
187
|
requirements:
|
211
188
|
- - ~>
|
212
189
|
- !ruby/object:Gem::Version
|
@@ -214,7 +191,6 @@ dependencies:
|
|
214
191
|
- !ruby/object:Gem::Dependency
|
215
192
|
name: simplecov
|
216
193
|
requirement: !ruby/object:Gem::Requirement
|
217
|
-
none: false
|
218
194
|
requirements:
|
219
195
|
- - ~>
|
220
196
|
- !ruby/object:Gem::Version
|
@@ -222,7 +198,6 @@ dependencies:
|
|
222
198
|
type: :development
|
223
199
|
prerelease: false
|
224
200
|
version_requirements: !ruby/object:Gem::Requirement
|
225
|
-
none: false
|
226
201
|
requirements:
|
227
202
|
- - ~>
|
228
203
|
- !ruby/object:Gem::Version
|
@@ -292,27 +267,26 @@ files:
|
|
292
267
|
homepage: https://github.com/robertgauld/osm
|
293
268
|
licenses:
|
294
269
|
- BSD 3 clause
|
270
|
+
metadata: {}
|
295
271
|
post_install_message:
|
296
272
|
rdoc_options: []
|
297
273
|
require_paths:
|
298
274
|
- lib
|
299
275
|
required_ruby_version: !ruby/object:Gem::Requirement
|
300
|
-
none: false
|
301
276
|
requirements:
|
302
277
|
- - ! '>='
|
303
278
|
- !ruby/object:Gem::Version
|
304
279
|
version: '0'
|
305
280
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
306
|
-
none: false
|
307
281
|
requirements:
|
308
282
|
- - ! '>='
|
309
283
|
- !ruby/object:Gem::Version
|
310
284
|
version: '0'
|
311
285
|
requirements: []
|
312
286
|
rubyforge_project: osm
|
313
|
-
rubygems_version:
|
287
|
+
rubygems_version: 2.2.2
|
314
288
|
signing_key:
|
315
|
-
specification_version:
|
289
|
+
specification_version: 4
|
316
290
|
summary: Use the Online Scout Manager API
|
317
291
|
test_files: []
|
318
292
|
has_rdoc:
|