unpack compat

lapis/application.lua

@@ -5,6 +5,7 @@ Router = require("lapis.router").Router
 local insert
 insert = table.insert
 local json = require("cjson")
+local unpack = unpack or table.unpack
 local capture_errors, capture_errors_json, respond_to
 local run_before_filter
 run_before_filter = function(filter, r)

lapis/application.moon

@@ -8,6 +8,8 @@ import insert from table
 
 json = require "cjson"
 
+unpack = unpack or table.unpack
+
 local capture_errors, capture_errors_json, respond_to
 
 run_before_filter = (filter, r) ->

lapis/cmd/actions.lua

@@ -6,6 +6,7 @@ end
 local default_environment
 default_environment = require("lapis.environment").default_environment
 local colors = require("ansicolors")
+local unpack = unpack or table.unpack
 local Actions
 do
   local _class_0

lapis/cmd/actions.moon

@@ -4,6 +4,8 @@ import default_environment from require "lapis.environment"
 
 colors = require "ansicolors"
 
+unpack = unpack or table.unpack
+
 class Actions
   defalt_action: "help"
 

lapis/db/base.lua

@@ -63,6 +63,7 @@ local is_list
 is_list = function(val)
   return getmetatable(val) == DBList.__base
 end
+local unpack = unpack or table.unpack
 local is_encodable
 is_encodable = function(item)
   local _exp_0 = type(item)

lapis/db/base.moon

@@ -9,6 +9,8 @@ class DBList
 list = (items) -> setmetatable {items}, DBList.__base
 is_list = (val) -> getmetatable(val) == DBList.__base
 
+unpack = unpack or table.unpack
+
 -- is item a value we can insert into a query
 is_encodable = (item) ->
   switch type(item)

lapis/db/base_model.lua

@@ -8,11 +8,12 @@ do
   local _obj_0 = table
   insert, concat = _obj_0.insert, _obj_0.concat
 end
-local require, type, setmetatable, rawget, assert, pairs, unpack, error, next
+local require, type, setmetatable, rawget, assert, pairs, error, next
 do
   local _obj_0 = _G
-  require, type, setmetatable, rawget, assert, pairs, unpack, error, next = _obj_0.require, _obj_0.type, _obj_0.setmetatable, _obj_0.rawget, _obj_0.assert, _obj_0.pairs, _obj_0.unpack, _obj_0.error, _obj_0.next
+  require, type, setmetatable, rawget, assert, pairs, error, next = _obj_0.require, _obj_0.type, _obj_0.setmetatable, _obj_0.rawget, _obj_0.assert, _obj_0.pairs, _obj_0.error, _obj_0.next
 end
+local unpack = unpack or table.unpack
 local cjson = require("cjson")
 local add_relations, mark_loaded_relations
 do

lapis/db/base_model.moon

@@ -1,7 +1,9 @@
 import underscore, escape_pattern, uniquify, singularize from require "lapis.util"
 import insert, concat from table
 
-import require, type, setmetatable, rawget, assert, pairs, unpack, error, next from _G
+import require, type, setmetatable, rawget, assert, pairs, error, next from _G
+
+unpack = unpack or table.unpack
 
 cjson = require "cjson"
 

lapis/db/mysql.lua

@@ -5,6 +5,7 @@ do
 end
 local concat
 concat = table.concat
+local unpack = unpack or table.unpack
 local FALSE, NULL, TRUE, build_helpers, format_date, is_raw, raw, is_list, list, is_encodable
 do
   local _obj_0 = require("lapis.db.base")

lapis/db/mysql.moon

@@ -2,6 +2,8 @@
 import type, tostring, pairs, select from _G
 import concat from table
 
+unpack = unpack or table.unpack
+
 import
   FALSE
   NULL

lapis/db/mysql/schema.lua

@@ -5,6 +5,7 @@ local concat
 concat = table.concat
 local gen_index_name
 gen_index_name = require("lapis.db.base").gen_index_name
+local unpack = unpack or table.unpack
 local append_all
 append_all = function(t, ...)
   for i = 1, select("#", ...) do

lapis/db/mysql/schema.moon

@@ -4,6 +4,8 @@ import escape_literal, escape_identifier from db
 import concat from table
 import gen_index_name from require "lapis.db.base"
 
