Merge 753acf1 into de43ddd

.travis.yml

@@ -0,0 +1,17 @@
+language: node_js
+node_js:
+    - "lts/*"
+sudo: false
+addons:
+    chrome: stable
+    firefox: latest-esr
+
+before_install:
+    - npm install grunt-cli -g
+
+script:
+    - xvfb-run grunt ci
+
+branches:
+    only:
+        - master

Gruntfile.js

@@ -56,6 +56,12 @@ module.exports = function (grunt) {
             }
         },
 
+        coveralls: {
+            library: {
+                src: 'build/coverage/lcov/lcov.info',
+            }
+        },
+
         strip_code: {
             multiple_files: {
                 src: ['build/src/js/**/*.js']
@@ -124,6 +130,8 @@ module.exports = function (grunt) {
                     }
                 },
                 files: [
+                    'tests/helpers/ace.js',
+                    'tests/helpers/StyledElements.min.js',
                     'node_modules/mock-applicationmashup/dist/MockMP.js',
                     'src/js/*.js',
                     'tests/js/*Spec.js'
@@ -191,13 +199,13 @@ module.exports = function (grunt) {
     grunt.registerTask('test', [
         'bower:install',
         'eslint',
-        //        'karma:widget'
+        'karma:widget'
     ]);
 
     grunt.registerTask('ci', [
         'bower:install',
         'eslint',
-        //        'karma:widgetci',
+        'karma:widgetci',
         'coveralls'
     ]);
 

README.md

@@ -1,6 +1,11 @@
 # json-injector widget
 
-The json-injector widget is a WireCloud widget that provides ...
+[![](https://nexus.lab.fiware.org/repository/raw/public/badges/chapters/visualization.svg)](https://www.fiware.org/developers/catalogue/)
+[![License: MIT](https://img.shields.io/github/license/lets-fiware/json-injector.svg)](https://opensource.org/licenses/MIT)<br/>
+[![Build Status](https://travis-ci.org/lets-fiware/json-injector.svg?branch=master)](https://travis-ci.org/lets-fiware/json-injector)
+[![Coverage Status](https://coveralls.io/repos/github/lets-fiware/json-injector/badge.svg?branch=master)](https://coveralls.io/github/lets-fiware/json-injector?branch=master)
+
+The json-injector widget is a WireCloud widget that allows you to send Json data to an output endpoint.
 
 Build
 -----

package.json

@@ -20,7 +20,7 @@
     "karma-firefox-launcher": "^1.2.0",
     "karma-jasmine": "^2.0.1",
     "karma-junit-reporter": "^2.0.1",
-    "mock-applicationmashup": "^1.0.0-d",
+    "mock-applicationmashup": "^1.0.0-g",
     "wirecloud-config-parser": "^0.2.2"
   },
   "private": true,

src/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<widget xmlns="http://wirecloud.conwet.fi.upm.es/ns/macdescription/1" vendor="FISUDA" name="json-injector" version="0.1.4">
+<widget xmlns="http://wirecloud.conwet.fi.upm.es/ns/macdescription/1" vendor="FISUDA" name="json-injector" version="0.1.5">
 
     <details>
         <title>Json Injector</title>

src/css/styles.css

@@ -3,13 +3,22 @@
     border: 1px solid rgb(231, 231, 231);
 }
 
+.header > h4 {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.type-selector {
+    flex-grow: 1;
+}
+
 .text-primary {
-    margin-left: 10px;
-    margin-right: 10px;
+    margin: 5px;
 }
 
-.text-primary > .se-select {
-    margin-bottom: 0px;
+.se-select {
+    margin: 3px;
 }
 
 #buttons {
@@ -18,4 +27,4 @@
 
 .acecontainer {
     padding: 2px;
-}
+}

src/js/JsonInjector.js

@@ -7,17 +7,12 @@
  */
 
 /* exported JsonInjector */
-/* global $, ace, MashupPlatform, StyledElements */
+/* global ace, MashupPlatform, StyledElements */
 
 var JsonInjector = (function () {
 
     'use strict';
 
-    var layout;
-    var editor;
-    var typeSelector;
-    var sendbtn;
-
     // =========================================================================
     // CLASS DEFINITION
     // =========================================================================
@@ -27,14 +22,7 @@ var JsonInjector = (function () {
         const editorData = 'JsonInjector-data-' + title + MashupPlatform.widget.id;
         const editorMode = 'JsonInjector-mode-' + title + MashupPlatform.widget.id;
 
-        layout = new StyledElements.VerticalLayout();
-        layout.insertInto(document.body);
-        layout.north.addClassName('header');
-        layout.north.appendChild(new StyledElements.Fragment('<h4 class="text-primary">Type: <span id="type-data">No data</span><div id="buttons"></div></h4>'));
-
-        var typed = $('#type-data')[0];
-        var parent = typed.parentNode;
-        parent.removeChild(typed);
+        var builder = new StyledElements.GUIBuilder();
 
         var entries = [
             {label: 'JSON - (Text)', value: 'JSON - (Text)'},
@@ -54,21 +42,27 @@ var JsonInjector = (function () {
             return '';
         }
 
-        typeSelector = new StyledElements.Select();
+        var typeSelector = new StyledElements.Select();
         typeSelector.addEntries(entries);
         typeSelector.setValue(sessionStorage.getItem(editorMode) || 'JSON - (Object)');
         typeSelector.addEventListener('change', () => {
             const mode = typeSelector.getValue();
             editor.session.setMode(getEditorMode(mode));
             sessionStorage.setItem(editorMode, mode);
         });
-        typeSelector.insertInto(parent);
+
+        var buttons = document.createElement('div');
+        buttons.className = "buttons";
 
         var action_buttons = document.createElement('div');
         action_buttons.className = 'btn-group';
-        document.getElementById('buttons').appendChild(action_buttons);
+        buttons.appendChild(action_buttons);
 
-        sendbtn = new StyledElements.Button({'class': 'btn-info', 'iconClass': 'fa fa-play', 'title': 'Output data'});
+        var sendbtn = new StyledElements.Button({
+            iconClass: 'fa fa-play',
+            state: 'info',
+            title: 'Output data'
+        });
         sendbtn.addEventListener('click', () => {
             if (MashupPlatform.widget.outputs.output.connected) {
                 var value = editor.getValue();
@@ -80,10 +74,21 @@ var JsonInjector = (function () {
         });
         sendbtn.insertInto(action_buttons);
 
+        var layout = new StyledElements.VerticalLayout();
+        layout.insertInto(document.body);
+        layout.north.addClassName('header');
+        layout.north.appendChild(builder.parse(
+            builder.DEFAULT_OPENING + '<h4 class="text-primary"><div class="type-selector">Type: <t:typeSelector/></div><t:buttons/></h4>' + builder.DEFAULT_CLOSING,
+            {
+                buttons: buttons,
+                typeSelector: typeSelector
+            }
+        ));
+
         layout.center.addClassName('acecontainer');
-        editor = ace.edit(layout.center.wrapperElement);
+        var editor = ace.edit(layout.center.wrapperElement);
         editor.setFontSize(14);
-        editor.session.setMode(getEditorMode(sessionStorage.getItem(editorMode)));
+        editor.session.setMode(getEditorMode(sessionStorage.getItem(editorMode)) || 'ace/mode/json');
         editor.session.setTabSize(2);
         editor.setValue(sessionStorage.getItem(editorData) || '');
         editor.session.on('change', (e) => {

tests/helpers/ace.js

@@ -0,0 +1,19 @@
+(function () {
+
+    "use strict";
+
+    window.ace = {
+        edit: function () {
+            return {
+                setFontSize: function () {},
+                setValue: function () {},
+                session: {
+                    setMode: function () {},
+                    setTabSize: function () {},
+                    on: function () {}
+                }
+            }
+        }
+    };
+
+})();

tests/js/JsonInjectorSpec.js

@@ -18,7 +18,9 @@
 
         beforeAll(function () {
             window.MashupPlatform = new MockMP({
-                type: 'widget'
+                type: 'widget',
+                inputs: ['input'],
+                outputs: ['output']
             });
         });