Skip to content

Commit

Permalink
Merge pull request #4 from unifire-app/develop
Browse files Browse the repository at this point in the history
2.0
  • Loading branch information
bzick authored Jun 30, 2020
2 parents 84018d0 + 770c17c commit d9e38e0
Show file tree
Hide file tree
Showing 24 changed files with 865 additions and 201 deletions.
31 changes: 6 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ matrix:
env:
- LUA="lua=5.3"
- LUA_CJSON="2.1.0"
# - os: linux
# env:
# - LUA="lua=5.4"
# - LUA_CJSON="2.1.0"
- os: linux
env:
- LUA="luajit=2.0"
Expand All @@ -27,36 +31,13 @@ matrix:
env:
- LUA="luajit=2.1"
- LUA_CJSON=""
# testing osx too long
# - os: osx
# language: generic
# env:
# - LUA="lua=5.1"
# - os: osx
# language: generic
# env:
# - LUA="lua=5.2"
# - os: osx
# language: generic
# env:
# - LUA="lua=5.3"
# - os: osx
# language: generic
# env:
# - LUA="luajit=2.0"
# - os: osx
# language: generic
# env:
# - LUA="luajit=2.1"

before_install:
install:
- pip install codecov
- pip install hererocks
- hererocks lua_install --$LUA -r latest
- source lua_install/bin/activate
- luarocks install busted
- luarocks install cluacov
- luarocks install lua-cjson $LUA_CJSON
- .travis/before.sh

script:
- busted -c
Expand Down
8 changes: 8 additions & 0 deletions .travis/before.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

set -ex

luarocks install busted
luarocks install cluacov
luarocks install lua-cjson $LUA_CJSON
luarocks install luautf8
31 changes: 22 additions & 9 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
ChangeLog
=========

Develop
-------

- `with` with expression
- extra build information
- `dump` + nil = friends
- tokenizer with offset
- add compiler contexts
- improve template inheritance algorithm
2.0
---

- Tag `with` now supports expressions.
- Extra build information
- Function `aspect.utils.dump` now works with nil
- Tokenizer with offset.
- Add compiler contexts. More information about the template.
- Improve template inheritance algorithm. The parent template is determined dynamically
- Add filter `truncate`
- UTF8 support:
- add `require("aspect.config").utf` configuration
- add filters `utf.lower`, `utf.upper`, `utf.truncate`
- parsing localized dates
- Internal improvements.

Date:

- Move `aspect.utils.date` to `aspect.date`
- UTC time offset now in seconds (instead of minutes)
- When formatting a date, if a time zone is not specified, then formatting will occur for the local time zone
- Add date localization.

1.14
----
Expand Down
2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ui:
# trianglify: true

project:
version: 1.14
version: 2.0
download_url: https://github.com/unifire-app/aspect/releases
download_text: Download

Expand Down
Loading

0 comments on commit d9e38e0

Please sign in to comment.