Merge pull request TryGhost#1764 from ErisDS/path-cleanup

Path, url and subdir cleanup & test
SaulG · Dec 28, 2013 · 25f3df2 · 25f3df2
2 parents 32f6575 + 755ad93
commit 25f3df2
Show file tree

Hide file tree

Showing 24 changed files with 180 additions and 98 deletions.
diff --git a/core/client/assets/lib/uploader.js b/core/client/assets/lib/uploader.js
@@ -47,7 +47,7 @@
                         .attr({'src': '', "width": 'auto', "height": 'auto'});
 
                     $progress.animate({"opacity": 0}, 250, function () {
-                        $dropzone.find('span.media').after('<img class="fileupload-loading"  src="' + Ghost.paths.ghostRoot + '/ghost/img/loadingcat.gif" />');
+                        $dropzone.find('span.media').after('<img class="fileupload-loading"  src="' + Ghost.paths.subdir + '/ghost/img/loadingcat.gif" />');
                         if (!settings.editor) {$progress.find('.fileupload-loading').css({"top": "56px"}); }
                     });
                     $dropzone.trigger("uploadsuccess", [result]);
@@ -62,7 +62,7 @@
                 var self = this;
 
                 $dropzone.find('.js-fileupload').fileupload().fileupload("option", {
-                    url: Ghost.paths.ghostRoot + '/ghost/upload/',
+                    url: Ghost.paths.subdir + '/ghost/upload/',
                     headers: {
                         'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
                     },

diff --git a/core/client/helpers/index.js b/core/client/helpers/index.js
@@ -1,5 +1,4 @@
-/*globals Handlebars, moment
-*/
+/*globals Handlebars, moment, Ghost */
 (function () {
     'use strict';
     Handlebars.registerHelper('date', function (context, options) {
@@ -29,4 +28,8 @@
         }
         return date;
     });
+
+    Handlebars.registerHelper('url', function () {
+        return Ghost.paths.subdir;
+    });
 }());
diff --git a/core/client/init.js b/core/client/init.js
@@ -4,11 +4,11 @@
 
     function ghostPaths() {
         var path = window.location.pathname,
-            root = path.substr(0, path.search('/ghost/'));
+            subdir = path.substr(0, path.search('/ghost/'));
 
         return {
-            ghostRoot: root,
-            apiRoot: root + '/ghost/api/v0.1'
+            subdir: subdir,
+            apiRoot: subdir + '/ghost/api/v0.1'
         };
     }
 
@@ -61,7 +61,7 @@
         Backbone.history.start({
             pushState: true,
             hashChange: false,
-            root: Ghost.paths.ghostRoot + '/ghost'
+            root: Ghost.paths.subdir + '/ghost'
         });
     };
 

diff --git a/core/client/tpl/login.hbs b/core/client/tpl/login.hbs
@@ -7,6 +7,6 @@
     </div>
     <button class="button-save" type="submit">Log in</button>
     <section class="meta">
-        <a class="forgotten-password" href="/ghost/forgotten/">Forgotten password?</a>{{! &bull; <a href="/ghost/signup/">Register new user</a>}}
+        <a class="forgotten-password" href="{{url}}/ghost/forgotten/">Forgotten password?</a>
     </section>
 </form>
diff --git a/core/client/tpl/preview.hbs b/core/client/tpl/preview.hbs
@@ -53,7 +53,7 @@
     <div class="no-posts-box">
         <div class="no-posts">
             <h3>You Haven't Written Any Posts Yet!</h3>
-            <form action="/ghost/editor/"><button class="button-add large" title="New Post">Write a new Post</button></form>
+            <form action="{{url}}/ghost/editor/"><button class="button-add large" title="New Post">Write a new Post</button></form>
         </div>
     </div>
 {{/unless}}
diff --git a/core/client/views/blog.js b/core/client/views/blog.js
@@ -213,7 +213,7 @@
             e.preventDefault();
             // for now this will disable "open in new tab", but when we have a Router implemented
             // it can go back to being a normal link to '#/ghost/editor/X'
