zena 1.2.7 → 1.2.8

data/test/integration/query_node/basic.yml

@@ -155,3 +155,10 @@ coalesce:
   src: "nodes in site order by parent_id.coalesce(0) asc limit 1"
   sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} ORDER BY COALESCE(nodes.parent_id,0) ASC LIMIT 1}"
   res: "Zena the wild CMS"
+
+in_sub_nodes:
+  context:
+    node: cleanWater
+  src: pages in sub_nodes
+  sql: "/nodes.fullpath LIKE CONCAT.\?,'/%'./"
+  res: "Etat des travaux, crocodiles"

data/test/integration/query_node/complex.yml

@@ -3,7 +3,7 @@ default:
     node_name: '@node'
     node: complex
     visitor: complex_admin
-    site: complex
+    host: complex.host
   src: ""
   sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
   res: "cskin, list of employees, jobs, courses list"

data/test/integration/query_node/errors.yml

@@ -15,4 +15,4 @@ pages_from_site_or_images:
 pagination_without_limit:
   src: "pages in site paginate p"
   # qb processor.rb 571
-  err: 'Invalid paginate clause (used without limit).'
+  err: 'Invalid paginate clause (used without limit).'

data/test/integration/query_node/filters.yml

@@ -178,4 +178,37 @@ quoted_literal:
 coalesce_in_filter:
   src: "posts select date.coalesce('2011-11-01') as da in site"
   sql: "%Q{SELECT nodes.*,COALESCE(nodes.idx_datetime1,'2011-11-01') AS `da` FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NNP%' ORDER BY nodes.zip ASC}"
-  res: 'super ouverture'
+  res: 'super ouverture'
+
+match:
+  src: "pages where fulltext match 'wiki' in site"
+  sql: "/ve1.idx_text_high LIKE '%wiki%'/"
+
+match_string_dyn:
+  src: "pages where fulltext match 'wiki#{params[:foo]}' in site"
+  sql: "/ve1.idx_text_high LIKE \?.*\"%wiki#\{params\[:foo\]\}/"
+
+match_dstring:
+  src: "pages where fulltext match \"ho#{params[:foo]}\" in site"
+  sql: "/ve1.idx_text_high LIKE \?.*\"%ho#\{params\[:foo\]\}/"
+
+match_dstring_no_rb:
+  src: "pages where fulltext match \"ho\" in site"
+  sql: "/ve1.idx_text_high LIKE '%ho%'/"
+  
+match_number:
+  src: "pages where fulltext match 123 in site"
+  sql: "/ve1.idx_text_high LIKE '%123%'/"
+
+match_rubyless:
+  src: "pages where fulltext match #{params[:foo]} in site"
+  sql: "/ve1.idx_text_high LIKE \?.*, \"%#\{params\[:foo\]\}%\"/"
+
+match_field:
+  src: "pages where fulltext match id in site"
+  sql: "Can only match against literal or rubyless values."
+
+match_sphinx:
+  src: "pages where sphinx match #{params[:foo]} in site"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.zip IN (?) AND nodes.kpath LIKE 'NP%' ORDER BY nodes.zip ASC}, test_search_for_ids(params[:foo])]"
+  res: 'Zena the wild CMS, projects list, a wiki with Zena'

data/test/integration/query_node/relations.yml

@@ -83,22 +83,15 @@ project_as_blog:
   src: "Blog:project"
   sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NPPB%' AND nodes.id = ? ORDER BY nodes.zip ASC}, @node.get_project_id]"
 
-from_root:
-  context:
-    site: alias
-  src: nodes from root limit 3
-  res: 'people, projects list, Collections'
-  
-from_home:
-  context:
-    site: alias
-  src: nodes from home limit 3
-  res: 'bird, flower'
-
 # openging in art(33) and news(34)
 having_on_relation_count:
   context:
     params:
       ids: '33,34'
   src: 'tagged from tag select id.count as t_count where id in (#{params[:ids].split(",")}) in site having t_count = #{params[:ids].split(",").size}'
