RubyGems - zena - Versions diffs - 1.2.1 → 1.2.2 - Mend

zena 1.2.1 → 1.2.2

Files changed (202) hide show

data/History.txt +38 -1
data/app/controllers/documents_controller.rb +7 -5
data/app/controllers/nodes_controller.rb +47 -6
data/app/controllers/user_sessions_controller.rb +12 -3
data/app/controllers/virtual_classes_controller.rb +8 -2
data/app/models/acl.rb +5 -2
data/app/models/cached_page.rb +5 -5
data/app/models/column.rb +27 -4
data/app/models/group.rb +1 -1
data/app/models/node.rb +106 -24
data/app/models/note.rb +2 -1
data/app/models/relation.rb +9 -4
data/app/models/relation_proxy.rb +2 -2
data/app/models/role.rb +12 -5
data/app/models/site.rb +10 -9
data/app/models/skin.rb +8 -0
data/app/models/string_hash.rb +65 -0
data/app/models/text_document.rb +1 -1
data/app/models/user.rb +2 -0
data/app/models/virtual_class.rb +43 -10
data/app/views/comments/create.rjs +1 -32
data/app/views/comments/edit.rjs +1 -1
data/app/views/comments/update.rjs +1 -1
data/app/views/documents/show.rhtml +1 -1
data/app/views/groups/_form.rhtml +7 -0
data/app/views/groups/_li.rhtml +1 -1
data/app/views/nodes/500.html +2 -1
data/app/views/nodes/destroy.rjs +2 -0
data/app/views/sites/jobs.erb +2 -3
data/app/views/templates/document_create_tabs/_file.rhtml +1 -1
data/app/views/templates/document_create_tabs/_import.rhtml +4 -1
data/app/views/templates/document_create_tabs/_template.rhtml +3 -0
data/app/views/templates/document_create_tabs/_text_document.rhtml +3 -0
data/app/views/versions/custom_tab.rhtml +1 -1
data/app/views/versions/edit.rhtml +1 -1
data/bricks/acls/lib/bricks/acls.rb +3 -3
data/bricks/acls/zena/test/unit/acl_test.rb +15 -0
data/bricks/fs_skin/lib/bricks/fs_skin.rb +190 -0
data/bricks/fs_skin/zena/init.rb +1 -0
data/bricks/fs_skin/zena/migrate/20110702010330_add_fs_skin_to_idx_templates.rb +12 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Image-edit.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Image.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Node-+index.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Node-+notFound.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Node-+search.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Node.zafu +1 -1
data/bricks/{static → fs_skin}/zena/skins/blog/Post.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Project--kml.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/Project.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/comments.zafu +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/dict.yml +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/img/dateBg.jpg +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/img/header.png +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/img/mapPin.png +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/img/menu.gif +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/img/menuover.gif +0 -0
data/bricks/{static → fs_skin}/zena/skins/blog/img/style.css +0 -0
data/bricks/fs_skin/zena/tasks.rb +26 -0
data/bricks/{static/zena/test/integration/static_integration_test.rb → fs_skin/zena/test/integration/fs_skin_integration_test.rb} +6 -6
data/bricks/fs_skin/zena/test/unit/fs_skin_test.rb +33 -0
data/bricks/grid/lib/bricks/grid.rb +4 -3
data/bricks/tags/lib/bricks/tags.rb +1 -7
data/bricks/zena/zena/migrate/20120605091558_add_ssl_login_to_site.rb +7 -0
data/bricks/zena/zena/migrate/20120630123551_add_auto_publish_to_group.rb +9 -0
data/config/bricks.yml +3 -3
data/config/gems.yml +2 -3
data/lib/tasks/zena.rake +7 -3
data/lib/zafu.rb +7 -0
data/lib/zafu/all.rb +21 -0
data/lib/zafu/compiler.rb +7 -0
data/lib/zafu/controller_methods.rb +58 -0
data/lib/zafu/handler.rb +57 -0
data/lib/zafu/info.rb +4 -0
data/lib/zafu/markup.rb +309 -0
data/lib/zafu/mock_helper.rb +42 -0
data/lib/zafu/node_context.rb +203 -0
data/lib/zafu/ordered_hash.rb +53 -0
data/lib/zafu/parser.rb +676 -0
data/lib/zafu/parsing_rules.rb +382 -0
data/lib/zafu/process/ajax.rb +530 -0
data/lib/zafu/process/conditional.rb +92 -0
data/lib/zafu/process/context.rb +186 -0
data/lib/zafu/process/forms.rb +143 -0
data/lib/zafu/process/html.rb +186 -0
data/lib/zafu/process/ruby_less_processing.rb +321 -0
data/lib/zafu/security.rb +15 -0
data/lib/zafu/template.rb +25 -0
data/lib/zafu/test_helper.rb +19 -0
data/lib/zafu/view_methods.rb +6 -0
data/lib/zena.rb +1 -1
data/lib/zena/acts/enrollable.rb +1 -1
data/lib/zena/app.rb +4 -17
data/lib/zena/console.rb +18 -1
data/lib/zena/core_ext/file_utils.rb +13 -1
data/lib/zena/core_ext/fixnum.rb +4 -0
data/lib/zena/core_ext/float.rb +7 -0
data/lib/zena/deploy.rb +4 -2
data/lib/zena/deploy/app_init.rhtml +2 -1
data/lib/zena/deploy/database.rhtml +1 -1
data/lib/zena/info.rb +1 -1
data/lib/zena/parser/zazen_rules.rb +4 -4
data/lib/zena/routes.rb +1 -1
data/lib/zena/test_controller.rb +1 -1
data/lib/zena/use.rb +14 -1
data/lib/zena/use/action.rb +4 -2
data/lib/zena/use/ajax.rb +86 -38
data/lib/zena/use/authlogic.rb +16 -1
data/lib/zena/use/calendar.rb +37 -17
data/lib/zena/use/conditional.rb +2 -2
data/lib/zena/use/context.rb +30 -9
data/lib/zena/use/dates.rb +39 -3
data/lib/zena/use/display.rb +6 -19
data/lib/zena/use/forms.rb +100 -79
data/lib/zena/use/i18n.rb +40 -16
data/lib/zena/use/query_builder.rb +0 -6
data/lib/zena/use/query_node.rb +17 -4
data/lib/zena/use/relations.rb +1 -3
data/lib/zena/use/rendering.rb +10 -8
data/lib/zena/use/scope_index.rb +5 -1
data/lib/zena/use/search.rb +2 -1
data/lib/zena/use/urls.rb +82 -77
data/lib/zena/use/workflow.rb +12 -4
data/lib/zena/use/zafu_safe_definitions.rb +37 -9
data/lib/zena/use/zafu_templates.rb +49 -20
data/lib/zena/use/zazen.rb +6 -2
data/locale/it/LC_MESSAGES/zena.mo +0 -0
data/locale/it/zena.mo +0 -0
data/locale/it/zena.po +1982 -0
data/public/images/arrow_back.png +0 -0
data/public/images/remove_tag.png +0 -0
data/public/javascripts/grid.js +800 -199
data/public/javascripts/window.js +1 -1
data/public/javascripts/zena.js +130 -21
data/public/stylesheets/grid.css +11 -2
data/public/stylesheets/zena.css +2 -1
data/test/custom_queries/complex.host.yml +5 -0
data/test/fixtures/files/TestNode.zafu +36 -0
data/test/functional/nodes_controller_test.rb +18 -1
data/test/integration/zafu_compiler/action.yml +2 -2
data/test/integration/zafu_compiler/ajax.yml +44 -26
data/test/integration/zafu_compiler/asset.yml +12 -2
data/test/integration/zafu_compiler/basic.yml +0 -16
data/test/integration/zafu_compiler/calendar.yml +6 -6
data/test/integration/zafu_compiler/complex_ok.yml +23 -1
data/test/integration/zafu_compiler/conditional.yml +5 -5
data/test/integration/zafu_compiler/context.yml +6 -5
data/test/integration/zafu_compiler/dates.yml +23 -2
data/test/integration/zafu_compiler/display.yml +46 -2
data/test/integration/zafu_compiler/errors.yml +2 -2
data/test/integration/zafu_compiler/eval.yml +35 -7
data/test/integration/zafu_compiler/forms.yml +47 -13
data/test/integration/zafu_compiler/i18n.yml +2 -2
data/test/integration/zafu_compiler/meta.yml +35 -1
data/test/integration/zafu_compiler/query.yml +23 -4
data/test/integration/zafu_compiler/relations.yml +10 -6
data/test/integration/zafu_compiler/roles.yml +4 -4
data/test/integration/zafu_compiler/rubyless.yml +11 -1
data/test/integration/zafu_compiler/safe_definitions.yml +23 -5
data/test/integration/zafu_compiler/security.yml +10 -6
data/test/integration/zafu_compiler/urls.yml +23 -6
data/test/integration/zafu_compiler/zafu_attributes.yml +1 -1
data/test/integration/zafu_compiler/zazen.yml +14 -0
data/test/selenium/Add/add3.rsel +8 -8
data/test/selenium/Destroy/0setup.rsel +12 -0
data/test/selenium/Destroy/destroy1.rsel +16 -0
data/test/selenium/Edit/edit2.rsel +9 -9
data/test/selenium/Edit/edit5.rsel +9 -9
data/test/selenium/Edit/edit6.rsel +9 -9
data/test/selenium/Form/form4.rsel +17 -0
data/test/selenium/Toggle/toggle1.rsel +2 -0
data/test/selenium/Toggle/toggle2.rsel +18 -0
data/test/sites/zena/columns.yml +3 -0
data/test/sites/zena/versions.yml +7 -0
data/test/unit/cached_page_test.rb +13 -13
data/test/unit/column_test.rb +26 -0
data/test/unit/node_test.rb +16 -1
data/test/unit/project_test.rb +6 -1
data/test/unit/relation_test.rb +1 -1
data/test/unit/role_test.rb +1 -1
data/test/unit/string_hash_test.rb +30 -0
data/test/unit/virtual_class_test.rb +31 -17
data/test/unit/zafu_markup_test.rb +414 -0
data/test/unit/zafu_node_context_test.rb +375 -0
data/test/unit/zafu_ordered_hash_test.rb +69 -0
data/test/unit/zena/acts/enrollable_test.rb +1 -1
data/test/unit/zena/parser/zafu_asset.yml +0 -10
data/test/unit/zena/parser/zazen.yml +1 -1
data/test/unit/zena/parser_test.rb +1 -72
data/test/unit/zena/use/dates_test.rb +1 -1
data/test/unit/zena/use/rendering_test.rb +24 -7
data/test/unit/zena/use/scope_index_test.rb +17 -0
data/test/unit/zena/use/zazen_test.rb +2 -1
data/zena.gemspec +71 -37
metadata +104 -83
data/app/views/nodes/destroy.erb +0 -0
data/bricks/static/lib/bricks/static.rb +0 -151
data/bricks/static/zena/init.rb +0 -1
data/bricks/static/zena/migrate/20110702010330_add_static_to_idx_templates.rb +0 -12
data/bricks/static/zena/test/unit/static_test.rb +0 -33
data/lib/zena/parser/zafu_rules.rb +0 -244
data/lib/zena/parser/zafu_tags.rb +0 -198
data/lib/zena/parser/zena_rules.rb +0 -23

