Us 4981

Dockerfile

@@ -10,4 +10,4 @@ WORKDIR /local
 
 RUN bundle install --system
 
-RUN npm install -g widdershins@3.6.6 node-fetch@2.2.0 json-stable-stringify@1.0.1 swagger-cli@2.2.1
+RUN npm install -g widdershins@3.6.6 node-fetch@2.2.0 json-stable-stringify@1.0.1 swagger-cli@4.0.3

domotz_gen.js

@@ -2,11 +2,12 @@ const converter = require('widdershins');
 const fs = require('fs');
 const fetch = require('node-fetch');
 const childProcess = require('child_process');
-// const apiDefBaseUrl = 'https://api-testing-eu-central-1-cell-1.domotz.nl';
-const apiDefBaseUrl = 'https://api-staging-eu-central-1-cell-1.domotz.co';
+const apiDefBaseUrl = 'https://api-testing-eu-central-1-cell-1.domotz.nl';
+// const apiDefBaseUrl = 'https://api-staging-eu-central-1-cell-1.domotz.co';
 // const apiDefBaseUrl = 'https://api.domotz.de';
 // const apiDefBaseUrl = 'http://172.17.0.1:8888';
-const apiDefDocUrl = 'your-domotz-api-endpoint';
+// const apiDefBaseUrl = 'http://192.168.77.5:8888';
+
 var stringify = require('json-stable-stringify');
 const tmpFile = '/tmp/domotz_api.json';
 
@@ -20,7 +21,7 @@ try {
 } catch (e) {
   validationError = true;
 }
-
+let apiDefDocUrl = '{baseURL}'
 
 let options = {};
 options.user_templates = './domotz_templates';

domotz_gen.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-docker run -w /local -v ${PWD}:/local -it registry.domotz.com/domotz/domotz_slate:1.0.2 \
+docker run -w /local -v ${PWD}:/local -it registry.domotz.com/domotz/domotz_slate:1.0.3 \
              bash -c 'export NODE_PATH="$(npm config get prefix)/lib/node_modules" && node domotz_gen.js && bundle exec middleman build'

domotz_templates/main.dot

@@ -4,23 +4,8 @@
 
 {{? data.api.info.description}}{{=data.api.info.description}}{{?}}
 
-{{? data.api.servers }}
-Base URLs:
-{{~data.api.servers :s}}
-* <a href="{{=s.url}}">{{=s.url}}</a>
-{{ for(var v in s.variables) { }}
-    * **{{=v}}** - {{=s.variables[v].description||''}} Default: {{=s.variables[v].default}}
-{{? s.variables[v].enum}}
-{{~ s.variables[v].enum :e}}
-        * {{= e}}
-{{~}}
-{{?}}
-{{ } }}
-{{~}}
-{{?}}
-
 {{? data.api.info.termsOfService}}<a href="{{=data.api.info.termsOfService}}">Terms of service</a>{{?}}
-{{? data.api.info.contact}}{{? data.api.info.contact.email}}Email: <a href="mailto:{{=data.api.info.contact.email}}">{{=data.api.info.contact.name || 'Support'}}</a> {{?}}{{? data.api.info.contact.url}}Web: <a href="{{=data.api.info.contact.url}}">{{= data.api.info.contact.name || 'Support'}}</a> {{?}}{{?}}
+{{? data.api.info.contact}}{{? data.api.info.contact.email}}<br><a href="mailto:{{=data.api.info.contact.email}}">{{=data.api.info.contact.name || 'Support'}}</a> {{?}}{{? data.api.info.contact.url}}Web: <a href="{{=data.api.info.contact.url}}">{{= data.api.info.contact.name || 'Support'}}</a> {{?}}{{?}}
 {{? data.api.info.license}}{{? data.api.info.license.url}}License: <a href="{{=data.api.info.license.url}}">{{=data.api.info.license.name}}</a>{{??}} License: {{=data.api.info.license.name}}{{?}}{{?}}
 
 {{? data.api.components && data.api.components.securitySchemes }}