-  res: 'super ouverture'
+  res: 'super ouverture'
+
+# TODO: change how fullpath is built should solve this issue.
+in_home:
+  src: "images in home"
+  res: it's a lake, bird, flower, Autumn Tree

data/test/integration/query_node_test.rb

@@ -1,6 +1,26 @@
 require 'test_helper'
 require 'yamltest'
 
+# Mock sphinx search
+
+# add 'sphinx match xxxx' to QueryNode
+Node.query_compiler.add_fulltext_field('sphinx') do |processor, table, right|
+  helper = processor.instance_variable_get(:@rubyless_helper)
+  case right[0]
+  when :string, :dstring, :real, :integer
+    value = RubyLess.translate_string(helper, right[1])
+  when :rubyless
+    value = RubyLess.translate(helper, right[1])
+  else
+    raise ::QueryBuilder::Error.new("Can only match against literal or rubyless values.")
+  end
+  "#{table}.zip IN (#{processor.send(:insert_bind, "test_search_for_ids(#{value})")})"
+end
+
+def test_search_for_ids(fld)
+  [11, 18, 29]
+end
+
 class QueryNodeTest < Zena::Unit::TestCase
   include RubyLess
   safe_method :date => Time
@@ -37,9 +57,8 @@ class QueryNodeTest < Zena::Unit::TestCase
     (@context[:params] || {}).each do |k,v|
       params[k.to_sym] = v
     end
-
-    $_test_site = @context[:site] || 'zena'
-    login(@context[:visitor].to_sym, $_test_site)
+    
+    login(@context[:visitor].to_sym, @context[:host])
 
     @context[:rubyless_helper] = self
     defaults = (@context[:default] ||= {})

data/test/integration/zafu_compiler/action.yml

@@ -20,7 +20,7 @@ login_link:
     # Forces NodesController type of url and params
     fake_controller: 'nodes'
   src: "<r:login_link/>"
-  res: '<a href="/oo/projects-list/Clean-Water-project/page22.html" rel="nofollow">login</a>'
+  res: '<a href="/oo/projects-list/Clean-Water-project/page22.html?lang=en" rel="nofollow">login</a>'
 
 logout_link_other_controller:
   src: "<r:login_link/>"

data/test/integration/zafu_compiler/alias_site.yml

@@ -0,0 +1,52 @@
+default:
+  context:
+    lang: 'en'
+    host: alias.host
+    visitor: 'ant'
+    node: 'status'
+  src: "<r:site do='host'/>: <r:home do='title'/>"
+  tem: "/visitor.site.home_node"
+  res: "alias.host: a wiki with Zena"
+  
+test_home:
+  context:
+    node: wiki
+  src: "<r:if test='id == home.id'>ok</r:if>"
+  res: 'ok'
+
+all_sub_nodes:
+  src: "<r:void do=\"nodes where fullpath like '#{home.fullpath}/%' in site\" do='each' join=', ' do='title'/>"
+  tem: '/visitor.site.home_node.fullpath/'
+  res: 'bird, flower'
+
+from_root:
+  context:
+    host: alias.host
+  src: <r:void do='nodes from root limit 3' do='each' join=', ' do='title'/>
+  res: 'Collections, Kill the bugs, Nature'
+
+# For this test, we add some sub-nodes in wiki
+from_home:
+  context:
+    host: alias.host
+  src: <r:void do='nodes from home' do='each' join=', ' do='title'/>
+  res: 'bird, flower, one'
+
+# For this test, we add some sub-nodes in wiki
+in_home:
+  src: <r:void do='nodes in home' do='each' join=', ' do='title'/>
+  res: bird, flower, one, three, two
+
+link_to_home:
+  src: <r:void do='home' do='link'/>
+  res: <a href='/oo'>a wiki with Zena</a>
+  
+link_with_custom_base:
+  # custom base is set on 'home' before this test
+  src: <r:void do='image in home' find='first' do='link'/> <r:void do='page where title = "three" in home' find='first' do='link'/>
+  res: <a href='/oo/image30.html'>bird</a> <a href='/oo/one/page68.html'>three</a>
+  
+link_with_custom_base_out_of_home:
+  # custom base is set on 'home' before this test
+  src: <r:void do='page where id = 22 in site' find='first' do='link'/>
+  res: <a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>

data/test/integration/zafu_compiler/complex.yml

@@ -58,7 +58,7 @@ default:
     node_name: '@node'
     node: roger
     visitor: complex_admin
-    site: complex
+    host: complex.host
     ref_date: 2004-09-01
   src: "<r:emp_form_dates where='repeat_every is not null' do='each' join=', '><r:show attr='title'/>(<r:show attr='priority'/>, <r:show attr='last_date' format='%Y-%m-%d'/>, <r:show attr='next_date' format='%Y-%m-%d'/>)</r:emp_form_dates>"
   res: "secure_a_site(10, , ), winch_usage(10, , ), dangerous_transportations(10, 2004-03-15, 2006-03-15), engine(5, , ), transmit_information(5, 2002-05-05, 2003-05-05), fiber_junction(5, 2003-03-03, 2005-03-03), radio_usage(1, , )"

data/test/integration/zafu_compiler/complex_ok.yml

@@ -3,7 +3,7 @@ it_should_compile_custom_select:
     node_name: '@node'
     node: roger
     visitor: complex_admin
-    site: complex
+    host: complex.host
     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.rcast\("last_date", :time\), :format => "%Y-%m"\) %>\]/'
