Added more convenience imports and fixed the require() caching proble…

…m again (revert).
relaypro-open · Sep 8, 2014 · 92f27a8 · 92f27a8
1 parent 0e7f400
commit 92f27a8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 6 deletions.
diff --git a/api.js b/api.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./settings').load().api;
+module.exports = require('./formidable').api;
diff --git a/context.js b/context.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./settings').load().context;
+module.exports = require('./formidable').context;
diff --git a/log.js b/log.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./settings').load().log;
+module.exports = require('./formidable').log;
diff --git a/option.js b/option.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('formidable').option;
diff --git a/path.js b/path.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./formidable').path;
diff --git a/settings.js b/settings.js
@@ -30,11 +30,22 @@ var //---------------
     reset = function() {
         var cached = cache[defaultPath] && cache[defaultPath].path;
 
-        delete require.cache[path.join(__dirname, 'formidable.js')];
         if (cached) {
             cached.js.clear();
             cached.template.clear();
         }
+        each([
+            'api',
+            'context',
+            'log',
+            'formidable',
+            'option',
+            'path',
+            'template',
+            'urls'
+        ], function(name) {
+            delete require.cache[path.join(__dirname, name + '.js')];
+        });
     },
 
     // Configure the default settings module file path.

diff --git a/template.js b/template.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./settings').load().template;
+module.exports = require('./formidable').template;
diff --git a/urls.js b/urls.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./settings').load().urls;
+module.exports = require('./formidable').urls;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		'use strict';

		module.exports = require('formidable').option;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		'use strict';

		module.exports = require('./formidable').path;