-            window.location = Ghost.paths.ghostRoot + '/ghost/editor/' + this.model.get('id') + '/';
+            window.location = Ghost.paths.subdir + '/ghost/editor/' + this.model.get('id') + '/';
         },
 
         toggleFeatured: function (e) {

diff --git a/core/client/views/login.js b/core/client/views/login.js
@@ -35,7 +35,7 @@
                 Ghost.Validate.handleErrors();
             } else {
                 $.ajax({
-                    url: Ghost.paths.ghostRoot + '/ghost/signin/',
+                    url: Ghost.paths.subdir + '/ghost/signin/',
                     type: 'POST',
                     headers: {
                         'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
@@ -100,7 +100,7 @@
                 Ghost.Validate.handleErrors();
             } else {
                 $.ajax({
-                    url: Ghost.paths.ghostRoot + '/ghost/signup/',
+                    url: Ghost.paths.subdir + '/ghost/signup/',
                     type: 'POST',
                     headers: {
                         'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
@@ -157,7 +157,7 @@
                 Ghost.Validate.handleErrors();
             } else {
                 $.ajax({
-                    url: Ghost.paths.ghostRoot + '/ghost/forgotten/',
+                    url: Ghost.paths.subdir + '/ghost/forgotten/',
                     type: 'POST',
                     headers: {
                         'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
@@ -224,7 +224,7 @@
             this.$('input, button').prop('disabled', true);
 
             $.ajax({
-                url: Ghost.paths.ghostRoot + '/ghost/reset/' + this.token + '/',
+                url: Ghost.paths.subdir + '/ghost/reset/' + this.token + '/',
                 type: 'POST',
                 headers: {
                     'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')

diff --git a/core/client/views/post-settings.js b/core/client/views/post-settings.js
@@ -221,7 +221,7 @@
                                     }).then(function () {
                                         // Redirect to content screen if deleting post from editor.
                                         if (window.location.pathname.indexOf('editor') > -1) {
-                                            window.location = Ghost.paths.ghostRoot + '/ghost/content/';
+                                            window.location = Ghost.paths.subdir + '/ghost/content/';
                                         }
                                         Ghost.notifications.addItem({
                                             type: 'success',

diff --git a/core/client/views/settings.js b/core/client/views/settings.js
@@ -383,7 +383,7 @@
             } else {
 
                 $.ajax({
-                    url: '/ghost/changepw/',
+                    url: Ghost.paths.subdir + '/ghost/changepw/',
                     type: 'POST',
                     headers: {
                         'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')

diff --git a/core/server/api/db.js b/core/server/api/db.js
@@ -10,7 +10,7 @@ var dataExport       = require('../data/export'),
     _                = require('underscore'),
     schema           = require('../data/schema'),
     config           = require('../config'),
-    debugPath        = config.paths().webroot + '/ghost/debug/',
+    debugPath        = config.paths().subdir + '/ghost/debug/',
 
     db;
 
@@ -142,7 +142,7 @@ db = {
                 res.set({
                     "X-Cache-Invalidate": "/*"
                 });
-                res.redirect(config.paths().webroot + '/ghost/signin/');
+                res.redirect(config.paths().subdir + '/ghost/signin/');
             });
         }).otherwise(function importFailure(error) {
             return apiNotifications.browse().then(function (notifications) {

diff --git a/core/server/api/index.js b/core/server/api/index.js
@@ -57,7 +57,7 @@ requestHandler = function (apiMethod) {
             // If permalinks have changed, find old post route
             if (req.body.permalinks && req.body.permalinks !== permalinks) {
                 for (i = 0; i < req.app.routes.get.length; i += 1) {
-                    if (req.app.routes.get[i].path === config.paths().webroot + permalinks) {
+                    if (req.app.routes.get[i].path === config.paths().subdir + permalinks) {
                         postRouteIndex = i;
                         break;
                     }

diff --git a/core/server/config/loader.js b/core/server/config/loader.js
@@ -49,7 +49,8 @@ function writeConfigFile() {
 }
 
 function validateConfigEnvironment() {
-    var envVal = process.env.NODE_ENV || 'undefined',
+    var envVal = process.env.NODE_ENV || undefined,
+        rejectMessage = 'Unable to load config',
         hasHostAndPort,
         hasSocket,
         config,
@@ -65,20 +66,20 @@ function validateConfigEnvironment() {
     if (!config) {
         errors.logError(new Error('Cannot find the configuration for the current NODE_ENV'), "NODE_ENV=" + envVal,
             'Ensure your config.js has a section for the current NODE_ENV value and is formatted properly.');
-        return when.reject();
+        return when.reject(rejectMessage);
     }
 
     // Check that our url is valid
     parsedUrl = url.parse(config.url || 'invalid', false, true);
     if (!parsedUrl.host) {
         errors.logError(new Error('Your site url in config.js is invalid.'), config.url, 'Please make sure this is a valid url before restarting');
-        return when.reject();
+        return when.reject(rejectMessage);
     }
 
     // Check that we have database values
     if (!config.database) {
         errors.logError(new Error('Your database configuration in config.js is invalid.'), JSON.stringify(config.database), 'Please make sure this is a valid Bookshelf database configuration');
-        return when.reject();
+        return when.reject(rejectMessage);
     }
 
     hasHostAndPort = config.server && !!config.server.host && !!config.server.port;
@@ -87,7 +88,7 @@ function validateConfigEnvironment() {
     // Check for valid server host and port values
     if (!config.server || !(hasHostAndPort || hasSocket)) {
         errors.logError(new Error('Your server values (socket, or host and port) in config.js are invalid.'), JSON.stringify(config.server), 'Please provide them before restarting.');
-        return when.reject();
+        return when.reject(rejectMessage);
     }
 
     return when.resolve(config);

diff --git a/core/server/config/paths.js b/core/server/config/paths.js
@@ -21,8 +21,7 @@ var path              = require('path'),
 function paths() {
     return {
         'appRoot':          appRoot,
-        'path':             localPath,
-        'webroot':          localPath === '/' ? '' : localPath,
+        'subdir':           localPath === '/' ? '' : localPath,
         'config':           path.join(appRoot, 'config.js'),
         'configExample':    path.join(appRoot, 'config.example.js'),
         'contentPath':      contentPath,

diff --git a/core/server/config/theme.js b/core/server/config/theme.js
@@ -1,7 +1,7 @@
 // Holds all theme configuration information
 // that as mostly used by templates and handlebar helpers.
 
-var when          = require('when'),
+var when        = require('when'),
 
 // Variables
     themeConfig = {};
@@ -23,8 +23,8 @@ function update(settings, configUrl) {
         settings.read('logo'),
         settings.read('cover')
     ]).then(function (globals) {
-
-        themeConfig.url = configUrl;
+        // normalise the URL by removing any trailing slash
+        themeConfig.url = configUrl.replace(/\/$/, '');
         themeConfig.title = globals[0].value;
         themeConfig.description = globals[1].value;
         themeConfig.logo = globals[2] ? globals[2].value : '';

diff --git a/core/server/controllers/admin.js b/core/server/controllers/admin.js
@@ -86,7 +86,7 @@ adminControllers = {
                 req.session.regenerate(function (err) {
                     if (!err) {
                         req.session.user = user.id;
-                        var redirect = config.paths().webroot + '/ghost/';
+                        var redirect = config.paths().subdir + '/ghost/';
                         if (req.body.redirect) {
                             redirect += decodeURIComponent(req.body.redirect);
                         }
@@ -137,7 +137,7 @@ adminControllers = {
                         if (req.session.user === undefined) {
                             req.session.user = user.id;
                         }
-                        res.json(200, {redirect: config.paths().webroot + '/ghost/'});
+                        res.json(200, {redirect: config.paths().subdir + '/ghost/'});
                     }
                 });
             });
@@ -179,7 +179,7 @@ adminControllers = {
             };
 
             return api.notifications.add(notification).then(function () {
-                res.json(200, {redirect: config.paths().webroot + '/ghost/signin/'});
+                res.json(200, {redirect: config.paths().subdir + '/ghost/signin/'});
             });
 
         }, function failure(error) {
@@ -215,7 +215,7 @@ adminControllers = {
             errors.logError(err, 'admin.js', "Please check the provided token for validity and expiration.");
 
             return api.notifications.add(notification).then(function () {
-                res.redirect(config.paths().webroot + '/ghost/forgotten');
+                res.redirect(config.paths().subdir + '/ghost/forgotten');
             });
         });
     },
@@ -233,7 +233,7 @@ adminControllers = {
             };
 
             return api.notifications.add(notification).then(function () {
-                res.json(200, {redirect: config.paths().webroot + '/ghost/signin/'});
+                res.json(200, {redirect: config.paths().subdir + '/ghost/signin/'});
             });
         }).otherwise(function (err) {
             // TODO: Better error message if we can tell whether the passwords didn't match or something
@@ -251,7 +251,7 @@ adminControllers = {
             };
 
         return api.notifications.add(notification).then(function () {
-            res.redirect(config.paths().webroot + '/ghost/signin/');
+            res.redirect(config.paths().subdir + '/ghost/signin/');
         });
     },
     'index': function (req, res) {

diff --git a/core/server/controllers/frontend.js b/core/server/controllers/frontend.js
@@ -33,7 +33,7 @@ frontendControllers = {
 
             // Redirect '/page/1/' to '/' for all teh good SEO
             if (pageParam === 1 && req.route.path === '/page/:page/') {
-                return res.redirect(config.paths().webroot + '/');
+                return res.redirect(config.paths().subdir + '/');
             }
 
             // No negative posts per page, must be number
@@ -54,7 +54,7 @@ frontendControllers = {
 
             // If page is greater than number of pages we have, redirect to last page
             if (pageParam > maxPage) {
-                return res.redirect(maxPage === 1 ? config.paths().webroot + '/' : (config.paths().webroot + '/page/' + maxPage + '/'));
+                return res.redirect(maxPage === 1 ? config.paths().subdir + '/' : (config.paths().subdir + '/page/' + maxPage + '/'));
             }
 
             // Render the page of posts
@@ -116,11 +116,11 @@ frontendControllers = {
 
             // No negative pages
             if (isNaN(pageParam) || pageParam < 1) {
-                return res.redirect(config.paths().webroot + '/rss/');
+                return res.redirect(config.paths().subdir + '/rss/');
             }
 
-            if (pageParam === 1 && req.route.path === config.paths().webroot + '/rss/:page/') {
-                return res.redirect(config.paths().webroot + '/rss/');
+            if (pageParam === 1 && req.route.path === config.paths().subdir + '/rss/:page/') {
+                return res.redirect(config.paths().subdir + '/rss/');
             }
 
             api.posts.browse({page: pageParam}).then(function (page) {
@@ -134,7 +134,7 @@ frontendControllers = {
 
                 // If page is greater than number of pages we have, redirect to last page
                 if (pageParam > maxPage) {
-                    return res.redirect(config.paths().webroot + '/rss/' + maxPage + '/');
+                    return res.redirect(config.paths().subdir + '/rss/' + maxPage + '/');
                 }
 
                 filters.doFilter('prePostsRender', page.posts).then(function (posts) {