change: moved the code from etcd.path to etcd.lua.

Author: membphis

lib/resty/etcd.lua

@@ -1,6 +1,5 @@
 -- https://github.com/ledgetech/lua-resty-http
 local HttpCli = require "resty.http"
-local normalize = require "resty.etcd.path"
 local typeof = require "resty.etcd.typeof"
 local encode_args = ngx.encode_args
 local setmetatable = setmetatable
@@ -12,11 +11,70 @@ do
 end
 local clear_tab = require "table.clear"
 local tab_nkeys = require "table.nkeys"
+local split = require "ngx.re" .split
+local concat_tab = table.concat
+local tostring = tostring
+local select = select
+local ipairs = ipairs
+
 
 local _M = {}
 local mt = { __index = _M }
 
 
+local normalize
+do
+    local items = {}
+    local function concat(sep, ...)
+        local argc = select('#', ...)
+        clear_tab(items)
+        local len = 0
+
+        for i = 1, argc do
+            local v = select(i, ...)
+            if v ~= nil then
+                len = len + 1
+                items[len] = tostring(v)
+            end
+        end
+
+        return concat_tab(items, sep);
+    end
+
+
+    local segs = {}
+    function normalize(...)
+        local path = concat('/', ...)
+        local names = {}
+        local err
+
+        segs, err = split(path, [[/]], "jo", nil, nil, segs)
+        if not segs then
+            return nil, err
+        end
+
+        local len = 0
+        for _, seg in ipairs(segs) do
+            if seg == '..' then
+                if len > 0 then
+                    len = len - 1
+                end
+
+            elseif seg == '' or seg == '/' and names[len] == '/' then
+                -- do nothing
+
+            elseif seg ~= '.' then
+                len = len + 1
+                names[len] = seg
+            end
+        end
+
+        return '/' .. concat_tab(names, '/', 1, len);
+    end
+end
+_M.normalize = normalize
+
+
 function _M.new(opts)
     if opts == nil then
         opts = {}

lib/resty/etcd/path.lua

@@ -8,111 +8,111 @@ local function typeof(cmp, arg)
     return cmp == type(arg)
 end
 
-local function typeofNil(...)
+local function typeof_nil(...)
     return typeof('nil', ...)
 end
 
-local function typeofBoolean(...)
+local function typeof_bool(...)
     return typeof('boolean', ...)
 end
 
-local function typeofString(...)
+local function typeof_str(...)
     return typeof('string', ...)
 end
 
-local function typeofNumber(...)
+local function typeof_num(...)
     return typeof('number', ...)
 end
 
-local function typeofFunction(...)
+local function typeof_fun(...)
     return typeof('function', ...)
 end
 
-local function typeofTable(...)
+local function typeof_table(...)
     return typeof('table', ...)
 end
 
-local function typeofThread(...)
+local function typeof_thread(...)
     return typeof('thread', ...)
 end
 
-local function typeofUserdata(...)
+local function typeof_userdata(...)
     return typeof('userdata', ...)
 end
 
-local function typeofFinite(arg)
+local function typeof_finite(arg)
     return type(arg) == 'number' and (arg < INFINITE_POS and arg > INFINITE_NEG)
 end
 
-local function typeofUnsigned(arg)
+local function typeof_unsigned(arg)
     return type(arg) == 'number' and (arg < INFINITE_POS and arg >= 0)
 end
 
-local function typeofInt(arg)
-    return typeofFinite(arg) and rawequal(floor(arg), arg)
+local function typeof_int(arg)
+    return typeof_finite(arg) and rawequal(floor(arg), arg)
 end
 
-local function typeofInt8(arg)
-    return typeofInt(arg) and arg >= -128 and arg <= 127
+local function typeof_int8(arg)
+    return typeof_int(arg) and arg >= -128 and arg <= 127
 end
 
-local function typeofInt16(arg)
-    return typeofInt(arg) and arg >= -32768 and arg <= 32767
+local function typeof_int16(arg)
+    return typeof_int(arg) and arg >= -32768 and arg <= 32767
 end
 
-local function typeofInt32(arg)
-    return typeofInt(arg) and arg >= -2147483648 and arg <= 2147483647
+local function typeof_int32(arg)
+    return typeof_int(arg) and arg >= -2147483648 and arg <= 2147483647
 end
 
-local function typeofUInt(arg)
-    return typeofUnsigned(arg) and rawequal(floor(arg), arg)
+local function typeof_uint(arg)
+    return typeof_unsigned(arg) and rawequal(floor(arg), arg)
 end
 
-local function typeofUInt8(arg)
-    return typeofUInt(arg) and arg <= 255
+local function typeof_uint8(arg)
+    return typeof_uint(arg) and arg <= 255
 end
 
-local function typeofUInt16(arg)
-    return typeofUInt(arg) and arg <= 65535
+local function typeof_uint16(arg)
+    return typeof_uint(arg) and arg <= 65535
 end
 
-local function typeofUInt32(arg)
-    return typeofUInt(arg) and arg <= 4294967295
+local function typeof_uint32(arg)
+    return typeof_uint(arg) and arg <= 4294967295
 end
 
-local function typeofNaN(arg)
+local function typeof_nan(arg)
     return arg ~= arg
 end
 
-local function typeofNon(arg)
+local function typeof_non(arg)
     return arg == nil or arg == false or arg == 0 or arg == '' or arg ~= arg
 end
 
 
 local _M = {
-    ['nil'] = typeofNil,
-    ['boolean'] = typeofBoolean,
-    ['string'] = typeofString,
-    ['number'] = typeofNumber,
-    ['function'] = typeofFunction,
-    ['table'] = typeofTable,
-    ['thread'] = typeofThread,
-    ['userdata'] = typeofUserdata,
-    ['finite'] = typeofFinite,
-    ['unsigned'] = typeofUnsigned,
-    ['int'] = typeofInt,
-    ['int8'] = typeofInt8,
-    ['int16'] = typeofInt16,
-    ['int32'] = typeofInt32,
-    ['uint'] = typeofUInt,
-    ['uint8'] = typeofUInt8,
-    ['uint16'] = typeofUInt16,
-    ['uint32'] = typeofUInt32,
-    ['nan'] = typeofNaN,
-    ['non'] = typeofNon,
+    ['nil'] = typeof_nil,
+    ['boolean'] = typeof_bool,
+    ['string'] = typeof_str,
+    ['number'] = typeof_num,
+    ['function'] = typeof_fun,
+    ['table'] = typeof_table,
+    ['thread'] = typeof_thread,
+    ['userdata'] = typeof_userdata,
+    ['finite'] = typeof_finite,
+    ['unsigned'] = typeof_unsigned,
+    ['int'] = typeof_int,
+    ['int8'] = typeof_int8,
+    ['int16'] = typeof_int16,
+    ['int32'] = typeof_int32,
+    ['uint'] = typeof_uint,
+    ['uint8'] = typeof_uint8,
+    ['uint16'] = typeof_uint16,
+    ['uint32'] = typeof_uint32,
+    ['nan'] = typeof_nan,
+    ['non'] = typeof_non,
     -- alias
-    ['Nil'] = typeofNil,
-    ['Function'] = typeofFunction
+    ['Nil'] = typeof_nil,
+    ['Function'] = typeof_fun
 }
 
 return _M

lib/resty/etcd/typeof.lua

@@ -17,7 +17,7 @@ __DATA__
 --- config
     location /t {
         content_by_lua_block {
-            local normalize = require "resty.etcd.path" .normalize
+            local normalize = require "resty.etcd" .normalize
 
             local function ifNotEqual(l, r)
                 if l ~= r then