zena 1.0.0.beta2 → 1.0.0.beta3

data/test/integration/zafu_compiler/complex.yml

@@ -246,4 +246,4 @@ all_course_emp_dates_paginate:
     ref_date: 2004-03-01
     # in 6 months = before 2004-09-01
   src: "<r:all_course_emp_dates where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' order='priority desc, log_at asc, node_name ASC' limit='3' paginate='p'><r:link page='list'/> <r:each join=',' do='node_name'/>"
-  res: "/1 <a.*>2</a> <a.*>3</a> <a.*>4</a> resp_management, secure_a_site, team_motivation/"
+  res: "/1 <a.*>2</a> <a.*>3</a> <a.*>4</a> resp_management, secure_a_site, team_motivation/"

data/test/integration/zafu_compiler/complex_ok.yml

@@ -0,0 +1,19 @@
+it_should_compile_custom_select:
+  context:
+    node_name: '@node'
+    node: roger
+    visitor: complex_admin
+    site: complex
+    ref_date: 2004-09-01
+  src: "<r:emp_form_dates do='each' join=', '><r:show attr='node_name'/>(<r:priority/>)</r:emp_form_dates>"
+  res: 'secureASite(10), winchUsage(10), dangerousTransportations(10), engine(5), transmitInformation(5), fiberJunction(5), formulateProblems(5), radioUsage(1)'
+
+it_should_group_by_custom_select:
+  context:
+    node_name: '@node'
+    node: roger
+    visitor: complex_admin
+    site: complex
+    ref_date: 2004-09-01
+  src: "<r:emp_form_dates do='group' by='priority' do='each_group' join=', '><r:show attr='priority'/></r:emp_form_dates>"
+  res: '10, 5, 1'

data/test/integration/zafu_compiler/dates.yml

@@ -55,4 +55,65 @@ show_date_foo:
     lang: fr
   src: "<r:show eval='date' format='%A %d.%m.%Y'/>"
   tem: "/main_date/"
-  res: 'dimanche 16.05.2010'
+  res: 'dimanche 16.05.2010'
+
+strftime:
+  src: "<p do='log_at.strftime(\"%d-%m\")'/>"
+  res: "<p>05-04</p>"
+
+date_tformat:
+  context:
+    node: 'people'
+    lang: 'fr'
+  src: "<r:show date='created_at' tformat='%d %B %Y'/>"
+  tem: "<%= format_date(@node.created_at, :format => \"%d %B %Y\") %>"
+  res: "10 mars 2006"
+
+date_tz:
+  context:
+    visitor: 'ant'
+    node: 'people'
+    lang: 'en'
+  src: "<r:show date='created_at' format='%H:%M'/> / <r:show date='created_at' format='%H:%M' tz='Asia/Jakarta'/>"
+  res: "01:00 / 07:00"
+
+date_tz_field:
+  context:
+    node: nature
+  src: "<r:nodes do='each' join=', '><r:show attr='node_name'/>: <r:show date='created_at' format='%H:%M' tz='#{tz || \"Europe/Zurich\"}'/> | <r:show date='created_at' format='%H:%M' tz='UTC'/></r:nodes>"
+  res: "forest: 01:00 | 00:00, tree: 07:00 | 00:00"
+
+date_fr:
+  context:
+    visitor: ant
+    lang: 'fr'
+  src: "<r:show date='created_at' format='%a'/>"
+  res: "ven"
+
+date_fr_lang:
+  context:
+    lang: 'fr'
+  old_src: "<r:show date='created_at' format='%a' lang='en'/>"
+  src: "<r:show attr='created_at' format='%a' lang='en'/>"
+  tem: "<%= format_date(@node.created_at, :lang => \"en\", :format => \"%a\") %>"
+  res: "Fri"
+
+date_context:
+  old_src: "<r:date select='2008-03-02'><r:show date='current_date' format='%A %d.%m.%Y'/></r:date>"
+  src: "<r:show eval='parse_date(\"2008-03-02\")' format='%A %d.%m.%Y'/>"
+  res: "Sunday 02.03.2008"
+
+date_from_params:
+  context:
+    year: 1975
+  old_src: "<r:date select='[param:year]-01-01'><r:show date='current_date' format='%A %d.%m.%Y'/></r:date>"
+  src: "<r:show eval='parse_date(\"#{params[:year]}-01-01\")' format='%A %d.%m.%Y'/>"
+  tem: "<%= format_date(parse_date(\"#{params[:year]}-01-01\"), :format => \"%A %d.%m.%Y\") %>"
+  res: "Wednesday 01.01.1975"
+
+date_from_params_in_query:
+  context:
+    year: 2006
+  src: "<r:date text='#{params[:year]}/04/03' format='%Y/%m/%d' do='show' eval='date' format='%Y-%m-%d'/>"
+  tem: "/_zdate = \"#\{params\[:year\]\}/04/03\".to_utc\(\"%Y/%m/%d\"\) -%>/"
+  res: "2006-04-03"