data/test/integration/zafu_compiler/i18n.yml CHANGED

@@ -115,8 +115,8 @@ complex_lang_list:
   res: "/li class='on'>/oo/projects-list/Clean-Water-project/page22.html\?lang=en</"
 html_lang_and_dict:
-  src: "<html xmlns='http://www.w3.org/1999/xhtml' lang='#{v.lang}' do='load' dictionary='/Default skin/translations' xml:lang='en'></html>"
-  res: "<html xmlns='http://www.w3.org/1999/xhtml' lang='en'></html>"
+  src: "<html xmlns='http://www.w3.org/1999/xhtml' lang='#{v.lang}' xml:lang='en' do='load' dictionary='/Default skin/translations'></html>"
+  res: "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'></html>"
 dictionary_fr:
   context:

data/test/integration/zafu_compiler/meta.yml CHANGED

@@ -4,12 +4,38 @@ default:
     visitor: 'ant'
     node: 'status'
+less_then_in_param:
+  src: "<a onclick='if (a < b) alert(a)'>xx</a>"
+  tem: "<a onclick='if (a < b) alert(a)'>xx</a>"
+greater_then_in_param:
+  src: "<a onclick='if (a > b) alert(a)'>xx</a>"
+  tem: "<a onclick='if (a > b) alert(a)'>xx</a>"
+less_then_in_dyn_param:
+  src: "<a onclick='if (a < b) alert(a)'>xx</a>"
+  tem: "<a onclick='if (a < b) alert(a)'>xx</a>"
+greater_then_in_dyn_param:
+  src: "<a foo='#{created_at > now ? \'yes\' : \'no\'}'>xx</a>"
+  tem: "<a foo='<%= (@node.created_at ? (@node.created_at>Time.now) : nil) ? \"yes\" : \"no\" %>'>xx</a>"
+greater_then_in_do:
+  src: "<a foo='bar' do='pages where created_at > 7'>xx</a>"
+  tem: "/<% if var1 = Node.do_find.*nodes.created_at > 7.*<a foo='bar'>xx</a>/"
+greater_then_in_text:
+  src: "<r:js>if (a < 4) alert('ok');</r:js>"
+  res: ""
+  tem: "<% js_data << \"if (a < 4) alert('ok');\" %>"
+  js: "/if \(a < 4\) alert\('ok'\);/"
 include_with:
   src: "include_with: <r:include template='/basic/name/title'><h1 do='with' part='title' attr='id'/>"
   res: "include_with: title: <h1 id='lala'>22</h1>"
 include_with_empty:
