Renamed single / post -> entry

refs #9192

- an entry is a post or a page, represented by a post model

core/server/controllers/single.js → core/server/controllers/entry.js

@@ -2,12 +2,13 @@ var utils = require('../utils'),
     filters = require('../filters'),
     handleError = require('./frontend/error'),
     postLookup = require('./frontend/post-lookup'),
-    renderPost = require('./frontend/render-post'),
+    renderEntry = require('./frontend/render-entry'),
     setRequestIsSecure = require('./frontend/secure');
 
 // This here is a controller.
+// It renders entries = individual posts or pages
 // The "route" is handled in site/routes.js
-module.exports = function singleController(req, res, next) {
+module.exports = function entryController(req, res, next) {
     // Query database to find post
     return postLookup(req.path).then(function then(lookup) {
         // Format data 1
@@ -35,6 +36,6 @@ module.exports = function singleController(req, res, next) {
         setRequestIsSecure(req, post);
 
         filters.doFilter('prePostsRender', post, res.locals)
-            .then(renderPost(req, res));
+            .then(renderEntry(req, res));
     }).catch(handleError(next));
 };

core/server/controllers/frontend/format-response.js

@@ -27,7 +27,7 @@ function formatPageResponse(result) {
 }
 
 /**
- * similar to formatPageResponse, but for single post pages
+ * similar to formatPageResponse, but for entries (post or page)
  * @return {Object} containing page variables
  */
 function formatResponse(post) {
@@ -38,5 +38,5 @@ function formatResponse(post) {
 
 module.exports = {
     channel: formatPageResponse,
-    single: formatResponse
+    entry: formatResponse
 };

core/server/controllers/frontend/render-entry.js

@@ -0,0 +1,28 @@
+var debug = require('ghost-ignition').debug('channels:render-post'),
+    templates = require('./templates'),
+    formatResponse = require('./format-response'),
+    setResponseContext = require('./context');
+/*
+ * Sets the response context around an entry (post or page)
+ * and renders it with the correct template.
+ * Used by post preview and entry methods.
+ * Returns a function that takes the entry to be rendered.
+ */
+module.exports = function renderEntry(req, res) {
+    debug('renderEntry called');
+    return function renderEntry(entry) {
+        // Renderer begin
+        // Format data 2 - 1 is in preview/entry
+        var response = formatResponse.entry(entry);
+
+        // Context
+        setResponseContext(req, res, response);
+
+        // Template
+        res.template = templates.entry(entry);
+
+        // Render Call
+        debug('Rendering view: ' + res.template);
+        res.render(res.template, response);
+    };
+};

core/server/controllers/frontend/templates.js

@@ -62,7 +62,7 @@ function getChannelTemplateHierarchy(channelOpts) {
 }
 
 /**
- * ## Get Single Template Hierarchy
+ * ## Get Entry Template Hierarchy
  *
  * Fetch the ordered list of templates that can be used to render this request.
  * 'post' is the default / fallback
@@ -72,7 +72,7 @@ function getChannelTemplateHierarchy(channelOpts) {
  * @param {Object} postObject
  * @returns {String[]}
  */
-function getSingleTemplateHierarchy(postObject) {
+function getEntryTemplateHierarchy(postObject) {
     var templateList = ['post'],
         slugTemplate = 'post-' + postObject.slug;
 
@@ -121,8 +121,8 @@ function pickTemplate(templateList, fallback) {
     return template;
 }
 
-function getTemplateForSingle(postObject) {
-    var templateList = getSingleTemplateHierarchy(postObject),
+function getTemplateForEntry(postObject) {
+    var templateList = getEntryTemplateHierarchy(postObject),
         fallback = templateList[templateList.length - 1];
     return pickTemplate(templateList, fallback);
 }
@@ -141,7 +141,7 @@ function getTemplateForError(statusCode) {
 
 module.exports = {
     channel: getTemplateForChannel,
-    single: getTemplateForSingle,
+    entry: getTemplateForEntry,
     error: getTemplateForError,
     pickTemplate: pickTemplate
 };

core/server/controllers/index.js

@@ -1,4 +1,4 @@
 module.exports = {
     preview: require('./preview'),
-    single: require('./single')
+    entry: require('./entry')
 };

core/server/controllers/preview.js

@@ -2,7 +2,7 @@ var api = require('../api'),
     utils = require('../utils'),
     filters = require('../filters'),
     handleError = require('./frontend/error'),
-    renderPost = require('./frontend/render-post'),
+    renderEntry = require('./frontend/render-entry'),
     setRequestIsSecure = require('./frontend/secure');
 
 // This here is a controller.
@@ -37,6 +37,6 @@ module.exports = function previewController(req, res, next) {
         setRequestIsSecure(req, post);
 
         filters.doFilter('prePostsRender', post, res.locals)
-            .then(renderPost(req, res));
+            .then(renderEntry(req, res));
     }).catch(handleError(next));
 };

core/server/site/routes.js

@@ -18,8 +18,8 @@ module.exports = function siteRouter() {
     // Apps - register sub-router
     router.use(apps.router);
 
-    // Default - register single controller as route
-    router.get('*', controllers.single);
+    // Default - register entry controller as route
+    router.get('*', controllers.entry);
 
     return router;
 };