Request is no longer global

expressjs · Apr 2, 2010 · a2a0935 · a2a0935
1 parent 2668156
commit a2a0935
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 8 deletions.
diff --git a/examples/coffee-upload/app.coffee b/examples/coffee-upload/app.coffee
@@ -3,6 +3,8 @@ require.paths.unshift 'lib'
 require 'express'
 require 'express/plugins'
 
+sys: require 'sys'
+
 configure ->
   use MethodOverride
   use ContentLength
@@ -26,7 +28,7 @@ get '/upload', ->
 
 post '/upload', ->
   @param('images').each (image) =>
-    puts image.filename + ' -> ' + image.tempfile
+    sys.puts image.filename + ' -> ' + image.tempfile
     @flash 'info', 'Uploaded ' + image.filename
   @redirect '/upload'
 

diff --git a/examples/upload/app.js b/examples/upload/app.js
@@ -3,6 +3,8 @@ require.paths.unshift('lib')
 require('express')
 require('express/plugins')
 
+var sys = require('sys')
+
 configure(function(){
   use(MethodOverride)
   use(ContentLength)
@@ -29,7 +31,7 @@ get('/upload', function(){
 
 post('/upload', function(){  
   this.param('images').each(function(image){
-    puts(image.filename + ' -> ' + image.tempfile)
+    sys.puts(image.filename + ' -> ' + image.tempfile)
     this.flash('info', 'Uploaded ' + image.filename)
   }, this)
   this.redirect('/upload')

diff --git a/lib/express/core.js b/lib/express/core.js
@@ -5,13 +5,14 @@
  * Module dependencies.
  */
 
-var multipart = require('multipart'),
+var Request = require('express/request').Request,
+    normalizePath = require('express/request').normalizePath,
+    multipart = require('multipart'),
     utils = require('express/utils'),
     http = require('http'),
     sys = require('sys'),
     fs = require('fs')
 
-global.merge(require('express/request'))
 global.merge(require('express/plugin'))
 global.merge(require('express/dsl'))
 

diff --git a/lib/express/plugins/cache.js b/lib/express/plugins/cache.js
@@ -1,6 +1,12 @@
 
 // Express - Cache - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
+/**
+ * Module dependencies.
+ */
+
+var Request = require('express/request').Request
+
 // --- Cache
 
 var Cache = new Class({

diff --git a/lib/express/plugins/cookie.js b/lib/express/plugins/cookie.js
@@ -1,6 +1,12 @@
 
 // Express - Cookie - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
+/**
+ * Module dependencies.
+ */
+
+var Request = require('express/request').Request
+
 /**
  * Parse an HTTP _cookie_ string into a hash.
  *

diff --git a/lib/express/plugins/flash.js b/lib/express/plugins/flash.js
@@ -1,6 +1,14 @@
 
 // Express - Flash - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
+/**
+ * Module dependencies.
+ */
+
+var Request = require('express/request').Request
+
+// --- Flash
+
 exports.Flash = Plugin.extend({
   extend: {
 

diff --git a/lib/express/plugins/redirect.js b/lib/express/plugins/redirect.js
@@ -1,6 +1,14 @@
 
 // Express - Redirect - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
+/**
+ * Module dependencies.
+ */
+
+var Request = require('express/request').Request
+
+// --- Redirect
+
 exports.Redirect = Plugin.extend({
   extend: {
 

diff --git a/lib/express/plugins/session.js b/lib/express/plugins/session.js
@@ -5,7 +5,8 @@
  * Module dependencies.
  */
 
-var utils = require('express/utils')
+var Request = require('express/request').Request,
+    utils = require('express/utils')
 
 // --- Session
 

diff --git a/lib/express/plugins/static.js b/lib/express/plugins/static.js
@@ -5,7 +5,8 @@
  * Module dependencies.
  */
 
-var path = require('path'),
+var Request = require('express/request').Request,
+    path = require('path'),
     fs = require('fs')
 
 // --- File

diff --git a/lib/express/plugins/view.js b/lib/express/plugins/view.js
@@ -5,7 +5,8 @@
  * Module dependencies.
  */
 
-var extname = require('path').extname,
+var Request = require('express/request').Request,
+    extname = require('path').extname,
     fs = require('fs')
 
 /**

diff --git a/lib/express/spec/mocks.js b/lib/express/spec/mocks.js
@@ -5,7 +5,8 @@
  * Module dependencies.
  */
 
-var path = require('path'),
+var Request = require('express/request').Request,
+    path = require('path'),
     fs = require('fs')
 
 /**