remove versioning from importer

refs TryGhost#4605, TryGhost#4479

core/server/data/import/000.js → core/server/data/import/data-importer.js

@@ -3,37 +3,15 @@ var Promise = require('bluebird'),
     models  = require('../../models'),
     utils   = require('./utils'),
 
-    Importer000;
+    DataImporter;
 
-Importer000 = function () {
-    _.bindAll(this, 'doImport');
+DataImporter = function () {};
 
-    this.version = '000';
-
-    this.importFrom = {
-        '000': this.doImport,
-        '001': this.doImport,
-        '002': this.doImport,
-        '003': this.doImport
-    };
+DataImporter.prototype.importData = function (data) {
+    return this.doImport(data);
 };
 
-Importer000.prototype.importData = function (data) {
-    return this.canImport(data)
-        .then(function (importerFunc) {
-            return importerFunc(data);
-        });
-};
-
-Importer000.prototype.canImport = function (data) {
-    if (data.meta && data.meta.version && this.importFrom[data.meta.version]) {
-        return Promise.resolve(this.importFrom[data.meta.version]);
-    }
-
-    return Promise.reject('Unsupported version of data: ' + data.meta.version);
-};
-
-Importer000.prototype.loadUsers = function () {
+DataImporter.prototype.loadUsers = function () {
     var users = {all: {}};
 
     return models.User.findAll({include: ['roles']}).then(function (_users) {
@@ -52,11 +30,7 @@ Importer000.prototype.loadUsers = function () {
     });
 };
 
-// Importer000.prototype.importerFunction = function (t) {
-//
-// };
-
-Importer000.prototype.doUserImport = function (t, tableData, users, errors) {
+DataImporter.prototype.doUserImport = function (t, tableData, users, errors) {
     var userOps = [],
         imported = [];
 
@@ -89,7 +63,7 @@ Importer000.prototype.doUserImport = function (t, tableData, users, errors) {
     return Promise.resolve({});
 };
 
-Importer000.prototype.doImport = function (data) {
+DataImporter.prototype.doImport = function (data) {
     var self = this,
         tableData = data.data,
         imported = {},
@@ -171,8 +145,8 @@ Importer000.prototype.doImport = function (data) {
 };
 
 module.exports = {
-    Importer000: Importer000,
+    DataImporter: DataImporter,
     importData: function (data) {
-        return new Importer000().importData(data);
+        return new DataImporter().importData(data);
     }
 };

core/server/data/import/index.js

@@ -4,6 +4,7 @@ var Promise         = require('bluebird'),
     errors          = require('../../errors'),
     uuid            = require('node-uuid'),
     validator       = require('validator'),
+    importer        = require('./data-importer'),
     tables          = require('../schema').tables,
     validate,
     handleErrors,
@@ -184,25 +185,12 @@ validate = function validate(data) {
     });
 };
 
-module.exports = function (version, data) {
-    var importer,
-        sanitizeResults;
-
-    sanitizeResults = sanitize(data);
+module.exports = function (data) {
+    var sanitizeResults = sanitize(data);
 
     data = sanitizeResults.data;
 
     return validate(data).then(function () {
-        try {
-            importer = require('./' + version);
-        } catch (ignore) {
-            // Zero effs given
-        }
-
-        if (!importer) {
-            return Promise.reject('No importer found');
-        }
-
         return importer.importData(data);
     }).then(function () {
         return sanitizeResults;

core/server/data/importer/importers/data.js

@@ -8,7 +8,7 @@ DataImporter = {
         return importData;
     },
     doImport: function (importData) {
-        return importer('003', importData);
+        return importer(importData);
     }
 };