Format.

evg-kazartseff · Nov 16, 2013 · 41a9576 · 41a9576
1 parent 670c03e
commit 41a9576
Show file tree

Hide file tree

Showing 38 changed files with 76 additions and 27 deletions.
diff --git a/gin/cli/api_console.lua b/gin/cli/api_console.lua
@@ -1,8 +1,8 @@
--- init module dependencies
+-- gin
 local Application = require 'config/application'
-
 local GinApiConsole = {}
 
+
 GinApiConsole.html = [====[
 
 <!DOCTYPE html>

diff --git a/gin/cli/application.lua b/gin/cli/application.lua
@@ -1,5 +1,7 @@
+-- dep
 local ansicolors = require 'ansicolors'
 
+-- gin
 local Gin = require 'gin.core.gin'
 local helpers = require 'gin.helpers.common'
 

diff --git a/gin/cli/base_launcher.lua b/gin/cli/base_launcher.lua
@@ -1,10 +1,9 @@
--- dependencies
+-- dep
 local lfs = require 'lfs'
 
+-- gin
 local Gin = require 'gin.core.gin'
 
-require 'gin.core.gin'
-
 
 local function create_dirs(necessary_dirs)
     for _, dir in pairs(necessary_dirs) do

diff --git a/gin/cli/console.lua b/gin/cli/console.lua
@@ -1,9 +1,11 @@
+-- dep
 local ansicolors = require 'ansicolors'
 local prettyprint = require 'pl.pretty'
 
 -- gin
 local Gin = require 'gin.core.gin'
 
+
 local GinConsole = {}
 
 function GinConsole.start()

diff --git a/gin/cli/launcher.lua b/gin/cli/launcher.lua
@@ -1,6 +1,7 @@
--- dependencies
+-- dep
 local ansicolors = require 'ansicolors'
 
+-- gin
 local Gin = require 'gin.core.gin'
 local BaseLauncher = require 'gin.cli.base_launcher'
 local helpers = require 'gin.helpers.common'

diff --git a/gin/cli/migrations.lua b/gin/cli/migrations.lua
@@ -1,4 +1,4 @@
--- dependencies
+-- dep
 local ansicolors = require 'ansicolors'
 
 -- gin

diff --git a/gin/core/detached.lua b/gin/core/detached.lua
@@ -1,3 +1,3 @@
--- detached modules
+-- detached
 local adapter_mysql = require 'gin.db.sql.mysql.adapter_detached'
 package.loaded['gin.db.sql.mysql.adapter'] = adapter_mysql
diff --git a/gin/core/error.lua b/gin/core/error.lua
@@ -1,5 +1,11 @@
+-- gin
 local helpers = require 'gin.helpers.common'
 
+-- perf
+local error = error
+local pairs = pairs
+local setmetatable = setmetatable
+
 
 -- define error
 Error = {}

diff --git a/gin/core/gin.lua b/gin/core/gin.lua
@@ -1,14 +1,17 @@
--- settings
+-- gin
 local settings = require 'gin.core.settings'
 
+-- perf
+local ogetenv = os.getenv
+
 
 local Gin = {}
 
 -- version
 Gin.version = '0.1'
 
 -- environment
-Gin.env = os.getenv("GIN_ENV") or 'development'
+Gin.env = ogetenv("GIN_ENV") or 'development'
 
 -- directories
 Gin.app_dirs = {

diff --git a/gin/core/request.lua b/gin/core/request.lua
@@ -1,10 +1,12 @@
--- dependencies
+-- dep
 local json = require 'cjson'
 
 -- perf
+local error = error
+local jdecode = json.decode
+local pcall = pcall
 local rawget = rawget
 local setmetatable = setmetatable
-local jdecode = json.decode
 
 
 local Request = {}
@@ -23,7 +25,7 @@ function Request.new(ngx)
         ok, json_or_error = pcall(function() return jdecode(body_raw) end)
         if ok == false then error({ code = 103 }) end
         if json_or_error[1] ~= nil then error({ code = 104 }) end
-        body= json_or_error
+        body = json_or_error
     end
 
     -- init instance

diff --git a/gin/core/router.lua b/gin/core/router.lua
@@ -1,6 +1,6 @@
 package.path = './app/controllers/?.lua;' .. package.path
 
--- dependencies
+-- dep
 local json = require 'cjson'
 
 -- gin

diff --git a/gin/core/routes.lua b/gin/core/routes.lua
@@ -5,8 +5,8 @@ local setmetatable = setmetatable
 local sgsub = string.gsub
 local smatch = string.match
 local tinsert = table.insert
-local type = type
 local tostring = tostring
+local type = type
 
 
 --  versions

diff --git a/gin/core/settings.lua b/gin/core/settings.lua
@@ -1,9 +1,8 @@
+-- gin
 local helpers = require 'gin.helpers.common'
 
 -- perf
 local pairs = pairs
-local pcall = pcall
-local require = require
 
 
 local GinSettings = {}

diff --git a/gin/db/migrations.lua b/gin/db/migrations.lua
@@ -1,4 +1,4 @@
--- run in detached mode
+-- detached
 require 'gin.core.detached'
 
 -- gin

diff --git a/gin/db/sql.lua b/gin/db/sql.lua
@@ -1,3 +1,9 @@
+-- perf
+local error = error
+local pairs = pairs
+local require = require
+local setmetatable = setmetatable
+
 
 local required_options = {
     adapter = true,

diff --git a/gin/db/sql/mysql/adapter.lua b/gin/db/sql/mysql/adapter.lua
@@ -1,9 +1,10 @@
 -- perf
 local error = error
 local ipairs = ipairs
+local pairs = pairs
 local require = require
 local tinsert = table.insert
-local error = error
+local tonumber = tonumber
 
 -- settings
 local timeout_subsequent_ops = 1000 -- 1 sec

diff --git a/gin/db/sql/mysql/adapter_detached.lua b/gin/db/sql/mysql/adapter_detached.lua
@@ -8,13 +8,17 @@ local Gin = require 'gin.core.gin'
 -- perf
 local assert = assert
 local ipairs = ipairs
+local pairs = pairs
 local pcall = pcall
+local setmetatable = setmetatable
 local smatch = string.match
 local tinsert = table.insert
+local tonumber = tonumber
 
 -- settings
 local mysql_default_database = 'mysql'
 
+
 -- deepcopy of a table
 local function deepcopy(orig)
     local orig_type = type(orig)

diff --git a/gin/db/sql/mysql/orm.lua b/gin/db/sql/mysql/orm.lua
@@ -1,11 +1,12 @@
 -- perf
+local next = next
 local pairs = pairs
+local setmetatable = setmetatable
 local tconcat = table.concat
 local tinsert = table.insert
 local type = type
-local next = next
-
 
+-- field and values helper
 local function field_and_values(quote, attrs, concat)
     local fav = {}
     for field, value in pairs(attrs) do

diff --git a/gin/helpers/command.lua b/gin/helpers/command.lua
@@ -1,6 +1,7 @@
 -- dep
 local prettyprint = require 'pl.pretty'
 
+
 -- pretty print
 function pp(o)
     prettyprint.dump(o)

diff --git a/gin/helpers/common.lua b/gin/helpers/common.lua
@@ -1,15 +1,19 @@
--- dependencies
+-- dep
 local lfs = require 'lfs'
 local prettyprint = require 'pl.pretty'
 
 -- perf
 local iopen = io.open
 local ipairs = ipairs
+local pairs = pairs
+local pcall = pcall
+local require = require
 local sfind = string.find
 local sgsub = string.gsub
 local smatch = string.match
 local ssub = string.sub
 local tinsert = table.insert
+local type = type
 
 
 local CommonHelpers = {}
@@ -120,7 +124,7 @@ end
 
 -- get the lua module name
 function CommonHelpers.get_lua_module_name(file_path)
-    return string.match(file_path, "(.*)%.lua")
+    return smatch(file_path, "(.*)%.lua")
 end
 
 -- shallow copy of a table

diff --git a/gin/spec/init.lua b/gin/spec/init.lua
@@ -3,6 +3,7 @@ package.path = './?.lua;' .. package.path
 -- gin
 local helpers = require 'gin.helpers.common'
 
+
 -- ensure test environment is specified
 local posix = require "posix"
 posix.setenv("GIN_ENV", 'test')

diff --git a/gin/spec/runner.lua b/gin/spec/runner.lua
@@ -1,5 +1,7 @@
+-- gin
 require 'gin.spec.init'
 
+
 -- add integration runner
 local IntegrationRunner = require 'gin.spec.runners.integration'
 

diff --git a/gin/spec/runners/integration.lua b/gin/spec/runners/integration.lua
@@ -1,4 +1,4 @@
--- dependencies
+-- dep
 local http = require 'socket.http'
 local url = require 'socket.url'
 local json = require 'cjson'

diff --git a/gin/spec/runners/response.lua b/gin/spec/runners/response.lua
@@ -1,3 +1,4 @@
+-- dep
 local json = require 'cjson'
 
 
@@ -18,8 +19,6 @@ function ResponseSpec.new(options)
     if options.body ~= nil and trim(options.body) ~= "" then
         ok, json_body = pcall(function() return json.decode(options.body) end)
         if ok == false then json_body = nil end
-        -- json_body = json.decode(options.body)
-        -- if type(json_body) ~= 'table' then json_body = nil end
     end
 
     -- init instance

diff --git a/spec/core/controller_spec.lua b/spec/core/controller_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("Controller", function()
     before_each(function()
         Controller = require 'gin.core.controller'

diff --git a/spec/core/error_spec.lua b/spec/core/error_spec.lua
@@ -1,7 +1,6 @@
 require 'spec.spec_helper'
 
 
-
 describe("Error", function()
     before_each(function()
         Error = require 'gin.core.error'

diff --git a/spec/core/request_spec.lua b/spec/core/request_spec.lua
@@ -1,7 +1,9 @@
 require 'spec.spec_helper'
 
+-- gin
 local Request = require 'gin.core.request'
 
+
 describe("Request", function()
     before_each(function()
         ngx = {

diff --git a/spec/core/response_spec.lua b/spec/core/response_spec.lua
@@ -1,7 +1,9 @@
 require 'spec.spec_helper'
 
+-- gin
 local Response = require 'gin.core.response'
 
+
 describe("Response", function()
     describe(".new", function()
         describe("when no options are passed in", function()

diff --git a/spec/core/router_spec.lua b/spec/core/router_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("Router", function()
     before_each(function()
         -- stub application packages

diff --git a/spec/core/routes_spec.lua b/spec/core/routes_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("Routes", function()
 
     before_each(function()

diff --git a/spec/core/settings_spec.lua b/spec/core/settings_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("Settings", function()
 
     before_each(function()

diff --git a/spec/core/zebra_spec.lua b/spec/core/zebra_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("Gin", function()
     before_each(function()
         package.loaded['gin.core.gin'] = nil

diff --git a/spec/db/migrations_spec.lua b/spec/db/migrations_spec.lua
@@ -8,6 +8,7 @@ CREATE TABLE schema_migrations (
 );
 ]]
 
+
 describe("Migrations", function()
     before_each(function()
         migrations = require 'gin.db.migrations'

diff --git a/spec/db/sql/mysql/orm_spec.lua b/spec/db/sql/mysql/orm_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("MySqlOrm", function()
 
     before_each(function()

diff --git a/spec/db/sql/orm_spec.lua b/spec/db/sql/orm_spec.lua
@@ -1,6 +1,9 @@
 require 'spec.spec_helper'
+
+-- gin
 local helpers = require 'gin.helpers.common'
 
+
 describe("SqlOrm", function()
 
     before_each(function()

diff --git a/spec/db/sql_spec.lua b/spec/db/sql_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("Database SQL", function()
     before_each(function()
         SqlDatabase =  require 'gin.db.sql'

diff --git a/spec/spec/runners/integration_spec.lua b/spec/spec/runners/integration_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("Integration", function()
     before_each(function()
         IntegrationRunner = require 'gin.spec.runners.integration'

diff --git a/spec/spec/runners/response_spec.lua b/spec/spec/runners/response_spec.lua
@@ -1,5 +1,6 @@
 require 'spec.spec_helper'
 
+
 describe("ResponseSpec", function()
     before_each(function()
         ResponseSpec = require 'gin.spec.runners.response'