zena 1.2.4 → 1.2.5

data/locale/zena.pot

@@ -1533,6 +1533,10 @@ msgstr ""
 msgid "site_img"
 msgstr ""
 
+#: app/views/sites/_li.erb:2 lib/gettext_strings.rb:34
+msgid "alias_img"
+msgstr ""
+
 #: app/views/sites/index.erb:1 lib/zena/use/display.rb:279
 msgid "sites"
 msgstr ""

data/test/functional/nodes_controller_test.rb

@@ -716,7 +716,8 @@ class NodesControllerTest < Zena::Controller::TestCase
         assert !File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg")
         # cache info ok
         get 'show', :prefix => 'en', :path => ["image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"]
-        assert_response :success
+        # This is the redirect to force apache serving
+        assert_redirected_to "/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg?1"
         assert File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg")
       end
     end
@@ -1029,135 +1030,3 @@ END:VCALENDAR
     assert_equal nodes_id(:cleanWater), nodes.first.id
   end
 end
-
-=begin
-
-  def test_import_archive
-    preserving_files('test.host/data') do
-      login(:tiger)
-      post 'import', :archive => uploaded_archive('import.tgz'), :id => nodes_zip(:status)
-      assert_response :success
-      assert_template 'import'
-    end
-  end
-
-  def test_form_tabs
-    @controller = TestNodeController.new
-    init_controller
-    page = @controller.send(:secure, Node) { Node.find(nodes_id(:status))    }
-    @controller.instance_variable_set(:@node, page)
-    assert_equal [["drive", "drive"], ["links", "links"], ["help", "help"]], @controller.send(:form_tabs)
-  end
-
-  def test_popup_page_not_found
-    get 'drive', :id=>99
-    assert_redirected_to :controller => 'node', :action=>'not_found'
-    get 'not_found'
-    assert_template 'node/not_found'
-  end
-
-
-  def test_add_link
-    login(:tiger)
-    node = secure!(Node) { nodes(:proposition) } # Post virtual class
-    assert_nil node.find(:all,'blogs')
-    assert_kind_of Relation, node.relation_proxy('blog')
-    post 'link', 'role'=>'blog', 'id'=>nodes_zip(:proposition), 'controller'=>'nodes', 'other_id'=>nodes_zip(:cleanWater)
-    assert_response :success
-    node = secure!(Node) { nodes(:proposition) } # reload
-    assert blogs = node.find(:all,'blogs')
-    assert_equal 1, blogs.size
-    assert_equal nodes_id(:cleanWater), blogs[0][:id]
-  end
-
-  def test_tags_update_string
-    login(:lion)
-    post 'update', :id => nodes_zip(:art), :node => {'tagged_ids' => "#{nodes_zip(:status)}, #{nodes_zip(:people)}"}
-
-    node = secure!(Node) { nodes(:art) }
-    assert_equal 2, node.tagged.size
-    stat = secure!(Node) { nodes(:status) }
-    peop = secure!(Node) { nodes(:people) }
-    assert_equal node[:id], stat.tags[0][:id]
-    assert_equal node[:id], peop.tags[0][:id]
-  end
-
-  def test_tags_update_array
-    login(:lion)
-    post 'update', :id => nodes_zip(:art), :node => {:tagged_ids => [nodes_zip(:lion).to_i, nodes_zip(:cleanWater).to_s]}
-
-    node = secure!(Node) { nodes(:art) }
-    assert_equal 2, node.tagged.size
-    lion = secure!(Node) { nodes(:lion) }
-    clea = secure!(Node) { nodes(:cleanWater) }
-    assert_equal node[:id], lion.tags[0][:id]
-    assert_equal node[:id], clea.tags[0][:id]
-  end
-
-  def test_create_ok
-    login(:tiger)
-    post 'create', :node=>{:klass=>'Tracker', :parent_id=>nodes_zip(:zena), :name=>'test'}
-    assert_response :success
-    assert_kind_of Page, assigns['page']
-    assert assigns['page'].vkind_of?('Tracker')
-    assert !assigns['page'].new_record?, "Not a new record"
-  end
-
-  def test_bad_skin_name
-    login(:anon)
-    without_files('zafu') do
-      Node.connection.execute "UPDATE nodes SET skin = 'bad' WHERE id = #{nodes_id(:status)}"
-      assert_nothing_raised do
-        get 'show', "prefix"=>"en",
-         "path"=>["projects", "cleanWater", "page22.html"]
-      end
-    end
-    assert_response :success
-  end
-
-  def test_find_node
-    Node.connection.execute "UPDATE nodes SET name = '2006' where id = #{nodes_id(:projects)}"
-    Node.connection.execute "UPDATE nodes SET name = '25-10-2006' where id = #{nodes_id(:wiki)}"
-    Node.connection.execute "UPDATE nodes SET name = 'archive-1' where id = #{nodes_id(:bird_jpg)}"
-    [ ['section12.html',:success],
-      ['section12_tree.xml',:success],
-      ['2006','page18.html'],
-      ['2006.xml','page18.xml'],
-      ['p12','page12.html'],
-      ['25-10-2006','blog29.html'],
-      ['archive-1','image30.html'],
-      ['archive', 404],
-    ].each do |name, result|
-      puts name
-      get 'show', 'prefix' => 'en', 'path' => [name]
-      if result.kind_of?(String)
-        assert_redirected_to 'path' => [result]
-      else
-        assert_response result
-      end
-    end
-  end
-
-  def test_cached_file
-    without_files('test.host/public') do
-      with_caching do
-        login(:anon)
-        page_path = visitor.site.public_path + '/en/section12.html'
-        file_path = "#{SITES_ROOT}#{page_path}"
-
-        assert !File.exists?(file_path), "No cached file yet"
-        assert !CachedPage.find_by_path_and_site_id(page_path, sites_id(:zena)), "No cache info yet"
-
-        get 'show', 'prefix' => 'en', 'path' => ['section12.html']
-        assert_response :success
-
-        assert File.exists?(file_path), "Cache file created"
-        assert CachedPage.find_by_path_and_site_id(page_path, sites_id(:zena))
-      end
-    end
-  end
-
-  # test edit_... mode only if can_write?
-
-end
-=end

