any2api-generator-soap - npm Package Compare versions

Comparing version 0.1.9 to 0.1.10

lib/Generator.js

@@ -66,3 +66,3 @@ var path = require('path');
         apiSpec.implementation.wsdl_ns_prefix = apiSpec.implementation.wsdl_ns_prefix || 'SOAP-API';
-        apiSpec.implementation.wsdl_doc = ''; //TODO: implementation.title, implementation.description
+        apiSpec.implementation.wsdl_doc = ''; //TODO: implementation.title, implementation.description; string ']]>' is not allowed!
 
@@ -86,3 +86,3 @@ var names = [];
 
-            if (!_.isEmpty(def.description)) def.wsdl_doc += 'Description: ' + def.description + '\n\n';
+            if (!_.isEmpty(def.description)) def.wsdl_doc += 'Description: ' + def.description;
             if (!_.isEmpty(def.default)) {
@@ -123,6 +123,6 @@ if (S(def.type).toLowerCase().contains('json')) {
 
-            def.wsdl_doc = def.wsdl_doc.trim();
+            def.wsdl_doc = def.wsdl_doc.trim(); //TODO: string ']]>' is not allowed!
 
             if (_.isEmpty(def.wsdl_doc)) delete def.wsdl_doc;
-            //else def.wsdl_doc = _.escape(def.wsdl_doc);
+            //def.wsdl_doc = _.escape(def.wsdl_doc);
           });
@@ -144,2 +144,7 @@ };
 
+            item.wsdl_porttype_name = item.wsdl_name + 'PortType';
+            item.wsdl_soapbinding_name = item.wsdl_name + 'SoapBinding';
+            item.wsdl_port_name = item.wsdl_name + 'Port';
+            item.wsdl_service_name = item.wsdl_name + 'Service';
+
             enrichSchema(item.parameters_schema, item.wsdl_name);
@@ -146,0 +151,0 @@ enrichSchema(item.results_schema, item.wsdl_name);

package.json

 {
   "name": "any2api-generator-soap",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "author": "Johannes Wettinger <[e-mail]>",
@@ -5,0 +5,0 @@ "description": "SOAP/WSDL API implementation generator for any2api",

tpl/impl/app.js

@@ -18,3 +18,3 @@ var path = require('path');
 var port = process.env.PORT || 3000;
-var baseAddress = process.env.BASE_ADDRESS || 'http://localhost:' + port;
+var baseAddress = process.env.BASE_ADDRESS || 'http://0.0.0.0:' + port;
 var timeout = process.env.TIMEOUT || 5 * 60 * 1000; // 5mins
@@ -172,4 +172,4 @@
       var port = {};
-      port[collection] = {};
-      port[collection][item.wsdl_name] = {
+      port[item.wsdl_service_name] = {};
+      port[item.wsdl_service_name][item.wsdl_port_name] = {
         invoke: _.bind(function(input, callback, headers) {
@@ -194,3 +194,3 @@ debug('wsdl_name', item.wsdl_name);
 
-      soap.listen(server, '/' + collection + '/' + item.wsdl_name, port, wsdl);
+      soap.listen(server, '/' + item.wsdl_service_name + '/' + item.wsdl_port_name, port, wsdl);
     });
@@ -197,0 +197,0 @@ });

tpl/impl/test/mintest.js

@@ -38,3 +38,3 @@ var chai = require('chai');
 
-  var executableNames = [];
+  var endpoints = [];
 
@@ -48,3 +48,3 @@ before('get executables', function(done) {
       _.each(apiSpec.executables, function(executable, name) {
-        executableNames.push(executable.wsdl_name);
+        endpoints.push({ service: executable.wsdl_service_name, port: executable.wsdl_port_name });
       });
@@ -58,6 +58,6 @@
     if (appListening) {
-      performRequests(executableNames, done);
+      performRequests(endpoints, done);
     } else {
       app.on('listening', function() {
-        performRequests(executableNames, done);
+        performRequests(endpoints, done);
       });
@@ -78,6 +78,6 @@ }
 
-var performRequests = function(executableNames, done) {
-  async.eachSeries(executableNames, function(name, done) {
+var performRequests = function(endpoints, done) {
+  async.eachSeries(endpoints, function(endpoint, done) {
     soap.createClient(baseUrl, options, function(err, client) {
-      client.executables[name].invoke(input, function(err, output) {
+      client[endpoint.service][endpoint.port].invoke(input, function(err, output) {
         if (err) return done(err);
@@ -84,0 +84,0 @@

No alert changes

Improved metrics

Total package byte prevSize

24253

increased by0.3%

Lines of code

359

increased by1.13%

No dependency changes