-  src: "include_with: <r:include template='/meta/name/title'><r:with part='title'/>"
+  src: "include_with: <r:include template='/meta/name/title'><r:with part='title'/></r:include>"
   res: "include_with: title: "
 name_title:
@@ -40,6 +66,14 @@ id_do_with:
   src: "include_part: <r:include template='/meta/id/do' do='with' part='logo' do='t'>foo</r:include>"
   res: "include_part: <h1 id='logo'>foo</h1>"
+with_part_do_setup:
+  src: "<div id='content'>hello <div id='main'>main</div></div>"
+  tem: "<div id='content'>hello <div id='main'>main</div></div>"
+with_part_do:
+  src: "with_part_do: <r:include template='/meta/with/part/do/setup'><r:with part='main' do='title'/></r:include>"
+  tem: "with_part_do: <div id='content'>hello <div id='main'><%= @node.prop['title'] %></div></div>"
 # this test is a dummy used by include_context
 context_dummy:
   src: "CD: <r:pages in='site' where='title like \"s%\"' name='pages'><r:each join=', ' do='title'/></r:pages>"

data/test/integration/zafu_compiler/query.yml CHANGED

@@ -200,6 +200,15 @@ query_with_parse_paginate:
   tem: '/page_numbers/'
   res: "/1.*2.*3.*4.*5/"
