Changeset 1163

Timestamp:

2008-09-18 15:32:47 (4 months ago)

Author:

gaspard

Message:

commit 805de9620cdddbf0b3a85ecb1a454f11a1742a08
Author: Gaspard Bucher <gaspard@teti.ch>

Fixed a bug preventing the use of test conditions with nil values.
To test a nil value you must use the empty string: <r:if test='custom_a eq ""'>...</r:if>

Files:

• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/test/fixtures/files/Node-test.zafu (modified) (1 diff)
• trunk/test/helpers/zena_parser/basic.yml (modified) (2 diffs)

trunk/lib/parser/lib/rules/zena.rb

@@ -2570 +2570 @@
-              else
-                if node_attr = node_attribute(part, :node => node)
-node_attr
+"#{node_attr}.to_s"
-                else
-                  nil

trunk/test/fixtures/files/Node-test.zafu

@@ -96 +96 @@
-
-<hr/>
+
+<h2>swap</h2>
+<style>
+.orange { background:orange;}
+.green  { background:green;}
+</style>
+<div id='swap' class='orange' do='block' green_if='custom_a eq 100'>
+  <span do='swap' states=',100' attr='custom_a' publish='true'><r:if test='custom_a eq 100'><r:t>done</r:t><r:else do='t'>open</r:else></r:if></span> custom_a: <b do='[custom_a]'/>
+</div>
-
-<h2>drag & drop</h2>

trunk/test/helpers/zena_parser/basic.yml

@@ -531 +531 @@
-  tem: "<% if params[:f].to_i == 3 -%>three<% end -%> / <% if !params[:f].blank? -%>exist<% end -%>"
-
+if_in_if:
+  src: "<r:if test='id eq 22'><r:if test='1 eq 2'>strange...<r:else>wrong!</r:else></r:if><r:else>other node</r:else></r:if>"
+  tem: "<% if @node.zip.to_i == 22 -%><% if 1 == 2 -%>strange...<% elsif true -%>wrong!<% end -%><% elsif true -%>other node<% end -%>"
+  res: "wrong!"
+
-do_if:
-  src: "<b do='if' test='1 eq 2'>it's true<r:else>it's false</r:else></b>"
@@ -550 +555 @@
-  src: "<r:root><r:pages><li do='each' on_if_node='ancestor' class='hello' join=', '><r:show attr='name'/></li></r:pages></r:root>"
-  res: "<li class='hello'>collections</li>, <li class='hello'>nature</li>, <li class='hello'>people</li>, <li class='on'>projects</li>, <li class='hello'>skins</li>"
+
+on_if_empty:
+  src: "<li do='void' on_if='custom_a eq \"\"'>hello</li>"
+  tem: "<li<%= @node.custom_a.to_s == \"\" ? \" class='on'\" : \"\" %>>hello</li>"
+  res: "<li class='on'>hello</li>"
-
-# var1 = stored 'papa'