Refactor parts of ember-app and minor cleanups

This PR refactors some of the functionality of ember-app into smaller functions. There is no functionality change but aims to keep functionality together and independent. It also cleans up uneeded functions and packages.

The refactoring will help us use fastboot library at LinkedIn with injecting LI specific stuff and reusing functions.

Author: kratiahuja

src/ember-app.js

@@ -123,13 +123,10 @@ class EmberApp {
   /**
    * @private
    *
-   * Initializes the sandbox by evaluating the Ember app's JavaScript
-   * code, then retrieves the application factory from the sandbox and creates a new
-   * `Ember.Application`.
+   * Loads the app and vendor files in the sandbox (Node vm).
    *
-   * @returns {Ember.Application} the Ember application from the sandbox
-   */
-  retrieveSandboxedApp() {
+  */
+  loadAppFiles() {
     let sandbox = this.sandbox;
     let appFilePath = this.appFilePath;
     let vendorFilePath = this.vendorFilePath;
@@ -146,6 +143,17 @@ class EmberApp {
 
     sandbox.eval(appFile, appFilePath);
     debug("app file evaluated");
+  }
+
+  /**
+   * @private
+   *
+   * Create the ember application in the sandbox.
+   *
+   */
+  createEmberApp() {
+    let sandbox = this.sandbox;
+    let appFilePath = this.appFilePath;
 
     // Retrieve the application factory from within the sandbox
     let AppFactory = sandbox.run(function(ctx) {
@@ -161,6 +169,21 @@ class EmberApp {
     return AppFactory['default']();
   }
 
+  /**
+   * @private
+   *
+   * Initializes the sandbox by evaluating the Ember app's JavaScript
+   * code, then retrieves the application factory from the sandbox and creates a new
+   * `Ember.Application`.
+   *
+   * @returns {Ember.Application} the Ember application from the sandbox
+   */
+  retrieveSandboxedApp() {
+    this.loadAppFiles();
+
+    return this.createEmberApp();
+  }
+
   /**
    * Destroys the app and its sandbox.
    */
@@ -186,6 +209,39 @@ class EmberApp {
     });
   }
 
+  /**
+   * @private
+   *
+   * Main funtion that creates the app instance for every `visit` request, boots
+   * the app instance and then visits the given route and destroys the app instance
+   * when the route is finished its render cycle.
+   *
+   * @param {string} path the URL path to render, like `/photos/1`
+   * @param {Object} fastbootInfo An object holding per request info
+   * @param {Object} bootOptions An object containing the boot options that are used by
+   *                             by ember to decide whether it needs to do rendering or not.
+   * @param {Object} result
+   * @return {Promise<instance>} instance
+   */
+  visitRoute(path, fastbootInfo, bootOptions, result) {
+    let instance;
+
+    return this.buildAppInstance()
+      .then(appInstance => {
+        instance = appInstance;
+        result.instance = instance;
+        registerFastBootInfo(fastbootInfo, instance);
+
+        return instance.boot(bootOptions);
+      })
+      .then(() => result.instanceBooted = true)
+      .then(() => instance.visit(path, bootOptions))
+      .then(() => waitForApp(instance))
+      .then(() => {
+        return instance;
+      });
+  }
+
   /**
    * Creates a new application instance and renders the instance at a specific
    * URL, returning a promise that resolves to a {@link Result}. The `Result`
@@ -225,8 +281,6 @@ class EmberApp {
 
     let doc = bootOptions.document;
 
-    let instance;
-
     let result = new Result({
       doc: doc,
       html: html,
@@ -246,17 +300,11 @@ class EmberApp {
       }, destroyAppInstanceInMs);
     }
 
-    return this.buildAppInstance()
+    let instance;
+    return this.visitRoute(path, fastbootInfo, bootOptions, result)
       .then(appInstance => {
         instance = appInstance;
-        result.instance = instance;
-        registerFastBootInfo(fastbootInfo, instance);
-
-        return instance.boot(bootOptions);
       })
-      .then(() => result.instanceBooted = true)
-      .then(() => instance.visit(path, bootOptions))
-      .then(() => waitForApp(instance))
       .then(() => {
         if (!disableShoebox) {
           // if shoebox is not disabled, then create the shoebox and send API data

test/fastboot-shoebox-test.js

@@ -66,5 +66,4 @@ describe("FastBootShoebox", function() {
         expect(html).to.not.include('<script type="fastboot/shoebox" id="shoebox-key5">{"otherUnicodeChars":"\\u0026\\u0026\\u003e\\u003e\\u003c\\u003c\\u2028\\u2028\\u2029\\u2029"}</script>');
       });
   });
-
 });