Update Spec 2.0's Schema

README.md

@@ -1,6 +1,6 @@
 # The Swagger Specification
 
-[![Build Status](https://travis-ci.org/reverb/swagger-spec.svg?branch=master)](https://travis-ci.org/wordnik/swagger-spec)
+[![Build Status](https://travis-ci.org/webron/swagger-spec.svg?branch=master)](https://travis-ci.org/webron/swagger-spec)
 
 ![](https://raw.github.com/wordnik/swagger-spec/master/swagger-logo.jpg)
 ## Welcome to the Swagger Project! 

examples/v2.0/json/petstore-expanded.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.0",
     "title": "Swagger Petstore",

examples/v2.0/json/petstore-simple.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.0",
     "title": "Swagger Petstore",
@@ -12,7 +12,8 @@
       "name": "MIT"
     }
   },
-  "host": "petstore.swagger.wordnik.com/api",
+  "host": "petstore.swagger.wordnik.com",
+  "basePath": "/api",
   "schemes": [
     "http"
   ],

examples/v2.0/json/petstore-with-external-docs.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.0",
     "title": "Swagger Petstore",

examples/v2.0/json/petstore.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.0",
     "title": "Swagger Petstore",
@@ -31,11 +31,11 @@
                 "$ref": "#/definitions/Pet"
               }
             },
-            "headers": [{
+            "headers": {
               "x-expires": {
                 "type": "string"
               }
-            }]
+            }
           },
           "default": {
             "description": "unexpected error",

examples/v2.0/yaml/petstore-expanded.yaml

@@ -1,4 +1,4 @@
-swagger: 2.0
+swagger: "2.0"
 info:
   version: 1.0.0
   title: Swagger Petstore

examples/v2.0/yaml/petstore.yaml

@@ -1,4 +1,4 @@
-swagger: 2.0
+swagger: "2.0"
 info:
   version: 1.0.0
   title: Swagger Petstore
@@ -30,7 +30,7 @@ paths:
         200:
           description: An paged array of pets
           headers:
-            - x-next:
+            x-next:
               type: string
               description: A link to the next page of responses
           schema:

examples/v2.0/yaml/uber.yaml

@@ -1,6 +1,6 @@
 # this is an example of the Uber API
 # as a demonstration of an API spec in YAML
-swagger: 2
+swagger: "2.0"
 info:
   title: Uber API
   description: Move your app forward with the Uber API

fixtures/v2.0/json/resources/cascadingSchemes.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/commonParameters.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/multipleMimeTypes.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/resourceWithExamplePayload.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/resourceWithLinkedDefinitions.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/resourceWithRelativeHost.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/reusableParameters.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/securityExample.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",
@@ -28,13 +28,10 @@
   ],
   "security": [
     {
-      "githubAuth": { "$ref": "#/security/github/accessCode" }
+      "githubAccessCode": [ "user", "gist" ]
     },
     {
-      "internalApiKey": {
-        "type": "header",
-        "name": "api_key"
-      }
+      "internalApiKey": []
     }
   ],
   "paths": {
@@ -58,12 +55,13 @@
         "operationId": "getPetsById",
         "security": [
           {
-            "githubAuth": {
-              "scopes": [ "user:read", "user:write" ]
-            }
+            "githubAuth":[
+                "user:read",
+                "user:write"
+              ]
           },
           {
-            "internalApiKey":{}
+            "internalApiKey": []
           }
         ],
         "produces": [
@@ -90,43 +88,64 @@
       }
     }
   },
