Merge pull request #5 from 3scale/safe-concat

handle empty values with __tostring metatable

Author: mikz

lib/liquid.lua

@@ -2018,17 +2018,19 @@ function Interpreter:visit_BinOp( node )
                     return false
                 end
             end
+
             if left_name == "Empty" then
                 local right_value = self:visit(node.right)
-                if right_value == nil or right_value == '' then
+                local str = self:obj2str(right_value)
+                if not str or str == '' then
                     if op == EQ then
                         return true
                     else
                         return false
                     end
                 end
                 if type(right_value) == "table" then
-                    if next(right_value) then
+                    if next(right_value) or (str and str ~= '') then
                         if op == NE then
                             return true
                         else
@@ -2045,15 +2047,18 @@ function Interpreter:visit_BinOp( node )
                 self:raise_error("Invalid empty comparision", node, 'op')
             else
                 local left_value = self:visit(node.left)
-                if left_value == nil or left_value == '' then
+                local str = self:obj2str(left_value)
+
+                if not str or str == '' then
                     if op == EQ then
                         return true
                     else
                         return false
                     end
                 end
+
                 if type(left_value) == "table" then
-                    if next(left_value) then
+                    if next(left_value) or (str and str ~= '') then
                         if op == NE then
                             return true
                         else
@@ -2723,7 +2728,7 @@ do
         elseif obj_type == "Boolean" then
             return tostring(obj)
         elseif type(mt__tostring(obj)) == 'function' then
-            return tostring(obj)
+            return tostring(obj) or ''
         end
     end
 

t/interpreter.t

@@ -690,7 +690,7 @@ too many loopcount. limit num:3
     location /t {
         content_by_lua_block {
             local Liquid = require 'liquid'
-            local document = [[str = {{ str }}, arr = {{ arr | join: '+' }}]]
+            local document = "str = {{ str }}, arr = {{ arr | join: '+' }}\n{%- if str == empty %}str is empty{%endif%}"
             local template = Liquid.Template:parse(document)
 
             local str = setmetatable({}, { __tostring = function() return 'val' end })
@@ -704,3 +704,26 @@ GET /t
 str = val, arr = val+val
 --- no_error_log
 [error]
+
+
+=== TEST 27: variable with __tostring metatable but returns nil
+--- http_config eval: $::HttpConfig
+--- config
+    location /t {
+        content_by_lua_block {
+            local Liquid = require 'liquid'
+            local document = "str = {{ str }}, arr = {{ arr | join: '+' }}\n{% if str == empty %}str is empty{%endif%}"
+            local template = Liquid.Template:parse(document)
+
+            local str = setmetatable({}, { __tostring = function()  end })
+            local context = Liquid.InterpreterContext:new({ str = str, arr = { str, str } })
+            ngx.say(assert(template:render(context)))
+        }
+    }
+--- request
+GET /t
+--- response_body
+str = , arr = +
+str is empty
+--- no_error_log
+[error]