Support loading specifications from YAML files (#67)

* Add macos/ JetBrains IDE git ignores

* Enable loading from YAML specifications

.gitignore

@@ -12,3 +12,10 @@
 
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
+
+ # Macos file system
+.DS_Store
+
+ # IntelliJ / GoLand
+.idea
+

openapi3/swagger_loader.go

@@ -2,7 +2,6 @@ package openapi3
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -90,26 +89,18 @@ func (swaggerLoader *SwaggerLoader) LoadSwaggerFromFile(path string) (*Swagger,
 
 func (swaggerLoader *SwaggerLoader) LoadSwaggerFromData(data []byte) (*Swagger, error) {
 	swagger := &Swagger{}
-	if err := json.Unmarshal(data, swagger); err != nil {
+	if err := yaml.Unmarshal(data, swagger); err != nil {
 		return nil, err
 	}
 	return swagger, swaggerLoader.ResolveRefsIn(swagger, nil)
 }
 
 func (swaggerLoader *SwaggerLoader) LoadSwaggerFromDataWithPath(data []byte, path *url.URL) (*Swagger, error) {
-	swagger := &Swagger{}
-	if err := json.Unmarshal(data, swagger); err != nil {
-		return nil, err
-	}
-	return swagger, swaggerLoader.ResolveRefsIn(swagger, path)
-}
-
-func (swaggerLoader *SwaggerLoader) LoadSwaggerFromYAMLData(data []byte) (*Swagger, error) {
 	swagger := &Swagger{}
 	if err := yaml.Unmarshal(data, swagger); err != nil {
 		return nil, err
 	}
-	return swagger, swaggerLoader.ResolveRefsIn(swagger, nil)
+	return swagger, swaggerLoader.ResolveRefsIn(swagger, path)
 }
 
 func (swaggerLoader *SwaggerLoader) ResolveRefsIn(swagger *Swagger, path *url.URL) (err error) {

openapi3/swagger_loader_test.go

@@ -56,7 +56,7 @@ paths:
 `)
 
 	loader := openapi3.NewSwaggerLoader()
-	doc, err := loader.LoadSwaggerFromYAMLData(spec)
+	doc, err := loader.LoadSwaggerFromData(spec)
 	require.NoError(t, err)
 	require.Equal(t, "An API", doc.Info.Title)
 	require.Equal(t, 2, len(doc.Components.Schemas))
@@ -123,7 +123,7 @@ paths:
                 test:
                   $ref: '#/components/examples/test'`)
 	loader := openapi3.NewSwaggerLoader()
-	doc, err := loader.LoadSwaggerFromYAMLData(source)
+	doc, err := loader.LoadSwaggerFromData(source)
 	require.NoError(t, err)
 
 	err = doc.Validate(loader.Context)
@@ -224,7 +224,7 @@ paths:
 `)
 
 	loader := openapi3.NewSwaggerLoader()
-	_, err := loader.LoadSwaggerFromYAMLData(spec)
+	_, err := loader.LoadSwaggerFromData(spec)
 	require.Error(t, err)
 }
 
@@ -252,7 +252,7 @@ paths:
 `)
 
 	loader := openapi3.NewSwaggerLoader()
-	swagger, err := loader.LoadSwaggerFromYAMLData(spec)
+	swagger, err := loader.LoadSwaggerFromData(spec)
 	require.NoError(t, err)
 
 	require.NotNil(t, swagger.Paths["/"].Parameters[0].Value)
@@ -284,7 +284,7 @@ paths:
 `)
 
 	loader := openapi3.NewSwaggerLoader()
-	swagger, err := loader.LoadSwaggerFromYAMLData(spec)
+	swagger, err := loader.LoadSwaggerFromData(spec)
 	require.NoError(t, err)
 
 	require.NotNil(t, swagger.Paths["/"].Post.RequestBody.Value.Content.Get("application/json").Examples["test"])
@@ -405,3 +405,21 @@ func TestLoadFromDataWithExternalRequestResponseHeaderRemoteRef(t *testing.T) {
 	require.NotNil(t, swagger.Paths["/test"].Post.Responses["default"].Value.Headers["X-TEST-HEADER"].Value.Description)
 	require.Equal(t, "description", swagger.Paths["/test"].Post.Responses["default"].Value.Headers["X-TEST-HEADER"].Value.Description)
 }
+
+func TestLoadYamlFile(t *testing.T) {
+	loader := openapi3.NewSwaggerLoader()
+	loader.IsExternalRefsAllowed = true
+	swagger, err := loader.LoadSwaggerFromFile("testdata/test.openapi.yml")
+	require.NoError(t, err)
+
+	require.Equal(t, "OAI Specification in YAML", swagger.Info.Title)
+}
+
+func TestLoadYamlFileWithExternalSchemaRef(t *testing.T) {
+	loader := openapi3.NewSwaggerLoader()
+	loader.IsExternalRefsAllowed = true
+	swagger, err := loader.LoadSwaggerFromFile("testdata/testref.openapi.yml")
+	require.NoError(t, err)
+
+	require.NotNil(t, swagger.Components.Schemas["AnotherTestSchema"].Value.Type)
+}

openapi3/swagger_test.go

@@ -65,7 +65,7 @@ func TestRefsYAML(t *testing.T) {
 	err = loader.ResolveRefsIn(docA, nil)
 	require.NoError(t, err)
 	t.Log("Resolve refs in marshalled *openapi3.Swagger")
-	docB, err := loader.LoadSwaggerFromYAMLData(data)
+	docB, err := loader.LoadSwaggerFromData(data)
 	require.NoError(t, err)
 	require.NotEmpty(t, docB)
 

openapi3/testdata/components.openapi.yml

@@ -0,0 +1,44 @@
+---
+openapi: 3.0.0
+info:
+  title: ''
+  version: '1'
+paths: {}
+components:
+  schemas:
+    Name:
+      type: string
+    CustomTestSchema:
+      "$ref": "#/components/schemas/Name"
+  responses:
+    Name:
+      description: description
+    CustomTestResponse:
+      "$ref": "#/components/responses/Name"
+  parameters:
+    Name:
+      name: id
+      in: header
+    CustomTestParameter:
+      "$ref": "#/components/parameters/Name"
+  examples:
+    Name:
+      description: description
+    CustomTestExample:
+      "$ref": "#/components/examples/Name"
+  requestBodies:
+    Name:
+      content: {}
+    CustomTestRequestBody:
+      "$ref": "#/components/requestBodies/Name"
+  headers:
+    Name:
+      description: description
+    CustomTestHeader:
+      "$ref": "#/components/headers/Name"
+  securitySchemes:
+    Name:
+      type: cookie
+      description: description
+    CustomTestSecurityScheme:
+      "$ref": "#/components/securitySchemes/Name"

openapi3/testdata/test.openapi.yml

@@ -0,0 +1,10 @@
+---
+openapi: 3.0.0
+info:
+  title: 'OAI Specification in YAML'
+  version: 0.0.1
+paths: {}
+components:
+  schemas:
+    TestSchema:
+      type: string

openapi3/testdata/testref.openapi.yml

@@ -0,0 +1,10 @@
+---
+openapi: 3.0.0
+info:
+  title: 'OAI Specification w/ refs in YAML'
+  version: '1'
+paths: {}
+components:
+  schemas:
+    AnotherTestSchema:
+      "$ref": components.openapi.yml#/components/schemas/CustomTestSchema