-  "security": {
-    "github": {
+  "securityDefinitions": {
+    "githubAccessCode": {
       "type": "oauth2",
-      "scopes": [
-        { "user":  "Grants read/write access to profile info only. Note that this scope includes user:email and user:follow." },
-        { "user:email": "Grants read access to a user’s email addresses." },
-        { "user:follow": "Grants access to follow or unfollow other users." },
-        { "public_repo": "Grants read/write access to code, commit statuses, and deployment statuses for public repositories and organizations." },
-        { "repo": "Grants read/write access to code, commit statuses, and deployment statuses for public and private repositories and organizations." },
-        { "repo_deployment": "Grants access to deployment statuses for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, without granting access to the code." },
-        { "repo:status": "Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses without granting access to the code." },
-        { "delete_repo": "Grants access to delete adminable repositories." },
-        { "notifications": "Grants read access to a user’s notifications. repo also provides this access." },
-        { "gist": "Grants write access to gists." },
-        { "read:repo_hook": "Grants read and ping access to hooks in public or private repositories." },
-        { "write:repo_hook": "Grants read, write, and ping access to hooks in public or private repositories." },
-        { "admin:repo_hook": "Grants read, write, ping, and delete access to hooks in public or private repositories." },
-        { "read:org": "Read-only access to organization, teams, and membership." },
-        { "write:org": "Publicize and unpublicize organization membership." },
-        { "admin:org": "Fully manage organization, teams, and memberships." },
-        { "read:public_key": "List and view details for public keys." },
-        { "write:public_key": "Create, list, and view details for public keys." },
-        { "admin:public_key": "Fully manage public keys." }
-      ],
-      "accessCode": {
-        "authorize": {
-          "url": "https://github.com/login/oauth/authorize"
-        },
-        "token": {
-          "url": "https://github.com/login/oauth/access_token"
-        }
+      "scopes": {
+        "user": "Grants read/write access to profile info only. Note that this scope includes user:email and user:follow.",
+        "user:email": "Grants read access to a user’s email addresses.",
+        "user:follow": "Grants access to follow or unfollow other users.",
+        "public_repo": "Grants read/write access to code, commit statuses, and deployment statuses for public repositories and organizations.",
+        "repo": "Grants read/write access to code, commit statuses, and deployment statuses for public and private repositories and organizations.",
+        "repo_deployment": "Grants access to deployment statuses for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, without granting access to the code.",
+        "repo:status": "Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses without granting access to the code.",
+        "delete_repo": "Grants access to delete adminable repositories.",
+        "notifications": "Grants read access to a user’s notifications. repo also provides this access.",
+        "gist": "Grants write access to gists.",
+        "read:repo_hook": "Grants read and ping access to hooks in public or private repositories.",
+        "write:repo_hook": "Grants read, write, and ping access to hooks in public or private repositories.",
+        "admin:repo_hook": "Grants read, write, ping, and delete access to hooks in public or private repositories.",
+        "read:org": "Read-only access to organization, teams, and membership.",
+        "write:org": "Publicize and unpublicize organization membership.",
+        "admin:org": "Fully manage organization, teams, and memberships.",
+        "read:public_key": "List and view details for public keys.",
+        "write:public_key": "Create, list, and view details for public keys.",
+        "admin:public_key": "Fully manage public keys."
       },
-      "implicit": {
-        "login": {
-          "url": "http://petstore.swagger.wordnik.com/oauth/dialog"
-        }
-      }
+      "flow": "accessCode",
+      "authorizationUrl": "https://github.com/login/oauth/authorize",
+      "tokenUrl": "https://github.com/login/oauth/access_token"
+    },
+    "petstoreImplicit": {
+      "type": "oauth2",
+      "scopes": {
+        "user": "Grants read/write access to profile info only. Note that this scope includes user:email and user:follow.",
+        "user:email": "Grants read access to a user’s email addresses.",
+        "user:follow": "Grants access to follow or unfollow other users.",
+        "public_repo": "Grants read/write access to code, commit statuses, and deployment statuses for public repositories and organizations.",
+        "repo": "Grants read/write access to code, commit statuses, and deployment statuses for public and private repositories and organizations.",
+        "repo_deployment": "Grants access to deployment statuses for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, without granting access to the code.",
+        "repo:status": "Grants read/write access to public and private repository commit statuses. This scope is only necessary to grant other users or services access to private repository commit statuses without granting access to the code.",
+        "delete_repo": "Grants access to delete adminable repositories.",
+        "notifications": "Grants read access to a user’s notifications. repo also provides this access.",
+        "gist": "Grants write access to gists.",
+        "read:repo_hook": "Grants read and ping access to hooks in public or private repositories.",
+        "write:repo_hook": "Grants read, write, and ping access to hooks in public or private repositories.",
+        "admin:repo_hook": "Grants read, write, ping, and delete access to hooks in public or private repositories.",
+        "read:org": "Read-only access to organization, teams, and membership.",
+        "write:org": "Publicize and unpublicize organization membership.",
+        "admin:org": "Fully manage organization, teams, and memberships.",
+        "read:public_key": "List and view details for public keys.",
+        "write:public_key": "Create, list, and view details for public keys.",
+        "admin:public_key": "Fully manage public keys."
+      },
+      "flow": "implicit",
+      "authorizationUrl": "http://petstore.swagger.wordnik.com/oauth/dialog"
+    },
+    "internalApiKey": {
+      "type": "apiKey",
+      "in": "header",
+      "name": "api_key"
     }
   },
   "definitions": {
@@ -144,7 +163,10 @@
       }
     },
     "ErrorModel": {
-      "required": [ "code", "message" ],
+      "required": [
+        "code",
+        "message"
+      ],
       "properties": {
         "code": {
           "type": "integer",
@@ -156,4 +178,4 @@
       }
     }
   }
-}
+}

fixtures/v2.0/json/resources/stringPathParamResource.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "info": {
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",

fixtures/v2.0/json/resources/taggedResource.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "x-reverb": {
     "addAnythingYouWant": true
   },
@@ -33,7 +33,7 @@
   ],
   "tags": [
     {
-      "foo": "bar"
+      "name": "pets"
     }
   ],
   "paths": {

fixtures/v2.0/json/resources/vendorExtensionExamples.json

@@ -1,5 +1,5 @@
 {
-  "swagger": 2.0,
+  "swagger": "2.0",
   "x-reverb": {
     "addAnythingYouWant": true
   },

fixtures/v2.0/json/responses/stringResponseWithHeader.json

@@ -3,8 +3,8 @@
   "schema": {
     "type": "string"
   },
-  "headers": [
-    { "is-dog": {"type": "boolean"} },
-    { "is-cat": {"type": "boolean"} }
-  ]
+  "headers": {
+    "is-dog": {"type": "boolean"},
+    "is-cat": {"type": "boolean"}
+  }
 }