refactoring

.busted

@@ -1,7 +1,7 @@
 return {
   _all = {
     coverage = true,
-    ROOT = { "tests" },
+    ROOT = { "spec" },
     ['sort-files'] = true,
   },
   default = {

.luacheckrc

@@ -1,12 +1,11 @@
 stds.fun = require 'fun'
-stds.is = require 'nginx-metrix.lib.is'
 
 std = 'max+luajit+fun+ngx_lua'
 
-files['tests'] = { std = "+busted" }
+files['spec'] = { std = "+busted" }
 
 new_read_globals = {
   '__TEST__',
-  'is',
   'copy',
+  'print_inspected',
 }

.luacov

@@ -1,29 +1,16 @@
 return {
   include = {
-    '^[.]/nginx[-]metrix/'
+    '^[.]/src/'
   },
   modules = {
-    ['nginx-metrix.main']                              = 'nginx-metrix/main.lua',
-
-    ['nginx-metrix.collectors']                        = 'nginx-metrix/collectors.lua',
-    ['nginx-metrix.listener']                          = 'nginx-metrix/listener.lua',
-    ['nginx-metrix.logger']                            = 'nginx-metrix/logger.lua',
-    ['nginx-metrix.scheduler']                         = 'nginx-metrix/scheduler.lua',
-    ['nginx-metrix.version']                           = 'nginx-metrix/version.lua',
-
-    ['nginx-metrix.lib.is']                            = 'nginx-metrix/lib/is.lua',
-
-    ['nginx-metrix.collectors.request']                = 'nginx-metrix/collectors/request.lua',
-    ['nginx-metrix.collectors.status']                 = 'nginx-metrix/collectors/status.lua',
-    ['nginx-metrix.collectors.upstream']               = 'nginx-metrix/collectors/upstream.lua',
-
-    ['nginx-metrix.output.helper']                     = 'nginx-metrix/output/helper.lua',
-    ['nginx-metrix.output.renderer']                   = 'nginx-metrix/output/renderer.lua',
-
-    ['nginx-metrix.storage.collector_wrapper_factory'] = 'nginx-metrix/storage/collector_wrapper_factory.lua',
-    ['nginx-metrix.storage.dict']                      = 'nginx-metrix/storage/dict.lua',
-    ['nginx-metrix.storage.namespaces']                = 'nginx-metrix/storage/namespaces.lua',
-    ['nginx-metrix.storage.serializer']                = 'nginx-metrix/storage/serializer.lua',
-    ['nginx-metrix.storage.window']                    = 'nginx-metrix/storage/window.lua',
+    ['nginx-metrix'] = 'src/nginx-metrix.lua',
+    ['nginx-metrix.aggregator'] = 'src/nginx-metrix/aggregator.lua',
+    ['nginx-metrix.collectors'] = 'src/nginx-metrix/collectors.lua',
+    ['nginx-metrix.logger'] = 'src/nginx-metrix/logger.lua',
+    ['nginx-metrix.scheduler'] = 'src/nginx-metrix/scheduler.lua',
+    ['nginx-metrix.serializer'] = 'src/nginx-metrix/serializer.lua',
+    ['nginx-metrix.storage'] = 'src/nginx-metrix/storage.lua',
+    ['nginx-metrix.validator'] = 'src/nginx-metrix/validator.lua',
+    ['nginx-metrix.vhosts'] = 'src/nginx-metrix/vhosts.lua',
   },
 }

pre-commit

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if git rev-parse --verify HEAD >/dev/null 2>&1; then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# Redirect output to stderr.
+exec 1>&2
+
+files=$(git diff --cached --name-only $against -- '*.lua')
+
+[ -z "${files}" ] && exit 0
+
+eval $(luarocks path --bin)
+
+exec luacheck ${files}

rockspecs/nginx-metrix-2.0.dev-1.rockspec

@@ -24,7 +24,7 @@ dependencies = {
 build = {
   type = "builtin",
   modules = {
-    ['nginx-metrix.main']                              = 'nginx-metrix/main.lua',
+    ['nginx-metrix.main']                              = 'nginx-metrix/nginx-metrix.lua',
 
     ['nginx-metrix.collectors']                        = 'nginx-metrix/collectors.lua',
     ['nginx-metrix.listener']                          = 'nginx-metrix/listener.lua',

rockspecs/nginx-metrix-local-1.rockspec

@@ -1,49 +1,39 @@
 package = 'nginx-metrix'
+
 version = 'local-1'
+
 source = {
-  url = "file://nginx-metrix/",
+  url = "file://src/",
   dir = "nginx-metrix",
 }
+
 description = {
-  summary    = 'Extended Nginx status and metrics.',
-  detailed   = [[Extended Nginx status and metrics.]],
-  homepage   = 'https://github.com/bankiru/nginx-metrix/',
-  license    = 'MIT <http://opensource.org/licenses/MIT>',
+  summary = 'Extended Nginx status and metrics.',
+  detailed = [[Extended Nginx status and metrics.]],
+  homepage = 'https://github.com/bankiru/nginx-metrix/',
+  license = 'MIT <http://opensource.org/licenses/MIT>',
   maintainer = 'Boris Gorbylev <ekho@ekho.name>',
 }
+
 dependencies = {
   'lua ~> 5.1',
   'lpeg',
   'dkjson',
   'fun-alloyed',
   'inspect',
-  'lust',
 }
 
 build = {
   type = "builtin",
   modules = {
-    ['nginx-metrix.main']                              = 'nginx-metrix/main.lua',
-
-    ['nginx-metrix.collectors']                        = 'nginx-metrix/collectors.lua',
-    ['nginx-metrix.listener']                          = 'nginx-metrix/listener.lua',
-    ['nginx-metrix.logger']                            = 'nginx-metrix/logger.lua',
-    ['nginx-metrix.scheduler']                         = 'nginx-metrix/scheduler.lua',
-    ['nginx-metrix.version']                           = 'nginx-metrix/version.lua',
-
-    ['nginx-metrix.lib.is']                            = 'nginx-metrix/lib/is.lua',
-
-    ['nginx-metrix.collectors.request']                = 'nginx-metrix/collectors/request.lua',
-    ['nginx-metrix.collectors.status']                 = 'nginx-metrix/collectors/status.lua',
-    ['nginx-metrix.collectors.upstream']               = 'nginx-metrix/collectors/upstream.lua',
-
-    ['nginx-metrix.output.helper']                     = 'nginx-metrix/output/helper.lua',
-    ['nginx-metrix.output.renderer']                   = 'nginx-metrix/output/renderer.lua',
-
-    ['nginx-metrix.storage.collector_wrapper_factory'] = 'nginx-metrix/storage/collector_wrapper_factory.lua',
-    ['nginx-metrix.storage.dict']                      = 'nginx-metrix/storage/dict.lua',
-    ['nginx-metrix.storage.namespaces']                = 'nginx-metrix/storage/namespaces.lua',
-    ['nginx-metrix.storage.serializer']                = 'nginx-metrix/storage/serializer.lua',
-    ['nginx-metrix.storage.window']                    = 'nginx-metrix/storage/window.lua',
+    ['nginx-metrix'] = 'src/nginx-metrix.lua',
+    ['nginx-metrix.aggregator'] = 'src/nginx-metrix/aggregator.lua',
+    ['nginx-metrix.collectors'] = 'src/nginx-metrix/collectors.lua',
+    ['nginx-metrix.logger'] = 'src/nginx-metrix/logger.lua',
+    ['nginx-metrix.scheduler'] = 'src/nginx-metrix/scheduler.lua',
+    ['nginx-metrix.serializer'] = 'src/nginx-metrix/serializer.lua',
+    ['nginx-metrix.storage'] = 'src/nginx-metrix/storage.lua',
+    ['nginx-metrix.validator'] = 'src/nginx-metrix/validator.lua',
+    ['nginx-metrix.vhosts'] = 'src/nginx-metrix/vhosts.lua',
   },
 }

rockspecs/nginx-metrix-scm-1.rockspec

@@ -24,7 +24,7 @@ dependencies = {
 build = {
   type = "builtin",
   modules = {
-    ['nginx-metrix.main']                              = 'nginx-metrix/main.lua',
+    ['nginx-metrix.main']                              = 'nginx-metrix/nginx-metrix.lua',
 
     ['nginx-metrix.collectors']                        = 'nginx-metrix/collectors.lua',
     ['nginx-metrix.listener']                          = 'nginx-metrix/listener.lua',

spec/bootstrap.lua

@@ -0,0 +1,151 @@
+_G.__TEST__ = true
+
+require 'nginx-metrix.lib.is'()
+
+local copy
+copy = function(obj, seen)
+  if type(obj) ~= 'table' then return obj end
+  if seen and seen[obj] then return seen[obj] end
+  local s = seen or {}
+  local res = setmetatable({}, getmetatable(obj))
+  s[obj] = res
+  for k, v in pairs(obj) do res[copy(k, s)] = copy(v, s) end
+  return res
+end
+_G.copy = copy
+
+_G.print_inspected = function(...)
+  print(require 'inspect'(...))
+end
+
+local s = require('say') --our i18n lib, installed through luarocks, included as a luassert dependency
+
+local M = {
+  assertions = {},
+  matchers = {},
+}
+
+local function table_includes(container, contained)
+  if container == contained then return true end
+  local t1, t2 = type(container), type(contained)
+  if t1 ~= t2 then return false end
+
+  if t1 == 'table' then
+    for k, v in pairs(contained) do
+      if not table_includes(container[k], v) then return false end
+    end
+    return true
+  end
+  return false
+end
+
+local function table_contains(t, element)
+  if t then
+    for _, value in pairs(t) do
+      if type(value) == type(element) then
+        if type(element) == 'table' then
+          -- if we wanted recursive items content comparison, we could use
+          -- table_equals(v, expected) but one level of just comparing
+          -- items is sufficient
+          if M.assertions.table_equals(nil, { value, element }) then
+            return true
+          end
+        else
+          if value == element then
+            return true
+          end
+        end
+      end
+    end
+  end
+  return false
+end
+
+
+local function table_equals(actual, expected)
+  if type(actual) == 'table' and type(expected) == 'table' then
+    for _, v in pairs(actual) do
+      if not table_contains(expected, v) then
+        return false
+      end
+    end
+    for _, v in pairs(expected) do
+      if not table_contains(actual, v) then
+        return false
+      end
+    end
+    return true
+  elseif type(actual) ~= type(expected) then
+    return false
+  elseif actual == expected then
+    return true
+  end
+  return false
+end
+
+local function is_callable(obj)
+  return type(obj) == 'function' or getmetatable(obj) and getmetatable(obj).__call and true
+end
+
+local function json_equal(json1, json2)
+  local json = require 'dkjson'
+  local util = require 'luassert.util'
+
+  if type(json1) == 'string' then
+    json1 = json.decode(json1)
+  end
+
+  if type(json2) == 'string' then
+    json2 = json.decode(json2)
+  end
+
+  return util.deepcompare(json1, json2, true)
+end
+
+s:set("assertion.fail.positive", "%s")
+s:set("assertion.fail.negative", "%s")
+M.assertions['fail'] = function(_) return false end
+
+s:set("assertion.table_contains.positive", "Expected %s\n to contain \n%s")
+s:set("assertion.table_contains.negative", "Expected %s\n to NOT contain \n%s")
+M.assertions['table_contains'] = function(_, arguments) return table_contains(arguments[1], arguments[2]) end
+
+s:set("assertion.table_equals.positive", "Expected %s\n to be equal with %s")
+s:set("assertion.table_equals.negative", "Expected %s\n to be NOT equal with %s")
+M.assertions['table_equals'] = function(_, arguments) return table_equals(arguments[1], arguments[2]) end
+
+s:set("assertion.table_includes.positive", "Expected %s\n to include \n%s")
+s:set("assertion.table_includes.negative", "Expected %s\n to NOT include \n%s")
+M.assertions['table_includes'] = function(_, arguments) return table_includes(arguments[1], arguments[2]) end
+
+s:set("assertion.is_callable.positive", "Expected %s to be callable")
+s:set("assertion.is_callable.negative", "Expected %s to be NOT callable")
+M.assertions['is_callable'] = function(_, arguments) return is_callable(arguments[1]) end
+
+s:set("assertion.json_equal.positive", "Expected %s\n to be equal with %s")
+s:set("assertion.json_equal.negative", "Expected %s\n to be NOT equal with %s")
+M.assertions['json_equal'] = function(_, arguments) return json_equal(arguments[1], arguments[2]) end
+
+M.matchers["json_equal"] = function(_, arguments)
+  return function(value)
+    local is_eq = json_equal(value, arguments[1])
+    if not is_eq then
+      print_inspected{ json1 = value, json2 = arguments[1] }
+    end
+    return is_eq
+  end
+end
+
+-- a special syntax sugar to export all functions to the global table
+setmetatable(M, {
+  __call = function(t, assert)
+    for a_name, a_func in pairs(t.assertions) do
+      assert:register("assertion", a_name, a_func, "assertion." .. a_name .. ".positive", "assertion." .. a_name .. ".negative")
+    end
+    for a_name, a_func in pairs(t.matchers) do
+      assert:register("matcher", a_name, a_func)
+    end
+  end,
+})
+
+return M