Skip to content

Commit

Permalink
Make request and response global objects
Browse files Browse the repository at this point in the history
  • Loading branch information
ostinelli committed Sep 22, 2013
1 parent 08ac6d7 commit bb69df8
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
6 changes: 5 additions & 1 deletion core/ralis.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
require 'core/request'
require 'core/response'

Ralis = {}

-- version
Ralis.version = '0.1'

-- set global environment
-- environment
Ralis.env = os.getenv("RALIS_ENV") or 'development'

return Ralis
2 changes: 1 addition & 1 deletion core/request.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local Request = {}
Request = {}
Request.__index = Request

function Request.new(options)
Expand Down
2 changes: 1 addition & 1 deletion core/response.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local Response = {}
Response = {}
Response.__index = Response

function Response.new(options)
Expand Down
4 changes: 1 addition & 3 deletions core/router.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package.path = './app/controllers/?.lua;' .. package.path

-- init module dependencies
local cjson = require 'cjson'

-- init Environment
require 'core/ralis'
local cjson = require 'cjson'

-- load modules
local routes = require 'config/routes'
Expand Down
4 changes: 2 additions & 2 deletions spec/core/request_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe("Request", function()
describe(".new", function()
describe("when no options are passed in", function()
it("initializes an instance with defaults", function()
local request = require('core/request').new()
local request = Request.new()

assert.are.same('GET', request.method)
assert.are.same("/", request.url)
Expand All @@ -16,7 +16,7 @@ describe("Request", function()

describe("when options are passed in", function()
it("saves them to the instance", function()
local request = require('core/request').new({
local request = Request.new({
method = 'PUT',
url = "/users",
query = { page = 2 },
Expand Down
4 changes: 2 additions & 2 deletions spec/core/response_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ describe("Response", function()
describe(".new", function()
describe("when no options are passed in", function()
it("initializes an instance with defaults", function()
local response = require('core/response').new()
local response = Response.new()

assert.are.same('GET', response.method)
assert.are.same("/", response.url)
Expand All @@ -16,7 +16,7 @@ describe("Response", function()

describe("when options are passed in", function()
it("saves them to the instance", function()
local response = require('core/response').new({
local response = Response.new({
method = 'PUT',
url = "/users",
query = { page = 2 },
Expand Down
1 change: 0 additions & 1 deletion spec/core/router_spec.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require 'spec/spec_helper'

describe("Router", function()

before_each(function()
router = require 'core/router'
routes = require 'core/routes'
Expand Down

0 comments on commit bb69df8

Please sign in to comment.