+link_page_list:
+  src: |
+    <r:query default='pages in site limit 4 paginate p' select='pages where #{query_parse(params[:q])} in site limit 2 paginate p'>
+      : <r:link page='list' page_count='12' join=' | '/>
+    </r:query>
+  # should properly pass the query to sub-contexts.
+  res: "/: 1 \| <a.*>2</a> \| <a.*>3</a> \| <a/"
+#  res: "/1.*2.*3.*4.*5/"
 query_can_be_nil_bad_argument_type:
   context:
     filter:
@@ -236,11 +245,21 @@ simple_select:
   tem: '/<%= var1.attributes\["ti"\] %>/'
   res: "<div>crocodiles</div>"
+select_with_type:
+  src: "<div do='nodes select created_at as ti:time' find='first' do='ti' format='%d.%m.%Y'/>"
+  tem: '/format_date\(var1.rcast\("ti", :time\)/'
+  res: "<div>11.04.2006</div>"
 select_in_from:
   src: "<div do='images select title as it from projects select title as pt in site' do='each' join=', '><r:pt/>: <r:it/></div>"
   tem: '/<%= var2.attributes\["pt"\] %>: <%= var2.attributes\["it"\] %>/'
   res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
+select_in_from_saved:
+  src: "<div do='images select title as it from projects select title as pt in site' do='set' list='this' do='list' do='each' join=', '><r:pt/>: <r:it/></div>"
+  tem: '/<%= var3.attributes\["pt"\] %>: <%= var3.attributes\["it"\] %>/'
+  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
 select_group:
   src: "<div do='images select title as it from projects select title as pt in site' do='group' by='pt' do='each_group' join=' / '><r:pt/>: <r:each join=', ' do='it'/></div>"
   res: "<div>a wiki with Zena: bird, flower / Clean Water project: it's a lake</div>"
@@ -260,8 +279,8 @@ query_errors:
   res: "<span class='query'>nodes in badaboum</span> <span class='error'>Invalid scope 'badaboum'.</span>"
 find_with_rubyless:
-  src: "<b do='find(\"images in site limit 2\")' do='each' join=',' do='title'/>"
-  res: "<b>Autumn Tree,bird</b>"
+  src: "<b do='find(\"images in site limit 2\")' do='each' join=', ' do='title'/>"
+  res: "<b>Autumn Tree, bird</b>"
 find_loads_class:
   src: "<div do='find(11)'><r:origin/></div>"
@@ -269,7 +288,7 @@ find_loads_class:
 query_on_vclass:
   # typical syntax error (should be Contact?)
-  src: "<r:Contact><div do='pages in site order by zip asc limit 2' do='each' join=',' do='title'/></r:Contact>"
+  src: "<r:Contact><div do='pages in site order by zip asc limit 2' do='each' join=', ' do='title'/></r:Contact>"
   # does the query on last @node
   tem: "/Node.do_find/"
