From 306a9c7d2812be19ed4764b75eb3826c7babb01e Mon Sep 17 00:00:00 2001 From: Ivan Shalganov Date: Fri, 15 May 2020 00:36:31 +0300 Subject: [PATCH] Prepare release --- changelog.md | 9 ++++-- docs/index.md | 8 +++++ rockspec/aspect-1.13-0.rockspec | 50 +++++++++++++++++++++++++++++++ rockspec/aspect-git-1.rockspec | 16 ++-------- spec/aspect_spec.lua | 2 +- src/aspect/compiler.lua | 2 +- src/aspect/{err.lua => error.lua} | 0 src/aspect/funcs.lua | 2 +- src/aspect/output.lua | 2 +- src/aspect/tags.lua | 2 +- src/aspect/template.lua | 2 +- src/aspect/tokenizer.lua | 2 +- 12 files changed, 74 insertions(+), 23 deletions(-) create mode 100644 rockspec/aspect-1.13-0.rockspec rename src/aspect/{err.lua => error.lua} (100%) diff --git a/changelog.md b/changelog.md index 9d5be28..a25decc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,8 +1,13 @@ ChangeLog ========= -Master ------- +Develop +------- + +not yet + +1.13 +---- - Add `apply` tag - Run docs on github pages [aspect.unifire.app](https://aspect.unifire.app/) diff --git a/docs/index.md b/docs/index.md index bd87a9c..34eb554 100644 --- a/docs/index.md +++ b/docs/index.md @@ -72,6 +72,9 @@ package.path = '/path/to/aspect/src/?.lua;' .. package.path ## Documentation links +
+
+ **For template designers:** - [Specification](./spec.md) @@ -83,12 +86,17 @@ package.path = '/path/to/aspect/src/?.lua;' .. package.path - [Tests](./tests.md) - [Tests](./tests.md) +
+
+ **For developers:** - [Lua API](./api.md) - [CLI](./cli.md) - [Extending](./api.md#extending) +
+
diff --git a/rockspec/aspect-1.13-0.rockspec b/rockspec/aspect-1.13-0.rockspec new file mode 100644 index 0000000..c9e2ceb --- /dev/null +++ b/rockspec/aspect-1.13-0.rockspec @@ -0,0 +1,50 @@ +package = "aspect" +version = "1.13-0" +source = { + url = "https://github.com/unifire-app/aspect/archive/1.13.zip", + dir = "aspect-1.13" +} +description = { + summary = "Aspect is a powerful templating engine for Lua and OpenResty with syntax Twig/Django/Jinja/Liquid.", + homepage = "https://aspect.unifire.app/", + license = "BSD-3-Clause", +} +dependencies = { + "lua >= 5.1" +} +build = { + type = "builtin", + modules = { + ["aspect"] = "src/aspect/init.lua", + ["aspect.config"] = "src/aspect/config.lua", + ["aspect.template"] = "src/aspect/template.lua", + ["aspect.output"] = "src/aspect/output.lua", + ["aspect.error"] = "src/aspect/error.lua", + + ["aspect.tags"] = "src/aspect/tags.lua", + ["aspect.filters"] = "src/aspect/filters.lua", + ["aspect.funcs"] = "src/aspect/funcs.lua", + ["aspect.tests"] = "src/aspect/tests.lua", + + ["aspect.compiler"] = "src/aspect/compiler.lua", + ["aspect.tokenizer"] = "src/aspect/tokenizer.lua", + ["aspect.ast"] = "src/aspect/ast.lua", + ["aspect.ast.ops"] = "src/aspect/ast/ops.lua", + + ["aspect.utils"] = "src/aspect/utils.lua", + ["aspect.utils.batch"] = "src/aspect/utils/batch.lua", + ["aspect.utils.range"] = "src/aspect/utils/range.lua", + ["aspect.utils.date"] = "src/aspect/utils/date.lua", + + ["aspect.loader.array"] = "src/aspect/loader/array.lua", + ["aspect.loader.filesystem"] = "src/aspect/loader/filesystem.lua", + ["aspect.loader.resty"] = "src/aspect/loader/resty.lua", + + ["aspect.cli"] = "src/aspect/cli.lua", + }, + install = { + bin = { + ['aspect'] = 'bin/aspect' + } + } +} diff --git a/rockspec/aspect-git-1.rockspec b/rockspec/aspect-git-1.rockspec index 2442808..530bf06 100644 --- a/rockspec/aspect-git-1.rockspec +++ b/rockspec/aspect-git-1.rockspec @@ -5,19 +5,7 @@ source = { } description = { summary = "Aspect is a powerful templating engine for Lua and OpenResty with syntax Twig/Django/Jinja/Liquid.", - detailed = [[ -* Well known: The most popular Liquid-like syntax is used - Twig compatible and Jinja like. -* Fast: Aspect compiles templates down to plain optimized Lua code. - Moreover, Lua code compiles into bytecode - the fastest representation of a template. -* Secure: Aspect has a sandbox mode to evaluate all template code. - This allows Aspect to be used as a template language for applications where users may modify the template design. -* Flexible: Aspect is powered by a flexible lexer and parser. - This allows the developer to define their own custom tags, filters, functions and operators, and to create their own DSL. -* Comfortable: Aspect allows you to process userdata data. - More intuitive behavior with special values such as a empty string, number zero and so on. -* Memory-safe: The template is built in such a way as to save maximum memory when it is executed, even if the iterator provides a lot of fixture. - ]], - homepage = "https://github.com/unifire-app/aspect", + homepage = "https://aspect.unifire.app/", license = "BSD-3-Clause", } dependencies = { @@ -30,7 +18,7 @@ build = { ["aspect.config"] = "src/aspect/config.lua", ["aspect.template"] = "src/aspect/template.lua", ["aspect.output"] = "src/aspect/output.lua", - ["aspect.err"] = "src/aspect/err.lua", + ["aspect.error"] = "src/aspect/error.lua", ["aspect.tags"] = "src/aspect/tags.lua", ["aspect.filters"] = "src/aspect/filters.lua", diff --git a/spec/aspect_spec.lua b/spec/aspect_spec.lua index 94484bd..60ab1d3 100644 --- a/spec/aspect_spec.lua +++ b/spec/aspect_spec.lua @@ -9,7 +9,7 @@ local var_dump = require("aspect.utils").var_dump local dump_table = require("aspect.utils").dump_table local batch = require("aspect.utils.batch") local date = require("aspect.utils.date") -local err = require("aspect.err") +local err = require("aspect.error") local strip = require("aspect.utils").strip local json_encode = require("cjson.safe").encode local assert = require("luassert") diff --git a/src/aspect/compiler.lua b/src/aspect/compiler.lua index 790fd4b..7577712 100644 --- a/src/aspect/compiler.lua +++ b/src/aspect/compiler.lua @@ -10,7 +10,7 @@ local concat = table.concat local tokenizer = require("aspect.tokenizer") local tags = require("aspect.tags") local tests = require("aspect.tests") -local err = require("aspect.err") +local err = require("aspect.error") local quote_string = require("aspect.utils").quote_string local get_keys = require("aspect.utils").keys local strcount = require("aspect.utils").strcount diff --git a/src/aspect/err.lua b/src/aspect/error.lua similarity index 100% rename from src/aspect/err.lua rename to src/aspect/error.lua diff --git a/src/aspect/funcs.lua b/src/aspect/funcs.lua index c728b0a..3c79aaf 100644 --- a/src/aspect/funcs.lua +++ b/src/aspect/funcs.lua @@ -1,6 +1,6 @@ local unpack = unpack or table.unpack local concat = table.concat -local err = require("aspect.err") +local err = require("aspect.error") local compiler_error = err.compiler_error local runtime_error = err.runtime_error local config = require("aspect.config") diff --git a/src/aspect/output.lua b/src/aspect/output.lua index c5f41b9..26b7320 100644 --- a/src/aspect/output.lua +++ b/src/aspect/output.lua @@ -10,7 +10,7 @@ local tostring = tostring local gsub = string.gsub local len = string.len local ngx = ngx or {} -local err = require("aspect.err") +local err = require("aspect.error") local var_dump = require("aspect.utils").var_dump local config = require("aspect.config") local e_pattern = config.escape.pattern diff --git a/src/aspect/tags.lua b/src/aspect/tags.lua index 2d0826c..09d817e 100644 --- a/src/aspect/tags.lua +++ b/src/aspect/tags.lua @@ -1,4 +1,4 @@ -local err = require("aspect.err") +local err = require("aspect.error") local compiler_error = err.compiler_error local quote_string = require("aspect.utils").quote_string local config = require("aspect.config") diff --git a/src/aspect/template.lua b/src/aspect/template.lua index 32d098b..43ce1f9 100644 --- a/src/aspect/template.lua +++ b/src/aspect/template.lua @@ -4,7 +4,7 @@ local output = require("aspect.output") local funcs = require("aspect.funcs") local filters = require("aspect.filters") local tests = require("aspect.tests") -local err = require("aspect.err") +local err = require("aspect.error") local utils = require("aspect.utils") local tag_type = require("aspect.config").compiler.tag_type local var_dump = utils.var_dump diff --git a/src/aspect/tokenizer.lua b/src/aspect/tokenizer.lua index bc7ca91..cabf4b7 100644 --- a/src/aspect/tokenizer.lua +++ b/src/aspect/tokenizer.lua @@ -1,4 +1,4 @@ -local compiler_error = require("aspect.err").compiler_error +local compiler_error = require("aspect.error").compiler_error local setmetatable = setmetatable local concat = table.concat local strlen = string.len