data/test/integration/zafu_compiler/display.yml

@@ -63,21 +63,21 @@ show_live_no_tag:
 
 show_format:
   old_src: "<b do='[id]' format='%.2f'/>"
-  src: "<b do='#{id}' format='%.2f'/>"
+  src: "<b do='id' format='%.2f'/>"
   res: "<b>22.00</b>"
 
 show_format_nil:
   context:
     node: 'bird_jpg'
   old_src: "<b do='[d_id]' format='%.2f'/>"
-  src: "<b do='#{weight}' format='%.2f'/>"
+  src: "<b do='weight' format='%.2f'/>"
   res: "<b>0.00</b>"
 
 show_format_hide_zero:
   context:
     node: 'bird_jpg'
   old_src: "<b do='[d_id]' format='%.2f' zero='hide'/>"
-  src: "<b do='#{weight}' format='%.2f' zero='hide'/>"
+  src: "<b do='weight' format='%.2f' zero='hide'/>"
   res: "<b></b>"
 
 show_edit_preview:
@@ -93,7 +93,7 @@ title_in_version_context:
 
 show_shortcut:
   old_src: "<p do='[title]'>hello</p>"
-  src: "<p do='#{title}'>hello</p>"
+  src: "<p do='title'>hello</p>"
   tem: "<p><%= @node.prop['title'] %></p>"
   res: "<p>status title</p>"
 

data/test/integration/zafu_compiler/forms.yml

@@ -14,6 +14,24 @@ add_btn:
   </table>"
   res: "/<tr class='btn_add' id='list1_add'><td><b><a href='#' onclick/"
 
+form_put:
+  # default should be a put method
+  src: "<r:form></r:form>"
+  tem: "/form_for.*:url.*node_path\(@node\.zip\)/"
+  res: '/<form action="/nodes/\d+".*method="post".*input name="_method" type="hidden" value="put"/'
+
+form_post:
+  # Should make a post on new objects
+  src: "<r:new klass='Post' title='Joe'><r:form></r:form></r:new>"
+  tem: "/if var1 = new_instance\(\"Post\", :title => \"Joe\"\)/"
+  res: "!/\"put\"/"
+
+new:
+  # Should accept allowed params (from class and roles) and transform ids to zip (back and forth)
+  src: "<r:new klass='Letter' title='Joe' parent_id='#{project.id}' paper='white' origin='Mars' bad='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='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'/>"
   tem: "<b><%= @node.rel[\"hot\"].try(:other_zip) %></b><i><%= @node.parent_zip %></i>"
@@ -48,12 +66,6 @@ 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>/"
 
-select_nodes_data_list:
-  context:
-    node: status
-  src: "<r:data><r:each><r:form><select nodes='projects in site' name='node_a_id'/></r:form></r:each></r:data>"
-  res: "/option\s* value=.29.\s* selected=.selected.>wiki/"
-
 select_time_zone:
   src: "<r:form><r:select type='time_zone' name='d_tz'/></r:form>"
   res: "/Asia/Jakarta.*Europe/Zurich.*US/Hawai"
@@ -127,4 +139,4 @@ input_new:
 show_in_form:
   src: "<r:form><b do='title'/></r:form>"
   tem: "/<b><%= @node.prop\['title'\] %></b>/"