-  res: '<div>Zena the wild CMS,people</div>'
+  res: '<div>Zena the wild CMS, people</div>'

data/test/integration/zafu_compiler/relations.yml CHANGED

@@ -371,7 +371,8 @@ where_two_attributes:
   res: "parc opening, zena enhancements"
 many_or:
-  src: "<r:tagged in='site' or='images in site' or='tags in site' do='each' join=',' do='title'/>"
+  # old: or='images in site' or='tags in site'
+  src: "<r:tagged in='site or images in site or tags in site' do='each' join=',' do='title'/>"
   res: "Art,bird,Clean Water project,flower,it's a lake,News list,parc opening,Top menu"
 hot_or_page:
@@ -403,13 +404,12 @@ group_by_project:
 group_by_project_sort_zip:
   context:
     visitor: ant
-  old_src: "<r:images in='site' order='title ASC' do='group' by='project' sort='zip'><b do='project' do='title'/>: <r:each join=',' do='title'/></r:images>"
-  src: "<r:images in='site' order='zip ASC' do='group' by='project' sort='id'><b do='project' do='title'/>: <r:each join=',' do='title'/></r:images>"
-  res: "<b>Clean Water project</b>: it's a lake<b>a wiki with Zena</b>: bird,flower<b>Zena the wild CMS</b>: Autumn Tree"
+  src: "<r:images in='site' order='zip ASC' do='group' by='project' sort='id'><b do='project' do='title'/>: <r:each join=', ' do='title'/></r:images>"
+  res: "<b>Clean Water project</b>: it's a lake<b>a wiki with Zena</b>: bird, flower<b>Zena the wild CMS</b>: Autumn Tree"
 group_by_parent_sort:
-  src: "<r:images in='site' order='title ASC' do='group' by='parent' sort='title'><b do='parent' do='title'/>: <r:each join=',' do='title'/></r:images>"
-  res: "<b>a wiki with Zena</b>: bird,flower<b>Clean Water project</b>: it's a lake"
+  src: "<r:images in='site' order='title ASC' do='group' by='parent' sort='title'><b do='parent' do='title'/>: <r:each join=', ' do='title'/></r:images>"
+  res: "<b>a wiki with Zena</b>: bird, flower<b>Clean Water project</b>: it's a lake"
 nodes_in_site_group_by_year:
   old_src: "<r:nodes in='site' group='log_at:year' order='log_at:year asc, title ASC' do='each' join=', '><r:show attr='log_at' format='%Y'/></r:nodes>"
@@ -490,3 +490,7 @@ core_context:
   # Ensure that :project rubyless method uses enrollable.
   src: "<r:project do='origin || title'/>"
   tem: "/ar1.prop\['origin'\] or var1.prop\['title'\]/"
+find_less_then:
+  src: <div do='projects where created_at < "2010-05-01" in site' do='each' do='title'/>
+  tem: "/nodes.created_at < '2010-05-01'/"

data/test/integration/zafu_compiler/roles.yml CHANGED

@@ -79,13 +79,13 @@ vclass_roles:
     node: letter
   src: "<r:vclass do='roles' do='each' join=', '><r:name/> (<r:columns do='each' join=',' do='name'/>)</r:vclass>"
   tem: "/var1 = @node\.virtual_class .* var2 = var1.sorted_roles/"
-  res: "Node (summary,text,title), Original (origin,tz,weight), Task (assigned), Letter (paper,search,search_mono)"
+  res: "Node (summary,text,title), Original (origin,settings,tz,weight), Task (assigned), Letter (paper,search,search_mono)"
 vclass_column_size:
   context:
     node: letter
   src: "<r:vclass do='roles' do='each' join=', '><r:name/> (<r:columns do='size'/>)</r:vclass>"
-  res: "Node (3), Original (3), Task (1), Letter (3)"
+  res: "Node (3), Original (4), Task (1), Letter (3)"
 vclass_context:
   src: "<r:Image><r:name/></r:Image>"
@@ -111,7 +111,7 @@ grid_manual:
       <tr do='Image' do='roles' do='each' do='columns'><th do='each' do='name'/></tr>
       <tr do='each'><r:Image do='roles' do='each' do='columns'><td do='each' do='@node.send(name)'/></r:Image></tr>
     </table>
-  res: "/<th colspan='3'>Node.*<th colspan='3'>Original.*<th>exif</th><th>height</th><th>width</th>.*<td>image/jpeg</td><td>jpg</td>/"
+  res: "/<th colspan='3'>Node.*<th colspan='4'>Original.*<th>exif</th><th>height</th><th>width</th>.*<td>image/jpeg</td><td>jpg</td>/"
 list_relations:
   src: "<r:Contact do='relations' do='each' join=', ' do='name'/>"
