Updating settings types

- issue #573, issue #632

core/server/data/default-settings.json

@@ -1,4 +1,9 @@
 {
+    "core": {
+        "currentVersion": {
+            "default": "000"
+        }
+    },
     "blog": {
         "title": {
             "default": "Ghost"
@@ -6,6 +11,13 @@
         "description": {
             "default": "Just a blogging platform."
         },
+        "email": {
+            "default": "ghost@example.com",
+            "validations": {
+                "notNull": true,
+                "isEmail": true
+            }
+        },
         "logo": {
             "default": ""
         },
@@ -33,14 +45,7 @@
             }
         }
     },
-    "general": {
-        "email": {
-            "default": "ghost@example.com",
-            "validations": {
-                "notNull": true,
-                "isEmail": true
-            }
-        },
+    "theme": {
         "activePlugins": {
             "default": ""
         },
@@ -48,10 +53,7 @@
             "default": "casper"
         }
     },
-    "core": {
-        "currentVersion": {
-            "default": "000"
-        },
+    "plugin": {
         "installedPlugins": {
             "default": "[]"
         }

core/server/models/settings.js

@@ -40,7 +40,7 @@ Settings = GhostBookshelf.Model.extend({
     defaults: function () {
         return {
             uuid: uuid.v4(),
-            type: 'general'
+            type: 'core'
         };
     },
 

core/test/unit/api_settings_spec.js

@@ -154,7 +154,7 @@ describe('Settings Model', function () {
                 createdSetting.has('uuid').should.equal(true);
                 createdSetting.attributes.key.should.equal(newSetting.key, "key is correct");
                 createdSetting.attributes.value.should.equal(newSetting.value, "value is correct");
-                createdSetting.attributes.type.should.equal("general");
+                createdSetting.attributes.type.should.equal("core");
 
                 done();
             }).then(null, done);