nutella_framework 0.6.19 → 0.6.20

data/framework_components/roomcast-teacher-controls/dist/nutella_lib.js

@@ -29,11 +29,11 @@ nutella.version = nutella_version.version;
  * @param {string} run_id - the run_id this component is launched in
  * @param {string} component_id - the name of this component
  */
-nutella.init = function(broker_hostname, app_id, run_id, component_id) {
+nutella.init = function(broker_hostname, app_id, run_id, component_id, done_cb) {
     if (broker_hostname===undefined || app_id===undefined || run_id===undefined || component_id=== undefined) {
         console.warn("Couldn't initialize nutella. Make sure you are setting all four required parameters (broker_hostname, app_id, run_id, component_id)");
     }
-    return new nutella_i.RunNutellaInstance(broker_hostname, app_id, run_id, component_id);
+    return new nutella_i.RunNutellaInstance(broker_hostname, app_id, run_id, component_id, done_cb);
 };
 
 
@@ -46,11 +46,11 @@ nutella.init = function(broker_hostname, app_id, run_id, component_id) {
  * @param {string} app_id - the app_id this component belongs to
  * @param {string} component_id - the name of this component
  */
-nutella.initApp = function(broker_hostname, app_id, component_id) {
+nutella.initApp = function(broker_hostname, app_id, component_id, done_cb) {
     if (broker_hostname===undefined || app_id===undefined || component_id=== undefined) {
         console.warn("Couldn't initialize nutella. Make sure you are setting all three required parameters (broker_hostname, app_id, component_id)");
     }
-    return new nutella_i.AppNutellaInstance(broker_hostname, app_id, component_id);
+    return new nutella_i.AppNutellaInstance(broker_hostname, app_id, component_id, done_cb);
 };
 
 
@@ -62,11 +62,11 @@ nutella.initApp = function(broker_hostname, app_id, component_id) {
  * @param {string} broker_hostname - the hostname of the broker.*
  * @param {string} component_id - the name of this component
  */
-nutella.initFramework = function(broker_hostname, component_id) {
+nutella.initFramework = function(broker_hostname, component_id, done_cb) {
     if (broker_hostname===undefined || component_id=== undefined) {
         console.warn("Couldn't initialize nutella. Make sure you are setting all two required parameters (broker_hostname, component_id)");
     }
-    return new nutella_i.FrNutellaInstance(broker_hostname, component_id);
+    return new nutella_i.FrNutellaInstance(broker_hostname, component_id, done_cb);
 };
 
 
@@ -1648,9 +1648,9 @@ var LocationSubModule = require('./run_location');
  * @param {string} broker_hostname - the hostname of the broker.
  * @param {string} component_id - the name of this component
  */
-var RunNutellaInstance = function (broker_hostname, app_id, run_id, component_id) {
+var RunNutellaInstance = function (broker_hostname, app_id, run_id, component_id, done_cb) {
     //Initialize parameters
-    this.mqtt_client = new SimpleMQTTClient(broker_hostname);
+    this.mqtt_client = new SimpleMQTTClient(broker_hostname, done_cb);
     this.appId = app_id;
     this.runId = run_id;
     this.componentId = component_id;
@@ -1681,9 +1681,9 @@ RunNutellaInstance.prototype.setResourceId = function(resource_id){
  * @param {string} broker_hostname - the hostname of the broker.
  * @param {string} component_id - the name of this component
  */
-var AppNutellaInstance = function (broker_hostname, app_id, component_id) {
+var AppNutellaInstance = function (broker_hostname, app_id, component_id, done_cb) {
     //Initialize parameters
-    this.mqtt_client = new SimpleMQTTClient(broker_hostname);
+    this.mqtt_client = new SimpleMQTTClient(broker_hostname, done_cb);
     this.appId = app_id;
     this.componentId = component_id;
     // Initialized the various sub-modules
@@ -1720,9 +1720,9 @@ AppNutellaInstance.prototype.setResourceId = function(resource_id){
  * @param {string} broker_hostname - the hostname of the broker.
  * @param {string} component_id - the name of this component
  */
-var FrNutellaInstance = function (broker_hostname, component_id) {
+var FrNutellaInstance = function (broker_hostname, component_id, done_cb) {
     //Initialize parameters
-    this.mqtt_client = new SimpleMQTTClient(broker_hostname);
+    this.mqtt_client = new SimpleMQTTClient(broker_hostname, done_cb);
     this.componentId = component_id;
     // Initialize the various sub-modules
     this.f = new FrSubModule(this);
@@ -2358,21 +2358,17 @@ var mqtt_lib = require('./paho/mqttws31');
  * Defines a Simple MQTT client.
  *
  * @param {string} host - the hostname of the broker.
- * @param {string} [clientId]  - the unique name of this client. If no ID is provided a random one is generated
+ * @param {function} [err_cb] - optional callback fired whenever an error occurs
  */
-var SimpleMQTTClient = function (host, clientId) {
+var SimpleMQTTClient = function (host, done_cb) {
     // Initializes the object that stores subscriptions
     this.subscriptions = {};
     // Initializes the object that holds the internal client
     this.client = {};
     // Functions backlog
     this.backlog = [];
-    // Handles the optional clientId parameter
-    if (arguments.length === 1 || clientId === undefined) {
-        clientId = generateRandomClientId();
-    }
     // Connect
-    this.client = connectBrowser(this.subscriptions, this.backlog, host, clientId);
+    this.client = connectBrowser(this.subscriptions, this.backlog, host, done_cb);
 };
 
 //
@@ -2391,9 +2387,9 @@ function generateRandomClientId() {
 //
 // Helper function that connects the MQTT client in the browser
 //
-function connectBrowser (subscriptions, backlog, host, clientId) {
+function connectBrowser (subscriptions, backlog, host, done_cb) {
     // Create client
-    var client = new mqtt_lib.Client(host, Number(1884), clientId);
+    var client = new mqtt_lib.Client(host, Number(1884), generateRandomClientId());
     // Register callback for connection lost
     client.onConnectionLost = function() {
         // TODO try to reconnect
@@ -2415,11 +2411,21 @@ function connectBrowser (subscriptions, backlog, host, clientId) {
     };
     // Connect
     client.connect({onSuccess: function() {
+        // Execute optional done callback passing true
+        if (done_cb!==undefined)
+            done_cb(true);
         // Execute the backlog of operations performed while the client wasn't connected
         backlog.forEach(function(e) {
             e.op.apply(this, e.params);
         });
-    }});
+    },
+        onFailure: function() {
+            // Execute optional done callback passing false
+            if (done_cb!==undefined)
+                done_cb(false);
+            else
+                console.error('There was a problem initializing nutella.');
+        }});
     return client;
 }
 
@@ -4972,6 +4978,7 @@ AbstractNet.prototype.request_to = function( channel, message, callback, appId,
 AbstractNet.prototype.handle_requests_on = function( channel, callback, appId, runId, done_callback) {
     // Save nutella reference
     var nut = this.nutella;
+    var abstract_net = this;
     // Pad channel
     var padded_channel = this.pad_channel(channel, appId, runId);
     var mqtt_cb = function(request) {
@@ -4981,7 +4988,7 @@ AbstractNet.prototype.handle_requests_on = function( channel, callback, appId, r
             // Only handle requests that have proper id set
             if(f.type!=='request' || f.id===undefined) return;
             // Execute callback and send response
-            var m = this.prepare_message_for_response(callback(f.payload, f.from), f.id);
+            var m = abstract_net.prepare_message_for_response(callback(f.payload, f.from), f.id);
             nut.mqtt_client.publish( padded_channel, m );
         } catch(e) {
             if (e instanceof SyntaxError) {
@@ -5116,6 +5123,6 @@ AbstractNet.prototype.prepare_message_for_response = function (response, id) {
 // Export module
 module.exports = AbstractNet;
 },{}],17:[function(require,module,exports){
-module.exports.version = '0.5.7';
+module.exports.version = '0.5.10';
 },{}]},{},[1])(1)
 });

data/framework_components/roomcast-teacher-controls/index.html

@@ -12,18 +12,6 @@
 
 <body>
 
-<!-- Nutella -->
-<script src="dist/nutella_lib.js" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript">
-
-    // Parse the query parameters
-    var query_parameters = NUTELLA.parseURLParameters();
-
-    // Get an instance of nutella.
-    var nutella = NUTELLA.init(query_parameters.broker, query_parameters.app_id, query_parameters.run_id, 'roomcast-teacher-interface');
-
-</script>
-
 <!-- This script adds the Roboto font to our project. For more detail go to this site:  http://www.google.com/fonts#UsePlace:use/Collection:Roboto:400,300,500 -->
 <script>
     var WebFontConfig = {

data/framework_components/roomcast-teacher-controls/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "d3": "^3.5.5",
     "material-ui": "^0.7.0",
-    "nutella_lib": "^0.5.1",
+    "nutella_lib": "^0.5.10",
     "react": "^0.13.0",
     "react-tap-event-plugin": "^0.1.3"
   }

data/framework_components/roomcast-teacher-controls/src/app/app.js

@@ -3,20 +3,26 @@
 
     var React = require('react'),
         injectTapEventPlugin = require("react-tap-event-plugin"),
-        Main = require('./components/main.js'); // Our custom react component
+        Main = require('./components/main.js'), // Our custom react component
+        NUTELLA = require('nutella_lib');
 
     //Needed for React Developer Tools
     window.React = React;
 
-    //Needed for onTouchTap
-    //Can go away when react 1.0 release
-    //Check this repo:
-    //https://github.com/zilverline/react-tap-event-plugin
     injectTapEventPlugin();
 
-    // Render the main app react component into the document body.
-    // For more details see: https://facebook.github.io/react/docs/top-level-api.html#react.render
-    //window.ReactMain = 'Main component';
-    window.ReactMain = React.render(<Main />, document.body);
+    var query_parameters = NUTELLA.parseURLParameters();
+    if(query_parameters.broker) {
+        window.nutella = NUTELLA.init(query_parameters.broker, query_parameters.app_id, query_parameters.run_id, 'roomcast-teacher-controls', function(connected) {
+            if(connected) {
+                window.ReactMain = React.render( <Main /> , document.body);
+            }
+        });
+    } else {
+        // for debugging purposes - works with tests outside of nutella
+        window.nutella = NUTELLA.init('ltg.evl.uic.edu', 'wallcology', '6BAM', 'roomcast-teacher-controls', function(connected) {
+            window.ReactMain = React.render( <Main /> , document.body);
+        });
+    }
 
 })();

data/framework_components/roomcast-teacher-controls/src/app/components/ActivityCard.js

@@ -151,13 +151,13 @@ var ActivityCard = React.createClass({
                     cardStyle[p] = selectedCardStyle[p];
                 }
             }
-            timer = this.formatTimer(this.props.timer);
+            timer = <span>{this.formatTimer(this.props.timer)}</span>;
             spanStyle = {
                 width: this.props.cardStyle.width,
                 textAlign: 'center',
                 fontWeight: '400',
-                fontSize: '2.6em',
-                marginBottom: '20px'};
+                fontSize: '2.6em'
+            };
         }
 
         return (
@@ -168,8 +168,10 @@ var ActivityCard = React.createClass({
 
                 <div className='card-name'>
 
-                    <span style={spanStyle} >{this.props.configName}</span>
-                    <span>{timer}</span>
+                    <div className='card-text'>
+                        <span style={spanStyle} >{this.props.configName}</span>
+                        {timer}
+                    </div>
 
                 </div>
 

data/framework_components/roomcast-teacher-controls/src/app/components/NutellaMixin.js

@@ -1,3 +1,4 @@
+var NUTELLA = require('nutella_lib');
 
 var NutellaMixin = {
 

data/framework_components/roomcast-teacher-controls/src/less/main.less

@@ -70,21 +70,31 @@ html, body {
         height: 100%;
         width: 100%;
         position: absolute;
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
+        //display: flex;
+        //flex-direction: row;
+        //flex-wrap: wrap;
         justify-content: center;
         align-items: center;
         align-content: center;
+        display: table;
+        text-align: center;
+
+        .card-text {
+          display: table-cell;
+          vertical-align: middle;
+        }
 
         span {
           font-size: 2em;
           font-weight: 300;
+          display: block;
+          line-height: 1.2em;
+          padding: 10px;
 
           // flex item properties
-          flex-grow: 0;
-          flex-shrink: 0;
-          flex-basis: main-size;
+          //flex-grow: 0;
+          //flex-shrink: 0;
+          //flex-basis: main-size;
         }
       }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutella_framework
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.20
 platform: ruby
 authors:
 - Alessandro Gnoli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic