-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from exoego/smart-merger
Implement smarter merge
- Loading branch information
Showing
7 changed files
with
217 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| { | ||
| "openapi": "3.0.3", | ||
| "info": { | ||
| "title": "My API", | ||
| "version": "1.0.0" | ||
| }, | ||
| "servers": [], | ||
| "paths": { | ||
| "/tables": { | ||
| "get": { | ||
| "summary": "index", | ||
| "tags": [ | ||
| "Table" | ||
| ], | ||
| "parameters": [ | ||
| { | ||
| "name": "id", | ||
| "in": "path", | ||
| "required": true, | ||
| "schema": { | ||
| "type": "integer" | ||
| }, | ||
| "example": 1 | ||
| } | ||
| ], | ||
| "responses": { | ||
| "200": { | ||
| "description": "foo", | ||
| "content": { | ||
| "application/json": { | ||
| "schema": { | ||
| "$ref": "#/components/schemas/Table" | ||
| }, | ||
| "example": [ | ||
| { | ||
| "id": 1, | ||
| "name": "THIS SHOULD BE UPDATED" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "parameters": [] | ||
| } | ||
| } | ||
| }, | ||
| "components": { | ||
| "schemas": { | ||
| "Table": { | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "type": "integer", | ||
| "format": "int64" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| { | ||
| "openapi": "3.0.3", | ||
| "info": { | ||
| "title": "My API", | ||
| "version": "1.0.0" | ||
| }, | ||
| "servers": [], | ||
| "paths": { | ||
| "/tables": { | ||
| "get": { | ||
| "summary": "index", | ||
| "tags": [ | ||
| "Table" | ||
| ], | ||
| "parameters": [ | ||
| { | ||
| "name": "foo_id", | ||
| "in": "path", | ||
| "required": true, | ||
| "schema": { | ||
| "type": "integer" | ||
| }, | ||
| "example": 9999 | ||
| } | ||
| ], | ||
| "responses": { | ||
| "200": { | ||
| "description": "foo", | ||
| "content": { | ||
| "application/json": { | ||
| "schema": { | ||
| "$ref": "#/components/schemas/Table" | ||
| }, | ||
| "example": [ | ||
| { | ||
| "id": 9999, | ||
| "name": "UPDATED" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "components": { | ||
| "schemas": { | ||
| "Table": { | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "type": "integer", | ||
| "format": "int64" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| { | ||
| "paths": { | ||
| "/tables": { | ||
| "get": { | ||
| "summary": "index", | ||
| "tags": [ | ||
| "Table" | ||
| ], | ||
| "parameters": [ | ||
| { | ||
| "name": "foo_id", | ||
| "in": "path", | ||
| "required": true, | ||
| "schema": { | ||
| "type": "integer" | ||
| }, | ||
| "example": 9999 | ||
| } | ||
| ], | ||
| "responses": { | ||
| "200": { | ||
| "description": "foo", | ||
| "content": { | ||
| "application/json": { | ||
| "schema": { | ||
| "type": "object", | ||
| "properties": { | ||
| "id": { | ||
| "type": "integer" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| }, | ||
| "example": [ | ||
| { | ||
| "id": 9999, | ||
| "name": "UPDATED" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| require 'spec_helper' | ||
| require 'json' | ||
| require "rspec/openapi/schema_merger" | ||
|
|
||
| RSpec.describe "SchemaMerger" do | ||
| include SpecHelper | ||
|
|
||
| let(:base_path) do | ||
| File.expand_path('spec/rspec/schema_merger/base.json', repo_root) | ||
| end | ||
|
|
||
| let(:input_path) do | ||
| File.expand_path('spec/rspec/schema_merger/input.json', repo_root) | ||
| end | ||
|
|
||
| let(:expected_path) do | ||
| File.expand_path('spec/rspec/schema_merger/expected.json', repo_root) | ||
| end | ||
|
|
||
| it "overwrite the supported key, but leaves the unsupported keys" do | ||
| base_json = JSON.load(File.read(base_path)) | ||
| input_json = JSON.load(File.read(input_path)) | ||
| res = RSpec::OpenAPI::SchemaMerger.reverse_merge!(base_json, input_json) | ||
| expected_json = JSON.load(File.read(expected_path)) | ||
| expect(res).to eq(expected_json) | ||
| end | ||
| end |