Added Open API 3 support, Insomnia v4 support, new config file

.gitignore

@@ -1 +1,4 @@
-./swaggomnia
+config.json
+swagger.yaml
+swaggomnia
+test.json

README.md

@@ -11,8 +11,12 @@ Generate Swagger Documentation from Insomnia REST Client.
 <br />
 *This is a fork of [swaggymnia](https://github.com/mlabouardy/swaggymnia) which is now dead.*
 
-## Releases
-[![Build Status](https://travis-ci.com/Fyb3roptik/swaggomnia.svg?branch=master)](https://travis-ci.com/Fyb3roptik/swaggomnia) | [Latest Release](https://github.com/Fyb3roptik/swaggomnia/releases/latest)
+## Changelog
+
+`2.0`
+ * Open API 3 support
+ * Insomnia v4 support
+ * New Config Format
 
 ## How to use it
 
@@ -59,9 +63,7 @@ $ swaggomnia generate -i examples/watchnow.json -c examples/config.json -o json
 {
   "title" : "API Name",
   "version" : "API version",
-  "host" : "API URL",
-  "basePath" : "Base URL",
-  "schemes" : "HTTP protocol",
+  "basePath" : "https://api.domain.com/v1",
   "description" : "API description"
 }
 ```

app.go

@@ -12,7 +12,7 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "swaggonmia"
 	app.Usage = "Insomnia to Swagger converter"
-	app.Version = "1.0.1"
+	app.Version = "1.1.0"
 	app.Compiled = time.Now()
 	app.Authors = []*cli.Author{
 		&cli.Author{

examples/config.json

@@ -1,8 +1,6 @@
 {
   "title" : "WatchNow API",
   "version" : "1.0.0",
-  "host" : "api.watchnow.com",
-  "basePath" : "/v1",
-  "schemes" : "https",
+  "basePath" : "https://api.domain.com/v1",
   "description" : "This API allows you to get in real time movies playing in theatre."
 }

swagger.go

@@ -154,7 +154,7 @@ func (s Swagger) generateYAML() {
 }
 
 func fetchVariables(resource *Resource) {
-	re := regexp.MustCompile("/{(.*?)}#*")
+	re := regexp.MustCompile("/{{ (.*?) }}#*")
 	for _, param := range re.FindAllStringSubmatch(resource.URL, -1) {
 		resource.InsomniaParams = append(resource.InsomniaParams, param[1])
 	}

tmpl/swagger.yaml

@@ -1,17 +1,15 @@
-swagger: "2.0"
+openapi: 3.0.0
 info:
   description: "{{ .Config.Description }}"
   version: "{{ .Config.Version }}"
   title: "{{ .Config.Title }}"
-host: "{{ .Config.Host }}"
-basePath: "{{ .Config.BasePath }}"
+servers:
+  - url: "{{ .Config.BasePath }}"
 tags:
 {{ range $key, $value := .Entities }}
 - name: "{{ $key | GetGroupName }}"
   description: ""
 {{ end }}
-schemes:
-- "{{ .Config.Schemes }}"
 paths:
 {{- range $key, $paths := .Entities }}
 {{- range $path, $resources := $paths }}
@@ -23,28 +21,22 @@ paths:
       summary: "{{ $resource.Name }}"
       {{- if or $resource.InsomniaParams $resource.Body.Params $resource.Headers }}
       {{- if $resource.Body.MimeType }}
-      consumes:
-        - "{{ $resource.Body.MimeType }}"
+      description: "{{ $resource.Description }}"
       {{- end }}
       parameters:
       {{- range $p, $param := $resource.InsomniaParams}}
       - name: "{{ $param }}"
         in: "path"
-        type: "string"
-        description: ""
-        required: true
-      {{- end }}
-      {{- range $p, $param := $resource.Body.Params}}
-      - name: "{{ $param.Name }}"
-        in: "formData"
-        type: "string"
+        schema:
+          type: "string"
         description: ""
         required: true
       {{- end }}
       {{- range $p, $param := $resource.Headers}}
       - name: "{{ $param.Name }}"
         in: "header"
-        type: "string"
+        schema:
+          type: "string"
         description: ""
         required: true
       {{- end }}