[misc] Removed dead code #294

  * Removes legacy Hook methods
  * Removes code that is now in `microcule`
  * Removes code for loading views / presenters
  * All tests passing

lib/resources/hook/index.js

@@ -356,13 +356,8 @@ hook.fork = require('./fork');
 hook.run = require('./run');
 hook.gateway = require('./gateway');
 hook.runHook = require('./runHook');
-hook.invalidateCache = require('./invalidateCache');
 hook.formatError = require('./formatError');
 hook.fetchHookSourceCode = require('./fetchHookSourceCode');
-hook.fetchHookTheme = require('./fetchHookTheme');
-hook.fetchHookPresenter = require('./fetchHookPresenter');
-hook.loadPresenter = require('./loadPresenter');
-hook.attemptToRequireUntrustedHook = require('./attemptToRequireUntrustedHook');
 hook.preprocessHook = require('./preprocessHook');
 hook.viewPresenter = require('microcule').viewPresenter;
 hook.runUntrustedService = require('run-service');

lib/server/routeHandlers/hookView.js

@@ -27,20 +27,12 @@ module['exports'] = function handleHookView (req, res) {
       if (!hasPermission) {
         return res.end(config.messages.unauthorizedRoleAccess(req, "hook::view::read"));
       } else {
-
         resource.emit('hook::view::read', {
           ip: req.connection.remoteAddress,
           owner: req.params.owner,
           url: req.url
         });
-
-        hook.fetchHookTheme({ req: req, res: res }, h.theme, function(err, _theme){
-         if (err) {
-            return res.end(err.message);
-          }
-          console.log(err, _theme)
-          return res.end(_theme)
-        });
+        return res.end(h.themeSource);
       }
 
     });

lib/web/index.js

@@ -38,9 +38,6 @@ var domain = require('../resources/domain');
 var keys = require('../resources/keys');
 var events = require('../resources/events');
 
-var updatePool = require('../helpers/updatePool');
-
-//var mergeParams = require('../../view/mergeParams');
 var checkRoleAccess = require('../server/routeHandlers/checkRoleAccess');
 keys.setUser(user);
 
@@ -57,17 +54,6 @@ var jsonParser = bodyParser.json();
 
 var sslKeyDirectory = config.sslKeyDirectory;
 
-/*
-var oysClient = require('oys/client');
-
-var client = oysClient.createClient({
-  oys_private_key: config.oys_private_key,
-  host: 'localhost',
-  port: 4000,
-  protocol: "http"
-});
-*/
-
 server.start = function start (opts, cb) {
 
   var GitHubStrategy = require('passport-github').Strategy;
@@ -304,19 +290,6 @@ server.start = function start (opts, cb) {
 
         var handleEvents = require('../server/routeHandlers/hookEvents');
         // var handleModules = require('../server/routeHandlers/modules');
-        var handleRefresh = require('../server/routeHandlers/refresh');
-
-        app.get('/:owner/:hook/refresh', function (req, res){
-          req.params.owner = req.params.owner.toLowerCase();
-          req.params.hook = req.params.hook.toLowerCase();
-          return handleRefresh(req, res);
-        });
-
-        app.post('/:owner/:hook/refresh', function (req, res){
-          req.params.owner = req.params.owner.toLowerCase();
-          req.params.hook = req.params.hook.toLowerCase();
-          return handleRefresh(req, res);
-        });
 
         app.get('/:owner/:hook/delete', function (req, res) {
           req.params.owner = req.params.owner.toLowerCase();

view/new.js

@@ -155,47 +155,11 @@ module['exports'] = function view (opts, callback) {
                name: params.name
              });
 
-            // the source of the hook is coming from the code editor
-            if (params.hookSource === "code") {
-               // if jsonResponse, return object
-               if (req.jsonResponse) {
-                 return res.json({ status: 'created', hook: result });
-               } else {
-                 // if not, redirect to admin page for newly created hook
-                 return res.redirect('/admin?owner=' + h.owner + "&name=" + h.name + "&status=created");
-               }
-            } else {
-              // the source of the hook is coming from a github gist
-              opts.gist = gist;
-              opts.req = opts.request;
-              opts.res = opts.response;
-              if (req.jsonResponse) {
-                return res.json({ result: 'created' })
-              } else {
-                return res.redirect('/' + h.owner + "/" + h.name + "");
-              }
-
-              // fetch the hook from github and check if it has a schema / theme
-              // if so, attach it to the hook document
-              // TODO: can we remove this? it seems like this logic should be in the Hook.runHook execution chain...
-              hook.fetchHookSourceCode(opts, function(err, code){
-                if (err) {
-                  return opts.res.end(err.message);
-                }
-                hook.attemptToRequireUntrustedHook(opts, function(err, _module){
-                  if (err) {
-                    return opts.res.end(err.message)
-                  }
-                  h.mschema = _module.schema;
-                  h.theme = _module.theme;
-                  h.presenter = _module.presenter;
-                  h.save(function(){
-                    // redirect to new hook friendly page
-                    return res.redirect('/' + h.owner + "/" + h.name + "");
-                    //return callback(null, JSON.stringify(result, true, 2));
-                  });
-                });
-              });
+             if (req.jsonResponse) {
+               return res.json({ status: 'created', hook: result });
+             } else {
+               // if not, redirect to admin page for newly created hook
+               return res.redirect('/admin?owner=' + h.owner + "&name=" + h.name + "&status=created");
             }
           });
         });