-
-
-
- - 9 Ready
- - 4 Pending
- - 1 Draft
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+ - 9 Ready
+ - 4 Pending
+ - 1 Draft
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/admin/views/editor.hbs b/core/admin/views/editor.hbs
index 0b972c6b01..ba5efc8884 100644
--- a/core/admin/views/editor.hbs
+++ b/core/admin/views/editor.hbs
@@ -4,6 +4,7 @@
+
{{/contentFor}}
diff --git a/core/admin/views/partials/navbar.hbs b/core/admin/views/partials/navbar.hbs
index c22b5043e6..a4de3e9239 100644
--- a/core/admin/views/partials/navbar.hbs
+++ b/core/admin/views/partials/navbar.hbs
@@ -1,3 +1,4 @@
+
\ No newline at end of file
+
diff --git a/core/frontend/controllers/index.js b/core/frontend/controllers/index.js
index 69a96044d2..7e2def4a92 100644
--- a/core/frontend/controllers/index.js
+++ b/core/frontend/controllers/index.js
@@ -16,14 +16,14 @@
'homepage': function (req, res) {
api.posts.browse().then(function (posts) {
ghost.doFilter('prePostsRender', posts.toJSON(), function (posts) {
- res.render('index', {posts: posts, ghostGlobals: ghost.globalConfig});
+ res.render('index', {posts: posts, ghostGlobals: ghost.globalConfig, navItems: res.locals.navItems});
});
});
},
'single': function (req, res) {
api.posts.read({'slug': req.params.slug}).then(function (post) {
ghost.doFilter('prePostsRender', post.toJSON(), function (post) {
- res.render('single', {post: post, ghostGlobals: ghost.globalConfig});
+ res.render('single', {post: post, ghostGlobals: ghost.globalConfig, navItems: res.locals.navItems});
});
});
}
diff --git a/core/frontend/filters/index.js b/core/frontend/filters/index.js
new file mode 100644
index 0000000000..9768e41d6f
--- /dev/null
+++ b/core/frontend/filters/index.js
@@ -0,0 +1,30 @@
+(function () {
+ "use strict";
+
+ var _ = require('underscore'),
+ coreFilters;
+
+ coreFilters = function (ghost) {
+ ghost.registerFilter('ghostNavItems', function (args) {
+ var selectedItem;
+
+ // Set the nav items based on the config
+ args.navItems = ghost.config().nav;
+
+ // Mark the current selected Item
+ selectedItem = _.find(args.navItems, function (item) {
+ // TODO: Better selection determination?
+ return item.url === args.path;
+ });
+
+ if (selectedItem) {
+ selectedItem.active = true;
+ }
+
+ return args;
+ });
+ };
+
+ module.exports.loadCoreFilters = coreFilters;
+
+}());
\ No newline at end of file
diff --git a/core/frontend/helpers/ghostNav.js b/core/frontend/helpers/ghostNav.js
new file mode 100644
index 0000000000..f1ae8bd9a7
--- /dev/null
+++ b/core/frontend/helpers/ghostNav.js
@@ -0,0 +1,53 @@
+(function () {
+ "use strict";
+
+ var fs = require('fs'),
+ path = require('path'),
+ _ = require('underscore'),
+ handlebars = require('express-hbs').handlebars,
+ nodefn = require('when/node/function'),
+ GhostNavHelper;
+
+ GhostNavHelper = function (navTemplate) {
+ // Bind the context for our methods.
+ _.bindAll(this, 'compileTemplate', 'renderNavItems');
+
+ if (_.isFunction(navTemplate)) {
+ this.navTemplateFunc = navTemplate;
+ } else {
+ this.navTemplatePath = navTemplate;
+ }
+ };
+
+ GhostNavHelper.prototype.compileTemplate = function (templatePath) {
+ var self = this;
+
+ // Allow people to overwrite the navTemplatePath
+ templatePath = templatePath || this.navTemplatePath;
+
+ return nodefn.call(fs.readFile, templatePath).then(function(navTemplateContents) {
+ // TODO: Can handlebars compile async?
+ self.navTemplateFunc = handlebars.compile(navTemplateContents.toString());
+ });
+ };
+
+ GhostNavHelper.prototype.renderNavItems = function (navItems) {
+ var output;
+
+ output = this.navTemplateFunc({links: navItems});
+
+ return output;
+ };
+
+ // A static helper method for registering with ghost
+ GhostNavHelper.registerWithGhost = function(ghost) {
+ var templatePath = path.join(ghost.paths().frontendViews, 'nav.hbs'),
+ ghostNavHelper = new GhostNavHelper(templatePath);
+
+ return ghostNavHelper.compileTemplate().then(function() {
+ ghost.registerThemeHelper("ghostNav", ghostNavHelper.renderNavItems);
+ });
+ };
+
+ module.exports = GhostNavHelper;
+}());
\ No newline at end of file
diff --git a/core/frontend/helpers/index.js b/core/frontend/helpers/index.js
index b0565110f9..51c2e5e1da 100644
--- a/core/frontend/helpers/index.js
+++ b/core/frontend/helpers/index.js
@@ -3,10 +3,11 @@
var _ = require('underscore'),
moment = require('moment'),
+ when = require('when'),
+ navHelper = require('./ghostNav'),
coreHelpers;
coreHelpers = function (ghost) {
-
/**
* [ description]
* @todo ghost core helpers + a way for themes to register them
@@ -39,6 +40,10 @@
return output;
});
+ return when.all([
+ // Just one async helper for now, but could be more in the future
+ navHelper.registerWithGhost(ghost)
+ ]);
};
diff --git a/core/frontend/views/nav.hbs b/core/frontend/views/nav.hbs
new file mode 100644
index 0000000000..72b01d6977
--- /dev/null
+++ b/core/frontend/views/nav.hbs
@@ -0,0 +1,7 @@
+
\ No newline at end of file
diff --git a/core/ghost.js b/core/ghost.js
index ebb9553d0c..1042a05130 100644
--- a/core/ghost.js
+++ b/core/ghost.js
@@ -13,10 +13,10 @@
_ = require('underscore'),
Polyglot = require('node-polyglot'),
models = require('./shared/models'),
+ ExampleFilter = require('../content/plugins/exampleFilters'),
Ghost,
- instance,
- filterCallbacks = {},
+ instance,
statuses;
// ## Article Statuses
@@ -40,10 +40,12 @@
*/
Ghost = function () {
var app,
+ plugin,
polyglot;
if (!instance) {
instance = this;
+ plugin = new ExampleFilter(instance).init();
app = express();
@@ -60,19 +62,32 @@
dataProvider: models,
statuses: function () { return statuses; },
polyglot: function () { return polyglot; },
+ plugin: function() { return plugin; },
paths: function () {
return {
- 'activeTheme': __dirname + '/../content/' + config.themeDir + '/' + config.activeTheme + '/',
- 'adminViews': __dirname + '/admin/views/',
- 'lang': __dirname + '/lang/'
+ 'activeTheme': __dirname + '/../content/' + config.themeDir + '/' + config.activeTheme + '/',
+ 'adminViews': __dirname + '/admin/views/',
+ 'frontendViews': __dirname + '/frontend/views/',
+ 'lang': __dirname + '/lang/'
};
}
});
}
-
return instance;
};
+ /**
+ * Holds the filters
+ * @type {Array}
+ */
+ Ghost.prototype.filterCallbacks = [];
+
+ /**
+ * Holds the filter hooks (that are built in to Ghost Core)
+ * @type {Array}
+ */
+ Ghost.prototype.filters = [];
+
/**
* @param {string} name
* @param {Function} fn
@@ -105,11 +120,11 @@
* @param {Function} fn
*/
Ghost.prototype.registerFilter = function (name, fn) {
- if (!filterCallbacks.hasOwnProperty(name)) {
- filterCallbacks[name] = [];
+ if (!this.filterCallbacks.hasOwnProperty(name)) {
+ this.filterCallbacks[name] = [];
}
console.log('registering filter for ', name);
- filterCallbacks[name].push(fn);
+ this.filterCallbacks[name].push(fn);
};
/**
@@ -121,14 +136,15 @@
Ghost.prototype.doFilter = function (name, args, callback) {
var fn;
- if (filterCallbacks.hasOwnProperty(name)) {
- for (fn in filterCallbacks[name]) {
- if (filterCallbacks[name].hasOwnProperty(fn)) {
+ if (this.filterCallbacks.hasOwnProperty(name)) {
+ for (fn in this.filterCallbacks[name]) {
+ if (this.filterCallbacks[name].hasOwnProperty(fn)) {
console.log('doing filter for ', name);
- args = filterCallbacks[name][fn](args);
+ args = this.filterCallbacks[name][fn](args);
}
}
}
+
callback(args);
};
diff --git a/core/shared/data/fixtures/001.js b/core/shared/data/fixtures/001.js
index f2ecbd92d5..849f92a6ae 100644
--- a/core/shared/data/fixtures/001.js
+++ b/core/shared/data/fixtures/001.js
@@ -50,15 +50,16 @@ module.exports = {
users: [
{
- "id": "1",
- "username": "johnonolan",
+ "id": "1",
+ "username": "johnonolan",
"first_name": "John",
"last_name": "O'Nolan",
+ "password": "$2a$10$.pb3wOEhbEPvArvOBB.iyuKslBjC7lSXCUzp29civDTvCg3M1j0XO",
"email_address": "john@onolan.org",
"profile_picture": "logo.png",
"cover_picture": "",
- "bio": "Interactive designer, public speaker, startup advisor and writer. Living in Austria, attempting world domination via keyboard.",
- "url": "john.onolan.org",
+ "bio": "Interactive designer, public speaker, startup advisor and writer. Living in Austria, attempting world domination via keyboard.",
+ "url": "john.onolan.org",
"created_by": 1,
"updated_by": 1
}
diff --git a/core/shared/errorHandling.js b/core/shared/errorHandling.js
index f61dcaafc0..af678453ae 100644
--- a/core/shared/errorHandling.js
+++ b/core/shared/errorHandling.js
@@ -10,7 +10,7 @@
errors = {
throwError: function (err) {
if (!err) {
- return;
+ err = new Error("An error occurred");
}
if (_.isString(err)) {
diff --git a/core/test/ghost/errorHandling_spec.js b/core/test/ghost/errorHandling_spec.js
index 816739e106..b4dc03b5f3 100644
--- a/core/test/ghost/errorHandling_spec.js
+++ b/core/test/ghost/errorHandling_spec.js
@@ -31,6 +31,14 @@
runThrowError.should['throw']("test2");
});
+ it("throws error even if nothing passed", function () {
+ var runThrowError = function () {
+ errors.throwError();
+ };
+
+ runThrowError.should['throw']("An error occurred");
+ });
+
it("logs errors", function () {
var err = new Error("test1"),
logStub = sinon.stub(console, "log");
diff --git a/core/test/ghost/frontend_helpers_ghostNav_spec.js b/core/test/ghost/frontend_helpers_ghostNav_spec.js
new file mode 100644
index 0000000000..bbf7177ec2
--- /dev/null
+++ b/core/test/ghost/frontend_helpers_ghostNav_spec.js
@@ -0,0 +1,69 @@
+/*globals describe, beforeEach, it*/
+(function () {
+ "use strict";
+
+ var should = require('should'),
+ sinon = require('sinon'),
+ _ = require('underscore'),
+ path = require('path'),
+ GhostNavHelper = require('../../frontend/helpers/ghostNav');
+
+ describe('ghostNav Helper', function () {
+ var navTemplatePath = path.join(process.cwd(), 'core/frontend/views/nav.hbs');
+
+ should.exist(GhostNavHelper, "GhostNavHelper exists");
+
+ it('can compile the nav template', function (done) {
+ var helper = new GhostNavHelper(navTemplatePath);
+
+ helper.compileTemplate().then(function () {
+ should.exist(helper.navTemplateFunc);
+ _.isFunction(helper.navTemplateFunc).should.equal(true);
+
+ done();
+ }, done);
+ });
+
+ it('can render nav items', function () {
+ var helper = new GhostNavHelper(function (data) { return "rendered " + data.links.length; }),
+ templateSpy = sinon.spy(helper, 'navTemplateFunc'),
+ fakeNavItems = [{
+ title: 'test1',
+ url: '/test1'
+ }, {
+ title: 'test2',
+ url: '/test2'
+ }],
+ rendered;
+
+ rendered = helper.renderNavItems(fakeNavItems);
+
+ // Returns a string returned from navTemplateFunc
+ should.exist(rendered);
+ rendered.should.equal("rendered 2");
+
+ templateSpy.calledWith({ links: fakeNavItems }).should.equal(true);
+ });
+
+ it('can register with ghost', function (done) {
+ var fakeGhost = {
+ paths: function () {
+ return {
+ frontendViews: path.join(process.cwd(), 'core/frontend/views/')
+ };
+ },
+
+ registerThemeHelper: function () {
+ return;
+ }
+ },
+ registerStub = sinon.stub(fakeGhost, 'registerThemeHelper');
+
+ GhostNavHelper.registerWithGhost(fakeGhost).then(function () {
+ registerStub.called.should.equal(true);
+
+ done();
+ }, done);
+ });
+ });
+}());
\ No newline at end of file
diff --git a/package.json b/package.json
index 0cf04c5962..54a2841d17 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"private": true,
"scripts": {
"start": "node app",
- "test": "grunt validate"
+ "test": "grunt validate --verbose"
},
"dependencies": {
"express": "3.1.x",
@@ -23,6 +23,7 @@
},
"devDependencies": {
"grunt": "~0.4.1",
+ "grunt-cli": "0.1.9",
"grunt-jslint": "0.2.x",
"should": "~1.2.2",
"grunt-mocha-test": "~0.4.0",