Prepare release

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/)

docs/index.md

@@ -72,6 +72,9 @@ package.path = '/path/to/aspect/src/?.lua;' .. package.path
 
 ## Documentation links
 
+<div class="row">
+<div class="col-lg-6" markdown="1">
+
 **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)
 
+</div>
+<div class="col-lg-6" markdown="1">
+
 **For developers:**
 
 - [Lua API](./api.md)
 - [CLI](./cli.md)
 - [Extending](./api.md#extending)
 
+</div>
+</div>
 
 </div>
 </div>

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'
+        }
+    }
+}

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",

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")

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

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")

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

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")

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

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