Merge branch 'rxi:master' into master

Fixes #32

.gitignore

@@ -1,3 +0,0 @@
-__*
-*.tmp
-*.swp

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014, rxi
+Copyright (c) 2020 rxi
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

README.md

@@ -2,6 +2,10 @@
 
 A collection of functions for Lua, geared towards game development.
 
+This fork incorporates randomization from the LOVE engine's math library if
+available, uses a local for random calls, and adds a function for setting the
+seed for its randomizer.
+
 
 ## Installation
 
@@ -15,10 +19,10 @@ lume = require "lume"
 
 ## Function Reference
 
-### lume.clamp(x, min, max)
+#### lume.clamp(x, min, max)
 Returns the number `x` clamped between the numbers `min` and `max`
 
-### lume.round(x [, increment])
+#### lume.round(x [, increment])
 Rounds `x` to the nearest integer; rounds away from zero if we're midway
 between two integers. If `increment` is set then the number is rounded to the
 nearest increment.
@@ -27,44 +31,55 @@ lume.round(2.3) -- Returns 2
 lume.round(123.4567, .1) -- Returns 123.5
 ```
 
-### lume.sign(x)
+#### lume.sign(x)
 Returns `1` if `x` is 0 or above, returns `-1` when `x` is negative.
 
-### lume.lerp(a, b, amount)
+#### lume.lerp(a, b, amount)
 Returns the linearly interpolated number between `a` and `b`, `amount` should
 be in the range of 0 - 1; if `amount` is outside of this range it is clamped.
 ```lua
 lume.lerp(100, 200, .5) -- Returns 150
 ```
 
-### lume.smooth(a, b, amount)
+#### lume.smooth(a, b, amount)
 Similar to `lume.lerp()` but uses cubic interpolation instead of linear
 interpolation.
 
-### lume.pingpong(x)
+#### lume.pingpong(x)
 Ping-pongs the number `x` between 0 and 1.
 
-### lume.distance(x1, y1, x2, y2 [, squared])
+#### lume.distance(x1, y1, x2, y2 [, squared])
 Returns the distance between the two points. If `squared` is true then the
 squared distance is returned -- this is faster to calculate and can still be
 used when comparing distances.
 
-### lume.angle(x1, y1, x2, y2)
+#### lume.angle(x1, y1, x2, y2)
 Returns the angle between the two points.
 
-### lume.random([a [, b]])
+#### lume.vector(angle, magnitude)
+Given an `angle` and `magnitude`, returns a vector.
+```lua
+local x, y = lume.vector(0, 10) -- Returns 10, 0
+```
+
+#### lume.seed([low [, high]])
+Sets random seed. If using LOVE engine's math library, both `low` and `high`
+arguments are used, else, only one argument is accepted.
+
+
+#### lume.random([a [, b]])
 Returns a random number between `a` and `b`. If only `a` is supplied a number
 between `0` and `a` is returned. If no arguments are supplied a random number
 between `0` and `1` is returned.
 
-### lume.randomchoice(t)
+#### lume.randomchoice(t)
 Returns a random value from array `t`. If the array is empty an error is
 raised.
 ```lua
 lume.randomchoice({true, false}) -- Returns either true or false
 ```
 
-### lume.weightedchoice(t)
+#### lume.weightedchoice(t)
 Takes the argument table `t` where the keys are the possible choices and the
 value is the choice's weight. A weight should be 0 or above, the larger the
 number the higher the probability of that choice being picked. If the table is
@@ -74,16 +89,65 @@ lume.weightedchoice({ ["cat"] = 10, ["dog"] = 5, ["frog"] = 0 })
 -- Returns either "cat" or "dog" with "cat" being twice as likely to be chosen.
 ```
 
-### lume.shuffle(t)
+#### lume.isarray(x)
-Shuffles the values of array `t` in place, returns the array.
+Returns `true` if `x` is an array -- the value is assumed to be an array if it
+is a table which contains a value at the index `1`. This function is used
+internally and can be overridden if you wish to use a different method to detect
+arrays.
 
-### lume.array(...)
+
-Iterates the supplied iterator and returns an array filled with the values.
+#### lume.push(t, ...)
+Pushes all the given values to the end of the table `t` and returns the pushed
+values. Nil values are ignored.
 ```lua
-lume.array(pairs({a = 1, b = 2})) -- Returns {"a", "b"}
+local t = { 1, 2, 3 }
+lume.push(t, 4, 5) -- `t` becomes { 1, 2, 3, 4, 5 }
 ```
 
-### lume.each(t, fn, ...)
+#### lume.remove(t, x)
+Removes the first instance of the value `x` if it exists in the table `t`.
+Returns `x`.
+```lua
+local t = { 1, 2, 3 }
+lume.remove(t, 2) -- `t` becomes { 1, 3 }
+```
+
+#### lume.clear(t)
+Nils all the values in the table `t`, this renders the table empty. Returns
+`t`.
+```lua
+local t = { 1, 2, 3 }
+lume.clear(t) -- `t` becomes {}
+```
+
+#### lume.extend(t, ...)
+Copies all the fields from the source tables to the table `t` and returns `t`.
+If a key exists in multiple tables the right-most table's value is used.
+```lua
+local t = { a = 1, b = 2 }
+lume.extend(t, { b = 4, c = 6 }) -- `t` becomes { a = 1, b = 4, c = 6 }
+```
+
+#### lume.shuffle(t)
+Returns a shuffled copy of the array `t`.
+
+#### lume.sort(t [, comp])
+Returns a copy of the array `t` with all its items sorted. If `comp` is a
+function it will be used to compare the items when sorting. If `comp` is a
+string it will be used as the key to sort the items by.
+```lua
+lume.sort({ 1, 4, 3, 2, 5 }) -- Returns { 1, 2, 3, 4, 5 }
+lume.sort({ {z=2}, {z=3}, {z=1} }, "z") -- Returns { {z=1}, {z=2}, {z=3} }
+lume.sort({ 1, 3, 2 }, function(a, b) return a > b end) -- Returns { 3, 2, 1 }
+```
+
+#### lume.array(...)
+Iterates the supplied iterator and returns an array filled with the values.
+```lua
+lume.array(string.gmatch("Hello world", "%a+")) -- Returns {"Hello", "world"}
+```
+
+#### lume.each(t, fn, ...)
 Iterates the table `t` and calls the function `fn` on each value followed by
 the supplied additional arguments; if `fn` is a string the method of that name
 is called for each value. The function returns `t` unmodified.
@@ -92,14 +156,14 @@ lume.each({1, 2, 3}, print) -- Prints "1", "2", "3" on separate lines
 lume.each({a, b, c}, "move", 10, 20) -- Does x:move(10, 20) on each value
 ```
 
-### lume.map(t, fn)
+#### lume.map(t, fn)
 Applies the function `fn` to each value in table `t` and returns a new table
 with the resulting values.
 ```lua
 lume.map({1, 2, 3}, function(x) return x * 2 end) -- Returns {2, 4, 6}
 ```
 
-### lume.all(t [, fn])
+#### lume.all(t [, fn])
 Returns true if all the values in `t` table are true. If a `fn` function is
 supplied it is called on each value, true is returned if all of the calls to
 `fn` return true.
@@ -107,7 +171,7 @@ supplied it is called on each value, true is returned if all of the calls to
 lume.all({1, 2, 1}, function(x) return x == 1 end) -- Returns false
 ```
 
