Merge pull request #141 from bekzod/es6-classes

es6 classes

Author: stefanpenner

src/fastboot-headers.js

@@ -2,92 +2,95 @@
 
 // Partially implements Headers from the Fetch API
 // https://developer.mozilla.org/en-US/docs/Web/API/Headers
-function FastBootHeaders(headers) {
-  headers = headers || {};
-  this.headers = {};
-
-  for (var header in headers) {
-    let value = headers[header];
-
-    // Express gives us either a string
-    // or an array of strings if there are multiple values.
-    // We want to support the Header spec
-    // so we will coerce to an array always.
-    if (typeof value === 'string') {
-      value = [value];
+class FastBootHeaders {
+  constructor(headers) {
+    headers = headers || {};
+    this.headers = {};
+
+    for (var header in headers) {
+      let value = headers[header];
+
+      // Express gives us either a string
+      // or an array of strings if there are multiple values.
+      // We want to support the Header spec
+      // so we will coerce to an array always.
+      if (typeof value === 'string') {
+        value = [value];
+      }
+
+      this.headers[header] = value;
     }
-
-    this.headers[header] = value;
   }
-}
 
-FastBootHeaders.prototype.append = function(header, value) {
-  header = header.toLowerCase();
-  if (!this.has(header)) {
-    this.headers[header] = [];
-  }
+  append(header, value) {
+    let _header = header.toLowerCase();
 
-  this.headers[header].push(value);
-};
+    if (!this.has(_header)) {
+      this.headers[_header] = [];
+    }
 
-FastBootHeaders.prototype.delete = function(header) {
-  delete this.headers[header.toLowerCase()];
-};
+    this.headers[_header].push(value);
+  }
 
-FastBootHeaders.prototype.entries = function() {
-  var entries = [];
+  delete(header) {
+    delete this.headers[header.toLowerCase()];
+  }
+
+  entries() {
+    var entries = [];
 
-  for(var key in this.headers) {
-    var values = this.headers[key];
-    for(var index = 0; index < values.length; ++index ) {
-      entries.push([key, values[index]]);
+    for(var key in this.headers) {
+      var values = this.headers[key];
+      for(var index = 0; index < values.length; ++index ) {
+        entries.push([key, values[index]]);
+      }
     }
-  }
 
-  return entries[Symbol.iterator]();
-};
+    return entries[Symbol.iterator]();
+  }
 
-FastBootHeaders.prototype.get = function(header) {
-  return this.getAll(header)[0] || null;
-};
+  get(header) {
+    return this.getAll(header)[0] || null;
+  }
 
-FastBootHeaders.prototype.getAll = function(header) {
-  return this.headers[header.toLowerCase()] || [];
-};
+  getAll(header) {
+    return this.headers[header.toLowerCase()] || [];
+  }
 
-FastBootHeaders.prototype.has = function(header) {
-  return this.headers[header.toLowerCase()] !== undefined;
-};
+  has(header) {
+    return this.headers[header.toLowerCase()] !== undefined;
+  }
 
-FastBootHeaders.prototype.keys = function() {
-  var entries = [];
+  keys() {
+    var entries = [];
 
-  for(var key in this.headers) {
-    var values = this.headers[key];
-    for(var index = 0; index < values.length; ++index ) {
-      entries.push(key);
+    for(var key in this.headers) {
+      var values = this.headers[key];
+      for(var index = 0; index < values.length; ++index ) {
+        entries.push(key);
+      }
     }
-  }
 
-  return entries[Symbol.iterator]();
-};
+    return entries[Symbol.iterator]();
+  }
 
-FastBootHeaders.prototype.set = function(header, value) {
-  header = header.toLowerCase();
-  this.headers[header] = [value];
-};
+  set(header, value) {
+    header = header.toLowerCase();
+    this.headers[header] = [value];
+  }
 
-FastBootHeaders.prototype.values = function() {
-  var entries = [];
+  values() {
+    var entries = [];
 
-  for(var key in this.headers) {
-    var values = this.headers[key];
-    for(var index = 0; index < values.length; ++index ) {
-      entries.push(values[index]);
+    for(var key in this.headers) {
+      var values = this.headers[key];
+      for(var index = 0; index < values.length; ++index ) {
+        entries.push(values[index]);
+      }
     }
-  }
 
-  return entries[Symbol.iterator]();
-};
+    return entries[Symbol.iterator]();
+  }
+}
 
 module.exports = FastBootHeaders;

src/fastboot-info.js

@@ -15,33 +15,35 @@ var FastBootResponse = require('./fastboot-response');
  * @param {Array} [options.hostWhitelist] expected hosts in your application
  * @param {Object} [options.metaData] per request meta data
  */
-function FastBootInfo(request, response, options) {
+class FastBootInfo {
+  constructor(request, response, options) {
+    this.deferredPromise = RSVP.resolve();
+    let hostWhitelist = options.hostWhitelist;
+    let metadata = options.metadata;
+    if (request) {
+      this.request = new FastBootRequest(request, hostWhitelist);
+    }
 
-  this.deferredPromise = RSVP.resolve();
-  let hostWhitelist = options.hostWhitelist;
-  let metadata = options.metadata;
-  if (request) {
-    this.request = new FastBootRequest(request, hostWhitelist);
+    this.response = new FastBootResponse(response || {});
+    this.metadata = metadata;
   }
 
-  this.response = new FastBootResponse(response || {});
-  this.metadata = metadata;
-}
+  deferRendering(promise) {
+    this.deferredPromise = this.deferredPromise.then(function() {
+      return promise;
+    });
+  }
 
-FastBootInfo.prototype.deferRendering = function(promise) {
-  this.deferredPromise = this.deferredPromise.then(function() {
-    return promise;
-  });
-};
+  /*
+   * Registers this FastBootInfo instance in the registry of an Ember
+   * ApplicationInstance. It is configured to be injected into the FastBoot
+   * service, ensuring it is available inside instance initializers.
+   */
+  register(instance) {
+    instance.register('info:-fastboot', this, { instantiate: false });
+    instance.inject('service:fastboot', '_fastbootInfo', 'info:-fastboot');
+  }
+}
 
-/*
- * Registers this FastBootInfo instance in the registry of an Ember
- * ApplicationInstance. It is configured to be injected into the FastBoot
- * service, ensuring it is available inside instance initializers.
- */
-FastBootInfo.prototype.register = function(instance) {
-  instance.register('info:-fastboot', this, { instantiate: false });
-  instance.inject('service:fastboot', '_fastbootInfo', 'info:-fastboot');
-};
 
 module.exports = FastBootInfo;

src/fastboot-request.js

@@ -1,60 +1,66 @@
+'use strict';
+
 var cookie = require('cookie');
 var FastBootHeaders = require('./fastboot-headers');
 
-function FastBootRequest(request, hostWhitelist) {
-  this.hostWhitelist = hostWhitelist;
-
-  this.protocol = request.protocol;
-  this.headers = new FastBootHeaders(request.headers);
-  this.queryParams = request.query;
-  this.path = request.url;
-  this.method = request.method;
-  this.body = request.body;
+class FastBootRequest {
+  constructor(request, hostWhitelist) {
+    this.hostWhitelist = hostWhitelist;
 
-  this.cookies = this.extractCookies(request);
-}
+    this.protocol = request.protocol;
+    this.headers = new FastBootHeaders(request.headers);
+    this.queryParams = request.query;
+    this.path = request.url;
+    this.method = request.method;
+    this.body = request.body;
 
-FastBootRequest.prototype.host = function() {
-  if (!this.hostWhitelist) {
-    throw new Error('You must provide a hostWhitelist to retrieve the host');
+    this.cookies = this.extractCookies(request);
   }
 
-  var host = this.headers.get('host');
+  host() {
+    if (!this.hostWhitelist) {
+      throw new Error('You must provide a hostWhitelist to retrieve the host');
+    }
+
+    var host = this.headers.get('host');
+
+    var matchFound = this.hostWhitelist.reduce(function(previous, currentEntry) {
+      if (currentEntry[0] === '/' &&
+          currentEntry.slice(-1) === '/') {
+        // RegExp as string
+        var regexp = new RegExp(currentEntry.slice(1, -1));
 
-  var matchFound = this.hostWhitelist.reduce(function(previous, currentEntry) {
-    if (currentEntry[0] === '/' &&
-        currentEntry.slice(-1) === '/') {
-      // RegExp as string
-      var regexp = new RegExp(currentEntry.slice(1, -1));
+        return previous || regexp.test(host);
+      } else {
+        return previous || currentEntry === host;
+      }
+    }, false);
 
-      return previous || regexp.test(host);
-    } else {
-      return previous || currentEntry === host;
+    if (!matchFound) {
+      throw new Error(`The host header did not match a hostWhitelist entry. Host header: ${host}`);
     }
-  }, false);
 
-  if (!matchFound) {
-    throw new Error(`The host header did not match a hostWhitelist entry. Host header: ${host}`);
+    return host;
   }
 
-  return host;
-};
+  extractCookies(request) {
+    // If cookie-parser middleware has already parsed the cookies,
+    // just use that.
+    if (request.cookies) {
+      return request.cookies;
+    }
 
-FastBootRequest.prototype.extractCookies = function(request) {
-  // If cookie-parser middleware has already parsed the cookies,
-  // just use that.
-  if (request.cookies) {
-    return request.cookies;
-  }
+    // Otherwise, try to parse the cookies ourselves, if they exist.
+    var cookies = request.headers.cookie;
+    if (cookies) {
+      return cookie.parse(cookies);
+    }
 
-  // Otherwise, try to parse the cookies ourselves, if they exist.
-  var cookies = request.headers.cookie;
-  if (cookies) {
-    return cookie.parse(cookies);
+    // Return an empty object instead of undefined if no cookies are present.
+    return {};
   }
 
-  // Return an empty object instead of undefined if no cookies are present.
-  return {};
-};
+}
+
 
 module.exports = FastBootRequest;

src/fastboot-response.js

@@ -1,8 +1,12 @@
+'use strict';
+
 var FastBootHeaders = require('./fastboot-headers');
 
-function FastbootResponse(response) {
-  this.headers = new FastBootHeaders(response._headers);
-  this.statusCode = 200;
+class FastbootResponse {
+  constructor(response) {
+    this.headers = new FastBootHeaders(response._headers);
+    this.statusCode = 200;
+  }
 }
 
 module.exports = FastbootResponse;