-  res: '/<b>status title</b>/'
+  res: '/<b>status title</b>/'

data/test/integration/zafu_compiler/i18n.yml

@@ -78,10 +78,18 @@ trans_attr:
   res: "english"
 
 trans_text_dyn_string:
+  context:
+    lang: 'fr'
   src: "<r:trans text='lang_#{ref_lang}'/>"
   tem: "<%= trans(\"lang_#{@node.ref_lang}\") %>"
   res: "lang_en"
 
+trans_rubyless_dyn_string:
+  context:
+    lang: 'fr'
+  src: "<r:load dictionary='/default/translations'><p do='t(\"lang_#{ref_lang}\")'/></r:load>"
+  res: "<p>anglais</p>"
+
 trans_literal_string:
   src: "<r:trans text='e#{\"\"}n'/>"
   tem: "english"
@@ -104,4 +112,51 @@ complex_lang_list:
     <ul do='site.lang_list'>
       <li do='each' class='#{this == visitor.lang ? "on" : "off"}' do='zen_path(@node, :lang =&gt; this)'/>
     </ul>
-  res: "/li class='on'>/oo/projects/cleanWater/page22.html\?lang=en</"
+  res: "/li class='on'>/oo/projects/cleanWater/page22.html\?lang=en</"
+
+html_lang_and_dict:
+  src: "<html xmlns='http://www.w3.org/1999/xhtml' lang='#{v.lang}' do='load' dictionary='/default/translations' xml:lang='en'></html>"
+  res: "<html xmlns='http://www.w3.org/1999/xhtml' lang='en'></html>"
+
+dictionary_fr:
+  context:
+    lang: 'fr'
+  src: "<r:load dictionary='/default/translations'><r:trans>foo</r:trans>: <r:t>I love</r:t> <r:trans>words</r:trans></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) -%>foo: j'aime les mots"
+  res: "foo: j'aime les mots"
+
+dynamic_dictionary_eval_fr:
+  context:
+    lang: 'fr'
+    node: status
+  src: "<r:load dictionary='/default/translations'><r:eval>trans(node_name)</r:eval></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) -%><%= _zdict.get(@node.node_name) %>"
+  res: "statut"
+
+dynamic_dictionary_t_fr:
+  context:
+    lang: 'fr'
+    node: status
+  src: "<r:load dictionary='/default/translations'><r:t attr='node_name'/></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) -%><%= _zdict.get(@node.node_name) %>"
+  res: "statut"
+
+dynamic_dictionary_literal_fr:
+  context:
+    lang: 'fr'
+    node: status
+  src: "<r:load dictionary='/default/translations'><r:eval>trans('status')</r:eval></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) -%>statut"
+  res: "statut"
+
+dictionary_de:
+  context:
+    lang: 'de'
+  src: "<r:load dictionary='/default/translations'><r:trans>foo</r:trans>: <r:trans>I love</r:trans> <r:trans>words</r:trans></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) -%>foo: Ich liebe Wörter"
+  res: "foo: Ich liebe Wörter"
+
+dictionary_tformat:
+  src: "<r:load dictionary='/default/translations'><r:show date='created_at' tformat='date_format'/></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) -%><%= format_date(@node.created_at, :format => \"[%d.%m]\") %>"
+  res: "[10.03]"

data/test/integration/zafu_compiler/later.yml

@@ -28,4 +28,26 @@ each_in_each_dom_id:
 # [swap] needs to be reimplemented
 swap_in_each:
   src: "<r:pages><li do='each'><span do='swap' attr='origin' states='todo,done,alert'/></li></r:pages>"
