test/integration/zafu_compiler/urls.yml in zena-1.2.2 vs test/integration/zafu_compiler/urls.yml in zena-1.2.3

- old
+ new

@@ -42,11 +42,11 @@ src: "<a href='#{path(this, :mode => \"foo\")}'>blah</a>" res: "<a href='/oo/projects-list/Clean-Water-project/page22_foo.html'>blah</a>" link: src: "<r:link/>" - tem: "<a href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>" + tem: "<a href='<%= zen_path(@node) %>'><%=h @node.prop['title'] %></a>" res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>" link_not_logged: context: visitor: anon @@ -73,20 +73,20 @@ src: "<r:link class='hello'/>" res: "<a class='hello' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>" link_set_class: src: "<r:link class='#{title}_foo'/>" - tem: "<a class='<%= \"#{@node.prop['title']}_foo\" %>' href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>" + tem: "<a class='<%= \"#{@node.prop['title']}_foo\" %>' href='<%= zen_path(@node) %>'><%=h @node.prop['title'] %></a>" res: "<a class='status title_foo' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>" link_set_title: src: "<r:link title='#{title}_foo'/>" res: "<a title='status title_foo' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>" link_attr: src: "<r:link attr='ref_lang'/>" - tem: "<a href='<%= zen_path(@node) %>'><%= @node.ref_lang %></a>" + tem: "<a href='<%= zen_path(@node) %>'><%=h @node.ref_lang %></a>" res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>en</a>" link_tattr: old_src: "<r:link tattr='ref_lang'/>" src: "<r:link eval='trans(ref_lang)'/>" @@ -106,23 +106,23 @@ tem: "<a href='<%= zen_path(@node.parent) %>'>click here</a>" res: "<a href='/oo/projects-list/Clean-Water-project'>click here</a>" link_with_block: src: "<r:link href='parent'>look at <b do='title'>her</b></r:link>" - tem: "<a href='<%= zen_path(@node.parent) %>'>look at <b><%= @node.prop['title'] %></b></a>" + tem: "<a href='<%= zen_path(@node.parent) %>'>look at <b><%=h @node.prop['title'] %></b></a>" res: "<a href='/oo/projects-list/Clean-Water-project'>look at <b>status title</b></a>" link_project: context: node: 'bird_jpg' src: "<r:link href='project'/>" - tem: "<a href='<%= zen_path(@node.project) %>'><%= @node.prop['title'] %></a>" + tem: "<a href='<%= zen_path(@node.project) %>'><%=h @node.prop['title'] %></a>" res: "<a href='/oo/blog29.html'>bird</a>" link_root: src: "<r:link href='root'/>" - tem: "<a href='<%= zen_path(visitor.site.root_node) %>'><%= @node.prop['title'] %></a>" + tem: "<a href='<%= zen_path(visitor.site.root_node) %>'><%=h @node.prop['title'] %></a>" res: "<a href='/oo'>status title</a>" link_anchor: src: "<r:link anchor='true'/>" res: "<a href='#node22'>status title</a>" @@ -198,18 +198,18 @@ link_with_custom_params: context: year: 2010 src: "<r:link class='foo' href='main' y='params[:year]'/>" - tem: "<a class='foo' href='<%= zen_path(@node, {:y => params[:year]}) %>'><%= @node.prop['title'] %></a>" + tem: "<a class='foo' href='<%= zen_path(@node, {:y => params[:year]}) %>'><%=h @node.prop['title'] %></a>" res: "<a class='foo' href='/oo/projects-list/Clean-Water-project/page22.html?y=2010'>status title</a>" link_format_data: context: node: bird_jpg src: "<r:link format='data'/>" - res: "<a href='/en/image30.jpg?1144713600'>bird</a>" + res: "<a href='/en/image30.11fbc.jpg'>bird</a>" live_link_format: old_src: "<h2 do='title' link='details.xml'/>" src: "<h2 do='link' live='true' format='xml' mode='details'/>" res: "<h2><a id='_title22' href='/oo/projects-list/Clean-Water-project/page22_details.xml'>status title</a></h2>" @@ -217,11 +217,11 @@ live_link_data_mode: context: node: 'bird_jpg' old_src: "<h2 do='title' link='pv.data'>super title</h2>" src: "<h2 do='link' live='true' mode='pv' format='data'/>" - res: "<h2><a id='_title30' href='/en/image30_pv.jpg?967816914293'>bird</a></h2>" + res: "<h2><a id='_title30' href='/en/image30_pv.7f6f0.jpg'>bird</a></h2>" url_with_lang: context: visitor: lion src: "window.location = \"<r:url lang='fr'/>\";" @@ -237,12 +237,21 @@ src: "<div do='nodes in site'><r:link/></div>" tem: "/zen_path\(@node\).*@node.prop\['title'\]/" res: '/a href.*page22.html.*status title/' link_trans: - src: "<r:link t='img_next_page'/>" - res: "/a href.*/images/control_fastforward.png/" + context: + lang: fr + src: | + <r:load dictionary='/Default skin/translations'> + <r:link t='view_live'/> + </r:load> + tem: "/view live <img src='/images/bullet_go.png'/>/" + +link_trans_block: + src: "<r:link do='t'>img_next_page</r:link>" + res: "/a href.*<img src='/images/control_fastforward.png'/" link_date_complex: context: ref_date: '2011-04-22 22:00' src: "<r:link date='date.advance(:months => -1).strftime(\"%Y-%m-%d\", \"Asia/Jakarta\")' text='PREV'/>" @@ -292,12 +301,12 @@ src: "<p do='link' node[date]=''/>" res: "/\?node\[date\]='/" cachestamp: # 26 would be the template for rendering JS's id. - src: "<script src='#{path(project, :format => \"js\", :tstamp => find(26).updated_at.to_i)}'></script>" - res: "<script src='/oo/projects-list/Clean-Water-project.js?1144713600&tstamp=1176249600'></script>" + src: "<script src='#{path(project, :format => \"js\")}'></script>" + res: "<script src='/oo/projects-list/Clean-Water-project.11fbc.js'></script>" node_in_argument: src: "<r:link node[done_by]='visitor_node'/>" res: "/\?node\[done_by\]=13'>status title</a>/" @@ -308,9 +317,15 @@ 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> || Panthera Tigris Sumatran,Panthera Leo Verneyi,My Life" 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_next_relation: + context: + node: art + src: "<r:Tag?><div id='a' do='block' do='tagged order by l_status asc limit 1 paginate pak'><r:link page='next' update='a' do='t'>next</r:link></div></r:Tag?>" + res: "!/parser_error/" link_page_list: context: pak: 2 src: "<r:nodes in='site' limit='10' order='zip' paginate='pak' do='link' page='list' join=', '/>" \ No newline at end of file