Skip to content
This repository has been archived by the owner on Oct 11, 2022. It is now read-only.

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
aldeed committed Nov 19, 2015
1 parent f0516dd commit 9616ea9
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 141 deletions.
1 change: 0 additions & 1 deletion packages/json-routes/json-routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ WebApp.rawConnectHandlers.use(connectRoute(function (router) {
connectRouter = router;
}));


// TODO Add error handling middleware here, so connect errors can be triggered
// TODO from endpoints (currently only works if triggered from other middleware)

Expand Down
12 changes: 8 additions & 4 deletions packages/json-routes/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ Package.onUse(function (api) {
'webapp',
], 'server');

api.addFiles('json-routes.js', 'server');
api.addFiles('middleware.js', "server");
api.addFiles([
'json-routes.js',
'middleware.js',
], 'server');

api.export('JsonRoutes', 'server');
api.export('RestMiddleware');
api.export([
'JsonRoutes',
'RestMiddleware',
], 'server');
});

Package.onTest(function (api) {
Expand Down
136 changes: 8 additions & 128 deletions packages/rest-json-error-handler/.jshintrc
Original file line number Diff line number Diff line change
@@ -1,130 +1,10 @@
{
// JSHint Meteor Configuration File
// Match the Meteor Style Guide
//
// By @raix with contributions from @aldeed and @awatson1978
// Source https://github.com/raix/Meteor-jshintrc
//
// See http://jshint.com/docs/ for more details

"maxerr" : 50, // {int} Maximum error before stopping

// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // false: Identifiers do not need to be in camelCase. We would like to enforce this except for when interacting with our api objects which use snakeCase properties.
"curly" : false, // false: Do not require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"indent" : 2, // {int} Number of spaces to use for indentation
"latedef" : false, // true: Require variables/functions to be defined before being used
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` & `--`
"quotmark" : false, // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // true: Require all defined variables be used
"strict" : false, // false: Do not require all functions to be run in ES5 Strict Mode
"trailing" : true, // true: Prohibit trailing whitespaces
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : 80, // {int} Max number of characters per line

// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : true, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements"
"globalstrict" : true, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function

// Environments
"browser" : true, // Web Browser (window, document, etc)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jquery" : false, // jQuery
"mootools" : false, // MooTools
"node" : false, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"prototypejs" : false, // Prototype and Scriptaculous
"rhino" : false, // Rhino
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface
//"meteor" : false, // Meteor.js

// Legacy
"nomen" : false, // true: Prohibit dangling `_` in variables
"onevar" : false, // true: Allow only one `var` statement per function
"passfail" : false, // true: Stop on first error
"white" : false, // true: Check against strict whitespace and indentation rules

// Custom globals, from http://docs.meteor.com, in the order they appear there
"globals" : {
"Meteor": false,
"DDP": false,
"Mongo": false, //Meteor.Collection renamed to Mongo.Collection
"Session": false,
"Accounts": false,
"Template": false,
"Blaze": false, //UI renamed to Blaze
"Spacebars": false,
"Match": false,
"check": false,
"Tracker": false, //Deps renamed to Tracker
"ReactiveVar": false,
"ReactiveDict": false,
"EJSON": false,
"Assets": false,
"Package": false,
"App": false, //mobile-config.js
"cordova": false,
"Cordova": false,

// Meteor internals
"DDPServer": false,
"global": false,
"Log": false,
"MongoInternals": false,
"process": false,
"Retry": false,
"WebApp": false,
"WebAppInternals": false,

// globals useful when creating Meteor packages
"Npm": false,
"Tinytest": false,

// common Meteor packages
"_": false, // Underscore.js
"$": false // jQuery
}
"extends": "../../.jshintrc",
"globals": {

},
"predef": [
"Meteor",
"Package"
]
}
9 changes: 4 additions & 5 deletions packages/rest-json-error-handler/json_error_handler_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if (Meteor.isServer) {
next({
statusCode: 400,
error: 'test-error',
reason: 'test reason'
reason: 'test reason',
});
}
);
Expand All @@ -28,8 +28,7 @@ if (Meteor.isServer) {
//next({statusCode: 400, error: 'test-error', reason: 'test reason'});
JsonRoutes.sendResult(res, 200, true);
});
}
else { // Meteor.isClient
} else { // Meteor.isClient
testAsyncMulti('Middleware - JSON Error Handling - ' +
'handle standard Connect error with JSON response', [
function (test, waitFor) {
Expand All @@ -38,7 +37,7 @@ else { // Meteor.isClient
test.equal(resp.statusCode, 400);
test.equal(resp.data.error, 'test-error');
test.equal(resp.data.reason, 'test reason');
}));
}
}));
},
]);
}
9 changes: 6 additions & 3 deletions packages/rest-json-error-handler/package.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
Package.describe({
name: 'simple:rest-json-error-handler',
version: '0.0.1',

// Brief, one-line summary of the package.
summary: 'simple:rest middleware for handling standard Connect errors',

// URL to the Git repository containing the source code for this package.
git: 'https://github.com/stubailo/meteor-rest',

// By default, Meteor will default to using README.md for documentation.
// To avoid submitting documentation, set this field to null.
documentation: 'README.md'
documentation: 'README.md',
});

Package.onUse(function(api) {
Package.onUse(function (api) {
api.versionsFrom('1.0');
api.use('simple:json-routes@1.0.3');
api.addFiles('json_error_handler.js', 'server');
});

Package.onTest(function(api) {
Package.onTest(function (api) {
api.use('tinytest');
api.use('test-helpers');
api.use('simple:json-routes@1.0.3');
Expand Down

0 comments on commit 9616ea9

Please sign in to comment.