data/test/functional/sites_controller_test.rb

@@ -23,7 +23,7 @@ class SitesControllerTest < Zena::Controller::TestCase
   end
 
 
-  test 'should clear cache with GET' do
+  test 'should clear cache with get' do
     with_caching do
       login(:anon)
       @node = secure!(Node) { nodes(:status) }

data/test/integration/multiple_hosts_test.rb

@@ -36,7 +36,8 @@ class MultipleHostsTest < ActionController::IntegrationTest
 
   def test_cache
     # We need the visitor to load VirtualClass cache.
-    Thread.current[:visitor] = users(:anon)
+    anon_user = users(:anon)
+    setup_visitor(anon_user, anon_user.site)
     node_zip = nodes(:zena, :people).zip
     Thread.current[:visitor] = nil
     

data/test/integration/navigation_test.rb

@@ -473,6 +473,43 @@ class NavigationTest < Zena::Integration::TestCase
       end
     end
   end
+  
+  def test_not_cache_on_redirect
+    login(:lion)
+    t = secure(Template) { 
+      Template.create(
+        :parent_id => nodes_id(:default),
+        :title     => 'Node-headers.zafu',
+        :text      => %q{<r:headers Location='/login' Status='303'/>DUMMY BODY},
+        :v_status  => Zena::Status::Pub
+      )
+    }
+    
+    without_files('test.host/public') do
+      without_files('/test.host/zafu') do
+        preserving_files('/test.host/data') do
+          with_caching do
+            login(:anon)
+            base  = "#{SITES_ROOT}#{visitor.site.public_path}"
+          
+            c = '/fr/page18.html'
+            assert !File.exists?(base + c), "No cached file #{c} yet"
+            get "http://test.host#{c}"
+            assert_response :success
+            assert File.exists?(base + c), "Cached file #{c} created"
+          
+            c = '/fr/page18_headers.html'
+            assert !File.exists?(base + c), "No cached file #{c} yet"
+            get "http://test.host#{c}"
+            assert_equal '<html><body>You are being <a href="http://test.host/login">redirected</a>.</body></html>', response.body
+            assert_response :redirect
+            assert_redirected_to '/login'
+            assert !File.exists?(base + c), "No cached file #{c} created"
+          end
+        end
+      end
+    end
+  end
 
   def test_should_not_change_session_lang_on_login
     get 'http://test.host/'

data/test/integration/query_node/basic.yml

@@ -154,4 +154,4 @@ select_index_field:
 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"
+  res: "Zena the wild CMS"

data/test/integration/zafu_compiler/ajax.yml

@@ -386,6 +386,13 @@ link_page_next:
   src: "<div id='foo' do='block' do='nodes in site' limit='3' order='id asc' paginate='pak'><r:link page='previous'/> | <r:pak/> | <r:link update='foo' page='next'/></div>"
   res: "/<a href='/oo/projects-list/Clean-Water-project/page22.html\?pak=1'>1</a> \| 2 \| .*22/zafu\?dom_id=foo.*pak=3.*>3</a>/"
 
+link_page_next_encode_params:
+  context:
+    pak: 2
+    foo: Hop
+  src: "<div id='foo' do='block' do='nodes in site' limit='3' order='id asc' paginate='pak'><r:link update='foo' page='next' encode_params='foo'/></div>"
+  res: "/Ajax.*foo=Hop/"
+
 link_page_list:
   context:
     pak: 2

