Merge pull request #471 from swagger-api/develop_2.0

Merged from develop_2.0

Author: fehguy

.travis.yml

@@ -3,5 +3,8 @@ language: node_js
 node_js:
   - '0.10'
 script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
   - npm install
-  - mocha
+  - npm test
+  - npm run browsertest

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 Reverb Technologies, Inc.
+Copyright 2015 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -17,17 +17,20 @@ npm install swagger-client
 
 Then let swagger do the work!
 ```js
-var client = require("swagger-client")
+var client = require('swagger-client');
 
 var swagger = new client({
   url: 'http://petstore.swagger.io/v2/swagger.json',
   success: function() {
-    swagger.apis.pet.getPetById({petId:1});
+    swagger.pet.getPetById({petId:7},{responseContentType: 'application/json'},function(pet){
+      console.log('pet', pet);
+    });
   }
 });
-
 ```
 
+NOTE: we're explicitly setting the responseContentType, because we don't want you getting stuck when there is more than one content type available.
+
 That's it!  You'll get a JSON response with the default callback handler:
 
 ```json
@@ -80,7 +83,7 @@ Download `browser/swagger-client.js` into your webapp:
     url: "http://petstore.swagger.io/api/api-docs",
     success: function() {
       // upon connect, fetch a pet and set contents to element "mydata"
-      swagger.apis.pet.getPetById({petId:1}, function(data) {
+      swagger.apis.pet.getPetById({petId:1},{responseContentType: 'application/json'}, function(data) {
         document.getElementById("mydata").innerHTML = JSON.stringify(data.obj);
       });
     }
@@ -187,7 +190,7 @@ gulp coverage
 License
 -------
 
-Copyright 2011-2015 Reverb Technologies, Inc.
+Copyright 2011-2015 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-js",
-  "version": "2.1.6-M2",
+  "version": "2.1.7-M2",
   "main": "browser/swagger-client.js",
   "ignore": [
     "gulpfile.js",
@@ -16,7 +16,7 @@
   "license": "apache 2.0",
   "repository": {
     "type": "git",
-    "url": "git://github.com/swagger-api/swagger-client.git"
+    "url": "git://github.com/swagger-api/swagger-js.git"
   },
   "homepage": "http://swagger.io",
   "moduleType": [ "globals" ],