diff --git a/README.md b/README.md index 3fa38c1..e3b9d24 100644 --- a/README.md +++ b/README.md @@ -75,18 +75,18 @@ if Meteor.isServer action: -> post = Posts.findOne @urlParams.id if post - status: "success", data: post + status: 'success', data: post else statusCode: 400 - body: status: "fail", message: "Unable to add post" + body: status: 'fail', message: 'Unable to add post' delete: roleRequired: 'admin' action: -> if Posts.remove @urlParams.id - status: "success", data: message: "Item removed" + status: 'success', data: message: 'Item removed' else statusCode: 404 - body: status: "fail", message: "Item not found" + body: status: 'fail', message: 'Item not found' ``` ###### JavaScript: @@ -139,11 +139,11 @@ if(Meteor.isServer) { action: function () { var post = Posts.findOne(this.urlParams.id); if (post) { - return {status: "success", data: post}; + return {status: 'success', data: post}; } return { statusCode: 400, - body: {status: "fail", message: "Unable to add post"} + body: {status: 'fail', message: 'Unable to add post'} }; } }, @@ -151,11 +151,11 @@ if(Meteor.isServer) { roleRequired: 'admin', action: function () { if (Posts.remove(this.urlParams.id)) { - return {status: "success", data: {message: "Item removed"}}; + return {status: 'success', data: {message: 'Item removed'}}; } return { statusCode: 404, - body: {status: "fail", message: "Item not found"} + body: {status: 'fail', message: 'Item not found'} }; } } diff --git a/lib/restivus.coffee b/lib/restivus.coffee index bd39b30..c4b4e07 100644 --- a/lib/restivus.coffee +++ b/lib/restivus.coffee @@ -140,28 +140,28 @@ class @Restivus action: -> entity = collection.findOne @urlParams.id if entity - {status: "success", data: entity} + {status: 'success', data: entity} else statusCode: 404 - body: {status: "fail", message: "Item not found"} + body: {status: 'fail', message: 'Item not found'} put: (collection) -> put: action: -> entityIsUpdated = collection.update @urlParams.id, @bodyParams if entityIsUpdated entity = collection.findOne @urlParams.id - {status: "success", data: entity} + {status: 'success', data: entity} else statusCode: 404 - body: {status: "fail", message: "Item not found"} + body: {status: 'fail', message: 'Item not found'} delete: (collection) -> delete: action: -> if collection.remove @urlParams.id - {status: "success", data: message: "Item removed"} + {status: 'success', data: message: 'Item removed'} else statusCode: 404 - body: {status: "fail", message: "Item not found"} + body: {status: 'fail', message: 'Item not found'} post: (collection) -> post: action: -> @@ -169,19 +169,19 @@ class @Restivus entity = collection.findOne entityId if entity statusCode: 201 - body: {status: "success", data: entity} + body: {status: 'success', data: entity} else statusCode: 400 - body: {status: "fail", message: "No item added"} + body: {status: 'fail', message: 'No item added'} getAll: (collection) -> get: action: -> entities = collection.find().fetch() if entities - {status: "success", data: entities} + {status: 'success', data: entities} else statusCode: 404 - body: {status: "fail", message: "Unable to retrieve items from collection"} + body: {status: 'fail', message: 'Unable to retrieve items from collection'} ###* @@ -193,10 +193,10 @@ class @Restivus action: -> entity = collection.findOne @urlParams.id, fields: profile: 1 if entity - {status: "success", data: entity} + {status: 'success', data: entity} else statusCode: 404 - body: {status: "fail", message: "User not found"} + body: {status: 'fail', message: 'User not found'} put: (collection) -> put: action: -> @@ -206,15 +206,15 @@ class @Restivus {status: "success", data: entity} else statusCode: 404 - body: {status: "fail", message: "User not found"} + body: {status: 'fail', message: 'User not found'} delete: (collection) -> delete: action: -> if collection.remove @urlParams.id - {status: "success", data: message: "User removed"} + {status: 'success', data: message: 'User removed'} else statusCode: 404 - body: {status: "fail", message: "User not found"} + body: {status: 'fail', message: 'User not found'} post: (collection) -> post: action: -> @@ -223,19 +223,19 @@ class @Restivus entity = collection.findOne entityId, fields: profile: 1 if entity statusCode: 201 - body: {status: "success", data: entity} + body: {status: 'success', data: entity} else statusCode: 400 - {status: "fail", message: "No user added"} + {status: 'fail', message: 'No user added'} getAll: (collection) -> get: action: -> entities = collection.find({}, fields: profile: 1).fetch() if entities - {status: "success", data: entities} + {status: 'success', data: entities} else statusCode: 404 - body: {status: "fail", message: "Unable to retrieve users"} + body: {status: 'fail', message: 'Unable to retrieve users'} ### @@ -264,7 +264,7 @@ class @Restivus catch e return {} = statusCode: e.error - body: status: "error", message: e.reason + body: status: 'error', message: e.reason # Get the authenticated user # TODO: Consider returning the user in Auth.loginWithPassword(), instead of fetching it again here @@ -278,7 +278,7 @@ class @Restivus # Call the login hook with the authenticated user attached self.config.onLoggedIn.call this - {status: "success", data: auth} + {status: 'success', data: auth} ### Add a logout endpoint to the API @@ -296,6 +296,6 @@ class @Restivus # Call the logout hook with the logged out user attached self.config.onLoggedOut.call this - {status: "success", data: message: 'You\'ve been logged out!'} + {status: 'success', data: message: 'You\'ve been logged out!'} Restivus = new @Restivus \ No newline at end of file diff --git a/lib/route.coffee b/lib/route.coffee index 68ded33..663ddf9 100644 --- a/lib/route.coffee +++ b/lib/route.coffee @@ -150,10 +150,10 @@ class @Route endpoint.action.call endpointContext else statusCode: 403 - body: {status: "error", message: "You do not have permission to do this."} + body: {status: 'error', message: 'You do not have permission to do this.'} else statusCode: 401 - body: {status: "error", message: "You must be logged in to do this."} + body: {status: 'error', message: 'You must be logged in to do this.'} ### diff --git a/test/api_tests.coffee b/test/api_tests.coffee index 327172c..5371d67 100644 --- a/test/api_tests.coffee +++ b/test/api_tests.coffee @@ -313,8 +313,8 @@ Meteor.startup -> Restivus.addRoute 'context/:test', post: -> test.equal @urlParams.test, '100' - test.equal @queryParams.test, "query" - test.equal @bodyParams.test, "body" + test.equal @queryParams.test, 'query' + test.equal @bodyParams.test, 'body' test.isNotNull @request test.isNotNull @response test.isTrue _.isFunction @done