Merge branch 'develop'

FreeAllMedia · Jul 1, 2015 · f794071 · f794071
2 parents e2a3ab2 + 381d9be
commit f794071
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 49 deletions.
diff --git a/es5/lib/response.js b/es5/lib/response.js
@@ -33,7 +33,7 @@ var Response = (function () {
 		value: function value() {
 			var _this = this;
 
-			var statuses = require("./http.statuses.json");
+			var statuses = require("../../http.statuses.json");
 			if (Array.isArray(statuses)) {
 				statuses.forEach(function (status) {
 					_this[status.name] = function (data) {

diff --git a/es5/spec/response.spec.js b/es5/spec/response.spec.js
@@ -280,7 +280,7 @@ describe("Response(expressResponse)", function () {
 		describe("(dynamic functions)", function () {
 			//camel cased names from the w3c specification names
 			//http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-			var statuses = require("../lib/http.statuses.json");
+			var statuses = require("../../http.statuses.json");
 
 			statuses.forEach(function (status) {
 				it("should load the " + status.name + " status as a member into the response", function () {

diff --git a/es5/spec/router.spec.js b/es5/spec/router.spec.js
@@ -418,7 +418,7 @@ describe("Router(...options)", function () {
 			it("should push every semanthic method through the formater middleware", function () {
 				//camel cased names from the w3c specification names
 				//http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-				var statuses = require("../lib/http.statuses.json");
+				var statuses = require("../../http.statuses.json");
 				describe("(jsonapi-formatter middleware)", function () {
 					statuses.forEach(function (status) {
 						describe("response." + status.name + "()", function () {

diff --git a/es6/lib/http.statuses.json b/es6/lib/http.statuses.json
diff --git a/es6/lib/response.js b/es6/lib/response.js
@@ -17,7 +17,7 @@ export default class Response {
 	}
 
 	[loadDynamicMethods]() {
-		const statuses = require("./http.statuses.json");
+		const statuses = require("../../http.statuses.json");
 		if(Array.isArray(statuses)) {
 			statuses.forEach((status) => {
 				this[status.name] = (data) => {

diff --git a/es6/spec/response.spec.js b/es6/spec/response.spec.js
@@ -277,7 +277,7 @@ describe("Response(expressResponse)", () => {
 		describe("(dynamic functions)", () => {
 			//camel cased names from the w3c specification names
 			//http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-			let statuses = require("../lib/http.statuses.json");
+			let statuses = require("../../http.statuses.json");
 
 			statuses.forEach((status) => {
 				it(`should load the ${status.name} status as a member into the response`, () => {

diff --git a/es6/spec/router.spec.js b/es6/spec/router.spec.js
@@ -418,7 +418,7 @@ describe("Router(...options)", () => {
 			it("should push every semanthic method through the formater middleware", () => {
 				//camel cased names from the w3c specification names
 				//http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-				let statuses = require("../lib/http.statuses.json");
+				let statuses = require("../../http.statuses.json");
 				describe("(jsonapi-formatter middleware)", () => {
 					statuses.forEach((status) => {
 						describe(`response.${status.name}()`, () => {

diff --git a/es5/lib/http.statuses.json → http.statuses.json b/es5/lib/http.statuses.json → http.statuses.json
diff --git a/index.js b/index.js
@@ -1 +1,2 @@
 module.exports = require("./es5/lib/router.js");
+module.exports.httpStatuses = require("./http.statuses.json");
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omnirouter",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "ES6 Component for message routing.",
   "main": "index.js",
   "scripts": {