Skip to content

2.0 fixes #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Mar 26, 2015
Merged

2.0 fixes #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
260bca0
Added allowEmptyValue
webron Mar 2, 2015
33417db
Added allowEmptyValue
webron Mar 2, 2015
920f465
Removed mimetype regex
webron Mar 4, 2015
163f6e4
Better references to the JSON Schema specifications
webron Mar 4, 2015
c0cfbea
Added clarification for missing formats
webron Mar 4, 2015
3c2c639
Better $ref documentation
webron Mar 4, 2015
989544c
Added additionalProperties to Schema Object
webron Mar 4, 2015
68c6777
Added additionalProperties:false to Schema Object
webron Mar 4, 2015
835532d
Modified Schema Object’s example type to ‘Any'
webron Mar 4, 2015
3eecea4
Fixed the tests due!
webron Mar 4, 2015
76ce76f
Another test fix!
webron Mar 4, 2015
852673a
Updated JSON examples
webron Mar 5, 2015
a16e092
Add password format
webron Mar 6, 2015
4636aba
Fixed model with examples
webron Mar 10, 2015
ba01fb6
Fixed models examples
webron Mar 10, 2015
e991b60
Added additionalProperties to the spec
webron Mar 11, 2015
299aecb
Allow empty arrays for parameters
webron Mar 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions examples/v2.0/json/petstore-expanded.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"version": "1.0.0",
"title": "Swagger Petstore",
"description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
"termsOfService": "http://helloreverb.com/terms/",
"termsOfService": "http://swagger.io/terms/",
"contact": {
"name": "Wordnik API Team",
"email": "[email protected]",
"url": "http://madskristensen.net"
"name": "Swagger API Team",
"email": "[email protected]",
"url": "http://swagger.io"
},
"license": {
"name": "MIT",
"url": "http://github.com/gruntjs/grunt/blob/master/LICENSE-MIT"
}
},
"host": "petstore.swagger.wordnik.com",
"host": "petstore.swagger.io",
"basePath": "/api",
"schemes": [
"http"
Expand Down Expand Up @@ -64,14 +64,14 @@
"schema": {
"type": "array",
"items": {
"$ref": "#/definitions/pet"
"$ref": "#/definitions/Pet"
}
}
},
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
Expand All @@ -89,21 +89,21 @@
"description": "Pet to add to the store",
"required": true,
"schema": {
"$ref": "#/definitions/newPet"
"$ref": "#/definitions/NewPet"
}
}
],
"responses": {
"200": {
"description": "pet response",
"schema": {
"$ref": "#/definitions/pet"
"$ref": "#/definitions/Pet"
}
},
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
Expand Down Expand Up @@ -133,13 +133,13 @@
"200": {
"description": "pet response",
"schema": {
"$ref": "#/definitions/pet"
"$ref": "#/definitions/Pet"
}
},
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
Expand All @@ -164,15 +164,15 @@
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
}
}
},
"definitions": {
"pet": {
"Pet": {
"required": [
"id",
"name"
Expand All @@ -190,10 +190,10 @@
}
}
},
"newPet": {
"NewPet": {
"allOf": [
{
"$ref": "pet"
"$ref": "#/definitions/Pet"
},
{
"required": [
Expand All @@ -208,7 +208,7 @@
}
]
},
"errorModel": {
"ErrorModel": {
"required": [
"code",
"message"
Expand Down
10 changes: 5 additions & 5 deletions examples/v2.0/json/petstore-minimal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"version": "1.0.0",
"title": "Swagger Petstore",
"description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
"termsOfService": "http://helloreverb.com/terms/",
"termsOfService": "http://swagger.io/terms/",
"contact": {
"name": "Wordnik API Team"
"name": "Swagger API Team"
},
"license": {
"name": "MIT"
}
},
"host": "petstore.swagger.wordnik.com",
"host": "petstore.swagger.io",
"basePath": "/api",
"schemes": [
"http"
Expand All @@ -36,7 +36,7 @@
"schema": {
"type": "array",
"items": {
"$ref": "#/definitions/pet"
"$ref": "#/definitions/Pet"
}
}
}
Expand All @@ -45,7 +45,7 @@
}
},
"definitions": {
"pet": {
"Pet": {
"required": [
"id",
"name"
Expand Down
30 changes: 15 additions & 15 deletions examples/v2.0/json/petstore-simple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"version": "1.0.0",
"title": "Swagger Petstore",
"description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
"termsOfService": "http://helloreverb.com/terms/",
"termsOfService": "http://swagger.io/terms/",
"contact": {
"name": "Wordnik API Team"
"name": "Swagger API Team"
},
"license": {
"name": "MIT"
}
},
"host": "petstore.swagger.wordnik.com",
"host": "petstore.swagger.io",
"basePath": "/api",
"schemes": [
"http"
Expand Down Expand Up @@ -61,14 +61,14 @@
"schema": {
"type": "array",
"items": {
"$ref": "#/definitions/pet"
"$ref": "#/definitions/Pet"
}
}
},
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
Expand All @@ -86,21 +86,21 @@
"description": "Pet to add to the store",
"required": true,
"schema": {
"$ref": "#/definitions/petInput"
"$ref": "#/definitions/PetInput"
}
}
],
"responses": {
"200": {
"description": "pet response",
"schema": {
"$ref": "#/definitions/pet"
"$ref": "#/definitions/Pet"
}
},
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
Expand Down Expand Up @@ -130,13 +130,13 @@
"200": {
"description": "pet response",
"schema": {
"$ref": "#/definitions/pet"
"$ref": "#/definitions/Pet"
}
},
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
Expand All @@ -161,15 +161,15 @@
"default": {
"description": "unexpected error",
"schema": {
"$ref": "#/definitions/errorModel"
"$ref": "#/definitions/ErrorModel"
}
}
}
}
}
},
"definitions": {
"pet": {
"Pet": {
"required": [
"id",
"name"
Expand All @@ -187,10 +187,10 @@
}
}
},
"petInput": {
"PetInput": {
"allOf": [
{
"$ref": "pet"
"$ref": "#/definitions/Pet"
},
{
"required": [
Expand All @@ -205,7 +205,7 @@
}
]
},
"errorModel": {
"ErrorModel": {
"required": [
"code",
"message"
Expand Down
Loading