-### lume.any(t [, fn])
+#### lume.any(t [, fn])
 Returns true if any of the values in `t` table are true. If a `fn` function is
 supplied it is called on each value, true is returned if any of the calls to
 `fn` return true.
@@ -115,25 +179,23 @@ supplied it is called on each value, true is returned if any of the calls to
 lume.any({1, 2, 1}, function(x) return x == 1 end) -- Returns true
 ```
 
-### lume.reduce(t, fn [, first])
+#### lume.reduce(t, fn [, first])
 Applies `fn` on two arguments cumulative to the items of the array `t`, from
 left to right, so as to reduce the array to a single value. If a `first` value
 is specified the accumulator is initialised to this, otherwise the first value
 in the array is used. If the array is empty and no `first` value is specified
-an error is raised,
+an error is raised.
 ```lua
 lume.reduce({1, 2, 3}, function(a, b) return a + b end) -- Returns 6
 ```
 
-### lume.set(t [, retainkeys])
+#### lume.unique(t)
-Returns a copy of the `t` table with all the duplicate values removed. If
+Returns a copy of the `t` array with all the duplicate values removed.
-`retainkeys` is true the table is not treated as an array and retains its
-original keys.
 ```lua
-lume.set({2, 1, 2, "cat", "cat"}) -- Returns {1, 2, "cat"}
+lume.unique({2, 1, 2, "cat", "cat"}) -- Returns {1, 2, "cat"}
 ```
 
-### lume.filter(t, fn [, retainkeys])
+#### lume.filter(t, fn [, retainkeys])
 Calls `fn` on each value of `t` table. Returns a new table with only the values
 where `fn` returned true. If `retainkeys` is true the table is not treated as
 an array and retains its original keys.
@@ -141,29 +203,42 @@ an array and retains its original keys.
 lume.filter({1, 2, 3, 4}, function(x) return x % 2 == 0 end) -- Returns {2, 4}
 ```
 
-### lume.merge(t, t2 [, retainkeys])
+#### lume.reject(t, fn [, retainkeys])
-Merges all the values from the table `t2` into `t` in place. If `retainkeys` is
+The opposite of `lume.filter()`: Calls `fn` on each value of `t` table; returns
-true the table is not treated as an array and retains its original keys; if `t`
+a new table with only the values where `fn` returned false. If `retainkeys` is
-and `t2` have a conflicting key, the value from `t2` is used.
+true the table is not treated as an array and retains its original keys.
 ```lua
-lume.merge({2, 3}, {4, 5}) -- Returns {2, 3, 4, 5}
+lume.reject({1, 2, 3, 4}, function(x) return x % 2 == 0 end) -- Returns {1, 3}
 ```
 
-### lume.find(t, value)
+#### lume.merge(...)
+Returns a new table with all the given tables merged together. If a key exists
+in multiple tables the right-most table's value is used.
+```lua
+lume.merge({a=1, b=2, c=3}, {c=8, d=9}) -- Returns {a=1, b=2, c=8, d=9}
+```
+
+#### lume.concat(...)
+Returns a new array consisting of all the given arrays concatenated into one.
+```lua
+lume.concat({1, 2}, {3, 4}, {5, 6}) -- Returns {1, 2, 3, 4, 5, 6}
+```
+
+#### lume.find(t, value)
 Returns the index/key of `value` in `t`. Returns `nil` if that value does not
 exist in the table.
 ```lua
 lume.find({"a", "b", "c"}, "b") -- Returns 2
 ```
 
-### lume.match(t, fn)
+#### lume.match(t, fn)
 Returns the value and key of the value in table `t` which returns true when
 `fn` is called on it. Returns `nil` if no such value exists.
 ```lua
 lume.match({1, 5, 8, 7}, function(x) return x % 2 == 0 end) -- Returns 8, 3
 ```
 
-### lume.count(t [, fn])
+#### lume.count(t [, fn])
 Counts the number of values in the table `t`. If a `fn` function is supplied it
 is called on each value, the number of times it returns true is counted.
 ```lua
@@ -171,41 +246,47 @@ lume.count({a = 2, b = 3, c = 4, d = 5}) -- Returns 4
 lume.count({1, 2, 4, 6}, function(x) return x % 2 == 0 end) -- Returns 3
 ```
 
-### lume.slice(t [, i [, j]])
+#### lume.slice(t [, i [, j]])
 Mimics the behaviour of Lua's `string.sub`, but operates on an array rather
 than a string. Creates and returns a new array of the given slice.
 ```lua
 lume.slice({"a", "b", "c", "d", "e"}, 2, 4) -- Returns {"b", "c", "d"}
 ```
 
-### lume.first(t [, n])
+#### lume.first(t [, n])
 Returns the first element of an array or nil if the array is empty. If `n` is
 specificed an array of the first `n` elements is returned.
 ```lua
 lume.first({"a", "b", "c"}) -- Returns "a"
 ```
 
-### lume.last(t [, n])
+#### lume.last(t [, n])
 Returns the last element of an array or nil if the array is empty. If `n` is
 specificed an array of the last `n` elements is returned.
 ```lua
 lume.last({"a", "b", "c"}) -- Returns "c"
 ```
 
-### lume.invert(t)
+#### lume.invert(t)
 Returns a copy of the table where the keys have become the values and the
 values the keys.
 ```lua
 lume.invert({a = "x", b = "y"}) -- returns {x = "a", y = "b"}
 ```
 
-### lume.keys(t)
+#### lume.pick(t, ...)
+Returns a copy of the table filtered to only contain values for the given keys.
+```lua
+lume.pick({ a = 1, b = 2, c = 3 }, "a", "c") -- Returns { a = 1, c = 3 }
+```
+
+#### lume.keys(t)
 Returns an array containing each key of the table.
 
-### lume.clone(t)
+#### lume.clone(t)
 Returns a shallow copy of the table `t`.
 
-### lume.fn(fn, ...)
+#### lume.fn(fn, ...)
 Creates a wrapper function around function `fn`, automatically inserting the
 arguments into `fn` which will persist every time the wrapper is called. Any
 arguments which are passed to the returned function will be inserted after the
@@ -215,7 +296,7 @@ local f = lume.fn(print, "Hello")
 f("world") -- Prints "Hello world"
 ```
 
-### lume.once(fn, ...)
+#### lume.once(fn, ...)
 Returns a wrapper function to `fn` which takes the supplied arguments. The
 wrapper function will call `fn` on the first call and do nothing on any
 subsequent calls.
@@ -225,7 +306,7 @@ f() -- Prints "Hello"
 f() -- Does nothing
 ```
 
