tidy up serve tool, adds 'gulp serve' task

gulpfile.js

@@ -8,6 +8,7 @@ var plumber = require('gulp-plumber');
 var onError = function (err) {
   gutil.log(gutil.colors.green(err));
 };
+var server = require("./tools/serve.js");
 
 // Lint JS
 gulp.task('lint', function() {
@@ -32,6 +33,10 @@ gulp.task('watch', function() {
   gulp.watch('lib/*/*.js', ['minify']);
 });
 
+gulp.task('serve', ["watch"], function() {
+  server();
+});
+
 // Default
 gulp.task('default', ['lint', 'minify']);
 

lib/epubjs/rendition.js

@@ -144,10 +144,42 @@ EPUBJS.Rendition.prototype.bounds = function() {
 
 EPUBJS.Rendition.prototype.display = function(what){
 	
-	return this.q.enqueue(this.load, what);
+	return this.q.enqueue(function(what){
+		
+		var displaying = new RSVP.defer();
+		var displayed = displaying.promise;
+	
+		var section = this.book.spine.get(what);
+		var view;
+	
+		this.displaying = true;
+	
+		if(section){
+			view = new EPUBJS.View(section);
+	
+			// This will clear all previous views
+			this.fill(view);
+	
+			// Move to correct place within the section, if needed
+			// this.moveTo(what)
+	
+			this.check();
+	
+			view.displayed.then(function(){
+				this.trigger("displayed", section);
+				this.displaying = false;
+				displaying.resolve(this);
+			}.bind(this));
+	
+		} else {
+			displaying.reject(new Error("No Section Found"));
+		}
+	
+		return displayed;
+	}, what);
 
 };
-
+/*
 EPUBJS.Rendition.prototype.load = function(what){
 	var displaying = new RSVP.defer();
 	var displayed = displaying.promise;
@@ -180,7 +212,7 @@ EPUBJS.Rendition.prototype.load = function(what){
 
 	return displayed;
 };
-
+*/
 // Takes a cfi, fragment or page?
 EPUBJS.Rendition.prototype.moveTo = function(what){
 	

package.json

@@ -3,6 +3,7 @@
   "version": "0.3.0",
   "description": "Render Epubs",
   "main": "/lib/epub.js",
+  "repository" : "https://github.com/futurepress/epub.js"
   "directories": {
     "test": "test"
   },
@@ -23,6 +24,7 @@
     "gulp-rename": "^1.2.0",
     "gulp-uglify": "^0.3.1",
     "gulp-util": "^3.0.0",
+    "gulp-webserver": "^0.9.0",
     "morgan": "^1.1.1",
     "optimist": "^0.6.1",
     "portfinder": "^0.2.1",

server.js

@@ -1,43 +0,0 @@
-var connect = require('connect'),
-	colors = require('colors'),
-	argv = require('optimist').argv,
-	portfinder = require('portfinder');
-
-var port = argv.p,
-	logger = argv.l,
-	log = console.log;
-
-if (!argv.p) {
-	portfinder.basePort = 8080;
-	portfinder.getPort(function (err, port) {
-	if (err) throw err;
-	listen(port);
-	});
-} else {
-	listen(port);
-}
-
-
-
-function listen(port) {
-	var server = connect();
-		server.use(connect.static(__dirname))
-		
-		if(!logger) server.use(connect.logger(logger))
-		
-		server.listen(port);
-	
-	log('Starting up Server, serving '.yellow
-		+ __dirname.green
-		+ ' on port: '.yellow
-		+ port.toString().cyan);
-	log('Hit CTRL-C to stop the server');
-	
-}
-	 
-	
-
-process.on('SIGINT', function () {
-	log('http-server stopped.'.red);
-	process.exit();
-});

tools/serve

@@ -1,57 +1,12 @@
 #!/usr/bin/env node
 
-var connect = require('connect');
-var express = require('express');
-var serveStatic = require('serve-static');
-var morgan  = require('morgan');
-var colors = require('colors');
 var	argv = require('optimist').argv;
-var	portfinder = require('portfinder');
+var server = require('./serve.js');
 
-var port = argv.p,
+var port = argv.p;
-	logger = argv.l,
-	log = console.log;
 
 if (!argv.p) {
-	portfinder.basePort = 8080;
+	server();
-	portfinder.getPort(function (err, port) {
-	if (err) throw err;
-	listen(port);
-	});
 } else {
-	listen(port);
+	server(port);
 }
-
-//CORS middleware
-function allowCrossDomain(req, res, next) {
-    res.header('Access-Control-Allow-Origin', '*');
-    res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE');
-    res.header('Access-Control-Allow-Headers', 'Content-Type');
-
-    next();
-}
-
-
-function listen(port) {
-	var server = express();
-	server.use(allowCrossDomain);
-	server.use(serveStatic(__dirname + "../../"));
-
-	if(!logger) server.use(morgan(logger))
-
-	server.listen(port);
-
-	log('Starting up Server, serving '.yellow
-		+ __dirname.replace("tools", '').green
-		+ ' on port: '.yellow
-		+ port.toString().cyan);
-	log('Hit CTRL-C to stop the server');
-
-}
-
-
-
-process.on('SIGINT', function () {
-	log('http-server stopped.'.red);
-	process.exit();
-});

tools/serve.js

@@ -0,0 +1,56 @@
+var connect = require('connect');
+var express = require('express');
+var serveStatic = require('serve-static');
+var morgan  = require('morgan');
+var colors = require('colors');
+var	argv = require('optimist').argv;
+var	portfinder = require('portfinder');
+var logger, port;
+var log = console.log;
+
+function start(_port) {
+ if (!_port) {
+    portfinder.basePort = 8080;
+    portfinder.getPort(function (err, openPort) {
+      if (err) throw err;
+      port = openPort
+      listen(port);
+    });
+  } else {
+    listen(_port);
+  } 
+}
+
+//CORS middleware
+function allowCrossDomain(req, res, next) {
+    res.header('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE');
+    res.header('Access-Control-Allow-Headers', 'Content-Type');
+
+    next();
+}
+
+
+function listen(port) {
+  var server = express();
+  server.use(allowCrossDomain);
+  server.use(serveStatic(__dirname + "../../"));
+
+  if(!logger) server.use(morgan(logger))
+
+  server.listen(port);
+
+  log('Starting up Server, serving '.yellow
+    + __dirname.replace("tools", '').green
+    + ' on port: '.yellow
+    + port.toString().cyan);
+  log('Hit CTRL-C to stop the server');
+
+}
+
+process.on('SIGINT', function () {
+  log('Server stopped.'.red);
+  process.exit();
+});
+
+module.exports = start;