api_resource 0.6.15 → 0.6.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.rspec +0 -2
- data/Gemfile.lock +9 -3
- data/api_resource.gemspec +1 -1
- data/lib/api_resource/version.rb +1 -1
- data/spec/spec_helper.rb +1 -0
- metadata +19 -53
- data/spec/lib/formats/json_format_spec.rb +0 -19
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
!binary "U0hBMQ==":
|
3
|
+
metadata.gz: 632f38e5c69b7fc0366a47658f215dd0677d9e0e
|
4
|
+
data.tar.gz: 8864d81591dda597971e65b930c5fee42f4c3ac3
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: dc9dc2ddf48d9a06edbdde988c61412aa628b1dea6f0199050c91798542accc81cf26f0af4d956ae70f59fd73e719ff129063260cfcaafec14380d4743270eb2
|
7
|
+
data.tar.gz: 2b9937b5a8f541e6033cbb6fb011fb4954c542fd680317e8e81b5a9f1e45786204f5c5bda2eb828e6333fe729c3757e01107452592df0c085b90f0e2a07fa25d
|
data/.rspec
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
api_resource (0.6.
|
4
|
+
api_resource (0.6.16)
|
5
5
|
colorize
|
6
6
|
differ
|
7
7
|
json
|
@@ -41,10 +41,15 @@ GEM
|
|
41
41
|
multi_json (~> 1.0)
|
42
42
|
arel (3.0.2)
|
43
43
|
builder (3.0.4)
|
44
|
+
byebug (2.3.0)
|
45
|
+
columnize (~> 0.3.6)
|
46
|
+
debugger-linecache (~> 1.2.0)
|
44
47
|
childprocess (0.3.6)
|
45
48
|
ffi (~> 1.0, >= 1.0.6)
|
46
49
|
coderay (1.0.8)
|
47
50
|
colorize (0.5.8)
|
51
|
+
columnize (0.3.6)
|
52
|
+
debugger-linecache (1.2.0)
|
48
53
|
diff-lcs (1.1.3)
|
49
54
|
differ (0.1.2)
|
50
55
|
erubis (2.7.0)
|
@@ -80,7 +85,7 @@ GEM
|
|
80
85
|
hike (1.2.3)
|
81
86
|
i18n (0.6.1)
|
82
87
|
journey (1.0.4)
|
83
|
-
json (1.8.
|
88
|
+
json (1.8.1)
|
84
89
|
listen (0.7.1)
|
85
90
|
log4r (1.1.10)
|
86
91
|
lumberjack (1.0.2)
|
@@ -155,7 +160,7 @@ GEM
|
|
155
160
|
treetop (1.4.15)
|
156
161
|
polyglot
|
157
162
|
polyglot (>= 0.3.1)
|
158
|
-
tzinfo (0.3.
|
163
|
+
tzinfo (0.3.38)
|
159
164
|
yarjuf (1.0.5)
|
160
165
|
builder
|
161
166
|
rspec (>= 2.0)
|
@@ -165,6 +170,7 @@ PLATFORMS
|
|
165
170
|
|
166
171
|
DEPENDENCIES
|
167
172
|
api_resource!
|
173
|
+
byebug
|
168
174
|
faker
|
169
175
|
flay
|
170
176
|
flog
|
data/api_resource.gemspec
CHANGED
@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
|
|
32
32
|
gem.add_development_dependency "flog"
|
33
33
|
gem.add_development_dependency "hash_dealer"
|
34
34
|
gem.add_development_dependency "rb-fsevent"
|
35
|
-
|
35
|
+
gem.add_development_dependency "byebug"
|
36
36
|
gem.add_development_dependency "simplecov"
|
37
37
|
# stuff that seems like crap
|
38
38
|
gem.add_development_dependency "sqlite3"
|
data/lib/api_resource/version.rb
CHANGED
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,8 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: api_resource
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
5
|
-
prerelease:
|
4
|
+
version: 0.6.16
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- Ethan Langevin
|
@@ -11,12 +10,11 @@ authors:
|
|
11
10
|
autorequire:
|
12
11
|
bindir: bin
|
13
12
|
cert_chain: []
|
14
|
-
date: 2013-10-
|
13
|
+
date: 2013-10-24 00:00:00.000000000 Z
|
15
14
|
dependencies:
|
16
15
|
- !ruby/object:Gem::Dependency
|
17
16
|
name: rake
|
18
17
|
requirement: !ruby/object:Gem::Requirement
|
19
|
-
none: false
|
20
18
|
requirements:
|
21
19
|
- - ! '>='
|
22
20
|
- !ruby/object:Gem::Version
|
@@ -24,7 +22,6 @@ dependencies:
|
|
24
22
|
type: :development
|
25
23
|
prerelease: false
|
26
24
|
version_requirements: !ruby/object:Gem::Requirement
|
27
|
-
none: false
|
28
25
|
requirements:
|
29
26
|
- - ! '>='
|
30
27
|
- !ruby/object:Gem::Version
|
@@ -32,7 +29,6 @@ dependencies:
|
|
32
29
|
- !ruby/object:Gem::Dependency
|
33
30
|
name: rspec
|
34
31
|
requirement: !ruby/object:Gem::Requirement
|
35
|
-
none: false
|
36
32
|
requirements:
|
37
33
|
- - ! '>='
|
38
34
|
- !ruby/object:Gem::Version
|
@@ -40,7 +36,6 @@ dependencies:
|
|
40
36
|
type: :development
|
41
37
|
prerelease: false
|
42
38
|
version_requirements: !ruby/object:Gem::Requirement
|
43
|
-
none: false
|
44
39
|
requirements:
|
45
40
|
- - ! '>='
|
46
41
|
- !ruby/object:Gem::Version
|
@@ -48,7 +43,6 @@ dependencies:
|
|
48
43
|
- !ruby/object:Gem::Dependency
|
49
44
|
name: spork
|
50
45
|
requirement: !ruby/object:Gem::Requirement
|
51
|
-
none: false
|
52
46
|
requirements:
|
53
47
|
- - ! '>='
|
54
48
|
- !ruby/object:Gem::Version
|
@@ -56,7 +50,6 @@ dependencies:
|
|
56
50
|
type: :development
|
57
51
|
prerelease: false
|
58
52
|
version_requirements: !ruby/object:Gem::Requirement
|
59
|
-
none: false
|
60
53
|
requirements:
|
61
54
|
- - ! '>='
|
62
55
|
- !ruby/object:Gem::Version
|
@@ -64,7 +57,6 @@ dependencies:
|
|
64
57
|
- !ruby/object:Gem::Dependency
|
65
58
|
name: yarjuf
|
66
59
|
requirement: !ruby/object:Gem::Requirement
|
67
|
-
none: false
|
68
60
|
requirements:
|
69
61
|
- - ! '>='
|
70
62
|
- !ruby/object:Gem::Version
|
@@ -72,7 +64,6 @@ dependencies:
|
|
72
64
|
type: :development
|
73
65
|
prerelease: false
|
74
66
|
version_requirements: !ruby/object:Gem::Requirement
|
75
|
-
none: false
|
76
67
|
requirements:
|
77
68
|
- - ! '>='
|
78
69
|
- !ruby/object:Gem::Version
|
@@ -80,7 +71,6 @@ dependencies:
|
|
80
71
|
- !ruby/object:Gem::Dependency
|
81
72
|
name: mocha
|
82
73
|
requirement: !ruby/object:Gem::Requirement
|
83
|
-
none: false
|
84
74
|
requirements:
|
85
75
|
- - '='
|
86
76
|
- !ruby/object:Gem::Version
|
@@ -88,7 +78,6 @@ dependencies:
|
|
88
78
|
type: :development
|
89
79
|
prerelease: false
|
90
80
|
version_requirements: !ruby/object:Gem::Requirement
|
91
|
-
none: false
|
92
81
|
requirements:
|
93
82
|
- - '='
|
94
83
|
- !ruby/object:Gem::Version
|
@@ -96,7 +85,6 @@ dependencies:
|
|
96
85
|
- !ruby/object:Gem::Dependency
|
97
86
|
name: faker
|
98
87
|
requirement: !ruby/object:Gem::Requirement
|
99
|
-
none: false
|
100
88
|
requirements:
|
101
89
|
- - ! '>='
|
102
90
|
- !ruby/object:Gem::Version
|
@@ -104,7 +92,6 @@ dependencies:
|
|
104
92
|
type: :development
|
105
93
|
prerelease: false
|
106
94
|
version_requirements: !ruby/object:Gem::Requirement
|
107
|
-
none: false
|
108
95
|
requirements:
|
109
96
|
- - ! '>='
|
110
97
|
- !ruby/object:Gem::Version
|
@@ -112,7 +99,6 @@ dependencies:
|
|
112
99
|
- !ruby/object:Gem::Dependency
|
113
100
|
name: guard-bundler
|
114
101
|
requirement: !ruby/object:Gem::Requirement
|
115
|
-
none: false
|
116
102
|
requirements:
|
117
103
|
- - ! '>='
|
118
104
|
- !ruby/object:Gem::Version
|
@@ -120,7 +106,6 @@ dependencies:
|
|
120
106
|
type: :development
|
121
107
|
prerelease: false
|
122
108
|
version_requirements: !ruby/object:Gem::Requirement
|
123
|
-
none: false
|
124
109
|
requirements:
|
125
110
|
- - ! '>='
|
126
111
|
- !ruby/object:Gem::Version
|
@@ -128,7 +113,6 @@ dependencies:
|
|
128
113
|
- !ruby/object:Gem::Dependency
|
129
114
|
name: guard-rspec
|
130
115
|
requirement: !ruby/object:Gem::Requirement
|
131
|
-
none: false
|
132
116
|
requirements:
|
133
117
|
- - ! '>='
|
134
118
|
- !ruby/object:Gem::Version
|
@@ -136,7 +120,6 @@ dependencies:
|
|
136
120
|
type: :development
|
137
121
|
prerelease: false
|
138
122
|
version_requirements: !ruby/object:Gem::Requirement
|
139
|
-
none: false
|
140
123
|
requirements:
|
141
124
|
- - ! '>='
|
142
125
|
- !ruby/object:Gem::Version
|
@@ -144,7 +127,6 @@ dependencies:
|
|
144
127
|
- !ruby/object:Gem::Dependency
|
145
128
|
name: guard-spork
|
146
129
|
requirement: !ruby/object:Gem::Requirement
|
147
|
-
none: false
|
148
130
|
requirements:
|
149
131
|
- - ! '>='
|
150
132
|
- !ruby/object:Gem::Version
|
@@ -152,7 +134,6 @@ dependencies:
|
|
152
134
|
type: :development
|
153
135
|
prerelease: false
|
154
136
|
version_requirements: !ruby/object:Gem::Requirement
|
155
|
-
none: false
|
156
137
|
requirements:
|
157
138
|
- - ! '>='
|
158
139
|
- !ruby/object:Gem::Version
|
@@ -160,7 +141,6 @@ dependencies:
|
|
160
141
|
- !ruby/object:Gem::Dependency
|
161
142
|
name: growl
|
162
143
|
requirement: !ruby/object:Gem::Requirement
|
163
|
-
none: false
|
164
144
|
requirements:
|
165
145
|
- - ! '>='
|
166
146
|
- !ruby/object:Gem::Version
|
@@ -168,7 +148,6 @@ dependencies:
|
|
168
148
|
type: :development
|
169
149
|
prerelease: false
|
170
150
|
version_requirements: !ruby/object:Gem::Requirement
|
171
|
-
none: false
|
172
151
|
requirements:
|
173
152
|
- - ! '>='
|
174
153
|
- !ruby/object:Gem::Version
|
@@ -176,7 +155,6 @@ dependencies:
|
|
176
155
|
- !ruby/object:Gem::Dependency
|
177
156
|
name: flay
|
178
157
|
requirement: !ruby/object:Gem::Requirement
|
179
|
-
none: false
|
180
158
|
requirements:
|
181
159
|
- - ! '>='
|
182
160
|
- !ruby/object:Gem::Version
|
@@ -184,7 +162,6 @@ dependencies:
|
|
184
162
|
type: :development
|
185
163
|
prerelease: false
|
186
164
|
version_requirements: !ruby/object:Gem::Requirement
|
187
|
-
none: false
|
188
165
|
requirements:
|
189
166
|
- - ! '>='
|
190
167
|
- !ruby/object:Gem::Version
|
@@ -192,7 +169,6 @@ dependencies:
|
|
192
169
|
- !ruby/object:Gem::Dependency
|
193
170
|
name: flog
|
194
171
|
requirement: !ruby/object:Gem::Requirement
|
195
|
-
none: false
|
196
172
|
requirements:
|
197
173
|
- - ! '>='
|
198
174
|
- !ruby/object:Gem::Version
|
@@ -200,7 +176,6 @@ dependencies:
|
|
200
176
|
type: :development
|
201
177
|
prerelease: false
|
202
178
|
version_requirements: !ruby/object:Gem::Requirement
|
203
|
-
none: false
|
204
179
|
requirements:
|
205
180
|
- - ! '>='
|
206
181
|
- !ruby/object:Gem::Version
|
@@ -208,7 +183,6 @@ dependencies:
|
|
208
183
|
- !ruby/object:Gem::Dependency
|
209
184
|
name: hash_dealer
|
210
185
|
requirement: !ruby/object:Gem::Requirement
|
211
|
-
none: false
|
212
186
|
requirements:
|
213
187
|
- - ! '>='
|
214
188
|
- !ruby/object:Gem::Version
|
@@ -216,7 +190,6 @@ dependencies:
|
|
216
190
|
type: :development
|
217
191
|
prerelease: false
|
218
192
|
version_requirements: !ruby/object:Gem::Requirement
|
219
|
-
none: false
|
220
193
|
requirements:
|
221
194
|
- - ! '>='
|
222
195
|
- !ruby/object:Gem::Version
|
@@ -224,7 +197,6 @@ dependencies:
|
|
224
197
|
- !ruby/object:Gem::Dependency
|
225
198
|
name: rb-fsevent
|
226
199
|
requirement: !ruby/object:Gem::Requirement
|
227
|
-
none: false
|
228
200
|
requirements:
|
229
201
|
- - ! '>='
|
230
202
|
- !ruby/object:Gem::Version
|
@@ -232,7 +204,20 @@ dependencies:
|
|
232
204
|
type: :development
|
233
205
|
prerelease: false
|
234
206
|
version_requirements: !ruby/object:Gem::Requirement
|
235
|
-
|
207
|
+
requirements:
|
208
|
+
- - ! '>='
|
209
|
+
- !ruby/object:Gem::Version
|
210
|
+
version: '0'
|
211
|
+
- !ruby/object:Gem::Dependency
|
212
|
+
name: byebug
|
213
|
+
requirement: !ruby/object:Gem::Requirement
|
214
|
+
requirements:
|
215
|
+
- - ! '>='
|
216
|
+
- !ruby/object:Gem::Version
|
217
|
+
version: '0'
|
218
|
+
type: :development
|
219
|
+
prerelease: false
|
220
|
+
version_requirements: !ruby/object:Gem::Requirement
|
236
221
|
requirements:
|
237
222
|
- - ! '>='
|
238
223
|
- !ruby/object:Gem::Version
|
@@ -240,7 +225,6 @@ dependencies:
|
|
240
225
|
- !ruby/object:Gem::Dependency
|
241
226
|
name: simplecov
|
242
227
|
requirement: !ruby/object:Gem::Requirement
|
243
|
-
none: false
|
244
228
|
requirements:
|
245
229
|
- - ! '>='
|
246
230
|
- !ruby/object:Gem::Version
|
@@ -248,7 +232,6 @@ dependencies:
|
|
248
232
|
type: :development
|
249
233
|
prerelease: false
|
250
234
|
version_requirements: !ruby/object:Gem::Requirement
|
251
|
-
none: false
|
252
235
|
requirements:
|
253
236
|
- - ! '>='
|
254
237
|
- !ruby/object:Gem::Version
|
@@ -256,7 +239,6 @@ dependencies:
|
|
256
239
|
- !ruby/object:Gem::Dependency
|
257
240
|
name: sqlite3
|
258
241
|
requirement: !ruby/object:Gem::Requirement
|
259
|
-
none: false
|
260
242
|
requirements:
|
261
243
|
- - ! '>='
|
262
244
|
- !ruby/object:Gem::Version
|
@@ -264,7 +246,6 @@ dependencies:
|
|
264
246
|
type: :development
|
265
247
|
prerelease: false
|
266
248
|
version_requirements: !ruby/object:Gem::Requirement
|
267
|
-
none: false
|
268
249
|
requirements:
|
269
250
|
- - ! '>='
|
270
251
|
- !ruby/object:Gem::Version
|
@@ -272,7 +253,6 @@ dependencies:
|
|
272
253
|
- !ruby/object:Gem::Dependency
|
273
254
|
name: rails
|
274
255
|
requirement: !ruby/object:Gem::Requirement
|
275
|
-
none: false
|
276
256
|
requirements:
|
277
257
|
- - ! '>='
|
278
258
|
- !ruby/object:Gem::Version
|
@@ -280,7 +260,6 @@ dependencies:
|
|
280
260
|
type: :runtime
|
281
261
|
prerelease: false
|
282
262
|
version_requirements: !ruby/object:Gem::Requirement
|
283
|
-
none: false
|
284
263
|
requirements:
|
285
264
|
- - ! '>='
|
286
265
|
- !ruby/object:Gem::Version
|
@@ -288,7 +267,6 @@ dependencies:
|
|
288
267
|
- !ruby/object:Gem::Dependency
|
289
268
|
name: json
|
290
269
|
requirement: !ruby/object:Gem::Requirement
|
291
|
-
none: false
|
292
270
|
requirements:
|
293
271
|
- - ! '>='
|
294
272
|
- !ruby/object:Gem::Version
|
@@ -296,7 +274,6 @@ dependencies:
|
|
296
274
|
type: :runtime
|
297
275
|
prerelease: false
|
298
276
|
version_requirements: !ruby/object:Gem::Requirement
|
299
|
-
none: false
|
300
277
|
requirements:
|
301
278
|
- - ! '>='
|
302
279
|
- !ruby/object:Gem::Version
|
@@ -304,7 +281,6 @@ dependencies:
|
|
304
281
|
- !ruby/object:Gem::Dependency
|
305
282
|
name: rest-client
|
306
283
|
requirement: !ruby/object:Gem::Requirement
|
307
|
-
none: false
|
308
284
|
requirements:
|
309
285
|
- - ! '>='
|
310
286
|
- !ruby/object:Gem::Version
|
@@ -312,7 +288,6 @@ dependencies:
|
|
312
288
|
type: :runtime
|
313
289
|
prerelease: false
|
314
290
|
version_requirements: !ruby/object:Gem::Requirement
|
315
|
-
none: false
|
316
291
|
requirements:
|
317
292
|
- - ! '>='
|
318
293
|
- !ruby/object:Gem::Version
|
@@ -320,7 +295,6 @@ dependencies:
|
|
320
295
|
- !ruby/object:Gem::Dependency
|
321
296
|
name: log4r
|
322
297
|
requirement: !ruby/object:Gem::Requirement
|
323
|
-
none: false
|
324
298
|
requirements:
|
325
299
|
- - ! '>='
|
326
300
|
- !ruby/object:Gem::Version
|
@@ -328,7 +302,6 @@ dependencies:
|
|
328
302
|
type: :runtime
|
329
303
|
prerelease: false
|
330
304
|
version_requirements: !ruby/object:Gem::Requirement
|
331
|
-
none: false
|
332
305
|
requirements:
|
333
306
|
- - ! '>='
|
334
307
|
- !ruby/object:Gem::Version
|
@@ -336,7 +309,6 @@ dependencies:
|
|
336
309
|
- !ruby/object:Gem::Dependency
|
337
310
|
name: differ
|
338
311
|
requirement: !ruby/object:Gem::Requirement
|
339
|
-
none: false
|
340
312
|
requirements:
|
341
313
|
- - ! '>='
|
342
314
|
- !ruby/object:Gem::Version
|
@@ -344,7 +316,6 @@ dependencies:
|
|
344
316
|
type: :runtime
|
345
317
|
prerelease: false
|
346
318
|
version_requirements: !ruby/object:Gem::Requirement
|
347
|
-
none: false
|
348
319
|
requirements:
|
349
320
|
- - ! '>='
|
350
321
|
- !ruby/object:Gem::Version
|
@@ -352,7 +323,6 @@ dependencies:
|
|
352
323
|
- !ruby/object:Gem::Dependency
|
353
324
|
name: colorize
|
354
325
|
requirement: !ruby/object:Gem::Requirement
|
355
|
-
none: false
|
356
326
|
requirements:
|
357
327
|
- - ! '>='
|
358
328
|
- !ruby/object:Gem::Version
|
@@ -360,7 +330,6 @@ dependencies:
|
|
360
330
|
type: :runtime
|
361
331
|
prerelease: false
|
362
332
|
version_requirements: !ruby/object:Gem::Requirement
|
363
|
-
none: false
|
364
333
|
requirements:
|
365
334
|
- - ! '>='
|
366
335
|
- !ruby/object:Gem::Version
|
@@ -453,7 +422,6 @@ files:
|
|
453
422
|
- spec/lib/finders/resource_finder_spec.rb
|
454
423
|
- spec/lib/finders/single_object_association_finder_spec.rb
|
455
424
|
- spec/lib/finders_spec.rb
|
456
|
-
- spec/lib/formats/json_format_spec.rb
|
457
425
|
- spec/lib/local_spec.rb
|
458
426
|
- spec/lib/mocks_spec.rb
|
459
427
|
- spec/lib/model_errors_spec.rb
|
@@ -479,27 +447,26 @@ files:
|
|
479
447
|
- spec/tmp/DIR
|
480
448
|
homepage: ''
|
481
449
|
licenses: []
|
450
|
+
metadata: {}
|
482
451
|
post_install_message:
|
483
452
|
rdoc_options: []
|
484
453
|
require_paths:
|
485
454
|
- lib
|
486
455
|
required_ruby_version: !ruby/object:Gem::Requirement
|
487
|
-
none: false
|
488
456
|
requirements:
|
489
457
|
- - ! '>='
|
490
458
|
- !ruby/object:Gem::Version
|
491
459
|
version: '0'
|
492
460
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
493
|
-
none: false
|
494
461
|
requirements:
|
495
462
|
- - ! '>='
|
496
463
|
- !ruby/object:Gem::Version
|
497
464
|
version: '0'
|
498
465
|
requirements: []
|
499
466
|
rubyforge_project:
|
500
|
-
rubygems_version: 1.
|
467
|
+
rubygems_version: 2.1.9
|
501
468
|
signing_key:
|
502
|
-
specification_version:
|
469
|
+
specification_version: 4
|
503
470
|
summary: ActiveRecord for restful APIs
|
504
471
|
test_files:
|
505
472
|
- spec/lib/api_resource_spec.rb
|
@@ -517,7 +484,6 @@ test_files:
|
|
517
484
|
- spec/lib/finders/resource_finder_spec.rb
|
518
485
|
- spec/lib/finders/single_object_association_finder_spec.rb
|
519
486
|
- spec/lib/finders_spec.rb
|
520
|
-
- spec/lib/formats/json_format_spec.rb
|
521
487
|
- spec/lib/local_spec.rb
|
522
488
|
- spec/lib/mocks_spec.rb
|
523
489
|
- spec/lib/model_errors_spec.rb
|
@@ -1,19 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe ApiResource::Formats::JsonFormat do
|
4
|
-
|
5
|
-
|
6
|
-
context "#decode" do
|
7
|
-
|
8
|
-
it "should not err on a blank response from an api" do
|
9
|
-
|
10
|
-
blank_str = " \n "
|
11
|
-
lambda{
|
12
|
-
subject.decode(blank_str)
|
13
|
-
}.should_not raise_error
|
14
|
-
|
15
|
-
end
|
16
|
-
|
17
|
-
end
|
18
|
-
|
19
|
-
end
|