zena 1.2.1 → 1.2.2

data/test/integration/zafu_compiler/asset.yml

@@ -10,8 +10,18 @@ default:
 
 rename_asset:
   src: "<link href='/Default skin/style.css' rel='Stylesheet' type='text/css'/>"
-  tem: "<link href='/en/textdocument54.css?1144713600' rel='Stylesheet' type='text/css'/>"
+  tem: "<link rel='Stylesheet' type='text/css' href='/en/textdocument54.css?1144713600'/>"
 
 should_not_change_script:
   src: "<script type='text/javascript' src='http://example.com'></script>"
-  tem: "<script src='http://example.com' type='text/javascript'></script>"
+  tem: "<script type='text/javascript' src='http://example.com'></script>"
+
+change_style_url:
+  src: |
+    <style>
+    #super { background:url('<r:image in='site' do='path' format='data'/>');}
+    </style>
+  res: |
+    <style>
+    #super { background:url('/oo/image40.jpg?1144713600');}
+    </style>

data/test/integration/zafu_compiler/basic.yml

@@ -268,22 +268,6 @@ find_count:
   src: "<r:nodes in='site' where='name like \"a%\"' find='count'/>"
   res: "3"
 
-link_page_next:
-  context:
-    pak: 2
-  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r:show var='pak'/> | <r:link page='next'/> || <r:each join=',' do='title'/></r:nodes>"
-  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?pak=1'>1</a> | 2 | <a href='/oo/projects-list/Clean-Water-project/page22.html?pak=3'>3</a> || tiger,lion,myLife"
-
-link_page_next_with_block:
-  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='next' do='t'>next</r:link></r:nodes>"
-  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?pak=2'>next</a>"
-
-link_page_list:
-  context:
-    pak: 2
-  src: "<r:nodes in='site' limit='10' order='zip' paginate='pak' do='link' page='list' join=', '/>"
-  tem: "/set_pak_page != set_pak.*zen_path\(@node,:pak.*elsif true.*set_pak_page/"
-  res: "/<a href='.*page22.html\?pak=1'>1</a>, 2, .*pak=3'>3</a>.*pak=4'>4</a>.*pak=5'>5</a>/"
 
 # TODO:
 #link_page_list_single_page:

data/test/integration/zafu_compiler/calendar.yml

@@ -9,26 +9,26 @@ calendar:
   context:
     date: "2006-03-18"
   src: "<div do='calendar' attr='date' select='posts where #{cal_start} <= date and date < #{cal_end} in project'/>"
-  res: "/<td><p>15</p><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>parc openi…</a></li></ol><\/td>.*<td class='sat ref'>18</td>/"
+  res: "/<td class='events'><p>15</p><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>parc openi…</a></li></ol><\/td>.*<td class='sat ref'>18</td>/"
 
 calendar_tz:
   context:
     date: "2006-03-18"
   src: "<div do='calendar' attr='date' tz='America/New_York' select='posts where #{cal_start} <= date and date < #{cal_end} in project'/>"
   # previous date 00:00 = uses tz in link.
-  res: "/date=2006-02-18\+00%3A00.*<td><p>14</p><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>parc openi…</a></li></ol><\/td>.*<td class='sat ref'>18</td>/"
+  res: "/date=2006-02-18\+00%3A00.*<td class='events'><p>14</p><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>parc openi…</a></li></ol><\/td>.*<td class='sat ref'>18</td>/"
 
 calendar_with_blocks:
   context:
     date: "2006-03-18"
   src: "<div do='calendar' attr='date' select='posts where #{cal_start} <= date and date < #{cal_end} in project'>
     <h3 do='header'>
-      <r:link date='date.advance(:months =&gt; -1)' text='PREV'/>
+      <r:link date='date.advance(:months => -1)' text='PREV'/>
       <r:date format='%B'/>
-      <r:link date='date.advance(:months =&gt; 1)' text='NEXT'/>
+      <r:link date='date.advance(:months => 1)' text='NEXT'/>
     </h3><r:cell><b do='date' format='%e.%m'/></r:cell></div>"