-  tem: "/<li id='list1_<%= var1.zip %>'><span>.*var1.can_write?.*tag_to_remote.*else.*var1.version.dyn\[\"status\"\]/"
+  tem: "/<li id='list1_<%= var1.zip %>'><span>.*var1.can_write?.*tag_to_remote.*else.*var1.version.dyn\[\"status\"\]/"
+
+
+# [ajax] zazen edit=true (maybe should implement in zafu_attributes with filter_edit)
+zazen_edit:
+  src: "<r:zazen attr='node_name' edit='true'/>"
+  tem: "<div class='zazen' id='list1_name'><% if @node.can_write? -%><span class='zazen_edit'><%= link_to_remote(\"edit\", :url => edit_node_path(@node.zip) + \"?attribute=name&dom_id=list1_name&zazen=true\", :method => :get) %></span><% end -%><%= zazen(@node.node_name, :node=>@node) %></div>"
+  res: "/div class='zazen' id='list1_name'>.*Ajax\.Request\('/nodes/22/edit\?attribute=name/"
+
+zazen_edit_publish_force:
+  src: "<r:zazen attr='node_name' edit='true' publish='force'/>"
+  tem: "/attribute=node_name&dom_id=.*_node_name&publish=force&zazen=true/"
+
+zazen_edit_publish_true:
+  src: "<r:zazen attr='node_name' edit='true' publish='true'/>"
+  tem: "/attribute=node_name&dom_id=.*_node_name&publish=true&zazen=true/"
+
+# Update query builder for DataEntry
+select_nodes_data_list:
+  context:
+    node: status
+  src: "<r:data><r:each><r:form><select nodes='projects in site' name='node_a_id'/></r:form></r:each></r:data>"
+  res: "/option\s* value=.29.\s* selected=.selected.>wiki/"

data/test/integration/zafu_compiler/relations.yml

@@ -336,7 +336,7 @@ else:
 
 incompatible_else:
   src: "<r:letters where='node_name = 1' in='site' else='this' do='each' join=',' do='node_name'/>"
-  tem: "/\(Node\).*finder \(\[Letter\]\)/"
+  tem: "/Incompatible.*\(Node\).*finder \(\[Letter\]\)/"
 
 where_not:
   context:

data/test/integration/zafu_compiler/roles.yml

@@ -25,4 +25,32 @@ show_property_filter_role_has_role:
 
 show_bad_role:
   src: "<r:Foo>abc</r:Foo>"
-  tem: "/Invalid role or class 'Foo'/"
+  tem: "/Invalid role or class 'Foo'/"
+
+form_with_all_roles:
+  context:
+    node: tree_jpg
+  src: |
+    <r:possible_roles>
+      <fieldset do='each'>
+        <legend do='name'/>
+        <ul do='columns'>
+          <li do='each'><label do='name'/> <r:input/></li>
+        </ul>
+      </fieldset>
+    </r:possible_roles>
+  res: "/label.weight.*node\[weight\].*origin.*value='Big Bang'.*assigned/"
+
+show_all_properties:
+  context:
+    node: tree_jpg
+  src: |
+    <r:roles>
+      <fieldset do='each'>
+        <legend do='name'/>
+        <ul do='columns'>
+          <li do='each' do='if' test='@node.send(name)'><label do='name'/> <r:eval>@node.send(name)</r:eval></li>
+        </ul>
+      </fieldset>
+    </r:roles>
+  res: "/<label>origin</label> Big Bang</li>/"

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -11,7 +11,7 @@ params:
   context:
     d: 'hello ladies'
   old_src: "<i do='show' param='d'/>"
-  src: "<i do='#{params[:d]}'/>"
+  src: "<i do='params[:d]'/>"
   tem: "<i><%= params[:d] %></i>"
   res: "<i>hello ladies</i>"
 

data/test/integration/zafu_compiler/zafu_attributes.yml

@@ -137,7 +137,8 @@ test_negative_value:
   tem: "<div class='<%= ((@node.custom_a==-10)) ? ' off' : '' %>'>...</div>"
 
 anchor_attribute:
-  src: "<p do='#{id}' anchor='#{node_name}'>hello</p>"
+  # Use to_s so that the method executed replaces the dummy text.
+  src: "<p do='id.to_s' anchor='#{node_name}'>hello</p>"
   res: "<a class='anchor' name='status'></a><p>22</p>"
 
 anchor_true:

data/test/integration/zafu_compiler_test.rb

@@ -25,21 +25,23 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     'zafu_attributes',
     'zazen',
     'security',
+    'ajax',
+    'complex_ok',
+    'forms',
   ]
 
   BUG = [
-    'ajax',
     'apphelper',
     'basic',
     'complex',
     'data',
     'eval',
-    'forms',
+    'complex',
   ]
 
   LATER = %w{later}
 