@@ -122,7 +122,7 @@ list_relations_filter_group:
   res: "reference, reference_for, set_tag"
 input_relation_name:
-  src: "<r:select name='rel' eval='Contact.relations(\"doc\").map(:name)'/>"
+  src: "<r:select name='rel' eval='Contact.relations(\"doc\").map(\"name\")'/>"
   res: "<select name='node[rel]'><option value=\"reference\">reference</option>\n<option value=\"reference_for\">reference_for</option>\n<option value=\"set_tag\">set_tag</option></select>"
 manual_select:

data/test/integration/zafu_compiler/rubyless.yml CHANGED

@@ -86,4 +86,14 @@ prop_in_list_context:
 role_existing_class_name:
   # Should understand 'Comment' as a Role.
   src: "<r:Comment?>xx</r:Comment?>"
-  tem: "/<% if @node.has_role\?\(\d+\) %>xx<% end %>/"
+  tem: "/<% if @node.has_role\?\(\d+\) %>xx<% end %>/"
+class_new:
+  src: "<div do='set' p='Post.new'><p do='p.klass'/>.<p do='p.title'/></div>"
+  tem: "/VirtualClass\[.Post.\].zafu_new.*_zp.klass.*_zp.prop\[.title.\]/"
+  res: "<div><p>Post</p>.<p></p></div>"
+class_new_with_attr:
+  src: "<div do='set' p='Post.new(:title => \"yes\")'><p do='p.klass'/>.<p do='p.title'/></div>"
+  tem: "/VirtualClass\[.Post.\].zafu_new.*_zp.klass.*_zp.prop\[.title.\]/"
+  res: "<div><p>Post</p>.<p>yes</p></div>"

data/test/integration/zafu_compiler/safe_definitions.yml CHANGED

@@ -94,15 +94,22 @@ kind_of_role:
 map_join:
   context:
     node: 'cleanWater'
-  src: "<r:children do='map(:title).join(\",\")'/>"
+  src: "<r:children do='map(\"title\").join(\",\")'/>"
   tem: "/var1.map\{\|_map_obj\| _map_obj.prop\['title'\]\}/"
   res: "crocodiles,it's a lake,The lake we love,parc opening,status title,water"
+sum:
+  context:
+    node: 'cleanWater'
+  src: "<r:children do='sum(\"created_at.to_i\")'/>"
+  tem: "/var1.map\{\|_sum_obj\| _sum_obj.created_at.to_i.to_f\}.reduce\(:\+\)/"
+  res: "6854457600.0"
 map_on_can_be_nil:
   context:
     node: 'cleanWater'
-  eval: "Contact.relations.map(:name).join('-')"
-  tem: "/VirtualClass\[\"Contact\"\] \? VirtualClass\[\"Contact\"\].all_relations.map\(&:other_role\).compact.join\(\"-\"\)/"
+  eval: "Contact.relations.map(\"name\").join('-')"
+  tem: "/VirtualClass\[\"Contact\"\] \? VirtualClass\[\"Contact\"\].all_relations.map\{\|_map_obj\| _map_obj.other_role\}.compact.join\(\"-\"\)/"
   res: "/collaborator_for-favorite-favorite_for/"
 min:
@@ -122,7 +129,7 @@ max:
 time_advance:
   context:
     date: '2011-02-03'
-  src: "<b do='date.advance(:months =&gt; 1).strftime(\"%Y-%m-%d\")'/>"
+  src: "<b do='date.advance(:months => 1).strftime(\"%Y-%m-%d\")'/>"
   res: "<b>2011-03-03</b>"
 time_blank:
@@ -138,6 +145,17 @@ hash_to_params:
     q:
       one: '1'
       two: '2'
-  src: "<b do='{:q =&gt; params[:q]}' do='to_param'/>"
+  src: "<b do='{:q => params[:q]}' do='to_param'/>"
   tem: "<% var1 = {:q => params[:q]} %><b><%= var1.to_param %></b>"
   res: '<b>q%5Bone%5D=1&q%5Btwo%5D=2</b>'
+string_hash:
+  src: "<b do='set' a='string_hash'>AAA<r:eval>a['foo']</r:eval></b>"
+  res: "<b>AAA</b>"
+  tem: "/StringHash.new/"
+string_hash_with_params:
+  src: "<b do='set' a='string_hash(:foo => \"men\")'>AAA<r:eval>a['foo']</r:eval></b>"
+  res: "<b>AAAmen</b>"
+  tem: "/StringHash.from_hash\(\{:foo => \"men\"\}\)/"

