Merge remote-tracking branch 'ian/production-readiness' into loadingview

Author: Becky Sroufe

app/app-js/app-require.js

@@ -10,12 +10,14 @@ require.config({
     'marionette':              '../vendor/marionette/backbone.marionette',
     'bootstrap':               '../vendor/bootstrap/bootstrap',
     'parsley':                 '../vendor/parsleyjs/parsley',
+    'spinner':                 '../vendor/spin.js/spin',
     'hogan':                   '../vendor/requirejs-hogan-plugin/hogan',
     'hgn':                     '../vendor/requirejs-hogan-plugin/hgn',
     'text':                    '../vendor/requirejs-hogan-plugin/text',
 
-    // change to logger-prod for production (disables logging)
-    'lib/logger':              'lib/logger-dev'
+    // change to -prod for production
+    'lib/logger':              'lib/logger-dev',
+    'lib/eventDebugger':       'lib/eventDebugger-dev'
   },
 
   shim: {
@@ -38,32 +40,4 @@ require.config({
   }
 });
 
-require([
-  'marionette',
-  'app',
-  'backbone.computedfields',
-  'bootstrap',
-  'entities/api/api.module',
-  'entities/service/service.module',
-  'entities/alert/alert.module',
-  'debug/event.debugger'
-],
-function (Marionette, app) {
-  require([
-    'modules/header/header.module',
-    'modules/menu/menu.module',
-    'modules/welcome/welcome.module',
-    'modules/footer/footer.module',
-    'modules/static/static.module',
-    'modules/tryUri/tryUri.module',
-    'modules/alert/alert.module',
-    'modules/loading/loading.module',
-  ], function () {
-    // Override templating method to use hgn templates
-    Marionette.Renderer.render = function (template, data) {
-      return template(data);
-    };
-
-    app.start();
-  });
-});
+require(['app-start']);

app/app-js/app-start.js

@@ -0,0 +1,46 @@
+define(function (require) {
+  require('marionette');
+  require('bootstrap');
+  require('backbone.computedfields');
+  require('lib/eventDebugger');
+
+  var Marionette = require('marionette'),
+      app = require('app'),
+
+      api = require('entities/api/api.module'),
+      service = require('entities/service/service.module'),
+      alert = require('entities/alert/alert.module'),
+
+      header = require('modules/header/header.module'),
+      menu = require('modules/menu/menu.module'),
+      welcome = require('modules/welcome/welcome.module'),
+      footer = require('modules/footer/footer.module'),
+      static_ = require('modules/static/static.module'),
+      tryUri = require('modules/tryUri/tryUri.module'),
+      alert = require('modules/alert/alert.module'),
+      loading = require('modules/loading/loading.module');
+
+  // Override templating method to use hgn templates
+  Marionette.Renderer.render = function (template, data) {
+    return template(data);
+  };
+
+  // start entity modules
+  api.start();
+  service.start();
+  alert.start();
+
+  // start rendering modules
+  header.start();
+  menu.start();
+  welcome.start();
+  footer.start();
+  static_.start();
+  tryUri.start();
+  alert.start();
+  loading.start();
+
+  // start app
+  app.start();
+
+});

app/app-js/app.controller.js

@@ -1,6 +1,7 @@
 define(function (require) {
   var AppContentLayout = require('app.content.layout'),
       ModuleController = require('lib/module.controller'),
+      history = require('lib/history'),
       AppController;
 
   AppController = ModuleController.extend({

app/app-js/app.js

@@ -11,6 +11,15 @@ define(function (require) {
     loadingRegion: '#loading-region'
   });
 
+  // Hacky fix for stupid Facebook oauth redirect hash
+  app.on('initialize:before', function () {
+    if (window.location.hash == '#_=_') {
+      history.replaceState 
+          ? history.replaceState(null, null, window.location.href.split('#')[0])
+          : window.location.hash = '';
+    }
+  });
+
   app.on('initialize:after', function () {
     history.start();
   });

app/app-js/entities/alert/alert.module.js

@@ -11,7 +11,6 @@ define(function (require) {
   });
 
   alertEntities = app.module('alertEntities', AlertModule);
-  alertEntities.start();
 
   return alertEntities;
 });

app/app-js/entities/api/api.model.js

@@ -4,7 +4,7 @@ define(function (require) {
       GenericUriModel = require('entities/api/call/genericUri.model'),
       SampleUriModel = require('entities/api/call/sampleUri.model'),
       GetUriModel = require('entities/api/call/tryUri.model'),
-      HasNestedModel = require('lib/hasNestedModel.mixin'),
+      HasNestedModel = require('lib/hasNestedModel'),
       appChannel = require('app.channel'),
       ApiModel;
 
@@ -34,43 +34,46 @@ define(function (require) {
       }
     },
 
-    constructor: function (attrs, options) {
-      var apiAttributes = _.pick(attrs, ['serviceKey', 'endpointKey']);
-
-      // Initialize submodels
-      _.extend(attrs, {
-        genericOutput: new GenericOutputModel(apiAttributes),
-        genericUri: new GenericUriModel(apiAttributes),
-        sampleUri: new SampleUriModel(apiAttributes),
-        tryUri: new GetUriModel()
-      });
-
+    constructor: function () {
       // Attach nested model functionality
       new HasNestedModel(this);
 
-      ApiModel.__super__.constructor.call(this, attrs, options);
+      // Attach computed field functionality
+      new Backbone.ComputedFields(this);
+
+      ApiModel.__super__.constructor.apply(this, arguments);
     },
 
     initialize: function () {
-      var self = this;
+      var self = this,
+          apiAttributes = {
+            serviceKey: this.get('serviceKey'),
+            endpointKey: this.get('endpointKey')
+          };
 
-      // Attach computed fields functionality
-      new Backbone.ComputedFields(this);
+      // Initialize submodels
+      this.set({
+        genericOutput: new GenericOutputModel(apiAttributes),
+        genericUri: new GenericUriModel(apiAttributes),
+        sampleUri: new SampleUriModel(apiAttributes),
+        tryUri: new GetUriModel()
+      });
 
       this.on('change', function () {
-        var serviceKey,
-            endpointKey;
-        
+        var apiAttributes;
+
         // When serviceKey or endpointKey are changed, pass them down to submodels
         if (self.hasChanged('serviceKey') || self.hasChanged('endpointKey')) {
-          serviceKey = self.get('serviceKey');
-          endpointKey = self.get('endpointKey');
+          apiAttributes = {
+            serviceKey: self.get('serviceKey'),
+            endpointKey: self.get('endpointKey')
+          };
 
           _.invoke([
             self.get('genericOutput'),
             self.get('genericUri'),
             self.get('sampleUri')
-          ], 'set', { serviceKey: serviceKey, endpointKey: endpointKey });
+          ], 'set', apiAttributes);
         }
       });
     },

app/app-js/entities/api/api.module.js

@@ -11,7 +11,6 @@ define(function (require) {
   });
 
   apiEntities = app.module('apiEntities', AlertModule);
-  apiEntities.start();
 
   return apiEntities;
 });

app/app-js/entities/service/service.collection.js

@@ -1,35 +1,12 @@
 define(function (require) {
   var Backbone = require('backbone'),
       ServiceModel = require('entities/service/service.model'),
-      AuthorizedServicesModel = require('entities/service/authorized/authorizedServices.model'),
+      appChannel = require('app.channel'),
       ServiceCollection;
 
   ServiceCollection = Backbone.Collection.extend({
 
-    model: ServiceModel,
-
-    initialize: function () {
-      this.authorizedServices = new AuthorizedServicesModel();
-      
-      this.listenTo(this.authorizedServices, 'change', function () {
-        var connections = this.authorizedServices.get('connections');
-        if (connections.length > 0) {
-          _.each(this.models, function (model) {
-            var connected = false;
-            _.each(connections, function (connection) {
-              if (model.get('serviceKey') === connection) {
-                connected = true;
-              }
-            });
-            model.set('connected', connected);
-          });
-        }
-      });
-    },
-
-    fetchAuthorized: function () {
-      this.authorizedServices.fetch();
-    }
+    model: ServiceModel
   });
 
   return ServiceCollection;

app/app-js/entities/service/service.controller.js

@@ -1,7 +1,10 @@
 define(function (require) {
-  var ModuleController = require('lib/module.controller'),
+  var Marionette = require('marionette'),
+      ModuleController = require('lib/module.controller'),
       ServiceCollection = require('entities/service/service.collection'),
+      AuthorizedServicesModel = require('entities/service/authorized/authorizedServices.model'),
       services = require('entities/service/services'),
+      appChannel = require('app.channel'),
       ServiceController;
 
   ServiceController = ModuleController.extend({
@@ -11,13 +14,42 @@ define(function (require) {
         'get:serviceCollection': 'getServiceCollection',
         'lookup:serviceName': 'lookupServiceName',
         'lookup:endpointName': 'lookupEndpointName'
+      },
+
+      commands: {
+        'poll:authorizedServices': 'pollAuthorizedServices',
+        'connect:service': 'connectService',
+        'disconnect:service': 'disconnectService'
       }
     },
 
+    authorizedServices: null,
+
+    initialize: function () {
+      this.authorizedServices = new AuthorizedServicesModel();
+    },
+
+    connectService: function (serviceKey) {
+      window.location.assign('/auth/' + serviceKey + '?auth-return=' +
+          encodeURIComponent(window.location.pathname + window.location.hash));
+    },
+
+    disconnectService: function (serviceKey) {
+      window.location.assign('/disconnect/' + serviceKey);
+    },
+
     getServiceCollection: function () {
       return new ServiceCollection(services.clone());
     },
 
+    pollAuthorizedServices: function () {
+      this.authorizedServices.fetch({
+        success: function (model, data) {
+          appChannel.vent.trigger('change:authorizedServices', data.connections);
+        }
+      });
+    },
+
     lookupServiceName: function (serviceKey) {
       return services.lookupServiceName(serviceKey);
     },

app/app-js/entities/service/service.module.js

@@ -11,7 +11,6 @@ define(function (require) {
   });
 
   serviceEntities = app.module('serviceEntities', ServiceModule);
-  serviceEntities.start();
 
   return serviceEntities;
 });

app/app-js/debug/event.debugger.js renamed to app/app-js/lib/eventDebugger-dev.js

@@ -0,0 +1,3 @@
+define(function (require) {
+  $.noop();
+});