Skip to content

Commit 46b7ee4

Browse files
committed
Merge branch 'master' of github.com:bungle/lua-resty-uuid
# Conflicts: # lib/resty/uuid.lua
2 parents 4587db7 + 9d1dba7 commit 46b7ee4

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

lib/resty/uuid.lua

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,26 @@ end
7676

7777
function uuid.type(id)
7878
assert(not OSX, "uuid_type is not supported on OS X.")
79-
return lib.uuid_type(parse(id))
79+
local parsed = parse(id)
80+
return parsed and lib.uuid_type(parsed)
8081
end
8182

8283
function uuid.variant(id)
8384
assert(not OSX, "uuid_variant is not supported on OS X.")
84-
return lib.uuid_variant(parse(id))
85+
local parsed = parse(id)
86+
return parsed and lib.uuid_variant(parsed)
8587
end
8688

8789
function uuid.time(id)
88-
local secs = lib.uuid_time(parse(id), tvl)
89-
return tonumber(secs), tonumber(tvl.tv_usec)
90+
local parsed = parse(id)
91+
if parsed then
92+
local secs = lib.uuid_time(parsed, tvl)
93+
return tonumber(secs), tonumber(tvl.tv_usec)
94+
end
95+
end
96+
97+
function uuid.is_valid(id)
98+
return not not parse(id)
9099
end
91100

92101
mt.__call = uuid.generate

0 commit comments

Comments
 (0)