Merge branch 'master' into master

Author: shockey

.github/pull_request_template.md

@@ -0,0 +1,42 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+### Description
+<!--- Describe your changes in detail -->
+
+
+
+### Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+<!--- Use the magic "Fixes #1234" format, so the issues are -->
+<!--- automatically closed when this PR is merged. -->
+
+
+
+### How Has This Been Tested?
+<!--- Please describe in detail how you manually tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+
+
+### Screenshots (if appropriate):
+
+
+
+### Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] No code changes (changes to documentation, CI, metadata, etc)
+- [ ] Dependency changes (any modification to dependencies in `package.json`)
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+### Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.

.travis.yml

@@ -1,19 +1,16 @@
+sudo: false
 language: node_js
 node_js:
 - '4.7'
 - '6.9'
-env:
-  - CXX=g++-4.8
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
+cache:
+  directories:
+    - node_modules
 branches:
   only:
   - master
   - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+before_script: "npm update"
 before_deploy: "npm run build"
 deploy:
   provider: npm

README.md

@@ -279,6 +279,7 @@ npm run test         # run test
 npm run test:watch   # run test with change watching
 npm run lint         # run lint
 npm run build        # package to release
+npm run build-dev    # package with non-minified dist/index.js (for debugging)
 npm run build-bundle # build browser version available at .../browser
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "main": "dist/index.js",
   "repository": "[email protected]:swagger-api/swagger-js.git",
@@ -17,6 +17,7 @@
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack -p --config ./webpack.config.js",
+    "build-dev": "cross-env NODE_ENV=development webpack --config ./webpack.config.js",
     "build-bundle": "cross-env NODE_ENV=production webpack -p --config ./webpack.bundle.config.js",
     "watch": "webpack --config webpack.config.js --watch --progress",
     "test": "npm run just-test && npm run lint",
@@ -69,7 +70,7 @@
     "fast-json-patch": "1.1.8",
     "isomorphic-form-data": "0.0.1",
     "js-yaml": "^3.8.1",
-    "lodash": "4.16.2",
+    "lodash": "^4.16.2",
     "qs": "^6.3.0",
     "url": "^0.11.0"
   }

src/execute/index.js

@@ -286,15 +286,18 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   const computedScheme = stripNonAlpha(parsedUrl.protocol) || stripNonAlpha(parsedContextUrl.protocol) || ''
   const computedHost = parsedUrl.host || parsedContextUrl.host
   const computedPath = parsedUrl.pathname || ''
+  let res
 
   if (computedScheme && computedHost) {
-    const res = `${computedScheme}://${computedHost + computedPath}`
+    res = `${computedScheme}://${computedHost + computedPath}`
 
     // If last character is '/', trim it off
-    return res[res.length - 1] === '/' ? res.slice(0, -1) : res
+  }
+  else {
+    res = computedPath
   }
 
-  return ''
+  return res[res.length - 1] === '/' ? res.slice(0, -1) : res
 }
 
 function getVariableTemplateNames(str) {
@@ -317,13 +320,17 @@ function swagger2BaseUrl({spec, scheme, contextUrl = ''}) {
   const computedScheme = scheme || firstSchemeInSpec || stripNonAlpha(parsedContextUrl.protocol) || 'http'
   const computedHost = spec.host || parsedContextUrl.host || ''
   const computedPath = spec.basePath || ''
+  let res
 
   if (computedScheme && computedHost) {
-    const res = `${computedScheme}://${computedHost + computedPath}`
-
-    // If last character is '/', trim it off
-    return res[res.length - 1] === '/' ? res.slice(0, -1) : res
+    // we have what we need for an absolute URL
+    res = `${computedScheme}://${computedHost + computedPath}`
+  }
+  else {
+    // if not, a relative URL will have to do
+    res = computedPath
   }
 
-  return ''
+  // If last character is '/', trim it off
+  return res[res.length - 1] === '/' ? res.slice(0, -1) : res
 }

test/execute/baseurl.js

@@ -129,4 +129,15 @@ describe('baseUrl', () => {
 
     expect(res).toEqual('https://example.com:9090')
   })
+
+  it('should include a basePath when no contextUrl is available', () => {
+    const res = baseUrl({
+      spec: {
+        title: 'a spec',
+        basePath: '/mybase'
+      }
+    })
+
+    expect(res).toEqual('/mybase')
+  })
 })

test/oas3/execute/main.js

@@ -497,6 +497,23 @@ describe('buildRequest - OpenAPI Specification 3.0', function () {
 
       expect(res).toEqual('http://google.com')
     })
+    it('should create a relative url based on a relative server if no contextUrl is available', function () {
+      const spec = {
+        openapi: '3.0.0',
+        servers: [
+          {
+            url: '/mypath'
+          }
+        ]
+      }
+
+      const res = baseUrl({
+        spec,
+        server: '/mypath'
+      })
+
+      expect(res).toEqual('/mypath')
+    })
     it('should return an empty string if no servers or contextUrl are provided', function () {
       const spec = {
         openapi: '3.0.0'