-  # Daylight savings change: Feb = 00:00, Apr 01:00
-  res: "/date=2006-02-18\+00%3A00'>PREV.*date=2006-04-18\+01%3A00'>NEXT.*<b>15.03</b>/"
+  # Daylight savings change: Feb = 00:00, Apr 01:00: Should still be 00:00 because we advance with the LOCAL time.
+  res: "/date=2006-02-18\+00%3A00'>PREV.*date=2006-04-18\+00%3A00'>NEXT.*<b>15.03</b>/"
 
 calendar_node_attr:
   context:

data/test/integration/zafu_compiler/complex_ok.yml

@@ -6,9 +6,31 @@ it_should_compile_custom_select:
     site: complex
     ref_date: 2004-09-01
   src: "<r:emp_form_dates do='each' join=', '><r:show attr='title'/>(<r:priority/>)[<r:last_date format='%Y-%m'/>]</r:emp_form_dates>"
-  tem: '/var2.attributes\["priority"\].*\[<%= format_date\(var2.attributes\["last_date"\], :format => "%Y-%m"\) %>\]/'
+  tem: '/var2.attributes\["priority"\].*\[<%= format_date\(var2.rcast\("last_date", :time\), :format => "%Y-%m"\) %>\]/'
   res: 'how to use the winch(10)[], secure a site(10)[], dangerous transportations(10)[2004-03], engine maintenance(5)[], information transmission(5)[2002-05], fiber junction(5)[2003-03], problem formulation(5)[2006-03], how to use the radio(1)[]'
 
+type_cast_to_time_using_existing_field:
+  context:
+    node_name: '@node'
+    node: roger
+    visitor: complex_admin
+    site: complex
+    ref_date: 2004-09-01
+  src: "<r:emp_form_dates where='idx_datetime1 is not null' do='each' join=', ' do='idx_datetime1' format='%d.%m.%Y %H:%M'/>"
+  tem: '/format_date\(var2.idx_datetime1/'
+  res: '15.03.2006 01:00, 05.05.2003 02:00, 03.03.2005 01:00'
+
+type_cast_to_time_custom_field:
+  context:
+    node_name: '@node'
+    node: roger
+    visitor: complex_admin
+    site: complex
+    ref_date: 2004-09-01
+  src: "<r:emp_form_dates where='next_date is not null' do='each' join=', ' do='next_date' format='%d.%m.%Y %H:%M'/>"
+  tem: '/format_date\(var2.rcast\("next_date", :time/'
+  res: '15.03.2006 01:00, 05.05.2003 02:00, 03.03.2005 01:00'
+  
 it_should_group_by_custom_select:
   context:
     node_name: '@node'

data/test/integration/zafu_compiler/conditional.yml

@@ -149,14 +149,14 @@ if_in_tag_else:
   res: "not in form"
 
 if_or:
-  src: "<r:if eval='can_write?' or_test='origin'>hello</r:if>"
-  tem: "/<% if @node.can_write? || !@node.version.prop[\"foo\"].blank? %>hello<% end %>|<% if !@node.version.prop[\"foo\"].blank? || @node.can_write? %>hello<% end %>/"
+  src: "<r:if eval='can_write? || origin'>hello</r:if>"
+  tem: "/<% if @node.can_write? \|\| !@node.version.prop[\"foo\"].blank? %>hello<% end %>|<% if !@node.version.prop[\"foo\"].blank? || @node.can_write? %>hello<% end %>/"
   res: "hello"
 
 if_or_same:
