Extend GadgetIndex API.

Extend addGadget API to include a mandatory ID.
Improve handling of data-gadget-source and data-gadget-handler and add a
test for this.

renderjs.js

@@ -102,7 +102,7 @@ var RenderJs = (function () {
              * Load gadget's SPECs from URL
              */
             var url, gadget_id, gadget_property, cacheable, cache_id,
-                app_cache, data, gadget_js;
+                app_cache, data, gadget_js, is_update_gadget_data_running;
             url = gadget.attr("data-gadget");
             gadget_id = gadget.attr("id");
             gadget_js = RenderJs.GadgetIndex.getGadgetById(gadget_id);
@@ -176,8 +176,12 @@ var RenderJs = (function () {
                 // gadget is an inline (InteractorGadget or one using
                 // data-gadget-source / data-gadget-handler) so no need
                 // to load it from network
-                RenderJs.updateGadgetData(gadget);
-                gadget_js.setReady();
+                is_update_gadget_data_running = RenderJs.updateGadgetData(gadget);
+                if (!is_update_gadget_data_running){
+                  // no update is running so gadget is basically ready
+                  // if update is running then it should take care and set status
+                  gadget_js.setReady();
+                }
                 RenderJs.checkAndTriggerReady();
             }
         },
@@ -216,6 +220,7 @@ var RenderJs = (function () {
                         trigger("ready");
                     // trigger ready on root body element
                     $("body").trigger("ready");
+                    // this set will make sure we fire this event only once
                     RenderJs.setReady(true);
                 }
             }
@@ -235,18 +240,30 @@ var RenderJs = (function () {
                 $.ajax({
                     url: data_source,
                     dataType: "json",
-                    yourCustomData: {"data_handler": data_handler},
+                    yourCustomData: {"data_handler": data_handler,
+                                     "gadget_id": gadget.attr("id")},
                     success: function (result) {
-                              var data_handler;
+                              var data_handler, gadget_id;
                               data_handler = this.yourCustomData.data_handler;
+                              gadget_id = this.yourCustomData.gadget_id;
                               if (data_handler !== undefined) {
-                                  eval(data_handler + "(result)");}
+                                  // eval is not nice to use
+                                  eval(data_handler + "(result)");
+                                  gadget = RenderJs.GadgetIndex.getGadgetById(gadget_id);
+                                  // mark gadget as loaded and fire a check
+                                  // to see if all gadgets are loaded
+                                  gadget.setReady();
+                                  RenderJs.checkAndTriggerReady();
+                              }
                              }
                 });
+                // asynchronous update happens and respective thread will update status
+                return true;
             }
+            return false;
         },
 
-        addGadget: function (dom_id, gadget, gadget_data_handler,
+        addGadget: function (dom_id, gadget_id, gadget, gadget_data_handler,
                             gadget_data_source) {
             /*
              * add new gadget and render it
@@ -256,6 +273,7 @@ var RenderJs = (function () {
             tab_container.empty();
             html_string = [
                 '<div class="gadget" ',
+                'id="' + gadget_id + '"',
                 'data-gadget="' + gadget + '"',
                 'data-gadget-handler="' + gadget_data_handler + '" ',
                 'data-gadget-source="' + gadget_data_source + '"></div>'
@@ -436,6 +454,13 @@ var RenderJs = (function () {
             var gadget_list = [];
 
             return {
+                setGadgetList: function (gadget_list_value) {
+                    /*
+                     * Set list of registered gadgets
+                     */
+                    gadget_list = gadget_list_value;
+                },
+
                 getGadgetList: function () {
                     /*
                      * Return list of registered gadgets

test/json/json_file.json

+{"first_name": "John",
+ "last_name": "Doh"}
\ No newline at end of file

test/renderjs_test.js

 /*
  * RenderJs tests
  */
-counter = 0;
+
 // in tests we need to call function manually rather than rely
 // on implicit calling
 RENDERJS_ENABLE_IMPLICIT_INTERACTION_BIND=false;
@@ -11,9 +11,17 @@ function cleanUp () {
    * Clean up namespace between tests
    */
   // re-init GadgetIndex
-  $.each(RenderJs.GadgetIndex.getGadgetList(), function () {
-    RenderJs.GadgetIndex.unregisterGadget(this);
-  });
+  RenderJs.GadgetIndex.setGadgetList([]);
+  equal(0, RenderJs.GadgetIndex.getGadgetList().length);
+}
+
+// used by tests namespace variables
+counter = 0;
+first_name=''
+last_name=''
+function parseJSONAndUpdateNameSpace(result) {
+  first_name=result['first_name'];
+  last_name=result['last_name'];
 }
 
 function setupRenderJSTest(){
@@ -56,7 +64,7 @@ function setupRenderJSTest(){
   test('addGadget', function () {
     cleanUp();
     equal(RenderJs.GadgetIndex.getGadgetList().length, 0);
-    RenderJs.addGadget("qunit-fixture", "loading/test-gadget.html", "", "");
+    RenderJs.addGadget("qunit-fixture", "new_added", "loading/test-gadget.html", "", "");
     stop();
 
     RenderJs.bindReady(function (){
@@ -81,7 +89,7 @@ function setupRenderJSTest(){
   module("GadgetReadyEvent");
   test('GadgetReadyEvent', function () {
     cleanUp();
-    RenderJs.addGadget("qunit-fixture", "interactions/index.html", "", "");
+    RenderJs.addGadget("qunit-fixture", "new_added", "interactions/index.html", "", "");
     stop();
 
     // we need to wait for all gadgets loading ...
@@ -94,7 +102,7 @@ function setupRenderJSTest(){
   module("InteractionGadget");
   test('InteractionGadget', function () {
     cleanUp();
-    RenderJs.addGadget("qunit-fixture", "interactions/index.html", "", "");
+    RenderJs.addGadget("qunit-fixture", "new_add", "interactions/index.html", "", "");
     stop();
 
     // we need to wait for all gadgets loading ...
@@ -110,5 +118,24 @@ function setupRenderJSTest(){
       equal(3, counter);
     });
    });
+
+  module("GadgetDataHandler");
+  test('GadgetDataHandler', function () {
+    cleanUp();
+    $("#qunit-fixture").append('<div data-gadget="" id="json-gadget" data-gadget-source = "json/json_file.json" data-gadget-handler="parseJSONAndUpdateNameSpace"></div>');
+    RenderJs.setReady(false);
+    RenderJs.bootstrap($("#qunit-fixture"));
+    equal('', first_name);
+    equal('', last_name);
+    stop();
+
+    // we need to wait for all gadgets loading ...
+    RenderJs.bindReady(function () {
+      start();
+      equal('John', first_name);
+      equal('Doh', last_name);
+    });
+  });
+
 };