Skip to content

Commit 4897b23

Browse files
author
Chris Park
committed
Merge branch 'SamHausmann-RCB-195' into develop
2 parents 72562bd + fdcafb4 commit 4897b23

File tree

498 files changed

+4063
-87227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

498 files changed

+4063
-87227
lines changed

.eslintrc.json

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
{
2+
"parserOptions": {
3+
"ecmaVersion": 6,
4+
"ecmaFeatures": {
5+
"experimentalObjectRestSpread": true,
6+
"jsx": true
7+
},
8+
"sourceType": "module"
9+
},
10+
11+
"env": {
12+
"es6": true,
13+
"node": true
14+
},
15+
16+
"globals": {
17+
"document": false,
18+
"navigator": false,
19+
"window": false
20+
},
21+
22+
"rules": {
23+
"accessor-pairs": 1,
24+
"arrow-parens": [1, "always"],
25+
"arrow-spacing": [1, { "before": true, "after": true }],
26+
"block-spacing": [1, "always"],
27+
"brace-style": [1, "1tbs", { "allowSingleLine": true }],
28+
"comma-dangle": [1, "never"],
29+
"comma-spacing": [1, { "before": false, "after": true }],
30+
"comma-style": [1, "last"],
31+
"constructor-super": 1,
32+
"curly": [1, "multi-line"],
33+
"dot-location": [1, "property"],
34+
"eol-last": 0,
35+
"eqeqeq": [0, "allow-null"],
36+
"generator-star-spacing": [1, { "before": true, "after": true }],
37+
"handle-callback-err": [1, "^(err|error)$" ],
38+
"indent": [1, 4],
39+
"jsx-quotes": [1, "prefer-single"],
40+
"key-spacing": [1, { "beforeColon": false, "afterColon": true }],
41+
"keyword-spacing": [1, { "before": true, "after": true }],
42+
"new-cap": [1, { "newIsCap": false, "capIsNew": false }],
43+
"new-parens": 1,
44+
"no-array-constructor": 1,
45+
"no-caller": 1,
46+
"no-class-assign": 1,
47+
"no-cond-assign": 1,
48+
"no-const-assign": 1,
49+
"no-control-regex": 1,
50+
"no-debugger": 1,
51+
"no-delete-var": 1,
52+
"no-dupe-args": 1,
53+
"no-dupe-class-members": 1,
54+
"no-dupe-keys": 1,
55+
"no-duplicate-case": 1,
56+
"no-empty-character-class": 1,
57+
"no-empty-pattern": 1,
58+
"no-eval": 1,
59+
"no-ex-assign": 1,
60+
"no-extend-native": 1,
61+
"no-extra-bind": 1,
62+
"no-extra-boolean-cast": 1,
63+
"no-extra-parens": [1, "functions"],
64+
"no-fallthrough": 1,
65+
"no-floating-decimal": 1,
66+
"no-func-assign": 1,
67+
"no-implied-eval": 1,
68+
"no-inner-declarations": [1, "functions"],
69+
"no-invalid-regexp": 1,
70+
"no-irregular-whitespace": 1,
71+
"no-iterator": 1,
72+
"no-label-var": 1,
73+
"no-labels": [1, { "allowLoop": false, "allowSwitch": false }],
74+
"no-lone-blocks": 1,
75+
"no-mixed-spaces-and-tabs": 1,
76+
"no-multi-spaces": 1,
77+
"no-multi-str": 1,
78+
"no-multiple-empty-lines": [1, { "max": 1 }],
79+
"no-native-reassign": 1,
80+
"no-negated-in-lhs": 1,
81+
"no-new": 1,
82+
"no-new-func": 1,
83+
"no-new-object": 1,
84+
"no-new-require": 1,
85+
"no-new-symbol": 1,
86+
"no-new-wrappers": 1,
87+
"no-obj-calls": 1,
88+
"no-octal": 1,
89+
"no-octal-escape": 1,
90+
"no-path-concat": 1,
91+
"no-proto": 1,
92+
"no-redeclare": 1,
93+
"no-regex-spaces": 1,
94+
"no-return-assign": [1, "except-parens"],
95+
"no-self-assign": 1,
96+
"no-self-compare": 1,
97+
"no-sequences": 1,
98+
"no-shadow-restricted-names": 1,
99+
"no-spaced-func": 1,
100+
"no-sparse-arrays": 1,
101+
"no-this-before-super": 1,
102+
"no-throw-literal": 1,
103+
"no-trailing-spaces": 0,
104+
"no-undef": 1,
105+
"no-undef-init": 1,
106+
"no-unexpected-multiline": 1,
107+
"no-unneeded-ternary": [1, { "defaultAssignment": false }],
108+
"no-unreachable": 1,
109+
"no-unused-vars": 0,
110+
"no-useless-call": 1,
111+
"no-useless-constructor": 1,
112+
"no-with": 1,
113+
"one-var": [1, { "initialized": "never" }],
114+
"operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }],
115+
"padded-blocks": [0, "never"],
116+
"quotes": 0,
117+
"semi": [0, "never"],
118+
"semi-spacing": [1, { "before": false, "after": true }],
119+
"space-before-blocks": [1, "always"],
120+
"space-before-function-paren": 0,
121+
"space-in-parens": [1, "never"],
122+
"space-infix-ops": 1,
123+
"space-unary-ops": [1, { "words": true, "nonwords": false }],
124+
"spaced-comment": 0,
125+
"template-curly-spacing": [1, "never"],
126+
"use-isnan": 1,
127+
"valid-typeof": 1,
128+
"wrap-iife": [1, "any"],
129+
"yield-star-spacing": [1, "both"]
130+
}
131+
}

