Upgrade Oasis.js ( 0.3.0 )

Author: cyril-sf

Gruntfile.js

@@ -116,7 +116,7 @@ module.exports = function(grunt) {
     },
 
     watch: {
-      files: ['lib/**', 'vendor/*', 'test/tests/*', 'node_modules/jsframe/*'],
+      files: ['lib/**', 'vendor/*', 'test/tests/*', 'test/helpers/*', 'node_modules/jsframe/*'],
       tasks: ['build-dev', 'concat:tests']
     },
 
@@ -152,13 +152,16 @@ module.exports = function(grunt) {
       },
 
       tests: {
-        src: ['test/test_helpers.js', 'test/tests/**/*_test.js'],
+        src: ['test/helpers/*', 'test/tests/**/*_test.js'],
         dest: 'tmp/conductor_tests.js'
       },
 
       dist: {
-        src: ['lib/loader.js', 'vendor/uuid.core.js', 'vendor/kamino.js', 'vendor/message_channel.js', 'vendor/rsvp.amd.js', 'vendor/oasis.amd.js', 'lib/exporter.js', 'tmp/browser/<%= pkg.name %>.js'],
-        dest: 'tmp/dist/<%= pkg.name %>-<%= pkg.version %>.js'
+        src: ['lib/loader.js', 'vendor/uuid.core.js', 'vendor/kamino.js', 'vendor/message_channel.js', 'vendor/rsvp-2.0.3.amd.js', 'vendor/oasis.amd.js', 'lib/exporter.js', 'tmp/browser/<%= pkg.name %>.js'],
+        dest: 'tmp/dist/<%= pkg.name %>-<%= pkg.version %>.js',
+        options: {
+          footer: "self.Oasis = requireModule('oasis'); self.oasis = new self.Oasis(); self.oasis.autoInitializeSandbox();"
+        }
       }
     },
 

dist/conductor-0.2.0.amd.js

@@ -181,8 +181,9 @@ define("conductor",
 
     var Conductor = function(options) {
       this.options = options || {};
+      this.oasis = new Oasis();
       this.conductorURL = this.options.conductorURL ||
-                          Oasis.config.oasisURL ||
+                          oasis.configuration.oasisURL ||
                           '/dist/conductor-0.2.0.js.html';
 
       this.data = {};
@@ -191,16 +192,6 @@ define("conductor",
       this.capabilities = Conductor.capabilities.slice();
     };
 
-    Conductor.configure = function (name, value) {
-      if (/(conductor|oasis)URL/.test(name)) {
-        Oasis.config.oasisURL = value;
-      } else if ('eventCallback' === name) {
-        Oasis.configure(name, value);
-      } else {
-        throw new Error("Unexpected Configuration `" + name + "` = `" + value + "`");
-      }
-    };
-
     Conductor.error = function (error) {
       return Conductor._error(error);
     };
@@ -234,6 +225,14 @@ define("conductor",
     }
 
     Conductor.prototype = {
+      configure: function (name, value) {
+        if ('eventCallback' === name) {
+          this.oasis.configure(name, value);
+        } else {
+          throw new Error("Unexpected Configuration `" + name + "` = `" + value + "`");
+        }
+      },
+
       loadData: function(url, id, data) {
         id = coerceId(id);
 
@@ -290,7 +289,7 @@ define("conductor",
           }
         }
 
-        var sandbox = Conductor.Oasis.createSandbox({
+        var sandbox = this.oasis.createSandbox({
           url: url,
           capabilities: capabilities,
           oasisURL: this.conductorURL,
@@ -315,9 +314,9 @@ define("conductor",
 
         // TODO: it would be better to access the consumer from
         // `conductor.parentCard` after the child card refactoring is in master.
-        if (Conductor.Oasis.consumers.nestedWiretapping) {
+        if (this.oasis.consumers.nestedWiretapping) {
           card.wiretap(function (service, messageEvent) {
-            Conductor.Oasis.consumers.nestedWiretapping.send(messageEvent.type, {
+            this.oasis.consumers.nestedWiretapping.send(messageEvent.type, {
               data: messageEvent.data,
               service: service+"",
               direction: messageEvent.direction,
@@ -452,7 +451,7 @@ define("conductor",
           this[prop] = options[prop];
         }
 
-        this.consumers = o_create(Conductor.Oasis.consumers);
+        this.consumers = o_create(oasis.consumers);
         this.options = options = options || {};
 
         this.deferred = {
@@ -483,7 +482,7 @@ define("conductor",
           cardOptions.consumers[prop] = cardOptions.consumers[prop].extend({card: this});
         }
 
-        Conductor.Oasis.connect(cardOptions);
+        oasis.connect(cardOptions);
       };
 
       Conductor.Card.prototype = {
@@ -492,7 +491,7 @@ define("conductor",
         },
 
         updateData: function(name, hash) {
-          Conductor.Oasis.portFor('data').send('updateData', { bucket: name, object: hash });
+          oasis.portFor('data').send('updateData', { bucket: name, object: hash });
         },
 
         /**