data/test/integration/zafu_compiler/comments.yml

@@ -13,8 +13,8 @@ comments_shown_if_empty_but_can_comment:
   tem: "/if \(var1 = @node.comments\) \|\| \(@node.can_comment\? && var1=\[\]\) %>/"
 
 discussion:
-  src: "<r:discussion do='comments' do='title'></r:discussion>"
-  tem: "<% if var1 = @node.discussion %><% if var2 = var1.comments %><%=h var2.first.title %><% end %><% end %>"
+  src: "<r:discussion do='comments' do='first.title'></r:discussion>"
+  tem: "<% if var1 = @node.discussion %><% if var2 = var1.comments %><%=h (var2.first ? var2.first.title : nil) %><% end %><% end %>"
   # no error
   res: "What about rivers ?"
 

data/test/integration/zafu_compiler/context.yml

@@ -5,7 +5,7 @@ default:
     node: 'cleanWater'
 
 each_group:
-  src: "<r:nodes do='group' by='kpath'><p do='each_group'><r:kpath/>: <r:each join=', ' do='title'/></p></r:nodes>"
+  src: "<r:nodes do='group' by='kpath'><p do='each_group'><r:first do='kpath'/>: <r:each join=', ' do='title'/></p></r:nodes>"
   res: "<p>NP: crocodiles, status title</p><p>NDI: it&#39;s a lake</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
 
 # set_var tested in eval.yml
@@ -24,4 +24,8 @@ list_else:
 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
+  # Master template on template rendering is tested in 'find master template', rendering_test.rb
+
+login_info:
+  src: "<r:contacts in='site'><r:each do='login_info'><r:login/>, </r:each></r:contacts>"
+  res: "lion, tiger, ant, , "

data/test/integration/zafu_compiler/display.yml

@@ -326,10 +326,13 @@ admin_links_for_anon:
   src: "<r:admin_links>hello</r:admin_links>"
   res: ''
 
+string_size:
+  src: "<div do='text.size'/>"
+  res: '<div>11</div>'
+
 string_limit:
-  src: "<div do=\"text.limit(10, %Q{<a href='#{url}'>read more</a>})\"/>"
-  tem: "<div><%= (@node.prop['text'] ? @node.prop['text'].limit(10, \"<a href='#{zen_url(@node)}'>read more</a>\") : nil) %></div>"
-  res: "<div>status tex<a href='http://test.host/oo/projects-list/Clean-Water-project/page22.html'>read more</a></div>"
+  src: "<div do='text'><r:void do='limit(10,\"\")'/><r:if test='size > 10' do='link' href='@node' t='read more'/></div>"
+  res: "<div>status tex<a href='/oo/projects-list/Clean-Water-project/page22.html'>read more</a></div>"
 
 show_with_label_shortcut:
   context:
@@ -390,7 +393,7 @@ each_whitespace:
 
 set_class_before_query:
   # Uses list context
-  src: "<div class='foo_#{title}' do='images in site'></div>"
+  src: "<div class='foo_#{first.title}' do='images in site'></div>"
   res: "<div class='foo_Autumn Tree'></div>"
 
 flash_messages:
@@ -509,3 +512,12 @@ with_a_custom_img_tag_field_with_JS:
 invalid_document:
   src: "<r:zazen text='!21!'/>"
   res: "/images/ext/project.png/"
+
+uuid:
+  src: "<div id='foo#{uuid}'>hop</div>"
+  res: "/<div id='foou[a-z0-9]+'>hop</div>/"
+
+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"

data/test/integration/zafu_compiler/forms.yml

@@ -123,6 +123,7 @@ checkbox:
 checkbox_literal_auto_trans:
   context:
     node: 'people'
+    lang: 'fr'
   src: "<r:load dictionary='/Default skin/translations'><r:checkbox name='assigned' values='1,2'/></r:load>"
   tem: "/foo/"
   res: "/value='1'/> <span>foo</span>/"

data/test/integration/zafu_compiler/query.yml

@@ -104,6 +104,12 @@ interval_date_en:
   tem: "<%= query_parse('para' => %{2010/1/1..2010/12/31}) %>"
   res: "para >= '2009-12-31 23:00' and para <= '2010-12-30 23:00'"
 
+interval_date_iso:
+  context:
+    lang: en
+  tem: "<%= query_parse('para' => %{2010-1-1..2010-12-31}) %>"
+  res: "para >= '2009-12-31 23:00' and para <= '2010-12-30 23:00'"
+
 like:
   tem: "<%= query_parse('para' => %{*bar}) %>"
   res: "para like \"%bar\""
@@ -265,7 +271,7 @@ select_in_from_saved:
   res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it&#39;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>"
+  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:first do='pt'/>: <r:each join=', ' do='it'/></div>"
   res: "<div>a wiki with Zena: bird, flower / Clean Water project: it&#39;s a lake</div>"
 
 select_group_count:

