Merge branch 'feature/guard-against-split'

Author: fehguy

lib/client.js

@@ -220,7 +220,7 @@ SwaggerClient.prototype.build = function (mock) {
   if (this.spec) {
     self.swaggerObject = this.spec;
     setTimeout(function () {
-      new Resolver().resolve(self.spec, self.buildFromSpec, self);
+      new Resolver().resolve(self.spec, self.url, self.buildFromSpec, self);
     }, 10);
   } else {
     this.clientAuthorizations.apply(obj);

lib/resolver.js

@@ -266,7 +266,8 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
   // resolve anything that is local
   for(var ii = 0; ii < toResolve.length; ii++) {
     (function(item, spec, self) {
-      if(item.root === null || item.root === root) {
+      // NOTE: this used to be item.root === null, but I (@ponelat) have added a guard against .split, which means item.root can be ''
+      if(!item.root || item.root === root) {
         // local resolve
         self.resolveItem(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, item);
         processedCalls += 1;
@@ -528,6 +529,10 @@ Resolver.prototype.retainRoot = function(obj, root) {
 Resolver.prototype.resolveInline = function (root, spec, property, resolutionTable, unresolvedRefs, location) {
   var key = property.$ref, ref = property.$ref, i, p, p2, rs;
   var rootTrimmed = false;
+
+  root = root || '' // Guard against .split. @fehguy, you'll need to check if this logic fits
+  // More imporantly is how do we gracefully handle relative urls, when provided just a 'spec', not a 'url' ?
+
   if (ref) {
     if(ref.indexOf('../') === 0) {
       // reset root

test/resolver.js

@@ -1351,4 +1351,35 @@ describe('swagger resolver', function () {
       done();
     });
   });
+
+  it('resolves remote parameters, without providing a root', function(done) {
+    var api = new Resolver();
+    var spec = {
+      swagger:'2.0',
+      info:{},
+      host:'localhost:9000',
+      basePath:'/2.0',
+      paths:{
+        '/':{
+          get:{
+            responses:{
+              '200':{
+                description:'thanks'
+              }
+            },
+            parameters:[
+              {
+                '$ref': 'http://localhost:8000/v2/parameters.json#/query/skip'
+              }
+            ]
+          }
+        }
+      }
+    };
+    api.resolve(spec, function (spec, unresolved) {
+      expect(spec.paths['/'].get.parameters[0].name).toBe('skip');
+      done();
+    });
+  });
+
 });