ubivar
Advanced tools
Comparing version 1.10.0 to 1.11.0
@@ -74,6 +74,12 @@ /* | ||
switch (rawUbivarError.type) { | ||
case "invalid_request_error": | ||
return new _Error.UbivarInvalidRequestError(rawUbivarError) | ||
case "api_error": | ||
return new _Error.UbivarAPIError(rawUbivarError) | ||
/* 4xx errors */ | ||
case "invalid_request_error" : return new _Error.UbivarInvalidRequestError(rawUbivarError) | ||
case "unauthorized_error" : return new _Error.UbivarUnauthorizedError(rawUbivarError) | ||
case "method_not_allowed_error" : return new _Error.UbivarMethodNotAllowedError(rawUbivarError) | ||
case "payment_required_error" : return new _Error.UbivarPaymentRequiredError(rawUbivarError) | ||
case "too_many_requests_error" : return new _Error.UbivarTooManyRequestsError(rawUbivarError) | ||
/* 5xx errors */ | ||
case "internal_server_error" : return new _Error.UbivarInternalServerError(rawUbivarError) | ||
case "bad_gateway_error" : return new _Error.UbivarBadGatewayError(rawUbivarError) | ||
case "api_error" : return new _Error.UbivarAPIError(rawUbivarError) | ||
} | ||
@@ -86,7 +92,13 @@ return new _Error("Generic", "Unknown Error") | ||
*/ | ||
_Error.UbivarInvalidRequestError = UbivarError.extend({"type": "UbivarInvalidRequestError" }) | ||
_Error.UbivarAPIError = UbivarError.extend({"type": "UbivarAPIError" }) | ||
_Error.UbivarAuthenticationError = UbivarError.extend({"type": "UbivarAuthenticationError" }) | ||
_Error.UbivarConnectionError = UbivarError.extend({"type": "UbivarConnectionError" }) | ||
_Error.UbivarInvalidRequestError = UbivarError.extend({"type": "UbivarInvalidRequestError" }) | ||
_Error.UbivarUnauthorizedError = UbivarError.extend({"type": "UbivarUnauthorizedError" }) | ||
_Error.UbivarConnectionError = UbivarError.extend({"type": "UbivarConnectionError" }) | ||
_Error.UbivarPaymentRequiredError = UbivarError.extend({"type": "UbivarPaymentRequiredError" }) | ||
_Error.UbivarTooManyRequestsError = UbivarError.extend({"type": "UbivarTooManyRequestsError" }) | ||
_Error.UbivarMethodNotAllowedError= UbivarError.extend({"type": "UbivarMethodNotAllowedError" }) | ||
_Error.UbivarInternalServerError = UbivarError.extend({"type": "UbivarInternalServerError" }) | ||
_Error.UbivarBadGatewayError = UbivarError.extend({"type": "UbivarBadGatewayError" }) | ||
_Error.UbivarAPIError = UbivarError.extend({"type": "UbivarAPIError" }) | ||
/* | ||
@@ -93,0 +105,0 @@ * Export the _Error factory |
@@ -10,17 +10,17 @@ /* Ubivar API client factory | ||
resources = resources || [ | ||
{"name": "Router" , "path": "router"} | ||
, {"name": "RouterParameter" , "path": "router_parameters"} | ||
, {"name": "RouterData" , "path": "router_data"} | ||
, {"name": "RouterDataGeocoding" , "path": "router_data_geocoding"} | ||
, {"name": "RouterDataBin" , "path": "router_data_bin"} | ||
, {"name": "RouterDataGeoip" , "path": "router_data_geoip"} | ||
, {"name": "RouterDataBlacklist" , "path": "router_data_blacklists"} | ||
, {"name": "RouterDataPhone" , "path": "router_data_phone"} | ||
, {"name": "RouterDataFeature" , "path": "router_data_features"} | ||
, {"name": "RouterFlow" , "path": "router_flows"} | ||
, {"name": "RouterFlowBackup" , "path": "router_flow_backups"} | ||
, {"name": "RouterTest" , "path": "router_tests"} | ||
{"name": "Router" , "path": "router"} | ||
, {"name": "RouterParameter" , "path": "router_parameters"} | ||
, {"name": "RouterData" , "path": "router_data"} | ||
, {"name": "RouterDataGeocoding" , "path": "router_data_geocoding"} | ||
, {"name": "RouterDataBin" , "path": "router_data_bin"} | ||
, {"name": "RouterDataGeoip" , "path": "router_data_geoip"} | ||
, {"name": "RouterDataBlacklist" , "path": "router_data_blacklists"} | ||
, {"name": "RouterDataPhone" , "path": "router_data_phone"} | ||
, {"name": "RouterDataFeature" , "path": "router_data_features"} | ||
, {"name": "RouterFlow" , "path": "router_flows"} | ||
, {"name": "RouterFlowBackup" , "path": "router_flow_backups"} | ||
, {"name": "RouterTest" , "path": "router_tests"} | ||
, {"name": "Event" , "path": "events"} | ||
, {"name": "EventPast" , "path": "event_past"} | ||
, {"name": "EventPast" , "path": "events_past"} | ||
, {"name": "EventNotification" , "path": "event_notifications"} | ||
@@ -27,0 +27,0 @@ , {"name": "EventLastId" , "path": "event_last_id"} |
@@ -25,9 +25,12 @@ /* | ||
var code = parseInt(res.statusCode) | ||
, isUnauthenticated = code === 401 | ||
, isOk = code >= 200 && code <= 204 | ||
if (isUnauthenticated) { | ||
err = new Error.UbivarAuthenticationError(json) | ||
} else if(!isOk){ | ||
err = new Error.UbivarError.generate(json) | ||
if(code === 401){ err = new Error.UbivarUnauthorizedError(json) | ||
} else if(code === 402){ err = new Error.UbivarPaymentRequiredError(json) | ||
} else if(code === 405){ err = new Error.UbivarMethodNotAllowedError(json) | ||
} else if(code === 429){ err = new Error.UbivarTooManyRequestsError(json) | ||
} else if(code === 500){ err = new Error.UbivarInternalServerError(json) | ||
} else if(code === 502){ err = new Error.UbivarBadGatewayError(json) | ||
} else if(code > 500){ err = new Error.UbivarAPIError(json) | ||
} else if(!isOk ){ err = new Error.UbivarError.generate(json) | ||
} | ||
@@ -38,3 +41,4 @@ } catch (e) { // failed to parse the json | ||
, "json" : json | ||
, "exception" : e }) | ||
, "exception" : e | ||
}) | ||
} | ||
@@ -49,3 +53,4 @@ | ||
, "json" : json | ||
, "exception" : err }) | ||
, "exception" : err | ||
}) | ||
@@ -52,0 +57,0 @@ next(err, json) |
{ | ||
"name" : "ubivar", | ||
"version" : "1.10.0", | ||
"version" : "1.11.0", | ||
"description" : "API wrapper to Ubivar", | ||
@@ -5,0 +5,0 @@ "main" : "lib/index.js", |
@@ -111,3 +111,3 @@ # Ubivar node.js bindings | ||
| | RouterData | | | [`123, {}`](https://ubivar.com/docs/nodejs#update_routerdata) | | [`{}`](https://ubivar.com/docs/nodejs#list_routerdata) | [See on github](https://github.com/ubivar/ubivar-node/blob/master/test/Resources/RouterData/spec.js) | | ||
| | RouterDataGeocoding | | | [`123, {}`](https://ubivar.com/docs/nodejs#update_routerdatageocoding) | | [`{}`](https://ubivar.com/docs/nodejs#list_routerdata) | [See on github](https://github.com/ubivar/ubivar-node/blob/master/test/Resources/RouterDataGeocoding/spec.js) | | ||
| | RouterDataGeocoding | | | | | [`{}`](https://ubivar.com/docs/nodejs#list_routerdatageocoding) | [See on github](https://github.com/ubivar/ubivar-node/blob/master/test/Resources/RouterDataGeocoding/spec.js) | | ||
| | RouterDataGeoip | | | [`123, {}`](https://ubivar.com/docs/nodejs#update_routerdatageoip) | | [`{}`](https://ubivar.com/docs/nodejs#list_routerdata) | [See on github](https://github.com/ubivar/ubivar-node/blob/master/test/Resources/RouterDataGeoip/spec.js) | | ||
@@ -114,0 +114,0 @@ | | RouterDataPhone | | | [`123, {}`](https://ubivar.com/docs/nodejs#update_routerdataphone) | | [`{}`](https://ubivar.com/docs/nodejs#list_routerdata) | [See on github](https://github.com/ubivar/ubivar-node/blob/master/test/Resources/RouterDataPhone/spec.js) | |
@@ -34,3 +34,33 @@ "use strict" | ||
}) | ||
it("Should have Unauthorized (401) error", function(){ | ||
var err = Error.UbivarError.generate({"type": "unauthorized_error"}) | ||
expect(err).to.be.instanceOf(Error.UbivarUnauthorizedError) | ||
}) | ||
it("Should have PaymentRequired (402) error", function(){ | ||
var err = Error.UbivarError.generate({"type": "payment_required_error"}) | ||
expect(err).to.be.instanceOf(Error.UbivarPaymentRequiredError) | ||
}) | ||
it("Should have MethodNotAllowed (405) error", function(){ | ||
var err = Error.UbivarError.generate({"type": "method_not_allowed_error"}) | ||
expect(err).to.be.instanceOf(Error.UbivarMethodNotAllowedError) | ||
}) | ||
it("Should have TooManyRequests (429) error", function(){ | ||
var err = Error.UbivarError.generate({"type": "too_many_requests_error"}) | ||
expect(err).to.be.instanceOf(Error.UbivarTooManyRequestsError) | ||
}) | ||
it("Should have InternalServerError (500) error", function(){ | ||
var err = Error.UbivarError.generate({"type": "internal_server_error"}) | ||
expect(err).to.be.instanceOf(Error.UbivarInternalServerError) | ||
}) | ||
it("Should have BadGatewayError (502) error", function(){ | ||
var err = Error.UbivarError.generate({"type": "bad_gateway_error"}) | ||
expect(err).to.be.instanceOf(Error.UbivarBadGatewayError) | ||
}) | ||
}) | ||
}) |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
128500
2965
55