data/test/integration/zafu_compiler/security.yml CHANGED

@@ -16,8 +16,8 @@ erb:
   tem: "&lt;% puts 'mean' %&gt;"
 forbidden_methods:
-  src: "<r:eval>eval '\'bad\''</r:eval>"
-  tem: "/unknown method 'eval\(String\)'/"
+  src: "<r:eval>puts '\'bad\''</r:eval>"
+  tem: "/unknown method 'puts\(String\)'/"
 syntax_error:
   src: "<r:show eval='<% puts \"mean\" %>'/>"
@@ -43,8 +43,8 @@ build_erb_with_trans:
 build_erb_with_void:
   context:
     lang: fr
-  src: "<r:void><</r:void><r:void>%= 5+8 %</r:void><r:void>></r:void></r:load>"
-  tem: "/>%= 5\+8 %>/"
+  src: "ABC: <r:void><</r:void><r:void>%= 5+8 %</r:void><r:void>></r:void></r:load>"
+  tem: "ABC: <span class='parser_error'>Invalid tag near '&lt;&lt;/r:void&gt;&lt;'</span>"
 mean_inc:
   src: '<'
@@ -56,7 +56,7 @@ build_erb_with_include:
 mean_part:
   src: "<<div id='foo'></div>"
-  res: "<<div id='foo'></div>"
+  res: "<span class='parser_error'>Invalid tag near '&lt;&lt;div id='f'</span>"
 build_erb_with_include_remove_part:
   src: "<r:include template='/security/mean/part'><r:with part='foo'/></r:include><r:void>%= 5+8 %</r:void><r:void>></r:void>"
@@ -64,4 +64,8 @@ build_erb_with_include_remove_part:
 build_erb_with_rubyless:
   src: "<r:void do='\"<\"'/><r:void>%= 5+8 %</r:void><r:void>></r:void>"
-  tem: "!/<%= 5/"
+  tem: "!/<%= 5/"
+multiple_trans:
+  src: "<r:t text='<'/><r:t text='%'/>"
+  tem: "&lt;%"

data/test/integration/zafu_compiler/urls.yml CHANGED

@@ -31,7 +31,7 @@ r_url_with_hash:
   res: "/page22_back.html\?f=x/"
 url_with_ssl:
-  src: "<a href='#{url(this, :host =&gt; \"some.host:445\", :ssl =&gt; true)}' do='title'/>"
+  src: "<a href='#{url(this, :host => \"some.host:445\", :ssl => true)}' do='title'/>"
   res: "<a href='https://some.host:445/oo/projects-list/Clean-Water-project/page22.html'>status title</a>"
 path:
@@ -39,7 +39,7 @@ path:
   res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>blah</a>"
 path_with_mode:
-  src: "<a href='#{path(this, :mode =&gt; \"foo\")}'>blah</a>"
+  src: "<a href='#{path(this, :mode => \"foo\")}'>blah</a>"
   res: "<a href='/oo/projects-list/Clean-Water-project/page22_foo.html'>blah</a>"
 link:
@@ -245,7 +245,7 @@ link_trans:
 link_date_complex:
   context:
     ref_date: '2011-04-22 22:00'
-  src: "<r:link date='date.advance(:months =&gt; -1).strftime(\"%Y-%m-%d\", \"Asia/Jakarta\")' text='PREV'/>"
+  src: "<r:link date='date.advance(:months => -1).strftime(\"%Y-%m-%d\", \"Asia/Jakarta\")' text='PREV'/>"
   # Date is in Asia/Jakarta timezone. Ref date is utc in tests.
   res: "/\?date=2011-03-23'>PREV/"
@@ -255,7 +255,7 @@ target_blank:
 action_destroy:
   src: "<r:link action='destroy'/>"
-  res: "<a data-confirm='Destroy ? \"status title\"' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
+  res: "<a data-confirm='Destroy status title ?' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
 action_publish:
   src: "<r:link action='publish'/>"
@@ -294,9 +294,26 @@ encode_blank_values:
 cachestamp:
   # 26 would be the template for rendering JS's id.
-  src: "<script src='#{path(project, :format =&gt; \"js\", :tstamp =&gt; find(26).updated_at.to_i)}'></script>"
+  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>"
 node_in_argument:
   src: "<r:link node[done_by]='visitor_node'/>"
