Remove remy from global scope

sailorproject · Feb 15, 2016 · ef75596 · ef75596
1 parent 999a995
commit ef75596
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -26,8 +26,7 @@ Remy was developed as part of [Sailor](https://github.com/Etiene/sailor), a Lua-
 ## Usage #
 
 ``` lua
-require "remy"
-require "string"
+local remy = require "remy"
 
 function handle(r)
     r.content_type = "text/plain"

diff --git a/src/remy.lua b/src/remy.lua
@@ -1,11 +1,11 @@
--- Remy 0.2.9
+-- Remy 0.2.10
 -- Copyright (c) 2014-2015 Felipe Daragon
 -- License: MIT (http://opensource.org/licenses/mit-license.php)
 --
 -- Remy runs Lua-based web applications in alternative web server
 -- environments that allow to run Lua code.
 
-remy = {
+local remy = {
 	MODE_AUTODETECT = nil,
 	MODE_CGILUA = 0,
 	MODE_MOD_PLUA = 1,
@@ -14,6 +14,8 @@ remy = {
 	MODE_LIGHTTPD = 4
 }
 
+local forced_mode = nil
+
 local emu = {}
 
 -- The values below will be updated during runtime
@@ -124,6 +126,7 @@ end
 -- Detects the Lua environment
 function remy.detect(native_request)
 	local mode = nil
+	if forced_mode then return forced_mode end
 	if cgilua ~= nil then
 		mode = remy.MODE_CGILUA
 	elseif ngx ~= nil then
@@ -133,6 +136,7 @@ function remy.detect(native_request)
 		if env["pLua-Version"] ~= nil then
 			mode = remy.MODE_MOD_PLUA
 		end
+	-- Note: lighty is not a package so package.loaded.lighty ~= nil will not work
 	elseif lighty ~= nil then
 		mode = remy.MODE_LIGHTTPD
 	elseif native_request ~= nil and type(native_request.query_param) == "function" then
@@ -176,3 +180,5 @@ function remy.sha1(str)
 	local sha1 = require "sha1"
 	return sha1(str)
 end
+
+return remy
diff --git a/src/remy/cgilua.lua b/src/remy/cgilua.lua
@@ -2,7 +2,9 @@
 -- Copyright (c) 2014 Felipe Daragon
 -- License: MIT
 
-require "base64"
+local base64 = require "base64"
+local cgilua = require "cgilua"
+local remy = require "remy"
 
 -- TODO: implement all functions from mod_lua's request_rec
 local request = {
@@ -125,4 +127,4 @@ function M.finish(code)
 	end
 end
 
-return M
+return M
diff --git a/src/remy/lwan.lua b/src/remy/lwan.lua
@@ -2,7 +2,8 @@
 -- Copyright (c) 2014 Leandro Pereira <[email protected]>
 -- License: MIT
 
-require "base64"
+local base64 = require "base64"
+local remy = require "remy"
 
 local lwan = {}
 lwan.query_param_table = function(req)

diff --git a/src/remy/mod_magnet.lua b/src/remy/mod_magnet.lua
@@ -2,7 +2,8 @@
 -- Copyright (c) 2015 Felipe Daragon
 -- License: MIT
 
-require "base64"
+local base64 = require "base64"
+local remy = require "remy"
 
 local utils = {}
 
@@ -50,7 +51,7 @@ function M.init()
 	r.args = lighty.env["uri.query"]
 	--r.args = remy.splitstring(lighty.env['request.uri'],'?')
 	r.banner = M.mode
-  r.basic_auth_pw = pass
+	r.basic_auth_pw = pass
 	r.canonical_filename = filename
 	r.context_document_root = lighty.env["physical.doc-root"]
 	r.document_root = lighty.env["physical.doc-root"]
@@ -76,4 +77,4 @@ function M.finish(code)
   lighty.content = { remy.responsetext }
 end
 
-return M
+return M
diff --git a/src/remy/mod_plua.lua b/src/remy/mod_plua.lua
@@ -2,6 +2,8 @@
 -- Copyright (c) 2014 Felipe Daragon
 -- License: MIT
 
+local remy = require "remy"
+
 -- TODO: implement all functions from mod_lua's request_rec
 local request = {
 	-- ENCODING/DECODING FUNCTIONS

diff --git a/src/remy/nginx.lua b/src/remy/nginx.lua
@@ -2,6 +2,9 @@
 -- Copyright (c) 2014 Felipe Daragon
 -- License: MIT
 
+local ngx = require "ngx"
+local remy = require "remy"
+
 -- TODO: implement all functions from mod_lua's request_rec
 local request = {
 	-- ENCODING/DECODING FUNCTIONS
@@ -38,7 +41,7 @@ function M.init()
 	r.method = ngx.var.request_method
 	r.args = remy.splitstring(ngx.var.request_uri,'?')
 	r.banner = M.mode.."/"..ngx.var.nginx_version
-  r.basic_auth_pw = pass
+	r.basic_auth_pw = pass
 	r.canonical_filename = filename
 	r.context_document_root = ngx.var.document_root
 	r.document_root = r.context_document_root