Merge pull request #92 from rutchkiwi/master

Fix for base path "/"

Author: fehguy

lib/swagger.js

@@ -372,20 +372,24 @@ var SwaggerResource = function(resourceObj, api) {
   }
 }
 
-SwaggerResource.prototype.getAbsoluteBasePath = function(relativeBasePath) {
-  var parts, pos, url;
+SwaggerResource.prototype.getAbsoluteBasePath = function (relativeBasePath) {
+  var pos, url;
   url = this.api.basePath;
   pos = url.lastIndexOf(relativeBasePath);
-  if (pos === -1) {
-    parts = url.split("/");
-    url = parts[0] + "//" + parts[2];
+  var parts = url.split("/");
+  var rootUrl = parts[0] + "//" + parts[2];
+  //if the relative path is '/' return the root url
+  if (relativeBasePath === '/'){
+    return rootUrl
+  }
+  //if the relative path is not in the base path
+  else if (pos === -1 ) {
     if (relativeBasePath.indexOf("/") === 0) {
       return url + relativeBasePath;
     } else {
       return url + "/" + relativeBasePath;
     }
-  } else if (relativeBasePath === "/") {
-    return url.substring(0, pos);
+    //If the relative path is in the base path
   } else {
     return url.substring(0, pos) + relativeBasePath;
   }

src/swagger-model-spec.coffee

@@ -53,4 +53,8 @@ describe 'Swagger models version 1.2 spec', ->
       pet = window.swagger.apis.pet.models["Pet"]
       sample = pet.createJSONSample()
       log sample
-      log JSON.stringify sample
+      log JSON.stringify sample
+
+    it "verifies the getAbsoluteBasePath method for relativeBasePath '/'", ->
+      window.SwaggerResource.prototype.api = {basePath : "http://localhost:8000/api-docs/"}
+      expect(window.SwaggerResource.prototype.getAbsoluteBasePath("/")).toBe("http://localhost:8000")