@@ -14,7 +14,7 @@ type_cast_to_time_using_existing_field:
     node_name: '@node'
     node: roger
     visitor: complex_admin
-    site: complex
+    host: complex.host
     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/'
@@ -25,7 +25,7 @@ type_cast_to_time_custom_field:
     node_name: '@node'
     node: roger
     visitor: complex_admin
-    site: complex
+    host: complex.host
     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/'
@@ -36,7 +36,7 @@ it_should_group_by_custom_select:
     node_name: '@node'
     node: roger
     visitor: complex_admin
-    site: complex
+    host: complex.host
     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'
@@ -46,7 +46,7 @@ it_should_secure_table:
     node_name: '@node'
     node: roger
     visitor: complex_admin
-    site: complex
+    host: complex.host
     ref_date: 2004-09-01
   src: "<r:secure_tables do='count'/>"
   tem: "/secure_scope\('other'\)/"

data/test/integration/zafu_compiler/context.yml

@@ -32,7 +32,7 @@ login_info:
 
 home_compiled_to_project:
   context:
-    site: alias
+    host: alias.host
   src: "<r:home do='collaborators'/>"
   # project_has_collaborators => home resolved as project during compilation
   tem: '/links.relation_id = 540144154/'

data/test/integration/zafu_compiler/display.yml

@@ -396,10 +396,12 @@ set_class_before_query:
   src: "<div class='foo_#{first.title}' do='images in site'></div>"
   res: "<div class='foo_Autumn Tree'></div>"
 
-flash_messages:
-  src: "<r:flash_messages/>"
-  tem: "<%= flash_messages %>"
-  res: "<div id='flash_messages'></div>"
+flash:
+  context:
+    flash: "Ho ho"
+  src: "<r:void do='flash[\"error\"]'/>"
+  tem: "<%=h zafu_flash[\"error\"] %>"
+  res: "Ho ho"
 
 date_without_set_var:
   context:
@@ -440,6 +442,10 @@ default_host:
   tem: '/zazen.*:host.*visitor.site.host/'
   res: "/href=\"http://b.test.host/oo/section12.html\">link.*src='http://b.test.host/en/image30_std.75a9a.jpg/"
 
+visitor_site_host:
+  src: "<r:eval>visitor.site.host</r:eval>"
+  res: "test.host"
+
 zazen_without_markup:
   src: "<r:void do='zazen(title)'/>"
   res: "<p>status title</p>"