-  yamltest :directories => ([:default] + Bricks.zafu_tests), :files => OK #+ BUG
+  yamltest :directories => ([:default] + Bricks.zafu_tests), :files => OK
 
   Section # make sure we load Section links before trying relations
 

data/test/sites/zena/columns.yml

@@ -8,5 +8,8 @@ Original_origin:
 Original_weight:
   ptype:           integer
 
+Original_tz:
+  ptype:           string
+
 Letter_paper:
   ptype:           string

data/test/sites/zena/roles.yml

@@ -22,7 +22,6 @@ Tracker:
 Tag:
   kpath:           NPT
   real_class:      Page
-  create_group:    admin
 
 Task:
   kpath:           N

data/test/sites/zena/sites.yml

@@ -11,6 +11,7 @@ zena:
   languages:       en,fr,de,es
   default_lang:    en
   formats_updated_at: 2008-05-01
+  api_group:       managers
   prop:
     recaptcha_pub: 'pub'
     recaptcha_priv: 'priv'

data/test/sites/zena/versions.yml

@@ -175,6 +175,7 @@ cleanWater_en:
   prop:
     assigned:      gaspard
     tz:            Asia/Jakarta
+    foo:           Some old legacy stuff
     title:         Clean Water project
 
 
@@ -420,6 +421,7 @@ tree_jpg_en:
     summary:       "photography © André Karwath 2004"
     text:          ""
     origin:        Big Bang
+    tz:            Asia/Jakarta
     cached_role_ids: Original
     content_type:  image/jpeg
     ext:           jpg

data/test/unit/node_test.rb

@@ -1027,22 +1027,31 @@ done: \"I am done\""
   end
 
   def test_classes_for_form
-    assert_equal [["Page", "Page"],
-     ["  Project", "Project"],
-     ["  Section", "Section"],
-     ["    Skin", "Skin"]], Node.classes_for_form(:class=>'Page', :without=>'Document')
+    Node.get_class('Tag')
+    assert_equal [
+      ["Page", "Page"],
+      ["  Project", "Project"],
+      ["  Section", "Section"],
+      ["    Skin", "Skin"],
+      ["  Tag", "Tag"],
+     ], Node.classes_for_form(:class=>'Page', :without=>'Document')
   end
 
   def test_change_to_classes_for_form
-    assert_equal [["Page", "Page"],
-     ["  Project", "Project"],
-     ["  Section", "Section"],
-     ["    Skin", "Skin"]], Project.classes_for_form(:class=>'Page', :without=>'Document')
+    Node.get_class('Tag')
+    assert_equal [
+      ["Page", "Page"],
+      ["  Project", "Project"],
+      ["  Section", "Section"],
+      ["    Skin", "Skin"],
+      ["  Tag", "Tag"],
+    ], Project.classes_for_form(:class=>'Page', :without=>'Document')
   end
 
   def test_allowed_change_to_classes
+    Node.get_class('Tag')
     node_changes = Node.allowed_change_to_classes.reject{|k| k[/Dummy/]} # In case we are testing after Secure
-    assert_equal %w{Node Note Letter Post Page Project Section Skin Reference}, node_changes
+    assert_equal %w{Node Note Letter Post Page Project Section Skin Tag Reference}, node_changes
 
     assert_equal node_changes, Page.allowed_change_to_classes.reject{|k| k[/Dummy/]}
     assert_equal node_changes, Project.allowed_change_to_classes.reject{|k| k[/Dummy/]}
@@ -1447,4 +1456,13 @@ done: \"I am done\""
     note = secure(Node) { nodes(:opening) }
     assert_equal %w{text title}, note.parse_keys.sort
   end
+
+  def test_safe_send
+    node = secure(Node) { nodes(:status) }
+    assert_equal 'safe_send("title")', RubyLess.translate(Node, 'send("title")')
+
+    assert_equal 'status title', node.safe_send("title")
+    assert_equal nodes_zip(:status).to_s, node.safe_send("id")
+    assert_equal nil, node.safe_send("object_id")
+  end
 end