-### lume.memoize(fn)
+#### lume.memoize(fn)
 Returns a wrapper function to `fn` where the results for any given set of
 arguments are cached. `lume.memoize()` is useful when used on functions with
 slow-running computations.
@@ -233,7 +314,7 @@ slow-running computations.
 fib = lume.memoize(function(n) return n < 2 and n or fib(n-1) + fib(n-2) end)
 ```
 
-### lume.combine(...)
+#### lume.combine(...)
 Creates a wrapper function which calls each supplied argument in the order they
 were passed to `lume.combine()`; nil arguments are ignored. The wrapper
 function passes its own arguments to each of its wrapped functions when it is
@@ -244,14 +325,21 @@ local f = lume.combine(function(a, b) print(a + b) end,
 f(3, 4) -- Prints "7" then "12" on a new line
 ```
 
-### lume.time(fn, ...)
+#### lume.call(fn, ...)
+Calls the given function with the provided arguments and returns its values. If
+`fn` is `nil` then no action is performed and the function returns `nil`.
+```lua
+lume.call(print, "Hello world") -- Prints "Hello world"
+```
+
+#### lume.time(fn, ...)
 Inserts the arguments into function `fn` and calls it. Returns the time in
 seconds the function `fn` took to execute followed by `fn`'s returned values.
 ```lua
 lume.time(function(x) return x end, "hello") -- Returns 0, "hello"
 ```
 
-### lume.lambda(str)
+#### lume.lambda(str)
 Takes a string lambda and returns a function. `str` should be a list of
 comma-separated parameters, followed by `->`, followed by the expression which
 will be evaluated and returned.
@@ -260,24 +348,24 @@ local f = lume.lambda "x,y -> 2*x+y"
 f(10, 5) -- Returns 25
 ```
 
-### lume.serialize(x)
+#### lume.serialize(x)
 Serializes the argument `x` into a string which can be loaded again using
 `lume.deserialize()`. Only booleans, numbers, tables and strings can be
-serialized. Circular references are not handled; all nested tables are
+serialized. Circular references will result in an error; all nested tables are
 serialized as unique tables.
 ```lua
 lume.serialize({a = "test", b = {1, 2, 3}, false})
 -- Returns "{[1]=false,["a"]="test",["b"]={[1]=1,[2]=2,[3]=3,},}"
 ```
 
-### lume.deserialize(str)
+#### lume.deserialize(str)
 Deserializes a string created by `lume.serialize()` and returns the resulting
 value. This function should not be run on an untrusted string.
 ```lua
 lume.deserialize("{1, 2, 3}") -- Returns {1, 2, 3}
 ```
 
-### lume.split(str [, sep])
+#### lume.split(str [, sep])
 Returns an array of the words in the string `str`. If `sep` is provided it is
 used as the delimiter, consecutive delimiters are not grouped together and will
 delimit empty strings.
@@ -286,7 +374,7 @@ lume.split("One two three") -- Returns {"One", "two", "three"}
 lume.split("a,b,,c", ",") -- Returns {"a", "b", "", "c"}
 ```
 
-### lume.trim(str [, chars])
+#### lume.trim(str [, chars])
 Trims the whitespace from the start and end of the string `str` and returns the
 new string. If a `chars` value is set the characters in `chars` are trimmed
 instead of whitespace.
@@ -294,7 +382,16 @@ instead of whitespace.
 lume.trim("  Hello  ") -- Returns "Hello"
 ```
 
-### lume.format(str [, vars])
+#### lume.wordwrap(str [, limit])
+Returns `str` wrapped to `limit` number of characters per line, by default
+`limit` is `72`. `limit` can also be a function which when passed a string,
+returns `true` if it is too long for a single line.
+```lua
+-- Returns "Hello world\nThis is a\nshort string"
+lume.wordwrap("Hello world. This is a short string", 14)
+```
+
+#### lume.format(str [, vars])
 Returns a formatted string. The values of keys in the table `vars` can be
 inserted into the string by using the form `"{key}"` in `str`; numerical keys
 can also be used.
@@ -303,25 +400,25 @@ lume.format("{b} hi {a}", {a = "mark", b = "Oh"}) -- Returns "Oh hi mark"
 lume.format("Hello {1}!", {"world"}) -- Returns "Hello world!"
 ```
 
-### lume.trace(...)
+#### lume.trace(...)
 Prints the current filename and line number followed by each argument separated
 by a space.
 ```lua
 -- Assuming the file is called "example.lua" and the next line is 12:
-lume.trace("hello", 1234) -- Prints "[example.lua:12] hello 1234"
+lume.trace("hello", 1234) -- Prints "example.lua:12: hello 1234"
 ```
 
-### lume.dostring(str)
+#### lume.dostring(str)
 Executes the lua code inside `str`.
 ```lua
 lume.dostring("print('Hello!')") -- Prints "Hello!"
 ```
 