data/test/integration/zafu_compiler/relations.yml

@@ -392,23 +392,23 @@ where_with_param:
 group_by_secret_project:
   context:
     visitor: ant
-  src: "<r:pages where='title like \"t%\"' in='site' order='title ASC' do='group' by='project'><b do='project' do='title'/>: <r:each join=',' do='title'/></r:pages>"
+  src: "<r:pages where='title like \"t%\"' in='site' order='title ASC' do='group' by='project'><b do='first.project' do='title'/>: <r:each join=',' do='title'/></r:pages>"
   res: ": Talk<b>Zena the wild CMS</b>: Top menu"
 
 group_by_project:
   context:
     visitor: lion
-  src: "<r:notes in='site' order='title ASC' do='group' by='project'><b do='project' do='title'/>: <r:each join=',' do='title'/></r:notes>"
+  src: "<r:notes in='site' order='title ASC' do='group' by='project'><b do='first.project' do='title'/>: <r:each join=',' do='title'/></r:notes>"
   res: "<b>Clean Water project</b>: parc opening<b>Secret</b>: Proposition<b>Zena the wild CMS</b>: zena enhancements"
 
 group_by_project_sort_zip:
   context:
     visitor: ant
-  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>"
+  src: "<r:images in='site' order='zip ASC' do='group' by='project' sort='id'><b do='first.project' do='title'/>: <r:each join=', ' do='title'/></r:images>"
   res: "<b>Clean Water project</b>: it&#39;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>"
+  src: "<r:images in='site' order='title ASC' do='group' by='parent' sort='title'><b do='first.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&#39;s a lake"
 
 nodes_in_site_group_by_year:
@@ -466,12 +466,12 @@ array_count:
 
 first:
   src: "<div do='nodes in site'><r:first do='link'/></div>"
-  tem: "/if var2 = var1.first %><a href='<%= zen_path\(var2\) %>'><%=h var2.prop\['title'\] %>/"
+  tem: "/var2 = var1.first %><a href='<%= zen_path\(var2\) %>'><%=h var2.prop\['title'\] %>/"
   res: '/a href.*a wiki with Zena/'
 
 rubyless_first:
   src: "<div do='nodes in site'><span do='first.title'/></div>"
-  tem: "/span><%=h \(var1.first \? var1.first.prop\['title'\] : nil\) %>/"
+  tem: "/span><%=h var1.first.prop\['title'\] %>/"
   res: '<div><span>a wiki with Zena</span></div>'
 
 query_in_array:
@@ -493,4 +493,9 @@ core_context:
 
 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'/"
+  tem: "/nodes.created_at < '2010-05-01'/"
+
+l_status_sum_group_year:
+  src: '<r:void do="set_tags select l_status.sum as s from nodes select created_at as c in site group by c.month" do="each" join=", "><r:s/>: <r:c/></r:void>'
+#  tem: 'xxx'
+  res: '15: 2006-03-10 00:00:00'

data/test/integration/zafu_compiler/roles.yml

@@ -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,settings,tz,weight), Task (assigned), Letter (paper,search,search_mono)"
+  res: "Node (summary,text,title), Original (origin,settings,tz,weight), Task (assigned), Note (info), 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 (4), Task (1), Letter (3)"
+  res: "Node (3), Original (4), Task (1), Note (1), Letter (3)"
 
 vclass_context:
   src: "<r:Image><r:name/></r:Image>"
@@ -131,7 +131,7 @@ manual_select:
 
 inspect_display_links:
   src: |
-    <r:Template do='relations' do='each' set_rel='name' do='main'>
+    <r:Template do='relations' do='each' do='main' set_rel='name'>
       <h3 do='rel'/>
       <ul do='query' default='nodes' select='#{rel}s'>
         <li do='each' do='link'/>

data/test/integration/zafu_compiler/rubyless.yml

@@ -85,8 +85,7 @@ ancestors_on_root:
 
 prop_in_list_context:
   src: "<div do='nodes in site'><r:title/></div>"
-  tem: "/var1.first.prop\['title'\]/"
-  res: '<div>a wiki with Zena</div>'
+  tem: "/unknown method <span class='type'>title..</span> .\[Node\] context./"
 
 role_existing_class_name:
   # Should understand 'Comment' as a Role.

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -169,6 +169,11 @@ 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\"\}\)/"
+
+string_from_string:
+  src: "<b do='set' a='string_hash(%q[{\"pack\": 4}])'>AAA<r:eval>a['pack']</r:eval></b>"
+  res: "<b>AAA4</b>"
+  tem: "/StringHash.from_string/"
   
 aparams:
   context:

data/test/sites/complex/roles.yml

@@ -29,4 +29,4 @@ Course:
 
 Formation:
   kpath:           NNF
-  real_class:      Note
+  real_class:      Note