Permalink
Browse files

Infer root resource name from baseUrl.

  • Loading branch information...
1 parent 063a948 commit a96cc2d39b996be211e32e4f4b76e0638b0c230e @zeke zeke committed Jan 25, 2012
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -233,12 +233,8 @@
// adeed by ayush
createAll: function(values){
- // debugger;
values = this.fromJSON(values);
-
- // debugger;
-
- for (var i=0, il = values.length; i < il; i++) {
+ for (var i=0, il = values.length; i < il; i++) {
var record = values[i];
record.newRecord = false;
record.id = record.id || Spine.guid();
@@ -11,17 +11,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
baseUrl = ("http://" + baseUrl);
}
- // baseUrl = baseUrl + "/resources.json";
-
- // log("using base url " + baseUrl);
var apiHost = baseUrl.substr(0, baseUrl.lastIndexOf("/"));
- // debugger
- // var rootResourcesApiName = baseUrl.substr(baseUrl.lastIndexOf("/") + 1, (baseUrl.lastIndexOf(".") - baseUrl.lastIndexOf("/") - 1));
-
- // assuming root swagger is resources
- var rootResourcesApiName = "resources";
- if (baseUrl.indexOf(".json") > -1) rootResourcesApiName += ".json";
-
+ var discoParts = baseUrl.split("/");
+ var rootResourcesApiName = discoParts[discoParts.length-1];
var formatString = ".{format}";
var statusListener = statusCallback;
var apiKey = _apiKey;
@@ -79,7 +71,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
},
addApis: function(apiObjects) {
- log("apiObjects: %o", apiObjects);
+ // log("apiObjects: %o", apiObjects);
this.apiList.createAll(apiObjects);
},
@@ -402,10 +394,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
var controller = this;
updateStatus("Fetching " + apiResource.name + "...");
var resourceUrl = apiHost + apiResource.path_json + apiKeySuffix;
- log("resourceUrl: %o", resourceUrl);
+ // log("resourceUrl: %o", resourceUrl);
$.getJSON(resourceUrl,
function(response) {
- log(response);
controller.loadResources(response, apiResource);
});
},
@@ -432,7 +423,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
updateStatus();
} finally {
if (this.countLoaded == ApiResource.count()) {
- log("all models/api loaded");
+ // log("all models/api loaded");
ApiResource.trigger("refresh");
}
}
@@ -233,12 +233,8 @@
// adeed by ayush
createAll: function(values){
- // debugger;
values = this.fromJSON(values);
-
- // debugger;
-
- for (var i=0, il = values.length; i < il; i++) {
+ for (var i=0, il = values.length; i < il; i++) {
var record = values[i];
record.newRecord = false;
record.id = record.id || Spine.guid();
@@ -11,17 +11,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
baseUrl = ("http://" + baseUrl);
}
- // baseUrl = baseUrl + "/resources.json";
-
- // log("using base url " + baseUrl);
var apiHost = baseUrl.substr(0, baseUrl.lastIndexOf("/"));
- // debugger
- // var rootResourcesApiName = baseUrl.substr(baseUrl.lastIndexOf("/") + 1, (baseUrl.lastIndexOf(".") - baseUrl.lastIndexOf("/") - 1));
-
- // assuming root swagger is resources
- var rootResourcesApiName = "resources";
- if (baseUrl.indexOf(".json") > -1) rootResourcesApiName += ".json";
-
+ var discoParts = baseUrl.split("/");
+ var rootResourcesApiName = discoParts[discoParts.length-1];
var formatString = ".{format}";
var statusListener = statusCallback;
var apiKey = _apiKey;
@@ -79,7 +71,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
},
addApis: function(apiObjects) {
- log("apiObjects: %o", apiObjects);
+ // log("apiObjects: %o", apiObjects);
this.apiList.createAll(apiObjects);
},
@@ -402,10 +394,9 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
var controller = this;
updateStatus("Fetching " + apiResource.name + "...");
var resourceUrl = apiHost + apiResource.path_json + apiKeySuffix;
- log("resourceUrl: %o", resourceUrl);
+ // log("resourceUrl: %o", resourceUrl);
$.getJSON(resourceUrl,
function(response) {
- log(response);
controller.loadResources(response, apiResource);
});
},
@@ -432,7 +423,7 @@ function SwaggerService(baseUrl, _apiKey, statusCallback) {
updateStatus();
} finally {
if (this.countLoaded == ApiResource.count()) {
- log("all models/api loaded");
+ // log("all models/api loaded");
ApiResource.trigger("refresh");
}
}

0 comments on commit a96cc2d

Please sign in to comment.