-  src: "<r:if test='origin' test='d_bar'>hello</r:if>"
-  tem: "/<% if !@node.version.prop[\"foo\"].blank? || !@node.version.prop[\"bar\"].blank? %>hello<% end %>|<% if !@node.version.prop[\"bar\"].blank? || !@node.version.prop[\"foo\"].blank? %>hello<% end %>/"
-  res: ""
+  src: "<r:if test='origin || text'>hello</r:if>"
+  tem: "/<% if !@node.version.prop[\"foo\"].blank? \|\| !@node.version.prop[\"text\"].blank? %>hello<% end %>|<% if !@node.version.prop[\"bar\"].blank? || !@node.version.prop[\"foo\"].blank? %>hello<% end %>/"
+  res: "hello"
 
 if_now:
   src: "<r:if test='log_at &gt; now'>future<r:else>past</r:else></r:if>"

data/test/integration/zafu_compiler/context.yml

@@ -8,11 +8,7 @@ each_group:
   src: "<r:nodes do='group' by='kpath'><p do='each_group'><r:kpath/>: <r:each join=', ' do='title'/></p></r:nodes>"
   res: "<p>NP: crocodiles, status title</p><p>NDI: it's a lake</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
 
-set_var:
-  context:
-    date: '2011-05-30'
-  src: "<div do='set' next_date='date.advance(:years =&gt; 1)'><span do='next_date' format='%Y-%m-%d'/></div>"
-  res: "<div><span>2012-05-30</span></div>"
+# set_var tested in eval.yml
 
 dom_id_in_each:
   src: "<r:pages in='site limit 2'><li do='each'><r:dom_id/> <p id='this#{dom_id}'/></li></r:pages>"
@@ -24,3 +20,8 @@ list_else:
     node: status
   src: "<ul do='posts'><li do='each' do='link'/><li do='else'>hop</li></ul>"
   res: "<ul><li>hop</li></ul>"
+
+master_template_on_static_render:
+  src: "<r:master_template><r:title/></r:master_template>"
+  tem: ''
+  # Master template on template rendering is tested in 'find master template', rendering_test.rb

data/test/integration/zafu_compiler/dates.yml

@@ -149,9 +149,15 @@ input_date:
   context:
     node: opening
   src: "<r:Post?><r:input type='date' name='date'/></r:Post?>"
-  tem: '/date_box\(@node, "date", :value => @node.prop\[.date.\], :size => 15\)/'
+  tem: '/date_box\(@node, "node\[date\]", :value => @node.prop\[.date.\], :size => 15\)/'
   res: "/value='2006-03-15 01:00'/"
 
+input_date_value_now:
+  context:
+    node: opening
+  src: "<r:Post?><r:input type='date' name='date' value='now'/></r:Post?>"
+  tem: '/date_box\(@node, "node\[date\]", :value => Time.now, :size => 15\)/'
+
 input_date_no_time:
   context:
     node: opening
@@ -160,6 +166,14 @@ input_date_no_time:
   res: "/value='2006-03-15'/"
   js: "/showsTime *: *false/"
 
+label_on_hash:
+  src: "<r:input name='settings[foo]' label='t'/>"
+  res: "<label>settings_foo</label> <span><input type='text' name='node[settings][foo]' value=''/></span>"
+
+date_on_hash:
+  src: "<r:input name='settings[foo]' type='date'/>"
+  res: "/<input id='.*' name='node\[settings\]\[foo\]' type='text' size='15' value='' class=''/>/"
+
 test_date:
   # test with 'date' tests contextual date (main_date).
   src: "<r:Post?><r:if test='this.date'></r:if></r:Post?>"
@@ -184,4 +198,11 @@ time_year:
     node: opening
     tz: 'US/Pacific'
   src: "<r:Post?><b do='this.date.year'/> <b do='this.date.year(\"UTC\")'/></r:Post?>"
-  res: "<b>2011</b> <b>2012</b>"
+  res: "<b>2011</b> <b>2012</b>"
+
+time_wday:
+  context:
+    node: opening
+    tz: 'US/Pacific'
+  src: "<r:Post?><b do='this.date.wday'/> <b do='this.date.wday(\"UTC\")'/></r:Post?>"
+  res: "<b>2</b> <b>3</b>"

data/test/integration/zafu_compiler/display.yml

