move files to new structure

walter0331 · Feb 17, 2014 · bf9e382 · bf9e382
1 parent 38c09d0
commit bf9e382
Show file tree

Hide file tree

Showing 50 changed files with 392 additions and 392 deletions.
diff --git a/lib/cache-engines/memcached.js → lib/_old/cache-engines/memcached.js b/lib/cache-engines/memcached.js → lib/_old/cache-engines/memcached.js
diff --git a/lib/cache-engines/no-cache.js → lib/_old/cache-engines/no-cache.js b/lib/cache-engines/no-cache.js → lib/_old/cache-engines/no-cache.js
diff --git a/lib/cache-engines/node-cache.js → lib/_old/cache-engines/node-cache.js b/lib/cache-engines/node-cache.js → lib/_old/cache-engines/node-cache.js
diff --git a/lib/cache-engines/redis.js → lib/_old/cache-engines/redis.js b/lib/cache-engines/redis.js → lib/_old/cache-engines/redis.js
diff --git a/lib/cache.js → lib/_old/cache.js b/lib/cache.js → lib/_old/cache.js
diff --git a/lib/iframely-meta.js → lib/_old/iframely-meta.js b/lib/iframely-meta.js → lib/_old/iframely-meta.js
diff --git a/lib/iframely.js → lib/_old/iframely.js b/lib/iframely.js → lib/_old/iframely.js
@@ -1,7 +1,7 @@
 (function(proxy) {
 
     if (!GLOBAL.CONFIG) {
-        GLOBAL.CONFIG = require('../config');
+        GLOBAL.CONFIG = require('../../config');
     }
 
     var fs = require('fs'),

diff --git a/lib/new/iframely2.js → lib/_old/iframely2_prototype.js b/lib/new/iframely2.js → lib/_old/iframely2_prototype.js
@@ -3,17 +3,17 @@ GLOBAL.CONFIG = require('../../config');
 var url = require("url");
 var _ = require("underscore");
 
-var utils = require('./utils');
+var utils = require('./../utils');
 
 var getUrl = utils.getUrl;
 
 var oembedDataPlugin = require('./plugins/custom/oembed/oembedData');
 var oembedLinksFromUriPlugin = require('./plugins/custom/oembed/oembedLinksFromUri');
 var oembedLinksFromMetaPlugin = require('./plugins/custom/oembed/oembedLinksFromMeta');
 var htmlMetaPlugin = require('./plugins/htmlMeta');
-var cheerioPlugin = require('./plugins/custom/cheerio');
-var readabilityPlugin = require('./plugins/generic/readability');
-var htmlparserPlugin = require('./plugins/custom/htmlparser');
+var cheerioPlugin = require('././custom/cheerio');
+var readabilityPlugin = require('././generic/readability');
+var htmlparserPlugin = require('././custom/htmlparser');
 
 var getUri = function(uri, settings, cb){
     if(typeof settings === "function"){

diff --git a/lib/jquery.js → lib/_old/jquery.js b/lib/jquery.js → lib/_old/jquery.js
diff --git a/lib/_old/utils.js b/lib/_old/utils.js
@@ -0,0 +1,46 @@
+exports.createTimer = function() {
+
+    var timer = new Date().getTime();
+
+    return function() {
+        return new Date().getTime() - timer;
+    };
+};
+
+var disposeObject = exports.disposeObject = function(o) {
+
+    if (o) {
+
+        if (o && o.hasOwnProperty && (
+                   o.hasOwnProperty('plugins')
+                || o.hasOwnProperty('whitelistRecord')
+                || o.hasOwnProperty('whitelist'))) {
+            delete o.plugins;
+            delete o.whitelistRecord;
+            delete o.whitelist;
+        }
+
+        if (o instanceof Array) {
+
+            for(var i = 0; i < o.length; i++) {
+
+                disposeObject(o[i]);
+
+                o[i] = null;
+            }
+
+            o.length = 0;
+
+        } else if (typeof o === "object") {
+
+            for(var key in o) {
+                if (o.hasOwnProperty(key)) {
+                    disposeObject(o[key]);
+                    o[key] = null;
+                    delete o[key];
+                }
+            }
+
+        }
+    }
+};
diff --git a/lib/whitelist.js → lib/_old/whitelist.js b/lib/whitelist.js → lib/_old/whitelist.js
diff --git a/lib/new/core/core.js → lib/core/core.js b/lib/new/core/core.js → lib/core/core.js
diff --git a/lib/new/core/pluginLoader.js → lib/core/pluginLoader.js b/lib/new/core/pluginLoader.js → lib/core/pluginLoader.js
@@ -326,10 +326,10 @@
                     }
                 }
 
-                loadPlugins('lib', 'new', 'plugins', 'generic');
-                loadPlugins('lib', 'new', 'plugins', 'custom');
-                loadPlugins('lib', 'new', 'plugins', 'post');
-                loadPlugins('lib', 'new', 'plugin-tests', 'domains');
+                loadPlugins('lib', 'plugins', 'generic');
+                loadPlugins('lib', 'plugins', 'custom');
+                loadPlugins('lib', 'plugins', 'post');
+                loadPlugins('lib', 'plugin-tests', 'domains');
 
                 /*
                 var modulePluginsPath = path.resolve(modulePath, 'lib', 'new', 'plugins');

diff --git a/lib/new/core/utils.js → lib/core/utils.js b/lib/new/core/utils.js → lib/core/utils.js
diff --git a/...ndlers/CollectingHandlerForMutliTarget.js → ...ndlers/CollectingHandlerForMutliTarget.js b/...ndlers/CollectingHandlerForMutliTarget.js → ...ndlers/CollectingHandlerForMutliTarget.js
diff --git a/lib/new/handlers/HTMLMetaHandler.js → lib/handlers/HTMLMetaHandler.js b/lib/new/handlers/HTMLMetaHandler.js → lib/handlers/HTMLMetaHandler.js