From 3e1ec7ddba5eb2d1cdcdafd7c9a34ea789c6c05a Mon Sep 17 00:00:00 2001
From: Todd Wolfson <todd@twolfson.com>
Date: Tue, 4 Feb 2014 15:23:33 -0800
Subject: [PATCH] Corrected port logic and fixed documentation hierarchy

Adding fallbacks for options
Removing startServer code
Documenting new options
Correcting README headings
Moving to implicit port for FixedServer's
Creating new method for starting a server on a pre-defined port
---
 README.md           | 21 ++++++++++++---------
 lib/fixed-server.js | 11 ++++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index e9c6e41..8cf7123 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Helper to quickly generate a server with fixtures from a file
     - This will be loaded via `require` and passed in to `factory.addFixtures`
 - option `Object` - Options to pass to `FixedServerFactory` constructor
 
-### `factory.addFixture(name, params)`
+#### `factory.addFixture(name, params)`
 Add a new fixture to the list of potential fixture to load into child servers.
 
 - name `String` - Key to store fixture under
@@ -73,37 +73,40 @@ Add a new fixture to the list of potential fixture to load into child servers.
 
 [`express` method]: http://expressjs.com/api.html#app.VERB
 
-### `factory.addFixtures(obj)`
+#### `factory.addFixtures(obj)`
 Add multiple fixtures to our list of fixtures
 
 - obj `Object` - Container for multiple fixtures
     - Each key-value pair will be used as `name` and `params` respectively for `FixedServer.addFixtures`
 
-### `factory.createServer(fixtureNames)`
+#### `factory.createServer(fixtureNames)`
 Create a `FixedServer` with `fixtureNames` running on it
 
 - fixtureNames `String|String[]` - Single fixture name or array of fixture names to load into server
     - Each of these will be loaded via `server.installFixture`
 
-### `factory.run(fixtureNames)`
+#### `factory.run(fixtureNames)`
 Helper method for running server inside of `mocha` tests
 
 - fixtureNames `String|String[]` - Information to pass onto `factory.createServer`
 
-### `FixedServer()`
+### `FixedServer(options)`
 Create a server to host fixtures on
 
-### `server.listen(port)`
+- options `Object` - Container for options
+    - port `Number` - Port to run server from via `.listen()`
+
+#### `server.listen(port)`
 Start listening for requests
 
-- port `Number` - Port to start listening against
+- port `Number` - Port to start listening against. If not provided, it will attempt to use `options.port`.
 
-### `server.destroy(cb)`
+#### `server.destroy(cb)`
 Tear down the server
 
 - cb `Function` - Optional error-first callback to run when the server teardown is completed
 
-### `server.installFixture(fixture)`
+#### `server.installFixture(fixture)`
 Add a new route to the server
 
 - fixture `Object` - Container for route parameters
diff --git a/lib/fixed-server.js b/lib/fixed-server.js
index aa1f509..4bd9a23 100644
--- a/lib/fixed-server.js
+++ b/lib/fixed-server.js
@@ -5,13 +5,14 @@ var express = require('express');
 function noop() {}
 
 // Create FixedServer constructor
-function FixedServer() {
+function FixedServer(options) {
   this.app = express();
+  this.options = options || {};
 }
 FixedServer.prototype = {
   // Setup/teardown methods
   listen: function (port) {
-    this._app = this.app.listen(port);
+    this._app = this.app.listen(port || this.options.port);
   },
   destroy: function (cb) {
     // Close the server
@@ -31,7 +32,7 @@ function FixedServerFactory(options) {
   this.fixtures = {};
 
   // Save options for later
-  this.options = options;
+  this.options = options || {};
 }
 FixedServerFactory.fromFile = function (filepath, options) {
   // Resolve the listed fixtures
@@ -71,7 +72,7 @@ FixedServerFactory.prototype = {
     }
 
     // Install each fixture
-    var server = new FixedServer();
+    var server = new FixedServer(this.options);
     fixtureNames.forEach(function (fixtureName) {
       // Get and assert the fixture exists
       var fixture = this.fixtures[fixtureName];
@@ -89,7 +90,7 @@ FixedServerFactory.prototype = {
     var server = this.createServer(fixtureNames);
     var that = this;
     before(function () {
-      server.listen(that.options.port);
+      server.listen();
     });
     after(function (done) {
       server.destroy(done);