@@ -520,4 +526,49 @@ uuid:
 use_first_in_list:
   src: "<r:void do='contacts where id = 13 in site'><r:first do='link'/> // <r:first do='title'/></r:void>"
   tem: "/var1.first.*var1.first/"
-  res: "<a href='/oo/contact13.html'>Solenopsis Invicta</a> // Solenopsis Invicta"
+  res: "<a href='/oo/contact13.html'>Solenopsis Invicta</a> // Solenopsis Invicta"
+
+# Make sure variables do not reach...
+zafu_eval:
+  context:
+    code: "<r:title/>"
+  src: "<r:title/>: [<r:parent do='zafu_eval' code='params[:code]'/>]"
+  tem: "/<%= zafu_eval\(var1/"
+  res: 'status title: [Clean Water project]'
+
+fetch_html:
+  src: "HELLO: <r:void do='fetch_html(\"http://zenadmin.org/en\")' h='false'/>"
+  tem: "HELLO: <%= fetch_html(\"http://zenadmin.org/en\") %>"
+  res: "/HELLO:.*DOCTYPE.*zenadmin.org/en/features/"
+
+section_id:
+  context:
+    node: wiki_Node_zafu
+  src: "section: <p do='section_id'/>"
+  res: 'section: <p>43</p>'
+
+project_id:
+  context:
+    node: wiki_Node_zafu
+  src: "project: <p do='project_id'/>"
+  res: 'project: <p>11</p>'
+
+parent_id:
+  context:
+    node: ant
+  src: "parent: <p do='parent_id'/>"
+  res: 'parent: <p>12</p>'
+
+fsize:
+  src: "<b do='fsize(32*1024)'/> <b do='fsize(3.45*1024*1024)'/>"
+  res: "<b>32 Kb</b> <b>3.5 Mb</b>"
+
+group_id_to_name_ant:
+  src: "<r:title/>: auth = <r:void do='visitor.group_id_to_name(rgroup_id)'/> // <r:void do='visitor.group_id_to_name(dgroup_id) || \"unknown\"'/>"
+  res: "status title: auth = public // unknown"
+
+group_id_to_name:
+  context:
+    visitor: lion
+  src: "<r:title/>: auth = <r:void do='visitor.group_id_to_name(rgroup_id)'/> // <r:void do='visitor.group_id_to_name(dgroup_id) || \"unknown\"'/>"
+  res: "status title: auth = public // managers"

data/test/integration/zafu_compiler/forms.yml

@@ -169,7 +169,7 @@ checkbox_checked_hash_value:
     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'/>"
+  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]'/>"
@@ -374,4 +374,37 @@ form_rel_status:
     node: 'cleanWater'
   src: "<r:input name='set_tag_status'/>"
   tem: "/other_status/"
-  res: "<input type='text' name='node[set_tag_status]' value='10.0'/>"
+  res: "<input type='text' name='node[set_tag_status]' value='10.0'/>"
+
+# Before change, tiger uses ant as profile
+auth_profile:
+  context:
+    node: tiger
+  src: "<b do='auth[\"profile\"]'/>: <r:select name='auth[profile]' type='profile'/>"
+  res: "<b>ant</b>: <select name='node[auth][profile]'><option value=\"ant\" selected=\"selected\">ant</option></select>"
+
+auth_login:
+  context:
+    node: ant
+  src: "<r:input name='auth[login]'/>"
+  res: "<input type='text' name='node[auth][login]' value='ant'/>"
+
+auth_password:
+  context:
+    node: ant
+  src: "<r:input type='password' name='auth[password]'/>"
+  res: "<input type='password' name='node[auth][password]' value=''/>"
+
+tlabel_with_default_label:
+  context:
+    lang: fr
+  src: "<r:default label='t'><r:input name='title' tlabel='Monday'/></r:default>"
+  res: '/<label>lundi</label>/'
+
+p_do_input:
+  src: "<p class='foo' do='input' name='title'/>"
+  res: "<p class='foo'><input type='text' name='node[title]' value='status title'/></p>"
+
+p_do_input_with_label:
+  src: "<p class='foo' do='input' name='title' label='t'/>"
+  res: "<p class='foo'><label>title</label> <span><input type='text' name='node[title]' value='status title'/></span></p>"