.gitignore

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
# Dependency directory
2-
node_modules
3-
4-
target
5-
6-
# Instrumented versions of lib/ files
7-
instrumented
8-
9-
# Istanbul generated reports
10-
reports
11-
12-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
13-
.grunt
14-
15-
# Jetbrains
16-
**/.idea/*
17-
!**/.idea/runConfigurations/
18-
*.iml
19-
20-
# General
21-
*~
22-
.DS_Store
23-
.DS_Store?
24-
.Spotlight-V100
25-
.Trashes
26-
ehthumbs.db
1+
# Dependency directory
2+
node_modules
3+
4+
target
5+
6+
# Instrumented versions of lib/ files
7+
instrumented
8+
9+
# Istanbul generated reports
10+
reports
11+
12+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
13+
.grunt
14+
15+
# Jetbrains
16+
**/.idea/*
17+
!**/.idea/runConfigurations/
18+
*.iml
19+
20+
# General
21+
*~
22+
.DS_Store
23+
.DS_Store?
24+
.Spotlight-V100
25+
.Trashes
26+
ehthumbs.db
2727
Thumbs.db

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "mock-data"]
2-
path = mock-data
3-
url = [email protected]:rosette-api/mock-data.git
1+
[submodule "mock-data"]
2+
path = mock-data
3+
url = [email protected]:rosette-api/mock-data.git

