task model: harmonizing validation

by keeping the singular form in validation function names
when the attribute is singular

server/models/task.coffee

@@ -11,9 +11,9 @@ module.exports =
     { type, suspectUri, suggestionUri, state, lexicalScore, relationScore, hasEncyclopediaOccurence } = newTask
     state or= 'requested'
 
-    validations.pass 'types', type
-    validations.pass 'states', state
-    validations.pass 'suspect', suspectUri
+    validations.pass 'type', type
+    validations.pass 'state', state
+    validations.pass 'suspectUri', suspectUri
     validations.pass 'lexicalScore', lexicalScore
     validations.pass 'relationScore', relationScore
     validations.pass 'hasEncyclopediaOccurence', hasEncyclopediaOccurence
@@ -31,12 +31,8 @@ module.exports =
   update: (task, attribute, value)->
     _.types arguments, [ 'object', 'string', 'string|number' ]
 
-    validations.pass 'attributes', attribute
-
-    # Todo : find a way to check update values according to valid attribute,
-    # without the current code smell (conditonal if)
-    if attribute is 'state'
-      validations.pass 'states', value
+    validations.pass 'attribute', attribute
+    validations.pass attribute, value
 
     now = Date.now()
 

server/models/validations/task.coffee

@@ -9,10 +9,10 @@ module.exports =
   pass: pass
   # in attributes/task.coffee, attributes keys should match
   # db keys to verify if attribute is updatable
-  attributes: (attribute)-> attribute in _.keys attributes
-  types: (taskType)-> taskType in attributes.type
-  states: (taskState)-> taskState in attributes.state
-  suspect: entityUri
+  attribute: (attribute)-> attribute in _.keys attributes
+  type: (taskType)-> taskType in attributes.type
+  state: (taskState)-> taskState in attributes.state
+  suspectUri: entityUri
   lexicalScore: _.isNumber
   relationScore: _.isNumber
   hasEncyclopediaOccurence: _.isBoolean

test/models/026-task.coffee

@@ -2,7 +2,6 @@ CONFIG = require 'config'
 __ = CONFIG.universalPath
 _ = __.require 'builders', 'utils'
 should = require 'should'
-
 Task = __.require 'models', 'task'
 
 validDoc = ->
@@ -84,7 +83,7 @@ describe 'task model', ->
     it 'should throw if invalid attribute to update', (done)->
       taskDoc = -> Task.update validDoc(), 'blob', 'dismissed'
       try taskDoc()
-      catch err then err.message.should.startWith 'invalid attributes'
+      catch err then err.message.should.startWith 'invalid attribute'
       taskDoc.should.throw()
       done()