data/test/integration/zafu_compiler/meta.yml

@@ -58,6 +58,10 @@ include_part_replace_method:
   src: "include_part: <r:include template='/meta/id/name' part='bob' do='title'/>"
   tem: "include_part: <b><%=h @node.prop['title'] %></b>"
 
+include_no_template_no_part:
+  src: "<r:include temalate='/foo/bar'/>"
+  tem: "/missing 'template' or 'part' parameter/"
+
 id_do:
   src: "<h1 id='logo' do='title'/>"
   res: "<h1 id='logo'>status title</h1>"

data/test/integration/zafu_compiler/rubyless.yml

@@ -100,4 +100,4 @@ class_new:
 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>"
+  res: "<div><p>Post</p>.<p>yes</p></div>"

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -45,6 +45,10 @@ string_strip:
   tem: "<%= \" #{@node.zip}\".strip %>"
   res: "22"
 
+string_split:
+  src: "<r:void do=\"'one,two'.split(',')\"><span do='each' join=' ' do='this'/></r:void>"
+  res: '<span>one</span> <span>two</span>'
+
 string_to_i:
   eval: "%Q{ #{id}}.to_i"
   tem: "<%= \" #{@node.zip}\".to_i %>"

data/test/integration/zafu_compiler/security.yml

@@ -114,3 +114,13 @@ build_erb_with_rubyless:
 multiple_trans:
   src: "<r:t text='<'/><r:t text='%'/>"
   tem: "&lt;%"
+
+zafu_eval:
+  context:
+    code: "<%= 3.class %>"
+  src: "<r:zafu_eval code='params[:code]'/>"
+  res: '&lt;%= 3.class %&gt;'
+
+eval_in_query:
+  src: "<r:void do=\"nodes where title like '#{puts Time.now}/%' in site\"/>"
+  res: /Unknown constant 'Time'/

data/test/integration/zafu_compiler/site.yml

@@ -15,4 +15,8 @@ host:
 default_lang:
   eval: "site.default_lang"
   tem: "<%= visitor.site.default_lang %>"
-  res: "en"
+  res: "en"
+
+readonly:
+  eval: "site.readonly?"
+  res: "true"

data/test/integration/zafu_compiler/urls.yml

@@ -124,12 +124,14 @@ link_root:
   res: "<a href='/oo'>status title</a>"
 
 link_anchor:
-  src: "<r:link anchor='true'/>"
+  old_src: "<r:link anchor='true'/>"
+  src: "<a href='#node#{id}' do='title'/>"
   res: "<a href='#node22'>status title</a>"
 
 link_anchor_title:
   old_src: "<r:link anchor='[name]'/>"
-  src: "<r:link anchor='#{title.url_name}'/>"
+  old_src: "<r:link anchor='#{title.url_name}'/>"
+  src: "<a href='##{title.url_name}' do='title'/>"
   res: "<a href='#status-title'>status title</a>"
 
 link_anchor_in:
@@ -141,6 +143,10 @@ link_anchor_name_in:
   src: "<r:link anchor='#{title.url_name}' href='parent'/>"
   res: "<a href='/oo/projects-list/Clean-Water-project#status-title'>status title</a>"
 
+link_anchor_lit:
+  src: <r:void do='node where id=18 in site' do='link' anchor='foo'/>
+  res: "<a href='/oo/page18.html#foo'>projects list</a>"
+
 link_stored:
   old_src: "<r:void store='foo'><r:parent><r:link href='foo' do='title'/></r:parent></r:void>"
   src: "<r:void set_foo='this'><r:parent><r:link href='foo' do='title'/></r:parent></r:void>"