+unpack = unpack or table.unpack
+
 append_all = (t, ...) ->
   for i=1, select "#", ...
     t[#t + 1] = select i, ...

lapis/db/pagination.lua

@@ -5,6 +5,7 @@ do
 end
 local get_fields
 get_fields = require("lapis.util").get_fields
+local unpack = unpack or table.unpack
 local query_parts = {
   "where",
   "group",

lapis/db/pagination.moon

@@ -2,6 +2,8 @@
 import insert, concat from table
 import get_fields from require "lapis.util"
 
+unpack = unpack or table.unpack
+
 query_parts = {"where", "group", "having", "order", "limit", "offset"}
 rebuild_query_clause = (parsed) ->
   buffer = {}

lapis/db/postgres.lua

@@ -5,6 +5,7 @@ do
   local _obj_0 = _G
   type, tostring, pairs, select = _obj_0.type, _obj_0.tostring, _obj_0.pairs, _obj_0.select
 end
+local unpack = unpack or table.unpack
 local raw_query, raw_disconnect
 local logger
 local FALSE, NULL, TRUE, build_helpers, format_date, is_raw, raw, is_list, list, is_encodable

lapis/db/postgres.moon

@@ -1,5 +1,6 @@
 import concat from table
 import type, tostring, pairs, select from _G
+unpack = unpack or table.unpack
 
 local raw_query, raw_disconnect
 local logger

lapis/db/postgres/model.lua

@@ -1,9 +1,10 @@
 local db = require("lapis.db.postgres")
-local select, pairs, unpack, type
+local select, pairs, type
 do
   local _obj_0 = _G
-  select, pairs, unpack, type, select = _obj_0.select, _obj_0.pairs, _obj_0.unpack, _obj_0.type, _obj_0.select
+  select, pairs, type, select = _obj_0.select, _obj_0.pairs, _obj_0.type, _obj_0.select
 end
+local unpack = unpack or table.unpack
 local insert
 insert = table.insert
 local BaseModel, Enum, enum

lapis/db/postgres/model.moon

@@ -1,6 +1,7 @@
 db = require "lapis.db.postgres"
 
-import select, pairs, unpack, type, select from _G
+import select, pairs, type, select from _G
+unpack = unpack or table.unpack
 import insert from table
 
 import BaseModel, Enum, enum from require "lapis.db.base_model"

lapis/db/postgres/schema.lua

@@ -5,6 +5,7 @@ local escape_literal, escape_identifier, is_raw
 escape_literal, escape_identifier, is_raw = db.escape_literal, db.escape_identifier, db.is_raw
 local concat
 concat = table.concat
+local unpack = unpack or table.unpack
 local append_all
 append_all = function(t, ...)
   for i = 1, select("#", ...) do

lapis/db/postgres/schema.moon

@@ -3,6 +3,7 @@ db = require "lapis.db.postgres"
 import gen_index_name from require "lapis.db.base"
 import escape_literal, escape_identifier, is_raw from db
 import concat from table
+unpack = unpack or table.unpack
 
 append_all = (t, ...) ->
   for i=1, select "#", ...

lapis/html.lua

@@ -3,9 +3,12 @@ do
   local _obj_0 = table
   concat, insert = _obj_0.concat, _obj_0.insert
 end
-local _G = _G
 local type, pairs, ipairs, tostring, getmetatable, setmetatable, table
-type, pairs, ipairs, tostring, getmetatable, setmetatable, table = _G.type, _G.pairs, _G.ipairs, _G.tostring, _G.getmetatable, _G.setmetatable, _G.table
+do
+  local _obj_0 = _G
+  type, pairs, ipairs, tostring, getmetatable, setmetatable, table = _obj_0.type, _obj_0.pairs, _obj_0.ipairs, _obj_0.tostring, _obj_0.getmetatable, _obj_0.setmetatable, _obj_0.table
+end
+local unpack = unpack or table.unpack
 local getfenv, setfenv
 do
   local _obj_0 = require("lapis.util.fenv")

lapis/html.moon

@@ -1,10 +1,11 @@
 
 import concat, insert from table
 
-_G = _G
 import type, pairs, ipairs, tostring, getmetatable,
   setmetatable, table from _G
 
+unpack = unpack or table.unpack
+
 import getfenv, setfenv from require "lapis.util.fenv"
 
 import locked_fn, release_fn from require "lapis.util.functions"

lapis/nginx.lua

@@ -6,6 +6,7 @@ end
 local run_after_dispatch
 run_after_dispatch = require("lapis.nginx.context").run_after_dispatch
 local lapis_config = require("lapis.config")
+local unpack = unpack or table.unpack
 local flatten_params
 flatten_params = function(t)
   local _tbl_0 = { }

lapis/nginx.moon

@@ -2,6 +2,8 @@ import escape_pattern, parse_content_disposition, build_url from require "lapis.
 import run_after_dispatch from require "lapis.nginx.context"
 lapis_config = require "lapis.config"
 
+unpack = unpack or table.unpack
+
 flatten_params = (t) ->
   {k, type(v) == "table" and v[#v] or v for k,v in pairs t}
 

lapis/nginx/cache.lua

@@ -1,4 +1,5 @@
 local json = require("cjson")
+local unpack = unpack or table.unpack
 local sort, concat
 do
   local _obj_0 = table

lapis/nginx/cache.moon

@@ -5,6 +5,8 @@
 
 json = require "cjson"
 
+unpack = unpack or table.unpack
+
 import sort, concat from table
 
 default_dict_name = "page_cache"

lapis/router.lua

@@ -1,5 +1,6 @@
 local insert
 insert = table.insert
+local unpack = unpack or table.unpack
 local lpeg = require("lpeg")
 local R, S, V, P
 R, S, V, P = lpeg.R, lpeg.S, lpeg.V, lpeg.P

lapis/router.moon

@@ -5,6 +5,7 @@
 --    :something[num] *[slug]
 
 import insert from table
+unpack = unpack or table.unpack
 
 lpeg = require "lpeg"
 

lapis/spec/db.lua

@@ -1,5 +1,6 @@
 local assert_env
 assert_env = require("lapis.environment").assert_env
+local unpack = unpack or table.unpack
 local truncate_tables
 truncate_tables = function(...)
   local db = require("lapis.db")

lapis/spec/db.moon

@@ -1,6 +1,8 @@
 
 import assert_env from require "lapis.environment"
 
+unpack = unpack or table.unpack
+
 truncate_tables = (...) ->
   db = require "lapis.db"
 

lapis/spec/request.lua

@@ -1,4 +1,5 @@
 local env = require("lapis.environment")
+local unpack = unpack or table.unpack
 local normalize_headers
 do
   local normalize

lapis/spec/request.moon

@@ -1,6 +1,8 @@
 
 env = require "lapis.environment"
 
+unpack = unpack or table.unpack
+
 normalize_headers = do
   normalize = (header) ->
     header\lower!\gsub "-", "_"

lapis/util.lua

@@ -5,6 +5,7 @@ do
   local _obj_0 = table
   concat, insert = _obj_0.concat, _obj_0.insert
 end
+local unpack = unpack or table.unpack
 local floor
 floor = math.floor
 local date

lapis/util.moon

@@ -3,6 +3,7 @@ url = require "socket.url"
 json = require "cjson"
 
 import concat, insert from table
+unpack = unpack or table.unpack
 import floor from math
 
 -- TODO: make this a dependency

lapis/validate.lua

@@ -1,5 +1,6 @@
 local insert
 insert = table.insert
+local unpack = unpack or table.unpack
 local validate_functions = {
   exists = function(input)
     return input and input ~= "", "%s must be provided"

lapis/validate.moon

@@ -1,6 +1,8 @@
 
 import insert from table
 
+unpack = unpack or table.unpack
+
 validate_functions = {
   exists: (input) ->
     input and input != "", "%s must be provided"

spec/core_model_specs.moon

@@ -3,6 +3,8 @@
 
 assert = require "luassert"
 
+unpack = unpack or table.unpack
+
 assert_same_rows = (a, b) ->
   a = {k,v for k,v in pairs a}
   b = {k,v for k,v in pairs b}

spec/mysql_spec.moon

@@ -3,6 +3,8 @@ require "spec.helpers" -- for one_of
 db = require "lapis.db.mysql"
 schema = require "lapis.db.mysql.schema"
 
+unpack = unpack or table.unpack
+
 -- TODO: we can't test escape_literal with strings here because we need a
 -- connection for escape function
 

spec/postgres_spec.moon

@@ -3,6 +3,8 @@ require "spec.helpers" -- for one_of
 db = require "lapis.db.postgres"
 schema = require "lapis.db.postgres.schema"
 
+unpack = unpack or table.unpack
+
 value_table = { hello: "world", age: 34 }
 
 tests = {

spec/routes_spec.moon

@@ -1,6 +1,8 @@
 
 import Router, RouteParser from require "lapis.router"
 
+unpack = unpack or table.unpack
+
 build_router = (routes) ->
   handler = (...) -> { ... }
   with r = Router!

spec/util_spec.moon

@@ -2,6 +2,8 @@
 util = require "lapis.util"
 json = require "cjson"
 
+unpack = unpack or table.unpack
+
 tests = {
   {
     -> util.parse_query_string "field1=value1&field2=value2&field3=value3"

spec_postgres/model_spec.moon

@@ -3,6 +3,8 @@ import setup_db, teardown_db from require "spec_postgres.helpers"
 
 import drop_tables, truncate_tables from require "lapis.spec.db"
 
+unpack = unpack or table.unpack
+
 db = require "lapis.db.postgres"
 import Model, enum from require "lapis.db.postgres.model"
 import types, create_table from require "lapis.db.postgres.schema"