.travis.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
language: node_js
2-
node_js:
3-
- "0.11.16"
4-
- "0.12.7"
5-
- "1.0.4"
6-
- "4.2.2"
7-
# Handle git submodules yourself
8-
git:
9-
submodules: false
10-
# Use sed to replace the SSH URL with the public URL, then initialize submodules
11-
before_install:
12-
- sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules
13-
- git submodule update --init --recursive
14-
- npm install -g npm
15-
before_script:
16-
- npm install grunt-cli -g
17-
script: grunt
18-
notifications:
19-
slack:
20-
rooms:
21-
- secure: 4FRaTAAiYyeUvgw2RhmblgbNiJO4wmd34OBgWcwURjP9oVmFfSwR9r1LNCdUGxrPOghexSY2DjXIuvIrfTfi/xYbhHb3Kw7PEAyB8IuBMlKtY4NSFou62S2VhYpxyg58T+C7P2zi0eDnDE06pwTCoGPaimxMZQY91yQ0yPYDPVXbwe5SjEgamzlwGBxlS/0A6w1iCPHg27/iO2hXtdW3oLS2I0F/Q8Q95RBkX9hpg6yqHlTV7jRbSqvQ9OFBqk/tXMHQvhoPDGgCgQDuykJuaAYx7g9d0YL0eEYYOh9B/TJ/kNOwdRFBu5kuQ2/nFS5Z0S3Y3UIhdYjUmm9gSMnwIbYnrW22EqDJLoT9Zi3Gv7Prg/8/fSkWsof7BJTMSuXUqO1AxDGKIxFv9uSF1daZoY+AC1ooU1xDu1nNvWVYPlkwEdDxxmHpFkGT3ESTZYccPovQl8Z5K0I1BBAVdJKDzm07lE6VHbxkKcvK6gG0TN3uLxnSlQtjkfJ+aVMq1kxeVsB9lEsKs9oezsKzzbftMm525aXPg+OAv+31CUFWxvT/p4ps8Q+AV6aZpoPHkpK8VryyNirUeZ/m4m4ebDHhD9vcN+JqE9gzshT+0U3g19SvLiUMQtbuZ2BUvrq2hh2LEGs03AFZaNg9AEUVA1PQRhV5NILyoS/lbiBYJPT39Sg=
22-
- secure: D4VxkkZlj7uaaFbqEBITkJCusVeii436N8X6GijuosUSaee9lqGYUF5ZS9lV6VGMKs719IfSJsCc2v/N4nc9Y/8AKgXd7AWHUwaRR+MC6rLwv9xqH8ZlkTPUKHUXkUQe1f9042PcMxzYa9r0+uKniM9l915Yx0PLaawJrWe3ZVig/uBhn5FueLhtUACzLJcjNcri/BKEgmP2+EgUsupUhujd0MsQd8xN5YIIv6VM5oD0XWXZCnBqHoZK+Qq7LfwDnTmUk7juqTOAjefF6v8IJTDELvSdK9QW7f9x7h0ICabIrI+Gl4IbNLJYEnELBi+X7da2YJUTgUoQrlBB4z+T8KybD8myqV/pJc1n0xrk84g1MtYQ3ahZn7eD3DTjIvK+ML8qAAGwxibF8VsV+GSoo5FcB6e3vV+glHODlwszstVs11PpL1grurVdoa5HPhUbm1jtQixOwO7h8GgGpwO20PuMLfyOfTjfoMcJ3ISjGNHRmUwcCH9avcaHqMLPLHht0z+8inVlDZeTcN+Wi8tk1YXwuQYUkTW46iFmoZNGdygRjTu43h9hCqdG7vcoKrR8oDbMT8X/sfs+z/UaBbuYBr9dT8rrdKJoa9115PaYpCs529DLrw1iGmzr5CkAXDElc1y2F352nwVS+dX7/OIQz1/dbT1ozWQ9Blx6ez5XN84=
23-
- secure: g/eOC2QCn7oUW234u/P1kmh9OASO9t5g6iC+DflNdnedHnpw8IEG9CsLAnNynOY0KvC/2/Q6BAIFpT/qO8BPdaC2eQnd9LDurOXExxvjKZgTujhqgzijJGzVPSL8//hafj0Ec2+iJZFo/DYMPqUpYDsiKxX53+SMz9/GN/PKVKsI7bzuaOm04xXktU0A76pVfaG0N/qFSVHI64SShACoUXRpTzyUbmksRgzk7FB162R+TH1soPsR3vPh8c2SSWC9msrDc4iljcBhSFTdjL68z+srjDPYMSoOcFXXFNP+dmL+Q0veL/E4e40e7CWIU1O3grOcEcCkaSoZVSpGduNnCst8h6MpgauPtrgwHk4zGMoSl+L6al+nFo/3h2dXeebrQ0tY/hRfZi4Q8xwqG9083TBqi71fTpoFZ7sNtrY4Kdtl5Oa2CFUo7lVn1JB9qQwSa0eai3Whv0RyRqqQe77aDUj0dfD2R3Q61rX5OF/f++W0XtNwHQubzmj8HD/cFneShIQsbl9KgYXoR6HiXcbBiNdmmZjSrzkPYh7vlsujYrz6Cg2msKybWJ/FfOz0tS1cjlCtiCMOTExN6tEF8YCp9l+s+5RLe61pgFPy4Snr9pEjuTS5DYliTyZMY2ZZC1clBQtgE8E2qCG1QSzqnqqiGxj2K4zmLPpB4y1XpW8e3yk=
24-
1+
language: node_js
2+
node_js:
3+
- "0.11.16"
4+
- "0.12.7"
5+
- "1.0.4"
6+
- "4.2.2"
7+
# Handle git submodules yourself
8+
git:
9+
submodules: false
10+
# Use sed to replace the SSH URL with the public URL, then initialize submodules
11+
before_install:
12+
- sed -i 's/[email protected]:/https:\/\/github.com\//' .gitmodules
13+
- git submodule update --init --recursive
14+
- npm install -g npm
15+
before_script:
16+
- npm install grunt-cli -g
17+
script: grunt
18+
notifications:
19+
slack:
20+
rooms:
21+
- secure: 4FRaTAAiYyeUvgw2RhmblgbNiJO4wmd34OBgWcwURjP9oVmFfSwR9r1LNCdUGxrPOghexSY2DjXIuvIrfTfi/xYbhHb3Kw7PEAyB8IuBMlKtY4NSFou62S2VhYpxyg58T+C7P2zi0eDnDE06pwTCoGPaimxMZQY91yQ0yPYDPVXbwe5SjEgamzlwGBxlS/0A6w1iCPHg27/iO2hXtdW3oLS2I0F/Q8Q95RBkX9hpg6yqHlTV7jRbSqvQ9OFBqk/tXMHQvhoPDGgCgQDuykJuaAYx7g9d0YL0eEYYOh9B/TJ/kNOwdRFBu5kuQ2/nFS5Z0S3Y3UIhdYjUmm9gSMnwIbYnrW22EqDJLoT9Zi3Gv7Prg/8/fSkWsof7BJTMSuXUqO1AxDGKIxFv9uSF1daZoY+AC1ooU1xDu1nNvWVYPlkwEdDxxmHpFkGT3ESTZYccPovQl8Z5K0I1BBAVdJKDzm07lE6VHbxkKcvK6gG0TN3uLxnSlQtjkfJ+aVMq1kxeVsB9lEsKs9oezsKzzbftMm525aXPg+OAv+31CUFWxvT/p4ps8Q+AV6aZpoPHkpK8VryyNirUeZ/m4m4ebDHhD9vcN+JqE9gzshT+0U3g19SvLiUMQtbuZ2BUvrq2hh2LEGs03AFZaNg9AEUVA1PQRhV5NILyoS/lbiBYJPT39Sg=
22+
- secure: D4VxkkZlj7uaaFbqEBITkJCusVeii436N8X6GijuosUSaee9lqGYUF5ZS9lV6VGMKs719IfSJsCc2v/N4nc9Y/8AKgXd7AWHUwaRR+MC6rLwv9xqH8ZlkTPUKHUXkUQe1f9042PcMxzYa9r0+uKniM9l915Yx0PLaawJrWe3ZVig/uBhn5FueLhtUACzLJcjNcri/BKEgmP2+EgUsupUhujd0MsQd8xN5YIIv6VM5oD0XWXZCnBqHoZK+Qq7LfwDnTmUk7juqTOAjefF6v8IJTDELvSdK9QW7f9x7h0ICabIrI+Gl4IbNLJYEnELBi+X7da2YJUTgUoQrlBB4z+T8KybD8myqV/pJc1n0xrk84g1MtYQ3ahZn7eD3DTjIvK+ML8qAAGwxibF8VsV+GSoo5FcB6e3vV+glHODlwszstVs11PpL1grurVdoa5HPhUbm1jtQixOwO7h8GgGpwO20PuMLfyOfTjfoMcJ3ISjGNHRmUwcCH9avcaHqMLPLHht0z+8inVlDZeTcN+Wi8tk1YXwuQYUkTW46iFmoZNGdygRjTu43h9hCqdG7vcoKrR8oDbMT8X/sfs+z/UaBbuYBr9dT8rrdKJoa9115PaYpCs529DLrw1iGmzr5CkAXDElc1y2F352nwVS+dX7/OIQz1/dbT1ozWQ9Blx6ez5XN84=
23+
- secure: g/eOC2QCn7oUW234u/P1kmh9OASO9t5g6iC+DflNdnedHnpw8IEG9CsLAnNynOY0KvC/2/Q6BAIFpT/qO8BPdaC2eQnd9LDurOXExxvjKZgTujhqgzijJGzVPSL8//hafj0Ec2+iJZFo/DYMPqUpYDsiKxX53+SMz9/GN/PKVKsI7bzuaOm04xXktU0A76pVfaG0N/qFSVHI64SShACoUXRpTzyUbmksRgzk7FB162R+TH1soPsR3vPh8c2SSWC9msrDc4iljcBhSFTdjL68z+srjDPYMSoOcFXXFNP+dmL+Q0veL/E4e40e7CWIU1O3grOcEcCkaSoZVSpGduNnCst8h6MpgauPtrgwHk4zGMoSl+L6al+nFo/3h2dXeebrQ0tY/hRfZi4Q8xwqG9083TBqi71fTpoFZ7sNtrY4Kdtl5Oa2CFUo7lVn1JB9qQwSa0eai3Whv0RyRqqQe77aDUj0dfD2R3Q61rX5OF/f++W0XtNwHQubzmj8HD/cFneShIQsbl9KgYXoR6HiXcbBiNdmmZjSrzkPYh7vlsujYrz6Cg2msKybWJ/FfOz0tS1cjlCtiCMOTExN6tEF8YCp9l+s+5RLe61pgFPy4Snr9pEjuTS5DYliTyZMY2ZZC1clBQtgE8E2qCG1QSzqnqqiGxj2K4zmLPpB4y1XpW8e3yk=
24+