-### lume.uuid()
+#### lume.uuid()
 Generates a random UUID string; version 4 as specified in
 [RFC 4122](http://www.ietf.org/rfc/rfc4122.txt).
 
-### lume.hotswap(modname)
+#### lume.hotswap(modname)
 Reloads an already loaded module in place, allowing you to immediately see the
 effects of code changes without having to restart the program. `modname` should
 be the same string used when loading the module with require(). In the case of
@@ -332,15 +429,29 @@ lume.hotswap("lume") -- Reloads the lume module
 assert(lume.hotswap("inexistant_module")) -- Raises an error
 ```
 
-### lume.rgba(color)
+#### lume.ripairs(t)
-Takes the 32bit integer `color` argument and returns 4 numbers, one for each
+Performs the same function as `ipairs()` but iterates in reverse; this allows
-channel, with a range of 0 - 255. The returned values can be used as the
+the removal of items from the table during iteration without any items being
-arguments to [LÖVE](http://love2d.org)'s setColor() function.
+skipped.
 ```lua
-lume.rgba(0xFF304050) -- Returns 48, 64, 80, 255
+-- Prints "3->c", "2->b" and "1->a" on separate lines
+for i, v in lume.ripairs({ "a", "b", "c" }) do
+  print(i .. "->" .. v)
+end
 ```
 
-### lume.chain(value)
+#### lume.color(str [, mul])
+Takes color string `str` and returns 4 values, one for each color channel (`r`,
+`g`, `b` and `a`). By default the returned values are between 0 and 1; the
+values are multiplied by the number `mul` if it is provided.
+```lua
+lume.color("#ff0000")               -- Returns 1, 0, 0, 1
+lume.color("rgba(255, 0, 255, .5)") -- Returns 1, 0, 1, .5
+lume.color("#00ffff", 256)          -- Returns 0, 256, 256, 256
+lume.color("rgb(255, 0, 0)", 256)   -- Returns 256, 0, 0, 256
+```
+
+#### lume.chain(value)
 Returns a wrapped object which allows chaining of lume functions. The function
 result() should be called at the end of the chain to return the resulting
 value.
@@ -356,9 +467,38 @@ as calling `lume.chain()`.
 lume({1, 2, 3}):each(print) -- Prints 1, 2 then 3 on separate lines
 ```
 
+## Iteratee functions
+Several lume functions allow a `table`, `string` or `nil` to be used in place
+of their iteratee function argument. The functions that provide this behaviour
+are: `map()`, `all()`, `any()`, `filter()`, `reject()`, `match()` and
+`count()`.
+
+If the argument is `nil` then each value will return itself.
+```lua
+lume.filter({ true, true, false, true }, nil) -- { true, true, true }
+```
+
+If the argument is a `string` then each value will be assumed to be a table,
+and will return the value of the key which matches the string.
+``` lua
+local t = {{ z = "cat" }, { z = "dog" }, { z = "owl" }}
+lume.map(t, "z") -- Returns { "cat", "dog", "owl" }
+```
+
+If the argument is a `table` then each value will return `true` or `false`,
+depending on whether the values at each of the table's keys match the
+collection's value's values.
+```lua
+local t = {
+  { age = 10, type = "cat" },
+  { age = 8,  type = "dog" },
+  { age = 10, type = "owl" },
+}
+lume.count(t, { age = 10 }) -- returns 2
+```
+
 
 ## License
 
 This library is free software; you can redistribute it and/or modify it under
 the terms of the MIT license. See [LICENSE](LICENSE) for details.
-

lume.lua

@@ -1,25 +1,46 @@
 --
 -- lume
 --
--- Copyright (c) 2014, rxi
+-- Copyright (c) 2020 rxi
 --
--- This library is free software; you can redistribute it and/or modify it
+-- Permission is hereby granted, free of charge, to any person obtaining a copy of
--- under the terms of the MIT license. See LICENSE for details.
+-- this software and associated documentation files (the "Software"), to deal in
+-- the Software without restriction, including without limitation the rights to
+-- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+-- of the Software, and to permit persons to whom the Software is furnished to do
+-- so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in all
+-- copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-- SOFTWARE.
 --
 
-local lume = { _version = "1.5.0" }
+local lume = { _version = "2.4.0-Guard13007-fork" }
 
 local pairs, ipairs = pairs, ipairs
 local type, assert, unpack = type, assert, unpack or table.unpack
 local tostring, tonumber = tostring, tonumber
 local math_floor = math.floor
 local math_ceil = math.ceil
-local math_random = math.random
+local math_atan2 = math.atan2 or math.atan
-local math_cos = math.cos
-local math_atan2 = math.atan2
 local math_sqrt = math.sqrt
 local math_abs = math.abs
-local math_pi = math.pi
+local math_random = love and love.math and love.math.random or math.random
+local math_randomseed = love and love.math and love.math.setRandomSeed or math.randomseed
+
+local noop = function()
+end
+
+local identity = function(x)
+  return x
+end
 
 local patternescape = function(str)
   return str:gsub("[%(%)%.%%%+%-%*%?%[%]%^%$]", "%%%1")
@@ -35,8 +56,13 @@ local iscallable = function(x)
   return mt and mt.__call ~= nil
 end
 
-local identity = function(x)
+local getiter = function(x)
-  return x
+  if lume.isarray(x) then
+    return ipairs
+  elseif type(x) == "table" then
+    return pairs
+  end
+  error("expected table", 3)
 end
 
 local iteratee = function(x)
@@ -62,7 +88,7 @@ end
 
 function lume.round(x, increment)
   if increment then return lume.round(x / increment) * increment end
-  return x > 0 and math_floor(x + .5) or math_ceil(x - .5)
+  return x >= 0 and math_floor(x + .5) or math_ceil(x - .5)
 end
 
 
@@ -101,6 +127,16 @@ function lume.angle(x1, y1, x2, y2)
 end
 
 
+function lume.vector(angle, magnitude)
+  return math.cos(angle) * magnitude, math.sin(angle) * magnitude
+end
+
+
+function lume.seed(low, high)
+  return math_randomseed(low, high)
+end
+
+
 function lume.random(a, b)
   if not a then a, b = 0, 1 end
   if not b then b = 0 end
@@ -115,7 +151,7 @@ end
 
 function lume.weightedchoice(t)
   local sum = 0
-  for k, v in pairs(t) do
+  for _, v in pairs(t) do
     assert(v >= 0, "weight value less than zero")
     sum = sum + v
   end
@@ -128,15 +164,87 @@ function lume.weightedchoice(t)
 end
 
 
-function lume.shuffle(t)
+function lume.isarray(x)
-  for i = 1, #t do
+  return type(x) == "table" and x[1] ~= nil
-    local r = math_random(#t)
+end
-    t[i], t[r] = t[r], t[i]
+
+
+function lume.push(t, ...)
+  local n = select("#", ...)
+  for i = 1, n do
+    t[#t + 1] = select(i, ...)
+  end
+  return ...
+end
+
+
+function lume.remove(t, x)
+  local iter = getiter(t)
+  for i, v in iter(t) do
+    if v == x then
+      if lume.isarray(t) then
+        table.remove(t, i)
+        break
+      else
+        t[i] = nil
+        break
+      end
+    end
+  end
+  return x
+end
+
+
+function lume.clear(t)
+  local iter = getiter(t)
+  for k in iter(t) do
+    t[k] = nil
   end
   return t
 end
 
 
+function lume.extend(t, ...)
+  for i = 1, select("#", ...) do
+    local x = select(i, ...)
+    if x then
+      for k, v in pairs(x) do
+        t[k] = v
+      end
+    end
+  end
+  return t
+end
+
+
+function lume.shuffle(t)
+  local rtn = {}
+  for i = 1, #t do
+    local r = math_random(i)
+    if r ~= i then
+      rtn[i] = rtn[r]
+    end
+    rtn[r] = t[i]
+  end
+  return rtn
+end
+
+
+function lume.sort(t, comp)
+  local rtn = lume.clone(t)
+  if comp then
+    if type(comp) == "string" then
+      table.sort(rtn, function(a, b) return a[comp] < b[comp] end)
+    else
+      table.sort(rtn, comp)
+    end
+  else
+    table.sort(rtn)
+  end
+  return rtn
+end
+
+
 function lume.array(...)
   local t = {}
   for x in ... do t[#t + 1] = x end
@@ -145,10 +253,11 @@ end
 
 
 function lume.each(t, fn, ...)
+  local iter = getiter(t)
   if type(fn) == "string" then
-    for _, v in pairs(t) do v[fn](v, ...) end
+    for _, v in iter(t) do v[fn](v, ...) end
   else
-    for _, v in pairs(t) do fn(v, ...) end
+    for _, v in iter(t) do fn(v, ...) end
   end
   return t
 end
@@ -156,15 +265,17 @@ end
 
 function lume.map(t, fn)
   fn = iteratee(fn)
+  local iter = getiter(t)
   local rtn = {}
-  for k, v in pairs(t) do rtn[k] = fn(v) end
+  for k, v in iter(t) do rtn[k] = fn(v) end
   return rtn
 end
 
 
 function lume.all(t, fn)
   fn = iteratee(fn)
-  for k, v in pairs(t) do
+  local iter = getiter(t)
+  for _, v in iter(t) do
     if not fn(v) then return false end
   end
   return true
@@ -173,7 +284,8 @@ end
 
 function lume.any(t, fn)
   fn = iteratee(fn)
-  for k, v in pairs(t) do
+  local iter = getiter(t)
+  for _, v in iter(t) do
     if fn(v) then return true end
   end
   return false
@@ -181,17 +293,26 @@ end
 
 
 function lume.reduce(t, fn, first)
-  local acc = first or t[1]
+  local started = first ~= nil
-  assert(acc, "reduce of an empty array with no first value")
+  local acc = first
-  for i = first and 1 or 2, #t do acc = fn(acc, t[i]) end
+  local iter = getiter(t)
+  for _, v in iter(t) do
+    if started then
+      acc = fn(acc, v)
+    else
+      acc = v
+      started = true
+    end
+  end
+  assert(started, "reduce of an empty table with no first value")
   return acc
 end
 
 
-function lume.set(t, retainkeys)
+function lume.unique(t)
   local rtn = {}
-  for k, v in pairs(lume.invert(t)) do
+  for k in pairs(lume.invert(t)) do
-    rtn[retainkeys and v or (#rtn + 1)] = k
+    rtn[#rtn + 1] = k
   end
   return rtn
 end
@@ -199,24 +320,69 @@ end
 
 function lume.filter(t, fn, retainkeys)
   fn = iteratee(fn)
+  local iter = getiter(t)
   local rtn = {}
-  for k, v in pairs(t) do
+  if retainkeys then
-    if fn(v) then rtn[retainkeys and k or (#rtn + 1)] = v end
+    for k, v in iter(t) do
+      if fn(v) then rtn[k] = v end
+    end
+  else
+    for _, v in iter(t) do
+      if fn(v) then rtn[#rtn + 1] = v end
+    end
   end
   return rtn
 end
 
 
-function lume.merge(t, t2, retainkeys)
+function lume.reject(t, fn, retainkeys)
-  for k, v in pairs(t2) do
+  fn = iteratee(fn)
-    t[retainkeys and k or (#t + 1)] = v
+  local iter = getiter(t)
+  local rtn = {}
+  if retainkeys then
+    for k, v in iter(t) do
+      if not fn(v) then rtn[k] = v end
+    end
+  else
+    for _, v in iter(t) do
+      if not fn(v) then rtn[#rtn + 1] = v end
+    end
   end
-  return t
+  return rtn
+end
+
+
+function lume.merge(...)
+  local rtn = {}
+  for i = 1, select("#", ...) do
+    local t = select(i, ...)
+    local iter = getiter(t)
+    for k, v in iter(t) do
+      rtn[k] = v
+    end
+  end
+  return rtn
+end
+
+
+function lume.concat(...)
+  local rtn = {}
+  for i = 1, select("#", ...) do
+    local t = select(i, ...)
+    if t ~= nil then
+      local iter = getiter(t)
+      for _, v in iter(t) do
+        rtn[#rtn + 1] = v
+      end
+    end
+  end
+  return rtn
 end
 
 
 function lume.find(t, value)
-  for k, v in pairs(t) do
+  local iter = getiter(t)
+  for k, v in iter(t) do
     if v == value then return k end
   end
   return nil
@@ -225,7 +391,8 @@ end
 
 function lume.match(t, fn)
   fn = iteratee(fn)
-  for k, v in pairs(t) do
+  local iter = getiter(t)
+  for k, v in iter(t) do
     if fn(v) then return v, k end
   end
   return nil
@@ -234,13 +401,17 @@ end
 
 function lume.count(t, fn)
   local count = 0
+  local iter = getiter(t)
   if fn then
     fn = iteratee(fn)
-    for k, v in pairs(t) do
+    for _, v in iter(t) do
       if fn(v) then count = count + 1 end
     end
   else
-    for k in pairs(t) do count = count + 1 end
+    if lume.isarray(t) then
+      return #t
+    end
+    for _ in iter(t) do count = count + 1 end
   end
   return count
 end
@@ -276,9 +447,20 @@ function lume.invert(t)
 end
 
 
+function lume.pick(t, ...)
+  local rtn = {}
+  for i = 1, select("#", ...) do
+    local k = select(i, ...)
+    rtn[k] = t[k]
+  end
+  return rtn
+end
+
+
 function lume.keys(t)
   local rtn = {}
-  for k, v in pairs(t) do rtn[#rtn + 1] = k end
+  local iter = getiter(t)
+  for k in iter(t) do rtn[#rtn + 1] = k end
   return rtn
 end
 
@@ -292,21 +474,21 @@ end
 
 function lume.fn(fn, ...)
   assert(iscallable(fn), "expected a function as the first argument")
-  local args = {...}
+  local args = { ... }
   return function(...)
-    local a = lume.merge(lume.clone(args), {...})
+    local a = lume.concat(args, { ... })
     return fn(unpack(a))
   end
 end
 
 
 function lume.once(fn, ...)
-  local fn = lume.fn(fn, ...)
+  local f = lume.fn(fn, ...)
   local done = false
   return function(...)
     if done then return end
     done = true
-    return fn(...)
+    return f(...)
   end
 end
 
@@ -330,8 +512,16 @@ end
 
 
 function lume.combine(...)
+  local n = select('#', ...)
+  if n == 0 then return noop end
+  if n == 1 then
+    local fn = select(1, ...)
+    if not fn then return noop end
+    assert(iscallable(fn), "expected a function or nil")
+    return fn
+  end
   local funcs = {}
-  for i = 1, select("#", ...) do
+  for i = 1, n do
     local fn = select(i, ...)
     if fn ~= nil then
       assert(iscallable(fn), "expected a function or nil")
@@ -344,6 +534,13 @@ function lume.combine(...)
 end
 
 
+function lume.call(fn, ...)
+  if fn then
+    return fn(...)
+  end
+end
+
+
 function lume.time(fn, ...)
   local start = os.clock()
   local rtn = {fn(...)}
@@ -364,19 +561,41 @@ function lume.lambda(str)
 end
 
 
-function lume.serialize(x)
+local serialize
-  local f = { string = function(v) return string.format("%q", v) end,
+
-              number = tostring, boolean = tostring }
+local serialize_map = {
-  f.table = function(t)
+  [ "boolean" ] = tostring,
+  [ "nil"     ] = tostring,
+  [ "string"  ] = function(v) return string.format("%q", v) end,
+  [ "number"  ] = function(v)
+    if      v ~=  v     then return  "0/0"      --  nan
+    elseif  v ==  1 / 0 then return  "1/0"      --  inf
+    elseif  v == -1 / 0 then return "-1/0" end  -- -inf
+    return tostring(v)
+  end,
+  [ "table"   ] = function(t, stk)
+    stk = stk or {}
+    if stk[t] then error("circular reference") end
     local rtn = {}
+    stk[t] = true
     for k, v in pairs(t) do
-      rtn[#rtn + 1] = "[" .. f[type(k)](k) .. "]=" .. f[type(v)](v) .. ","
+      rtn[#rtn + 1] = "[" .. serialize(k, stk) .. "]=" .. serialize(v, stk)
     end
-    return "{" .. table.concat(rtn) .. "}"
+    stk[t] = nil
+    return "{" .. table.concat(rtn, ",") .. "}"
   end
-  local err = function(t,k) error("unsupported serialize type: " .. k) end
+}
-  setmetatable(f, { __index = err })
+
-  return f[type(x)](x)
+setmetatable(serialize_map, {
+  __index = function(_, k) error("unsupported serialize type: " .. k) end
+})
+
+serialize = function(x, stk)
+  return serialize_map[type(x)](x, stk)
+end
+
+function lume.serialize(x)
+  return serialize(x)
 end
 
 
@@ -403,6 +622,38 @@ function lume.trim(str, chars)
 end
 
 
+function lume.wordwrap(str, limit)
+  limit = limit or 72
+  local check
+  if type(limit) == "number" then
+    check = function(s) return #s >= limit end
+  else
+    check = limit
+  end
+  local rtn = {}
+  local line = ""
+  for word, spaces in str:gmatch("(%S+)(%s*)") do
+    local s = line .. word
+    if check(s) then
+      table.insert(rtn, line .. "\n")
+      line = word
+    else
+      line = s
+    end
+    for c in spaces:gmatch(".") do
+      if c == "\n" then
+        table.insert(rtn, line .. "\n")
+        line = ""
+      else
+        line = line .. c
+      end
+    end
+  end
+  table.insert(rtn, line)
+  return table.concat(rtn)
+end
+
+
 function lume.format(str, vars)
   if not vars then return str end
   local f = function(x)
@@ -414,10 +665,12 @@ end
 
 function lume.trace(...)
   local info = debug.getinfo(2, "Sl")
-  local t = { "[" .. info.short_src .. ":" .. info.currentline .. "]" }
+  local t = { info.short_src .. ":" .. info.currentline .. ":" }
   for i = 1, select("#", ...) do
     local x = select(i, ...)
-    x = (type(x) == "number") and lume.round(x, .01) or (x or "nil")
+    if type(x) == "number" then
+      x = string.format("%g", lume.round(x, .01))
+    end
     t[#t + 1] = tostring(x)
   end
   print(table.concat(t, " "))
@@ -453,7 +706,7 @@ function lume.hotswap(modname)
   end
   local err = nil
   local function onerror(e)
-    for k, v in pairs(_G) do _G[k] = oldglobal[k] end
+    for k in pairs(_G) do _G[k] = oldglobal[k] end
     err = lume.trim(e)
   end
   local ok, oldmod = pcall(require, modname)
@@ -475,12 +728,38 @@ function lume.hotswap(modname)
 end
 
 
-function lume.rgba(color)
+local ripairs_iter = function(t, i)
-  local a = math_floor((color / 16777216) % 256)
+  i = i - 1
-  local r = math_floor((color /    65536) % 256)
+  local v = t[i]
-  local g = math_floor((color /      256) % 256)
+  if v ~= nil then
-  local b = math_floor((color) % 256)
+    return i, v
-  return r, g, b, a
+  end
+end
+
+function lume.ripairs(t)
+  return ripairs_iter, t, (#t + 1)
+end
+
+
+function lume.color(str, mul)
+  mul = mul or 1
+  local r, g, b, a
+  r, g, b = str:match("#(%x%x)(%x%x)(%x%x)")
+  if r then
+    r = tonumber(r, 16) / 0xff
+    g = tonumber(g, 16) / 0xff
+    b = tonumber(b, 16) / 0xff
+    a = 1
+  elseif str:match("rgba?%s*%([%d%s%.,]+%)") then
+    local f = str:gmatch("[%d.]+")
+    r = (f() or 0) / 0xff
+    g = (f() or 0) / 0xff
+    b = (f() or 0) / 0xff
+    a = f() or 1
+  else
+    error(("bad color string '%s'"):format(str))
+  end
+  return r * mul, g * mul, b * mul, a * mul
 end
 
 
@@ -499,7 +778,7 @@ function lume.chain(value)
 end
 
 setmetatable(lume,  {
-  __call = function(t, ...)
+  __call = function(_, ...)
     return lume.chain(...)
   end
 })

test/test.lua

@@ -1,4 +1,4 @@
-local tester = require "tester"
+local tester = require "util.tester"
 
 package.path = "../?.lua;" .. package.path
 
@@ -20,7 +20,7 @@ end
 
 -- lume.round
 tests["lume.round"] = function()
-  testeq( lume.round(.5),           1       )   
+  testeq( lume.round(.5),           1       )
   testeq( lume.round(-.5),          -1      )
   testeq( lume.round(2.4),          2       )
   testeq( lume.round(123, 10),      120     )
@@ -80,6 +80,18 @@ tests["lume.angle"] = function()
   testeq( lume.angle(10, 10, 10, 30), math.rad(90)  )
 end
 
+-- lume.vector
+tests["lume.vector"] = function()
+  local function cmp(a, b) return math.abs(a - b) < 10e-6 end
+  local x, y
+  x, y = lume.vector(0, 10)
+  testeq( cmp(x, 10) and cmp(y, 0), true )
+  x, y = lume.vector(math.pi, 100)
+  testeq( cmp(x, -100) and cmp(y, 0), true )
+  x, y = lume.vector(math.pi * 0.25, 100)
+  testeq( cmp(x, 70.71067811865476) and cmp(y, 70.71067811865476), true )
+end
+
 -- lume.random
 tests["lume.random"] = function()
   testeq( type(lume.random()),      "number" )
@@ -106,15 +118,75 @@ tests["lume.weightedchoice"] = function()
   tester.test.error( lume.weightedchoice, { a = 1, b = -1 }   )
 end
 
+-- lume.push
+tests["lume.push"] = function()
+  local t = { 1, 2 }
+  lume.push(t, 3, 4)
+  testeq(t, { 1, 2, 3, 4 })
+  lume.push(t, 5, nil, 6, nil, 7)
+  testeq(t, { 1, 2, 3, 4, 5, 6, 7 })
+  lume.push(t)
+  testeq(t, { 1, 2, 3, 4, 5, 6, 7 })
+  local x, y = lume.push(t, 123, 456)
+  testeq(x, 123)
+  testeq(y, 456)
+end
+
+-- lume.remove
+tests["lume.remove"] = function()
+  local t = { 1, 2, 3, 4, 5 }
+  lume.remove(t, 3)
+  testeq(t, { 1, 2, 4, 5  })
+  lume.remove(t, 1)
+  testeq(t, { 2, 4, 5 })
+  lume.remove(t, 5)
+  testeq(t, { 2, 4 })
+  local x = lume.remove(t, 123)
+  testeq(x, 123)
+end
+
+-- lume.clear
+tests["lume.clear"] = function()
+  local t = { 1, 2, 3 }
+  lume.clear(t)
+  testeq(t, {})
+  local m = { a = 1, b = 2, c = 3 }
+  lume.clear(m)
+  testeq(m, {})
+  testeq( lume.clear(t) == t, true )
+end
+
+-- lume.extend
+tests["lume.extend"] = function()
+  local t = { a = 10, b = 20, c = 30 }
+  testeq( lume.extend(t) == t, true )
+  lume.extend(t, { d = 40 }, { e = 50 })
+  testeq( t, { a = 10, b = 20, c = 30, d = 40, e = 50 } )
+  lume.extend(t, { a = "cat", b = "dog" }, { b = "owl", c = "fox" })
+  testeq( t, { a = "cat", b = "owl", c = "fox", d = 40, e = 50 } )
+end
+
 -- lume.shuffle
 tests["lume.shuffle"] = function()
   local t = {1, 2, 3, 4, 5}
-  lume.shuffle(t)
+  t = lume.shuffle(t)
   table.sort(t)
   testeq( t,                {1, 2, 3, 4, 5} )
   testeq( lume.shuffle({}), {}              )
 end
 
+-- lume.sort
+tests["lume.sort"] = function()
+  local t = { 1, 5, 2, 4, 3 }
+  local fn = function(a, b) return a > b end
+  testeq( t == lume.sort(t), false             )
+  testeq( lume.sort(t),      { 1, 2, 3, 4, 5 } )
+  testeq( lume.sort(t, fn),  { 5, 4, 3, 2, 1 } )
+  testeq( t,                 { 1, 5, 2, 4, 3 } )
+  local t = { { id = 2 }, { id = 3 }, { id = 1 } }
+  testeq( lume.sort(t, "id"), { { id = 1 }, { id = 2 }, { id = 3 } })
+end
+
 -- lume.array
 tests["lume.array"] = function()
   local t = lume.array(pairs({a=0, b=0, c=0}))
@@ -172,6 +244,7 @@ end
 tests["lume.reduce"] = function()
   local concat = function(a, b) return a .. b end
   local add = function(a, b) return a + b end
+  local any = function(a, b) return a or b end
   testeq( lume.reduce({"cat", "dog"}, concat, ""),    "catdog"    )
   testeq( lume.reduce({"cat", "dog"}, concat, "pig"), "pigcatdog" )
   testeq( lume.reduce({"me", "ow"}, concat),          "meow"      )
@@ -179,33 +252,57 @@ tests["lume.reduce"] = function()
   testeq( lume.reduce({1, 2, 3, 4}, add, 5),          15          )
   testeq( lume.reduce({1}, add),                      1           )
   testeq( lume.reduce({}, concat, "potato"),          "potato"    )
+  testeq( lume.reduce({a=1, b=2}, add, 5),            8           )
+  testeq( lume.reduce({a=1, b=2}, add),               3           )
+  testeq( lume.reduce({false, false, false}, any),    false       )
+  testeq( lume.reduce({false, true, false}, any),     true        )
+  tester.test.error(lume.reduce, {}, add)
 end
 
--- lume.set
+-- lume.unique
-tests["lume.set"] = function()
+tests["lume.unique"] = function()
-  testeq( lume.set({}), {} )
+  testeq( lume.unique({}), {} )
-  local t = lume.set({1, 2, 3, 2, 5, 6, 6})
+  local t = lume.unique({1, 2, 3, 2, 5, 6, 6})
   table.sort(t)
   testeq( t, {1, 2, 3, 5, 6} )
-  local t = lume.set({"a", "b", "c", "b", "d"})
+  local t = lume.unique({"a", "b", "c", "b", "d"})
   table.sort(t)
   testeq( t, {"a", "b", "c", "d"} )
 end
 
 -- lume.filter
 tests["lume.filter"] = function()
-  local t = lume.filter({1, 2, 3, 4, 5}, function(x) return x % 2 == 0 end  ) 
+  local t = lume.filter({1, 2, 3, 4, 5}, function(x) return x % 2 == 0 end  )
   testeq( t, {2, 4} )
-  local t = lume.filter({a=1, b=2, c=3}, function(x) return x == 2 end, true) 
+  local t = lume.filter({a=1, b=2, c=3}, function(x) return x == 2 end, true)
   testeq( t, {b=2} )
   local t = lume.filter({{ x=1, y=1 }, { x=2, y=2 }, { x=1, y=3 }}, { x = 1 })
   testeq( t, {{ x=1, y=1 }, {x=1, y=3}} )
 end
 
+-- lume.reject
+tests["lume.reject"] = function()
+  local t = lume.reject({1, 2, 3, 4, 5}, function(x) return x % 2 == 0 end  )
+  testeq( t, {1, 3, 5} )
+  local t = lume.reject({a=1, b=2, c=3}, function(x) return x == 2 end, true)
+  testeq( t, {a=1, c=3} )
+  local t = lume.reject({{ x=1, y=1 }, { x=2, y=2 }, { x=1, y=3 }}, { x = 1 })
+  testeq( t, {{ x=2, y=2 }} )
+end
+
 -- lume.merge
 tests["lume.merge"] = function()
-  testeq( lume.merge({1, 2, 3}, {8, 9, 0}),         {1, 2, 3, 8, 9, 0}  )
+  testeq( lume.merge(),                       {}              )
-  testeq( lume.merge({a=1, b=2}, {b=3, c=4}, true), {a=1, b=3, c=4}     )
+  testeq( lume.merge({x=1, y=2}),             {x=1, y=2}      )
+  testeq( lume.merge({a=1, b=2}, {b=3, c=4}), {a=1, b=3, c=4} )
+end
+
+-- lume.concat
+tests["lume.concat"] = function()
+  testeq( lume.concat(nil),                            {}                    )
+  testeq( lume.concat({1, 2, 3}),                      {1, 2, 3}             )
+  testeq( lume.concat({1, 2, 3}, {4, 5, 6}),           {1, 2, 3, 4, 5, 6}    )
+  testeq( lume.concat({1, 2, 3}, {4, 5, 6}, nil, {7}), {1, 2, 3, 4, 5, 6, 7} )
 end
 
 -- lume.find
@@ -271,7 +368,7 @@ tests["lume.first"] = function()
   local t = { "a", "b", "c", "d", "e" }
   testeq( lume.first(t),    "a"           )
   testeq( lume.first(t, 1), { "a" }       )
-  testeq( lume.first(t, 2), { "a", "b" }  )  
+  testeq( lume.first(t, 2), { "a", "b" }  )
 end
 
 -- lume.last
@@ -279,7 +376,7 @@ tests["lume.last"] = function()
   local t = { "a", "b", "c", "d", "e" }
   testeq( lume.last(t),     "e"           )
   testeq( lume.last(t, 1),  { "e" }       )
-  testeq( lume.last(t, 2),  { "d", "e" }  )  
+  testeq( lume.last(t, 2),  { "d", "e" }  )
 end
 
 -- lume.invert
@@ -290,12 +387,21 @@ tests["lume.invert"] = function()
   testeq( lume.invert(lume.invert{a = 1, b = 2}), {a = 1, b = 2}      )
 end
 
+-- lume.pick
+tests["lume.pick"] = function()
+  local t = { cat = 10, dog = 20, fox = 30, owl = 40 }
+  testeq( lume.pick(t, "cat", "dog"), { cat = 10, dog = 20 } )
+  testeq( lume.pick(t, "fox", "owl"), { fox = 30, owl = 40 } )
+  testeq( lume.pick(t, "owl"), { owl = 40 } )
+  testeq( lume.pick(t), {} )
+end
+
 -- lume.keys
 tests["lume.keys"] = function()
   testeq( lume.keys({}), {} )
-  local t = lume.keys({ aaa = 1, bbb = 2, ccc = 3 }) 
+  local t = lume.keys({ aaa = 1, bbb = 2, ccc = 3 })
   table.sort(t)
-  testeq( t, {"aaa", "bbb", "ccc"} ) 
+  testeq( t, {"aaa", "bbb", "ccc"} )
   local t = lume.keys({ "x", "x", "x" })
   testeq( t, {1, 2, 3} )
 end
@@ -349,6 +455,20 @@ tests["lume.combine"] = function()
   fn = lume.combine(nil, a, nil, b, nil)
   fn(10, 20)
   testeq( acc, 230 )
+  local x = false
+  fn = lume.combine(function() x = true end)
+  fn()
+  testeq( x, true )
+  testeq( type(lume.combine(nil)), "function" )
+  testeq( type(lume.combine()),    "function" )
+end
+
+-- lume.call
+tests["lume.call"] = function()
+  local add = function(a, b) return a + b end
+  testeq( lume.call(),              nil )
+  testeq( lume.call(nil, 1, 2, 3),  nil )
+  testeq( lume.call(add, 1, 2),     3   )
 end
 
 -- lume.time
@@ -378,6 +498,10 @@ tests["lume.serialize, lume.deserialize"] = function()
   local t = { 1, 2, 3, 4, true, false, "cat", "dog", {1, 2, 3} }
   local s = lume.serialize(t)
   testeq( lume.deserialize(s), t )
+  testeq( lume.deserialize(lume.serialize(math.huge)), math.huge )
+  testeq( lume.deserialize(lume.serialize(-math.huge)), -math.huge )
+  local x = lume.deserialize(lume.serialize(0 / 0)) -- nan
+  testeq( x ~= x, true )
 end
 
 -- lume.split
@@ -402,6 +526,16 @@ tests["lume.trim"] = function()
   testeq( lume.trim("^.hello world]^", "^.]"),  "hello world"   )
 end
 
+-- lume.wordwrap
+tests["lume.wordwrap"] = function()
+  local str = "A small string with some words and then some more   words"
+  local b = "A small string with \nsome words and then \nsome more   words"
+  local fn = function(str) return #str >= 20 end
+  testeq( lume.wordwrap(str),     str )
+  testeq( lume.wordwrap(str, 20), b   )
+  testeq( lume.wordwrap(str, fn), b   )
+end
+
 -- lume.format
 tests["lume.format"] = function()
   local str = lume.format("a {a} in a {b}", {a = "mouse", b = "house"})
@@ -419,19 +553,19 @@ tests["lume.trace"] = function()
   local oldprint = print
   local file, line, msg
   print = function(x)
-    file, line, msg = x:match("%[(.-):(.-)%] (.*)")
+    file, line, msg = x:match("(.-):(.-): (.*)")
   end
   lume.trace("Hi world", 123.456, 1, nil)
   print = oldprint
   testeq( file:match(".lua$"),    ".lua"                  )
-  testeq( tonumber(line) ~= nil,  true                    ) 
+  testeq( tonumber(line) ~= nil,  true                    )
   testeq( msg,                    "Hi world 123.46 1 nil" )
 end
 
 -- lume.dostring
 tests["lume.dostring"] = function()
   testeq( lume.dostring([[return "hello!"]]), "hello!"  )
-  testeq( lume.dostring([[return 12345]]),    12345     )   
+  testeq( lume.dostring([[return 12345]]),    12345     )
 end
 
 -- lume.uuid
@@ -447,18 +581,37 @@ tests["lume.hotswap"] = function()
   testeq( type(err),  "string"  )
 end
 
--- lume.rgba
+-- lume.ripairs
-tests["lume.rgba"] = function()
+tests["lume.ripairs"] = function()
-  local r, g, b, a = lume.rgba(0x12345678)
+  local t = { "a", "b", false, "c" }
-  testeq( a, 0x12 )
+  local r = {}
-  testeq( r, 0x34 )
+  for i, v in lume.ripairs(t) do
-  testeq( g, 0x56 )
+    table.insert(r, { i, v })
-  testeq( b, 0x78 )
+  end
+  testeq( r, { { 4, "c" }, { 3, false }, { 2, "b" }, { 1, "a" } })
+  tester.test.error(lume.ripairs, nil)
+end
+
+-- lume.color
+tests["lume.color"] = function()
+  testeq({ lume.color("#ff0000") },                   { 1, 0, 0, 1 }  )
+  testeq({ lume.color("#00ff00") },                   { 0, 1, 0, 1 }  )
+  testeq({ lume.color("#0000ff") },                   { 0, 0, 1, 1 }  )
+  testeq({ lume.color("rgb( 255, 255, 255 )") },      { 1, 1, 1, 1 }  )
+  testeq({ lume.color("rgb (0, 0, 0)") },             { 0, 0, 0, 1 }  )
+  testeq({ lume.color("rgba(255, 255, 255, .5)") },   { 1, 1, 1, .5 } )
+  testeq({ lume.color("#ffffff", 2) },                { 2, 2, 2, 2 }  )
+  testeq({ lume.color("rgba(255, 255, 255, 1)", 3) }, { 3, 3, 3, 3 }  )
+  tester.test.error(lume.color, "#ff00f")
+  tester.test.error(lume.color, "#xyzxyz")
+  tester.test.error(lume.color, "rgba(hello)")
+  tester.test.error(lume.color, "rgba()")
+  tester.test.error(lume.color, "rgba(1, 1, 1, 1")
 end
 
 -- lume.chain
 tests["lume.chain"] = function()
-  local t = lume.chain({1, 2}):map(function(x) return x * 2 end):result() 
+  local t = lume.chain({1, 2}):map(function(x) return x * 2 end):result()
   testeq( t, { 2, 4 } )
   testeq( lume.chain(10):result(), 10 )
   local t = lume({1, 2}):map(function(x) return x * 2 end):result()
@@ -469,4 +622,3 @@ end
 tester.dotests(tests)
 tester.test.global()
 tester.printresults()
-