-  res: "/\?node\[done_by\]=13'>status title</a>/"
+  res: "/\?node\[done_by\]=13'>status title</a>/"
+link_page_next:
+  context:
+    pak: 2
+  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r: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> || 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_list:
+  context:
+    pak: 2
+  src: "<r:nodes in='site' limit='10' order='zip' paginate='pak' do='link' page='list' join=', '/>"
+  tem: "/_zpage != _zcurrent.*zen_path\(@node,.*:pak.*elsif true.*_zpage/"
+  res: "/<a href='.*page22.html\?pak=1'>1</a>, 2, .*pak=3'>3</a>.*pak=4'>4</a>.*pak=5'>5</a>/"

data/test/integration/zafu_compiler/zafu_attributes.yml CHANGED

@@ -84,7 +84,7 @@ store_node:
 store_in_block:
   src: "<r:block><r:void set_found='this' do='node' where='id = 18 in site' do='page'><r:found do='title'/>: <r:show attr='title'/></r:void></r:block>"
-  res: "<div id='list1'>status title: a wiki with Zena</div>"
+  res: "<div id='list1' data-z='22'>status title: a wiki with Zena</div>"
   'zafu_attributes/store/in/block/en/list1.erb': "/_zfound = @node.*<% var3 = _zfound %><%= var3.prop\['title'\] %>:/"
 set_var_outside_block:

data/test/integration/zafu_compiler/zazen.yml CHANGED

@@ -112,3 +112,17 @@ unknown_link:
 host:
   tem: "<%= zazen('this is a \"link\":12. !30!', :host => 'foo.com') %>"
   res: "/http://foo.com/oo/section12.html\">link.*http://foo.com/en/image30_std.jpg/"
+amp:
+  tem: "<%= zazen('this & that') %>"
+  res: "<p>this &#38; that</p>"
+pre:
+  tem: "<%= zazen(' Vin') %>"
+  res: "<pre>Vin</pre>"
+target:
+  src: |
+    <r:zazen text='"":12' target="foobar"/>
+  tem: /:target => "foobar"/
+  res: /<div class='zazen'><p><a .* target=\"foobar\"/

data/test/selenium/Add/add3.rsel CHANGED

@@ -1,22 +1,22 @@
 # Add first element
 open '/oo/testnode37.html?test=add3'
-assert_not_visible 'add33_title'
+assert_not_visible 'add31_title'
 click 'css=img[alt=add]'
-assert_visible 'add33_title'
-type 'add33_title', 'add3'
+assert_visible 'add31_title'
+type 'add31_title', 'add3'
 click 'css=input[type=submit]'
-wait_for_not_visible 'add33_title'
+wait_for_not_visible 'add31_title'
 verify_text 'css=.add3 a', 'add3'
 # should have correct parent
 verify_text 'css=.add3 span', 'Kill the bugs'
 # Add a second element
-assert_not_visible 'add33_title'
+assert_not_visible 'add31_title'
 click 'css=img[alt=add]'
-assert_visible 'add33_title'
-type 'add33_title', 'add3_2'
+assert_visible 'add31_title'
+type 'add31_title', 'add3_2'
 click 'css=input[type=submit]'
-wait_for_not_visible 'add33_title'
+wait_for_not_visible 'add31_title'
 verify_text 'css=.add3_2 a', 'add3_2'
 # should have correct parent
 verify_text 'css=.add3_2 span', 'Kill the bugs'

data/test/selenium/Destroy/0setup.rsel ADDED

@@ -0,0 +1,12 @@
+# See also the RDoc for SeleniumOnRails::TestBuilder.
+# View result in browser: http://test.host:3000/selenium
+setup :fixtures => :all
+# Setup code
+open '/login'
+type 'user_login', 'lion'
+type 'password', 'lion'
+click_and_wait 'commit'
+click_and_wait 'link=Kill the bugs'
+verify_text '_title37', 'Kill the bugs'

data/test/selenium/Destroy/destroy1.rsel ADDED

@@ -0,0 +1,16 @@
+# Add first element
+open '/oo/testnode37.html?test=destroy1'
+verify_element_not_present 'destroy_destroy1'
+click 'css=img[alt=add]'
+type 'destroy_list1_title', 'destroy1'
+click 'css=input[type=submit]'
+wait_for_element_present 'destroy_destroy1'
+click 'css=#destroy_destroy1 a'
+assert_confirmation 'Destroy destroy1 ?'
+wait_for_element_not_present 'destroy_destroy1'
+# Reload
+open '/oo/testnode37.html?test=destroy1'
+verify_element_not_present 'destroy_destroy1'