CHANGES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
0.7.4: cleaned up mock-data references
2-
0.7.1: RELAX endpoint
3-
0.5.0: first published version.
1+
0.7.4: cleaned up mock-data references
2+
0.7.1: RELAX endpoint
3+
0.5.0: first published version.

Gruntfile.js

Lines changed: 55 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,55 @@
1-
"use strict";
2-
3-
module.exports = function(grunt) {
4-
5-
// Project configuration.
6-
grunt.initConfig({
7-
clean: ["node_modules", "target"],
8-
nodeunit: {
9-
all: ["tests/**/*Test.js"]
10-
},
11-
eslint: {
12-
lib: {
13-
src: ["lib/**/*.js"]
14-
},
15-
test: {
16-
src: ["tests/**/*.js"]
17-
},
18-
options: {
19-
configFile: "conf/eslint.json"
20-
},
21-
gruntfile: {
22-
src: "Gruntfile.js"
23-
}
24-
},
25-
jsdoc: {
26-
dist: {
27-
src: ["lib/*.js", "tests/*.js"],
28-
options: {
29-
destination: "target/html"
30-
}
31-
}
32-
},
33-
instrument: {
34-
files: ["lib/*.js", "index.js"],
35-
options: {
36-
lazy: true,
37-
basePath: "target/instrumented"
38-
}
39-
},
40-
storeCoverage: {
41-
options: {
42-
dir: "target"
43-
}
44-
},
45-
makeReport: {
46-
src: "target/coverage.json",
47-
options: {
48-
type: "lcov",
49-
dir: "target/reports",
50-
print: "detail"
51-
}
52-
},
53-
watch: {
54-
gruntfile: {
55-
files: "<%= eslint.gruntfile.lib %>",
56-
tasks: ["eslint:gruntfile"]
57-
},
58-
lib: {
59-
files: "<%= eslint.lib.src %>",
60-
tasks: ["eslint:lib", "nodeunit"]
61-
},
62-
test: {
63-
files: "<%= eslint.test.src %>",
64-
tasks: ["eslint:test", "nodeunit"]
65-
}
66-
}
67-
});
68-
69-
// These plugins provide necessary tasks.
70-
grunt.loadNpmTasks("grunt-contrib-clean");
71-
grunt.loadNpmTasks("grunt-contrib-nodeunit");
72-
grunt.loadNpmTasks("grunt-contrib-watch");
73-
grunt.loadNpmTasks("grunt-eslint");
74-
grunt.loadNpmTasks("grunt-istanbul");
75-
grunt.loadNpmTasks("grunt-jsdoc");
76-
77-
// Task definitions.
78-
// run `grunt <task>` in command line and it will run the sequence in brackets
79-
grunt.registerTask("default", ["jsdoc", "eslint", "test"]);
80-
grunt.registerTask("doc", ["jsdoc"]);
81-
grunt.registerTask("lint", ["eslint"]);
82-
grunt.registerTask("test", ["instrument", "nodeunit", "storeCoverage", "makeReport"]); // with coverage report
83-
grunt.registerTask("nock", ["instrument", "nodeunit:nock", "storeCoverage", "makeReport"]);
84-
};
1+
"use strict";
2+
3+
module.exports = function(grunt) {
4+
5+
// Project configuration.
6+
grunt.initConfig({
7+
clean: ["target"],
8+
eslint: {
9+
lib: {
10+
src: ["lib/**/*.js"]
11+
},
12+
options: {
13+
configFile: "conf/eslint.json"
14+
},
15+
gruntfile: {
16+
src: "Gruntfile.js"
17+
}
18+
},
19+
jsdoc: {
20+
dist: {
21+
src: "lib/*.js",
22+
options: {
23+
destination: "target/html"
24+
}
25+
}
26+
},
27+
instrument: {
28+
files: ["lib/*.js", "index.js"],
29+
options: {
30+
lazy: true,
31+
basePath: "target/instrumented"
32+
}
33+
},
34+
watch: {
35+
gruntfile: {
36+
files: "<%= eslint.gruntfile.lib %>",
37+
tasks: ["eslint:gruntfile"]
38+
},
39+
lib: {
40+
files: "<%= eslint.lib.src %>",
41+
tasks: ["eslint:lib"]
42+
}
43+
}
44+
});
45+
46+
// These plugins provide necessary tasks.
47+
grunt.loadNpmTasks("grunt-contrib-clean");
48+
grunt.loadNpmTasks("grunt-contrib-watch");;
49+
grunt.loadNpmTasks("grunt-jsdoc");
50+
51+
// Task definitions.
52+
// run `grunt <task>` in command line and it will run the sequence in brackets
53+
grunt.registerTask("default", ["clean","jsdoc"]);
54+
grunt.registerTask("doc", ["jsdoc"]);
55+
};

0 commit comments

Comments
 (0)