@@ -7,6 +7,50 @@ default:
   tem: "simple text"
   res: "simple text"
 
+space_in_tag:
+  src: <meta http-equiv='Content-type' content='text/html; charset=utf-8' /><r:title/>
+  tem: '!/r:title/'
+
+multiline_tag:
+  src: |
+    <meta 
+    http-equiv='Content-type'
+      content='text/html; charset=utf-8' /><r:title/>
+  tem: '!/r:title/'
+
+multiline_rtag:
+  src: |
+    <r:void 
+    http-equiv='Content-type'
+      content='text/html; charset=utf-8' /><r:title/>
+  tem: '!/r:title/'
+
+cdata:
+  src: |
+    <script type='text/javascript'>
+      <![CDATA[
+      var urls = [<r:images in='site limit 2' do='each' join=', '>'<r:url mode='med' format='data'/>'</r:images>];
+      //]]>
+    </script>
+  res: |
+    <script type='text/javascript'>
+      <![CDATA[
+      var urls = ['http://test.host/oo/image40_med.jpg?390663777446', 'http://test.host/en/image30_med.jpg?390663777446'];
+      //]]>
+    </script>
+
+multiline_tag:
+  src: |
+    <div id='extract'>
+      <r:section do='zazen' attr='infos' edit='true' publish='true' />
+  
+      <div id='cert' do='pages' in='site'>
+        <div class='cert' do='each' do='link' do='img' src='find("image")' mode='cert' />
+      </div>
+    </div>
+  tem: "!/do='pages'/"
+
+  
 show_title:
   old_src: "<r:show attr='title'/>"
   old_tem: "<%= @node.title %>"
@@ -340,9 +384,9 @@ each_whitespace:
   res: "53\n37\n12\n.\n"
 
 set_class_before_query:
-  # Should use previous node (not list context)
+  # Uses list context
   src: "<div class='foo_#{title}' do='images in site'></div>"
-  res: "<div class='foo_status title'></div>"
+  res: "<div class='foo_Autumn Tree'></div>"
 
 flash_messages:
   src: "<r:flash_messages/>"

data/test/integration/zafu_compiler/errors.yml

@@ -81,8 +81,8 @@ toggle_bad_finder_class:
 map_join:
   context:
     node: 'cleanWater'
-  src: "<r:children do='map(:flobo).join(\",\")'/>"
-  tem: "/unknown method .*map\(:flobo\)/"
+  src: "<r:children do='map(\"flobo\").join(\",\")'/>"
+  tem: "/unknown method <span class='type'>flobo\(\)</span>/"
 
 datebox_on_vclass:
   src: "<r:Contact><r:input type='date' name='log_at'/></r:Contact>"

data/test/integration/zafu_compiler/eval.yml

@@ -8,14 +8,42 @@ show_var_overwrites_attribute:
   src: "<r:set title='12345'><b do='title'/></r:set>"
   res: "<b>12345</b>"
 
-test_set_in_scope:
+set_in_scope:
   src: "<r:set hours='3'><r:if test='hours &gt; 0'>you have: <r:show eval='hours' format='%.2f'/></r:if></r:set>"
   res: "you have: 3.00"
 
-test_set_for_siblings:
-  src: "<r:set hours='3'/><r:if test='hours &gt; 0'>you have: <r:show eval='hours' format='%.2f'/></r:if>"
-  res: "you have: 3.00"
+set_bad_code:
+  src: "<r:set hours='foobar'><r:if test='hours &gt; 0'>you have: <r:show eval='hours' format='%.2f'/></r:if></r:set>"
+  res: "/unknown method 'foobar\(\)'/"
+
+set_var:
+  context:
+    date: '2011-05-30'
+  src: "<div do='set' next_date='date.advance(:years =&gt; 1)'><span do='next_date' format='%Y-%m-%d'/></div>"
+  res: "<div><span>2012-05-30</span></div>"
+
+set_var_propagates:
+  src: "<div do='set' a='%q{hello}'><r:void do='set' a='%q{goodbye}'/><r:a/></div>"
+  tem: '<div><% _za = "hello" %><% _za = "goodbye" %><%= _za %></div>'
+  res: "<div>goodbye</div>"
 
-test_set_for_siblings_overwrite:
-  src: "<r:set hours='3'/><r:set hours='%{hello}'/><r:if test='!hours.blank?'>you have: <r:eval>hours.gsub(/o/,'')</r:eval></r:if>"
-  res: "you have: hell"
+set_var_can_be_nil:
+  src: "<div do='set' a='%q{hello}'><r:void do='set' a='origin'/><r:a/></div>"
+  tem: "<div><% _za = \"hello\" %><% _za = @node.prop['origin'] || _za %><%= _za %></div>"
+  res: "<div>hello</div>"
+
+set_var_different_type:
+  src: "<div do='set' a='%q{hello}'><r:void do='set' a='15'/><r:a/></div>"
+  tem: "/Type mismatch for var a=15: Number != String/"
+
+node_eval:
+  src: "<r:void do='@node.eval(\"title\")'/>"
+  tem: "<%= @node.zafu_eval(\"title\") %>"
+  res: "status title"
+
+node_eval_array:
+  context:
+    node: opening
+  src: "<r:void do='@node.eval(\"set_tag_ids\")'/>"
+  tem: "<%= @node.zafu_eval(\"set_tag_ids\") %>"
+  res: "33,34"

data/test/integration/zafu_compiler/forms.yml

@@ -36,7 +36,7 @@ new:
   # Should accept allowed params (from class and roles) and transform ids to zip (back and forth)
   src: "<r:new klass='Letter' title='%q{Joe}' parent_id='project.id' paper='%q{white}' origin='%q{Mars}' bad='%q{value}'><r:form><r:input name='title'/> <r:input name='parent_id'/></r:form></r:new>"
   tem: "/:title => \"Joe\", :parent_id => .*@node.project.zip.*, :paper => \"white\", :origin => \"Mars\"/"
-  res: "/<input type='text' name='node\[title\]' value='Joe'/> <input type='text' name='node\[parent_id\]' value='21'/><div class='hidden'><input type='hidden' name='node\[klass\]' value='Letter'/><input type='submit'/><input type='hidden' name='node\[paper\]' value='white'/><input type='hidden' name='node\[origin\]' value='Mars'/></div>/"
+  res: "/<input type='text' name='node\[title\]' value='Joe' id='list1_title'/> <input type='text' name='node\[parent_id\]' value='21'[^>]+/><div class='hidden'><input type='hidden' name='node\[klass\]' value='Letter'/><input type='submit'/><input type='hidden' name='node\[paper\]' value='white'/><input type='hidden' name='node\[origin\]' value='Mars'/></div>/"
 
 translate_id_to_zip:
   src: "<b do='hot_id'/><i do='parent_id'/>"
@@ -46,23 +46,32 @@ select_class_existing_node:
   context:
     node: 'letter'
   src: "<r:form><r:select name='klass' root_class='Note' selected='Post'/></r:form>"
-  res: "/<select name=.node\[klass\].><option value=\"Note\">Note<\/option>\n<option value=\"Letter\" selected=\"selected\">  Letter<\/option>\n<option value=\"Post\">  Post<\/option><\/select>/"
+  res: "/<select name=.node\[klass\]. id=.list1_klass.><option value=\"Note\">klass_Note<\/option>\n<option value=\"Letter\" selected=\"selected\">  klass_Letter<\/option>\n<option value=\"Post\">  klass_Post<\/option><\/select>/"
 
 select_class_new_node:
   src: "<r:pages><r:each/><r:add/><r:form><r:select name='klass' root_class='Note' selected='Post'/></r:form>"
-  res: "/<select.*name=.node\[klass\].*Note.*Letter.*Post. selected=.selected./"
+  res: "/<select.*name=.node\[klass\].*klass_Note.*klass_Letter.*Post. selected=.selected./"
 
 select_class_kpath:
   src: "<r:select param='k' root_class='Note' attr='kpath'/>"
-  res: "/<select.*name=.k.*NN.*Note.*NNL.*Letter.*NNP.*Post/"
+  res: "/<select.*name=.k.*NN.*k_Note.*NNL.*k_Letter.*NNP.*k_Post/"
+
+select_class_tprefix:
+  src: "<r:select tprefix='foo' param='k' root_class='Note'/>"
+  tem: '/\["foo_Note", "Note"\]/'
+  res: "/foo_Note.*foo_Letter/"
+
+select_data:
+  src: "<r:select data-d='foo' param='k' root_class='Note' attr='kpath'/>"
+  res: "/<select name=.k. data-d='foo'.*NN.*k_Note.*NNL.*k_Letter.*NNP.*k_Post/"
 
 select_nodes:
   src: "<r:form><r:select nodes='images in site' name='foo'></select></r:form>"
-  res: "/name='node\[foo\]'><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Autumn Tree</option>\n<option value=\"30\">bird</option>/"
+  res: "/name='node\[foo\]'[^>]+><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Autumn Tree</option>\n<option value=\"30\">bird</option>/"
 
 select_nodes_show_rubyless:
   src: "<r:form><r:select nodes='images in site' name='foo' show='title.limit(3)'></select></r:form>"
-  res: "/name='node\[foo\]'><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Aut…</option>\n<option value=\"30\">bir…</option>/"
+  res: "/name='node\[foo\]'[^>]+><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Aut…</option>\n<option value=\"30\">bir…</option>/"
 
 do_not_set_parent_id_if_form_contains_parent_id:
   src: "<r:children><r:each do='title'/><r:add/><r:form><r:select name='parent_id' nodes='projects in site'/><input name='title'/></r:form></r:children>"
@@ -74,11 +83,11 @@ select_nodes_selected:
 
 select_nodes_in_ajax:
   src: "<r:pages><r:each do='title'/><r:add/><r:form><r:select nodes='images in site' name='d_ref'/></r:form></r:pages>"
-  res: "/name=.node\[d_ref\].><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Autumn Tree</option>\n<option value=\"30\">bird</option>/"
+  res: "/name=.node\[d_ref\].[^>]+><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Autumn Tree</option>\n<option value=\"30\">bird</option>/"
 
 select_nodes_show_attr:
   src: "<r:form><r:select name='title' nodes='images in site' attr='ext' show='title'/></r:form>"
-  res: "/name=.node\[title\].>.*<option value=\"jpg\">flower</option>\n<option value=\"jpg\">it's a lake</option>/"
+  res: "/name=.node\[title\].[^>]+>.*<option value=\"jpg\">flower</option>\n<option value=\"jpg\">it's a lake</option>/"
 
 select_time_zone:
   src: "<r:form><r:select type='time_zone' name='d_tz'/></r:form>"
@@ -138,6 +147,13 @@ checkbox_checked_value:
   tem: "/@node.tagged\[\"sky\"\].blank\?/"
   res: "<input type='hidden' name='node[tagged][sky]' value=''/><input type='checkbox' name='node[tagged][sky]' value='sky' checked='checked'/>"
 
+checkbox_checked_hash_value:
+  context:
+    node: test
+  src: "<r:input type='checkbox' name='settings[one]' value='un'/> <r:input type='checkbox' name='settings[one]' value='deux'/>"
+  tem: "/@node.prop\[.settings.\]\[.one.\] : nil\) == .un. \? . checked='checked'/"
+  res: "<input type='hidden' name='node[settings][one]' value=''/><input type='checkbox' name='node[settings][one]' value='un' checked='checked'/><input type='hidden' name='node[settings][one]' value=''/> <input type='checkbox' name='node[settings][one]' value='deux'/>"
+
 checkbox_unchecked_value:
   src: "<r:input type='checkbox' name='tagged[foo]'/>"
   tem: "/@node.tagged\[\"foo\"\].blank\?/"
@@ -160,19 +176,19 @@ input:
   context:
     node: 'ant'
   src: "<r:Contact?><r:input name='first_name'/></r:Contact?>"
-  tem: "<% if @node.kpath_match?('NRC') %><input type='text' name='node[first_name]' value='<%= fquote @node.prop['first_name'] %>'/><% end %>"
+  tem: "<% if @node.kpath_match?('NRC') %><input type='text' name='node[first_name]' value='<%= fquote(@node.prop['first_name']) %>'/><% end %>"
   res: "<input type='text' name='node[first_name]' value='Solenopsis'/>"
 
 input_raw_name:
   src: "<r:input param='first_name'/>"
-  tem: "<input type='text' name='first_name' value='<%= fquote params[:first_name] %>'/>"
+  tem: "<input type='text' name='first_name' value='<%= fquote(params[:first_name]) %>'/>"
 
 input_param_value:
   context:
     foo:
       "bar.baz": 'xyz'
   src: "<r:input param='foo[bar.baz]'/>"
-  tem: "<input type='text' name='foo[bar.baz]' value='<%= fquote param_value(\"foo[bar.baz]\") %>'/>"
+  tem: "<input type='text' name='foo[bar.baz]' value='<%= fquote(param_value(\"foo[bar.baz]\")) %>'/>"
   res: "<input type='text' name='foo[bar.baz]' value='xyz'/>"
 
 input_checkbox_param_value:
@@ -212,7 +228,7 @@ input_new:
   context:
     node: 'ant'
   src: "<r:contacts><r:each/><r:form><r:input name='first_name'/></r:form><r:add/></r:contacts>"
-  res: "/name='node\[first_name\]' [^>]*id='list2_first_name'/"
+  res: "/name='node\[first_name\]' [^>]*id='list1_first_name'/"
 
 show_in_form:
   src: "<r:form><b do='title'/></r:form>"
@@ -228,13 +244,23 @@ set_parent_id_in_new:
   tem: "/node\[parent_id\].*@node.zip/"
   res: "/<input type='hidden' name='node\[parent_id\]' value='22'/>/"
 
-
 label_on_input:
   context:
     lang: fr
   src: "<r:input label='t' name='title'/>"
   res: "<label>titre</label> <span><input type='text' name='node[title]' value='Etat des travaux'/></span>"
 
+label_on_input_param:
+  context:
+    lang: fr
+  src: "<r:input label='t' param='title'/>"
+  res: "<label>titre</label> <span><input type='text' name='title' value=''/></span>"
+
+label_on_hash:
+  src: "<r:input name='settings[foo]' label='t'/>"
+  tem: "/@node.prop\[.settings.\]\[.foo.\]/"
+  res: "<label>settings_foo</label> <span><input type='text' name='node[settings][foo]' value=''/></span>"
+
 label_on_textarea:
   context:
     lang: fr
@@ -267,6 +293,14 @@ param_on_select:
   src: "<r:select param='q[contact.status]' values='0,-5,-10' tshow='active, being registered, inactive'/>"
   res: "<select name='q[contact.status]'><option value=\"0\">active</option>\n<option value=\"-5\">being registered</option>\n<option value=\"-10\">inactive</option></select>"
 
+select_eval_value:
+  context:
+    f: "a,b,c,en"
+    q: 'en'
+  src: "<r:select param='q' eval='params[:f]'/>"
+  tem: "<select name='q'><%= options_for_select((params[:f] || '').split(',').map(&:strip).map {|e| [trans(e), e]}, param_value(\"q\").to_s) %></select>"
+  res: "<select name='q'><option value=\"a\">a</option>\n<option value=\"b\">b</option>\n<option value=\"c\">c</option>\n<option value=\"en\" selected=\"selected\">english</option></select>"
+
 crop:
   context:
     node: 'bird_jpg'