Merge pull request #14 from 3scale/THREESCALE-6594

Threescale 6594 Adds date filter support

Author: djmarinb

.travis.yml

@@ -17,6 +17,7 @@ install:
   - docker run --name testContainer -d -v $(pwd):/opt/code openresty/openresty:bionic sleep 1h
   - docker exec -ti testContainer apt-get install -qq -y cpanminus axel
   - docker exec -ti testContainer cpanm --notest Test::Nginx
+  - docker exec -ti testContainer luarocks install date 2.2-2
 
 script:
   - docker exec -ti testContainer bash -c "cd /opt/code; prove -r t"

lib/liquid.lua

@@ -1,4 +1,5 @@
 local cjson = require 'cjson'
+local Datelib = require 'date'
 local Liquid = {}
 local Lexer = {}
 local Parser = {}
@@ -3076,6 +3077,34 @@ local function str_reverse( str )
     return string.reverse(str)
 end
 --=== String filter end
+--=== Date filter
+local function date_parse(obj)
+    local dateobj = Datelib(obj)
+    return dateobj
+end
+
+local function date_now()
+    local dateobj = Datelib(true)
+    return dateobj
+end
+
+local date_func =
+{
+    ["now"] = date_now,
+    ["default"] = date_parse,
+}
+
+local function date(obj, format)
+    local date_obj = nil;
+    local func = date_func[obj]
+    if func then 
+        date_obj = func(obj)
+    else
+        date_obj = date_func["default"](obj)
+    end
+    return date_obj:fmt(format)
+end
+--=== Date filter end
 --=== Additional filter begin
 local function json( obj )
     -- body
@@ -3134,6 +3163,9 @@ FilterSet:add_filter("url_encode", url_encode )
 FilterSet:add_filter("url_decode", url_decode )
 FilterSet:add_filter("str_reverse", str_reverse )
 
+--Date filter
+FilterSet:add_filter("date", date )
+
 --Additinal filter
 FilterSet:add_filter("json", json )
 FilterSet:add_filter("get", get)

rockspecs/liquid-scm-1.rockspec

@@ -10,7 +10,9 @@ description = {
    homepage = "https://github.com/chenxianyu2015/liquid-lua",
    license = "BSD-2-Clause"
 }
-dependencies = {}
+dependencies = {
+   "date >= 2.2-2"
+}
 build = {
    type = "builtin",
    modules = {

t/date_filters.t

@@ -0,0 +1,45 @@
+use Test::Nginx::Socket::Lua;
+use Cwd qw(cwd);
+
+# repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks());
+
+my $pwd = cwd();
+
+our $HttpConfig = qq{
+    lua_package_path "$pwd/lib/?.lua;;;";
+    lua_package_cpath "/usr/local/openresty/lualib/?.so;;";
+};
+
+
+no_long_string();
+#no_diff();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: 'date' filter.
+--- http_config eval: $::HttpConfig
+--- config
+    location /t {
+        content_by_lua_block {
+            local Liquid = require 'liquid'
+            local Lexer = Liquid.Lexer
+            local Parser = Liquid.Parser
+            local Interpreter = Liquid.Interpreter
+            local document = "{% assign a = \"03/Jan/2022:09:24:58 +0000\"  %} {{ a | date: \"%m %d, %Y %H:%M:%S\" }}"
+            local lexer = Lexer:new(document)
+            local parser = Parser:new(lexer)
+            local interpreter = Interpreter:new(parser)
+            ngx.say(interpreter:interpret())
+        }
+    }
+--- request
+GET /t
+--- response_body
+ 01 03, 2022 09:24:58
+
+--- no_error_log
+[error]