Merged branch master into master

package.json

@@ -46,9 +46,9 @@
     "cli-table": "^0.3.1",
     "commander": "^2.9.0",
     "connect-busboy": "0.0.2",
-    "deepmerge": "^0.2.10",
-    "dir-compare": "1.0.1",
-    "es6-promise": "^3.0.2",
+    "deepmerge": "^1.1.0",
+    "dir-compare": "^1.2.0",
+    "es6-promise": "^4.0.4",
     "exec": "^0.2.1",
     "express": "^4.13.3",
     "express-handlebars": "^3.0.0",
@@ -60,8 +60,8 @@
     "handlebars": "^4.0.3",
     "handlebars-helper-slugify": "^0.3.2",
     "handlebars-intl": "^1.1.1",
-    "helmet": "^1.3.0",
-    "html-minifier": "^1.5.0",
+    "helmet": "^2.3.0",
+    "html-minifier": "^3.1.0",
     "https": "^1.0.0",
     "limax": "^1.4.0",
     "lorem-ipsum": "^1.0.3",
@@ -71,13 +71,12 @@
     "node-sqlparser": "^1.0.2",
     "on": "^1.3.0",
     "openurl": "^1.1.0",
-    "pm2": "^1.1.3",
+    "pm2": "^2.0.18",
     "prettyjson": "^1.1.3",
     "prompt": "^1.0.0",
     "qs": "^6.0.1",
-    "redis": "^2.6.2",
     "request": "^2.69.0",
-    "watch": "^0.17.1",
+    "watch": "^0.19.2",
     "xss": "^0.2.10"
   },
   "devDependencies": {

src/cli/Create.js → src/cli/cms/Create.js

@@ -4,7 +4,7 @@ import slug from 'limax'
 
 import {
   config
-} from './'
+} from '../'
 
 export default class Create {
 

src/cli/helpers/abe-create.js → src/cli/cms/operations/abe-create.js

@@ -10,7 +10,7 @@ import {
   Hooks,
   removeDuplicateAttr,
   Manager
-} from '../../cli'
+} from '../../'
 
 var create = function(template, pathCreate, name, req, forceJson = {}, duplicate = false) {
   var p = new Promise((resolve, reject) => {

src/cli/helpers/abe-duplicate.js → src/cli/cms/operations/abe-duplicate.js

@@ -11,7 +11,7 @@ import {
   config,
   save,
   abeCreate
-} from '../../cli'
+} from '../../'
 
 var duplicate = function(oldFilePath, template, newPath, name, req, isUpdate = false) {
   var p = new Promise((resolve, reject) => {

src/cli/controllers/Save.js → src/cli/cms/operations/save.js

@@ -18,7 +18,7 @@ import {
   ,getTemplate
   ,Hooks
   ,cleanSlug
-} from '../'
+} from '../../'
 
 export function checkRequired(text, json) {
   var regAbe = /{{abe[\S\s].*?key=['|"]([\S\s].*?['|"| ]}})/g

src/cli/helpers/abe-get-select-template-keys.js → src/cli/cms/templates/abe-get-select-template-keys.js

@@ -13,7 +13,7 @@ import {
   Hooks,
   removeDuplicateAttr,
   Manager
-} from '../../cli'
+} from '../../'
 
 var traverseFileSystem = function (currentPath, arr) {
   var res = []

src/cli/helpers/abe-template.js → src/cli/cms/templates/abe-template.js

@@ -11,7 +11,7 @@ import {
   ,escapeTextToRegex
   ,Hooks
   ,Plugins
-} from '../../cli'
+} from '../../'
 
 export function addOrder(text) {
   var regAbe = /{{abe[\S\s].*?key=['|"]([\S\s].*?['|"| ]}})/g

src/cli/core/config/config.json

@@ -96,10 +96,5 @@
   "partials": "templates/partials",
   "custom": "custom",
   "siteUrl": false,
-  "sitePort": false,
-  "redis": {
-    "enable": false,
-    "port": "6379",
-    "host":"127.0.0.1"
-  }
+  "sitePort": false
 }

src/cli/index.js

@@ -34,7 +34,7 @@ import {
 } from './cms/editor/index'
 
 import Manager from './core/manager/Manager'
-import Page from './models/Page'
+import Page from './cms/Page'
 
 import {dateSlug, dateUnslug} from './core/utils/abe-date'
 import Locales from './core/utils/abe-locales'
@@ -44,25 +44,25 @@ import folderUtils from './core/utils/folder-utils'
 import slugify from './core/utils/slugify'
 import {cleanSlug} from './core/utils/slugify'
 
-import {getTemplate} from './helpers/abe-template'
-import Create from './Create'
+import {getTemplate} from './cms/templates/abe-template'
+import Create from './cms/Create'
 
 import config from './core/config/config'
 
 import {getAttr, getEnclosingTags, escapeTextToRegex} from './cms/data/regex-helper'
 import removeDuplicateAttr from './cms/data/abe-remove-duplicate-attr'
 import Sql from './cms/data/abe-sql'
 
-import abeCreate from './helpers/abe-create'
-import abeDuplicate from './helpers/abe-duplicate'
-import {save, checkRequired, saveJson} from './controllers/Save'
+import abeCreate from './cms/operations/abe-create'
+import abeDuplicate from './cms/operations/abe-duplicate'
+import {save, checkRequired, saveJson} from './cms/operations/save'
 
 import abeProcess from './extend/abe-process'
 import Hooks from './extend/abe-hooks'
 import Plugins from './extend/abe-plugins'
 
 
-import getSelectTemplateKeys from './helpers/abe-get-select-template-keys'
+import getSelectTemplateKeys from './cms/templates/abe-get-select-template-keys'
 
 export {
 	fileAttr

src/server/app.js

@@ -40,8 +40,6 @@ import {
   middleWebsite,
 } from './middlewares'
 
-import * as redis from '../cli/services/RedisClient'
-
 var abePort = null
 
 if(process.env.ROOT) config.set({root: process.env.ROOT.replace(/\/$/, '') + '/'})
@@ -81,10 +79,6 @@ if (fileUtils.isFile(path.join(config.root, 'cert.pem'))) {
 }
 
 var app = express(opts)
-
-if(config.redis.enable){
-  redis.connect(config.redis.port, config.redis.host)
-}
 
   // Instantiate Singleton Manager (which lists all blog files)
 Manager.instance.init()

test/template.js

@@ -4,8 +4,8 @@ var config = require('../src/cli').config
 config.set({root: __dirname + '/fixtures'})
 
 var getTemplate = require('../src/cli').getTemplate
-var includePartials = require('../src/cli/helpers/abe-template').includePartials
-var getAbeImport = require('../src/cli/helpers/abe-template').getAbeImport
+var includePartials = require('../src/cli/cms/templates/abe-template').includePartials
+var getAbeImport = require('../src/cli/cms/templates/abe-template').getAbeImport
 var Manager = require('../src/cli').Manager;
 var fse = require('fs-extra');