Skip to content
This repository was archived by the owner on Jul 8, 2023. It is now read-only.

Commit 7935cde

Browse files
committed
Tidied up promise code.
1 parent 3999e81 commit 7935cde

File tree

5 files changed

+16
-56
lines changed

5 files changed

+16
-56
lines changed

src/CouchBuilder.coffee

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,17 @@ module.exports = class CouchBuilder
2424
return
2525

2626
stream.on 'error', (error) ->
27-
reject error
28-
29-
return
27+
return reject error
3028

3129
stream.on 'end', =>
3230
@_processEntries entries
3331
.then (result) ->
34-
resolve result
35-
36-
return
32+
return resolve result
3733

3834
return
3935

4036
stream.on 'close', ->
41-
reject closeError
42-
43-
return
37+
return reject closeError
4438

4539
return
4640

@@ -64,9 +58,7 @@ module.exports = class CouchBuilder
6458

6559
@_set result, atoms, results[i][1].toString()
6660

67-
resolve result
68-
69-
return
61+
return resolve result
7062

7163
return
7264

@@ -76,13 +68,9 @@ module.exports = class CouchBuilder
7668
Promise.all(handler filePath for handler in @handlers)
7769
.then (results) ->
7870
for result in results when result?
79-
resolve result
80-
81-
return
71+
return resolve result
8272

83-
resolve null
84-
85-
return
73+
return resolve null
8674

8775
return
8876

src/handler/CommonCoffeeHandler.coffee

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,15 @@ module.exports = class CommonCoffeeHandler
1717
'''
1818

1919
handle: (filePath) -> new Promise (resolve, reject) =>
20-
if path.extname(filePath) isnt '.coffee'
21-
resolve null
22-
23-
return
20+
return resolve null if path.extname(filePath) isnt '.coffee'
2421

2522
fs.readFile filePath, (error, data) =>
26-
if error
27-
reject error
28-
29-
return
23+
return reject error if error
3024

3125
try
3226
js = coffee.compile data.toString()
3327
catch error
34-
reject error
35-
36-
return
28+
return reject error
3729

3830
resolve [
3931
path.basename filePath, '.coffee'

src/handler/CommonJsHandler.coffee

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,10 @@ module.exports = class CommonJsHandler
1818
'''
1919

2020
handle: (filePath) -> new Promise (resolve, reject) =>
21-
if path.extname(filePath) isnt '.js'
22-
resolve null
23-
24-
return
21+
return resolve null if path.extname(filePath) isnt '.js'
2522

2623
fs.readFile filePath, (error, data) =>
27-
if error
28-
reject error
29-
30-
return
24+
return reject error if error
3125

3226
resolve [
3327
path.basename filePath, '.js'

src/handler/JsonHandler.coffee

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,15 @@ Promise = require 'bluebird'
55
module.exports = class JsonHandler
66

77
handle: (filePath) -> new Promise (resolve, reject) ->
8-
if path.extname(filePath) isnt '.json'
9-
resolve null
10-
11-
return
8+
return resolve null if path.extname(filePath) isnt '.json'
129

1310
fs.readFile filePath, (error, json) ->
14-
if error
15-
reject error
16-
17-
return
11+
return reject error if error
1812

1913
try
2014
data = JSON.parse json
2115
catch error
22-
reject error
23-
24-
return
16+
return reject error
2517

2618
resolve [path.basename(filePath, '.json'), data]
2719

src/handler/TextHandler.coffee

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@ module.exports = class TextHandler
99
handle: (filePath) -> new Promise (resolve, reject) =>
1010
extension = path.extname filePath
1111

12-
unless extension in @extensions
13-
resolve null
14-
15-
return
12+
return resolve null unless extension in @extensions
1613

1714
fs.readFile filePath, (error, data) ->
18-
if error
19-
reject error
20-
21-
return
15+
return reject error if error
2216

2317
resolve [
2418
path.basename filePath, extension

0 commit comments

Comments
 (0)