Skip to content

Commit c5167e6

Browse files
committed
Fix pluralization
1 parent a023821 commit c5167e6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"method-override": "^2.1.2",
1919
"morgan": "^1.3.1",
2020
"node-uuid": "^1.4.2",
21+
"pluralize": "^1.1.2",
2122
"underscore": "^1.5.2",
2223
"underscore-db": "^0.8.0",
23-
"underscore.inflections": "~0.2.1",
2424
"update-notifier": "^0.2.2",
2525
"yargs": "^1.3.1"
2626
},

src/router.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ var methodOverride = require('method-override')
33
var bodyParser = require('body-parser')
44
var _ = require('underscore')
55
var low = require('lowdb')
6+
var pluralize = require('pluralize')
67
var utils = require('./utils')
78

8-
// Add methods to lowdb
9+
// Add underscore-db methods to lowdb
910
low.mixin(require('underscore-db'))
10-
low.mixin(require('underscore.inflections'))
1111

1212
// Override underscore-db's createId with utils.createId
1313
// utils.createId can generate incremental id or uuid
@@ -88,7 +88,8 @@ module.exports = function (source) {
8888

8989
// Add :parentId filter in case URL is like /:parent/:parentId/:resource
9090
if (req.params.parent) {
91-
filters[req.params.parent.slice(0, -1) + 'Id'] = +req.params.parentId
91+
var parent = pluralize.singular(req.params.parent)
92+
filters[parent + 'Id'] = +req.params.parentId
9293
}
9394

9495
// Add query parameters filters

src/utils.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
var _ = require('underscore')
22
var uuid = require('node-uuid')
3-
var _inflections = require('underscore.inflections')
4-
_.mixin(_inflections)
3+
var pluralize = require('pluralize')
54

65
// Turns string to native.
76
// Example:
@@ -50,7 +49,7 @@ function getRemovable (db) {
5049
_(coll).each(function (doc) {
5150
_(doc).each(function (value, key) {
5251
if (/Id$/.test(key)) {
53-
var refName = _.pluralize(key.slice(0, -2))
52+
var refName = pluralize.plural(key.slice(0, -2))
5453
// Test if table exists
5554
if (db[refName]) {
5655
// Test if references is defined in table

0 commit comments

Comments
 (0)