zena 1.2.2 → 1.2.3

data/test/unit/exif_data_test.rb

@@ -51,7 +51,12 @@ class ExifDataTest < Test::Unit::TestCase
 
   def test_to_json_should_ignore_symbols
     e = ExifData.new("Make" => "SONY", "DateTime" => "1998:10:01 10:15:30")
-    assert_equal '{"data":{"Make":"SONY","DateTime":"1998:10:01 10:15:30"},"json_class":"ExifData"}', e.to_json
+    # '{"data":{"Make":"SONY","DateTime":"1998:10:01 10:15:30"},"json_class":"ExifData"}'
+    keys = []
+    e.to_json.gsub(/"([^"]+)"/) do |m|
+      keys << m
+    end
+    assert_equal '"1998:10:01 10:15:30","DateTime","ExifData","Make","SONY","data","json_class"', keys.sort.join(',')
   end
 
   def test_gps_longitude

data/test/unit/group_test.rb

@@ -107,12 +107,27 @@ class GroupTest < Zena::Unit::TestCase
     assert groups(:admin).users.include?(users(:ant))
   end
 
-  def test_cannot_update_site_or_public
+  def test_cannot_update_site_or_public_user_ids
     login(:lion)
     group = groups(:public)
-    assert !group.update_attributes(:user_ids=>[])
+    # ignores user_ids
+    assert group.update_attributes(:user_ids=>[])
+    assert_equal [users_id(:ant), users_id(:anon), users_id(:tiger), users_id(:lion)].sort, group.user_ids.sort
     group = groups(:workers)
-    assert !group.update_attributes(:user_ids=>[])
+    # ignores user_ids
+    assert group.update_attributes(:user_ids=>[])
+    assert_equal [users_id(:ant), users_id(:tiger), users_id(:lion)].sort, group.user_ids.sort
+  end
+  
+  def test_can_update_site_or_public_name
+    login(:lion)
+    group = groups(:public)
+    assert group.update_attributes(:name=>'pub')
+    assert_equal 'pub', groups(:public).name
+    
+    group = groups(:workers)
+    assert group.update_attributes(:name=>'logged-in', :user_ids => [])
+    assert_equal 'logged-in', groups(:workers).name
   end
 
   def test_cannot_destroy_group_with_nodes

data/test/unit/node_test.rb

@@ -1369,13 +1369,6 @@ done: \"I am done\""
     end
   end
 
-  # FIXME: write test
-  def test_assets
-    print 'P'
-    # sweep_cache (save) => remove asset folder
-    # render math ?
-  end
-
   def find_node_by_pseudo(string, base_node = nil)
     secure(Node) { Node.find_node_by_pseudo(string, base_node || @node) }
   end

data/test/unit/project_test.rb

@@ -15,6 +15,10 @@ class ProjectTest < Zena::Unit::TestCase
   end
 
   def test_update_set_project_id_on_update
+    login(:lion)
+    # Memory based cache leaks. Make sure we start with a clean cache.
+    VirtualClass.expire_cache!
+    
     login(:tiger)
     node = secure!(Project) { Project.find(nodes_id(:cleanWater))}
     assert_equal nodes_id(:cleanWater), node.get_project_id

data/test/unit/relation_proxy_test.rb

@@ -232,12 +232,12 @@ class RelationProxyTest < Zena::Unit::TestCase
     node = secure!(Node) { nodes(:cleanWater) }
     assert_equal 'very hot', node.find(:first, 'hot').l_comment
     # modify again
-    node.update_attributes(:link_id => links_id(:status_hot_for_cleanWater), :l_comment => 'very hot', :l_status => '45')
+    node.update_attributes(:link_id => links_id(:status_hot_for_cleanWater), :l_comment => 'not hot', :l_status => '45')
     assert node.save
     # reload
     hot  = node.find(:first, 'hot')
     node = secure!(Node) { nodes(:cleanWater) }
-    assert_equal 'very hot', hot.l_comment
+    assert_equal 'not hot', hot.l_comment
     assert_equal 45,         hot.l_status
   end
 

data/test/unit/remote_test.rb

@@ -58,15 +58,6 @@ class RemoteTest < Zena::Integration::TestCase
           assert_equal ['News list'], subject.all('title like "%w%"').map(&:title)
         end
       end # finding nodes
-
-      context 'getting Klass attributes' do
-        should 'return list of properties' do
-          # TODO
-          print 'P'
-          #assert_equal {}, subject.properties
-        end
-      end # getting Klass attributes
-
     end # and a remote class
 
 

data/test/unit/role_test.rb

@@ -278,7 +278,7 @@ class RoleTest < Zena::Unit::TestCase
             e = assert_raise(Exception) do
               subject.import_columns({
                 'one' => {
-                  'ptype' => 'stringbar',
+                  'ptype' => 'string',
                 },
                 'paper' => {
                   'ptype' => 'integer',

data/test/unit/string_hash_test.rb

@@ -12,7 +12,7 @@ class StringHashTest < Test::Unit::TestCase
     end
     
     should 'convert to json' do
-      assert_match %r{\{"data":\{"b":"2","a":"1"|"a":"1","b":"2"\},"json_class":"StringHash"\}}, subject.to_json
+      assert_match %r{"json_class":"StringHash",\{"data":\{"b":"2","a":"1"|"a":"1","b":"2"\}\}|\{"data":\{"b":"2","a":"1"|"a":"1","b":"2"\},"json_class":"StringHash"\}}, subject.to_json
     end
     
     should 'create from json' do

data/test/unit/text_document_test.rb

@@ -27,17 +27,17 @@ class TextDocumentTest < Zena::Unit::TestCase
           #header { background:url('bird.jpg') }
           #pv     { background:url('bird_pv.jpg') }
           #footer { background:url('/projects list/a wiki with Zena/flower.jpg') }
-          #no_stamp { background:url('/en/image30_pv.jpg?100001001345') }
+          #no_stamp { background:url('/en/image30_pv.7f6f0.jpg') }
           END_CSS
 
           assert subject.update_attributes(:text => css)
 
           parsed_css =<<-END_CSS
           body { font-size:10px; }
-          #header { background:url('/en/image30.jpg?1144713600') }
-          #pv     { background:url('/en/image30_pv.jpg?967816914293') }
-          #footer { background:url('/en/image31.jpg?1144713600') }
-          #no_stamp { background:url('/en/image30_pv.jpg?967816914293') }
+          #header { background:url('/en/image30.11fbc.jpg') }
+          #pv     { background:url('/en/image30_pv.7f6f0.jpg') }
+          #footer { background:url('/en/image31.11fbc.jpg') }
+          #no_stamp { background:url('/en/image30_pv.7f6f0.jpg') }
           END_CSS
 
           assert_equal parsed_css, subject.text
@@ -141,11 +141,11 @@ class TextDocumentTest < Zena::Unit::TestCase
     assert node.errors.empty?
     res =<<-END_CSS
     body { font-size:10px; behavior:url("/stylesheets/csshover2.htc?#{File.mtime(File.join(RAILS_ROOT, 'public/stylesheets/csshover2.htc')).to_i}"); }
-    #header { background:url('/en/image30.jpg?1144713600') }
-    #pv     { background:url('/en/image30_pv.jpg?967816914293') }
-    #footer { background:url('/en/image31.jpg?1144713600') }
-    #back   { background:url('/en/image31.jpg?1144713600') }
-    #no_stamp { background:url('/en/image30_pv.jpg?967816914293') }
+    #header { background:url('/en/image30.11fbc.jpg') }
+    #pv     { background:url('/en/image30_pv.7f6f0.jpg') }
+    #footer { background:url('/en/image31.11fbc.jpg') }
+    #back   { background:url('/en/image31.11fbc.jpg') }
+    #no_stamp { background:url('/en/image30_pv.7f6f0.jpg') }
     END_CSS
     assert_equal res, text
     text = node.parse_assets(text, helper, 'text')
@@ -186,9 +186,9 @@ class TextDocumentTest < Zena::Unit::TestCase
     assert node.errors.empty?
     res =<<-END_CSS
     body { font-size:10px; }
-    #header { background:url('/en/image30.jpg?1144713600') }
-    #tiny   { background:url('/en/image30_tiny.jpg?812062401186') }
-    #footer { background:url('/en/image31.jpg?1144713600') }
+    #header { background:url('/en/image30.11fbc.jpg') }
+    #tiny   { background:url('/en/image30_tiny.0059b.jpg') }
+    #footer { background:url('/en/image31.11fbc.jpg') }
     END_CSS
     assert_equal res, text
   end

data/test/unit/zena/use/html_tags_test.rb

@@ -24,12 +24,12 @@ class HtmlTagsTest < Zena::View::TestCase
           assert_match 'img', img_tag(subject)
         end
 
-        should 'append timestamp' do
-          assert_match %r{\?1144713600}, img_tag(subject)
+        should 'use timestamp' do
+          assert_match %r{image30.11fbc.jpg}, img_tag(subject)
         end
 
         should 'use IFormat for timestamp' do
-          assert_match %r{\?967816914293}, img_tag(subject, :mode => 'pv')
+          assert_match %r{image30_pv.7f6f0.jpg}, img_tag(subject, :mode => 'pv')
         end
 
         should 'set class from mode' do
@@ -134,7 +134,7 @@ class HtmlTagsTest < Zena::View::TestCase
           end
 
           should 'show notice' do
-            assert_match %r{Amy & Eve}, flash_messages(:show => 'both')
+            assert_match %r{Amy &amp; Eve}, flash_messages(:show => 'both')
           end
         end
 
@@ -222,7 +222,7 @@ class HtmlTagsTest < Zena::View::TestCase
 
   def test_alt_with_apos
     doc = secure!(Node) { nodes(:lake_jpg) }
-    assert_equal "<img src='/en/projects-list/Clean-Water-project/image24.jpg?1144713600' width='600' height='440' alt='it&apos;s a lake' class='full'/>", img_tag(doc)
+    assert_equal "<img src='/en/projects-list/Clean-Water-project/image24.11fbc.jpg' width='600' height='440' alt='it&apos;s a lake' class='full'/>", img_tag(doc)
   end
 
   def test_select_id
@@ -281,7 +281,7 @@ class HtmlTagsTest < Zena::View::TestCase
     assert_equal [], @controller.js_data
     img_tag(img, :mode => 'med', :id => 'flop') # med has a popup setting
     popup_data = JSON.load(@controller.js_data[0][%r{\A.*?(\{.*\}).*\Z},1])
-    assert_equal '/en/image30_std.jpg?929831698949', popup_data['src']
+    assert_equal '/en/image30_std.75a9a.jpg', popup_data['src']
     assert_equal 400, popup_data['height']
     assert_equal 440, popup_data['width']
   end

data/test/unit/zena/use/rendering_test.rb

@@ -54,7 +54,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
   def make_template(zafu, mode = 'special')
     login(:lion)
     # create template for 'special' mode
-    secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => "Node-#{mode}.zafu", :text => zafu, :v_status => Zena::Status::Pub) }
+    @template = secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => "Node-#{mode}.zafu", :text => zafu, :v_status => Zena::Status::Pub) }
   end
 
   context 'A custom rendering engine' do
@@ -96,7 +96,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
 
   end # A custom rendering engine
 
-  context 'Custom rendering options' do
+  context 'Custom headers' do
     subject do
       login(:lion)
       # create template for 'special' mode
@@ -117,7 +117,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
         assert_equal v, @response.headers[k]
       end
     end
-  end # Custom rendering options
+  end # Custom headers
 
   context 'special rendering zafu' do
     subject do
@@ -185,17 +185,17 @@ class RenderingInControllerTest < Zena::Controller::TestCase
     end # to update
   end # special rendering zafu
 
-  context 'Custom rendering options on html' do
+  context 'Custom headers on html' do
+    setup do
+      make_template %q{<r:headers X-Foobar='my thing' Content-Type='text/css' Content-Disposition='attachment; filename=special_#{title}.csv'/>}, 'bar'
+    end
+    
     subject do
-      login(:lion)
-      # create template for 'special' mode
-      @template = secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Node-bar.zafu', :text => @zafu, :v_status => Zena::Status::Pub) }
       login(:anon)
       {:action => 'show', :controller => 'nodes', :path => ["section#{nodes_zip(:people)}_bar.html"], :prefix => 'en'}
     end
 
     should 'set type and disposition headers' do
-      @zafu = %q{<r:headers X-Foobar='my thing' Content-Type='text/css' Content-Disposition='attachment; filename=special_#{title}.csv'/>}
       get_subject
       assert_response :success
       {
@@ -206,13 +206,23 @@ class RenderingInControllerTest < Zena::Controller::TestCase
         assert_equal v, @response.headers[k]
       end
     end
+  end
+  
+  context 'With a master template' do
+    setup do
+      make_template %q{MASTER_TEMPLATE[<r:master_template do='id'/>]}, 'baz'
+    end
+    
+    subject do
+      login(:anon)
+      {:action => 'show', :controller => 'nodes', :path => ["section#{nodes_zip(:people)}_baz.html"], :prefix => 'en'}
+    end
     
     should 'find master template' do
-      @zafu = %q{MASTER_TEMPLATE[<r:master_template do='id'/>]}
       get_subject
       assert_response :success
       assert_equal "MASTER_TEMPLATE[#{@template.zip}]", @response.body
     end
-  end # Custom rendering options
+  end # Custom headers on html
 
 end

data/test/unit/zena/use/urls_test.rb

@@ -26,7 +26,7 @@ class UrlsTest < Zena::View::TestCase
     node = secure!(Node) { nodes(:people) }
     assert_equal '/en/section12.html', zen_path(node)
     assert_equal '/en/section12_test.html', zen_path(node, :mode=>'test')
-    assert_match %r{/tt/section12_test.jpg}, zen_path(node, :mode=>'test', :prefix=>'tt', :format=>'jpg')
+    assert_match %r{/tt/section12_test.11fbc.jpg}, zen_path(node, :mode=>'test', :prefix=>'tt', :format=>'jpg')
     node = secure!(Node) { nodes(:cleanWater) }
     assert_equal '/en/projects-list/Clean-Water-project', zen_path(node)
     assert_equal '/en/projects-list/Clean-Water-project_test', zen_path(node, :mode=>'test')
@@ -56,41 +56,43 @@ class UrlsTest < Zena::View::TestCase
   def test_zen_path_cache_stamp
     login(:ant)
     node = secure!(Node) { nodes(:zena) }
-    assert_equal '/oo/project11.png?1144713600', zen_path(node, :format => 'png')
+    assert_equal '/oo/project11.11fbc.png', zen_path(node, :format => 'png')
     node = secure!(Node) { nodes(:bird_jpg) }
-    assert_equal '/en/image30.jpg?1144713600', zen_path(node, :format => 'jpg')
+    assert_equal '/en/image30.11fbc.jpg', zen_path(node, :format => 'jpg')
     node = secure!(Node) { nodes(:style_css) }
-    assert_equal '/en/textdocument54.css?1144713600', zen_path(node, :format => 'css')
+    assert_equal '/en/textdocument54.11fbc.css', zen_path(node, :format => 'css')
 
     login(:anon)
     node = secure!(Node) { nodes(:cleanWater) }
-    assert_equal '/en/projects-list/Clean-Water-project.jpg?1144713600', zen_path(node, :format => 'jpg')
+    assert_equal '/en/projects-list/Clean-Water-project.11fbc.jpg', zen_path(node, :format => 'jpg')
   end
 
   def test_make_cachestamp
     login(:lion)
 
     node = secure!(Node) { nodes(:bird_jpg) }
-    assert_equal '967816914293', make_cachestamp(node, 'pv')
+    base = '7f6f0'
+    assert_equal base, make_cachestamp(node, 'pv')
     # update pv
     imf = Iformat.create(:name => 'pv', :width => 70, :height=> 70, :size=> 'force')
     assert !imf.new_record?
     # same hash
-    assert_equal '967816914293', make_cachestamp(node, 'pv')
+    assert_equal base, make_cachestamp(node, 'pv')
 
     assert Iformat.update(imf.id, :width => 60)
-    assert_equal '8889395035', make_cachestamp(node, 'pv')
+    assert_equal '14052', make_cachestamp(node, 'pv')
+    assert_not_equal base, '14052'
 
     assert Iformat.update(imf.id, :width => 70)
     # should be the same as first
-    assert_equal '967816914293', make_cachestamp(node, 'pv')
+    assert_equal base, make_cachestamp(node, 'pv')
   end
 
   def test_zen_path_cachestamp_image_mode
     login(:ant)
     node = secure!(Node) { nodes(:bird_jpg) }
-    assert_equal "/en/image30.jpg?#{node.updated_at.to_i}", zen_path(node, :format => 'jpg')
-    assert_equal "/en/image30_pv.jpg?#{node.updated_at.to_i + Iformat['pv'][:hash_id]}", zen_path(node, :format => 'jpg', :mode => 'pv')
+    assert_equal "/en/image30.#{make_cachestamp(node,nil)}.jpg", zen_path(node, :format => 'jpg')
+    assert_equal "/en/image30_pv.#{make_cachestamp(node, 'pv')}.jpg", zen_path(node, :format => 'jpg', :mode => 'pv')
   end
 
   def test_zen_path_with_anchor
@@ -101,20 +103,20 @@ class UrlsTest < Zena::View::TestCase
   def test_zen_path_asset
     login(:ant)
     node = secure!(Node) { nodes(:zena) }
-    assert_equal "/oo/project11.abcd.html", zen_path(node, :asset=>'abcd')
+    assert_equal "/oo/project11=abcd.html", zen_path(node, :asset=>'abcd')
     node = secure!(Node) { nodes(:people) }
-    assert_equal "/oo/section12.m1234.png?1144713600", zen_path(node, :asset=>'m1234', :format=>'png')
+    assert_equal "/oo/section12=m1234.#{make_cachestamp(node,nil)}.png", zen_path(node, :asset=>'m1234', :format=>'png')
 
     login(:anon)
     node = secure!(Node) { nodes(:zena) }
-    assert_equal "/en/project11.abcd.png?1144713600", zen_path(node, :asset=>'abcd', :format=>'png')
+    assert_equal "/en/project11=abcd.11fbc.png", zen_path(node, :asset=>'abcd', :format=>'png')
     node = secure!(Node) { nodes(:people) }
-    assert_equal "/en/section12.kls.html", zen_path(node, :asset=>'kls')
-    assert_equal "/tt/section12.foo.jpg?1144713600", zen_path(node, :mode=>'test', :prefix=>'tt', :format=>'jpg', :asset => 'foo')
+    assert_equal "/en/section12=kls.html", zen_path(node, :asset=>'kls')
+    assert_equal "/tt/section12=foo.11fbc.jpg", zen_path(node, :mode=>'test', :prefix=>'tt', :format=>'jpg', :asset => 'foo')
     node = secure!(Node) { nodes(:cleanWater) }
-    assert_equal "/en/projects-list/Clean-Water-project.kls", zen_path(node, :asset => 'kls')
+    assert_equal "/en/projects-list/Clean-Water-project=kls", zen_path(node, :asset => 'kls')
     node = secure!(Node) { nodes(:status) }
-    assert_equal "/en/projects-list/Clean-Water-project/page22.abcd.png?1144713600", zen_path(node, :asset => 'abcd', :format => 'png')
+    assert_equal "/en/projects-list/Clean-Water-project/page22=abcd.11fbc.png", zen_path(node, :asset => 'abcd', :format => 'png')
   end
 
   def test_zen_url
@@ -143,6 +145,7 @@ class UrlsTest < Zena::View::TestCase
     node = secure!(Node) { nodes(:water_pdf) }
     assert node.update_attributes( :rgroup_id => groups_id(:workers), :inherit => 0 )
     assert !node.public?
+    assert !node.v_public?
     assert_equal "/oo/projects-list/Clean-Water-project/document25.pdf", data_path(node)
     node = secure!(Node) { nodes(:status) }
     assert_equal "/oo/projects-list/Clean-Water-project/page22.html", data_path(node)

data/test/unit/zena/use/zafu_template_test.rb

@@ -56,11 +56,6 @@ class ZafuTemplateTest < Zena::View::TestCase
         visiting(:wiki)
         assert_match %r{/wiki skin/Node}, @controller.send(:template_url)
       end
-
-      should 'not insert dev_box for non html content' do
-        # TODO
-        print 'P'
-      end
     end # with an admin visitor
 
     context 'without an admin visitor' do

data/test/unit/zena/use/zazen_test.rb

@@ -49,15 +49,15 @@ class ZazenTest < Zena::View::TestCase
 
   def test_make_image
     # * [!24!] inline image 24. (default format is 'pv' defined in #ImageBuilder). Options are :
-    assert_equal "<p><img src='/en/projects-list/Clean-Water-project/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/></p>", zazen('!24!')
+    assert_equal "<p><img src='/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg' width='545' height='400' alt='it&apos;s a lake' class='std'/></p>", zazen('!24!')
     # ** [!024!] inline image, default format, link to full image.
-    assert_equal "<p><a class='popup' href='/en/projects-list/Clean-Water-project/image24.jpg?1144713600' target='_blank'><img src='/en/projects-list/Clean-Water-project/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/></a></p>", zazen('!024!')
+    assert_equal "<p><a class='popup' href='/en/projects-list/Clean-Water-project/image24.11fbc.jpg' target='_blank'><img src='/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg' width='545' height='400' alt='it&apos;s a lake' class='std'/></a></p>", zazen('!024!')
   end
 
   def test_make_image_with_document
-    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!25!')
-    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!025!') # same as '!25!'
-    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25\.pdf.*img src='/images/ext/pdf_pv.png' width='70' height='70' alt='pdf document' class='doc'/></a></p>}, zazen('!25_pv!')
+    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!25!')
+    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!025!') # same as '!25!'
+    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25.pdf.*img src='/images/ext/pdf_pv.png' width='70' height='70' alt='pdf document' class='doc'/></a></p>}, zazen('!25_pv!')
   end
 
   def test_make_bad_image
@@ -66,34 +66,34 @@ class ZazenTest < Zena::View::TestCase
 
   def test_make_image_align
     # ** [!<.24!] or [!<24!] inline image surrounded with <p class='float_left'></p>
-    assert_match %r{class='img_left'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!<.24!')
-    assert_match %r{class='img_left'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!<24!')
+    assert_match %r{class='img_left'.*img.*/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg.*class='std'}, zazen('!<.24!')
+    assert_match %r{class='img_left'.*img.*/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg.*class='std'}, zazen('!<24!')
     # ** [!>.24!] inline image surrounded with <p class='float_right'></p>
-    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!>.24!')
-    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!>24!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg.*class='std'}, zazen('!>.24!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg.*class='std'}, zazen('!>24!')
     # ** [!=.24!] inline image with <p class='center'></p>
-    assert_match %r{class='img_center'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!=.24!')
-    assert_match %r{class='img_center'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!=24!')
+    assert_match %r{class='img_center'.*img.*/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg.*class='std'}, zazen('!=.24!')
+    assert_match %r{class='img_center'.*img.*/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg.*class='std'}, zazen('!=24!')
   end
 
   def test_make_iformat
     # ** [!24_pv!] inline image transformed to format 'pv'. Formats are defined in #ImageBuilder.
-    assert_match %r{.*img.*/en/projects-list/Clean-Water-project/image24.jpg.*600.*440.*class='full'}, zazen('!24_full!')
-    assert_match %r{.*img.*/en/projects-list/Clean-Water-project/image24_tiny.jpg.*16.*16.*class='tiny'}, zazen('!24_tiny!')
+    assert_match %r{.*img.*/en/projects-list/Clean-Water-project/image24.[0-9a-f]+.jpg.*600.*440.*class='full'}, zazen('!24_full!')
+    assert_match %r{.*img.*/en/projects-list/Clean-Water-project/image24_tiny.[0-9a-f]+.jpg.*16.*16.*class='tiny'}, zazen('!24_tiny!')
   end
 
   def test_all_options
     # ** all the options above can be used together as in [!>.26.std!] : inline image on the right, size 'med'.
-    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_mini.jpg.*32.*32.*class='mini'}, zazen('!>24_mini!')
-    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_mini.jpg.*32.*32.*class='mini'}, zazen('!>.24_mini!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_mini.[0-9a-f]+.jpg.*32.*32.*class='mini'}, zazen('!>24_mini!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_mini.[0-9a-f]+.jpg.*32.*32.*class='mini'}, zazen('!>.24_mini!')
   end
 
   def test_make_gallery
     # ** [![2,3,5]!] gallery : inline preview with javascript inline viewer
-    assert_match %r{table.*gallery.*Zena.transfer.*image24_pv.jpg.*image24_std.jpg.*image30_pv.jpg.*image30_std.jpg}m, zazen('![24,30]!')
+    assert_match %r{table.*gallery.*Zena.transfer.*image24_pv.*image24_std.*image30_pv.*image30_std}m, zazen('![24,30]!')
     @node = secure!(Node) { Node.find(nodes_id(:wiki)) }
     # ** [![]!] gallery with all images contained in the current node
-    assert_match %r{table.*gallery.*Zena.transfer.*image30_pv.jpg.*image30_std.jpg.*image31_pv.jpg.*image31_std.jpg}m, zazen('![]!')
+    assert_match %r{table.*gallery.*Zena.transfer.*image30_pv.*image30_std.*image31_pv.*image31_std}m, zazen('![]!')
   end
 
   def test_make_gallery_bad_zips
@@ -118,13 +118,13 @@ class ZazenTest < Zena::View::TestCase
 
   def test_image_as_link
     # * [!26!:37] you can use an image as the source for a link
-    assert_zazen_match "p a[@href='/en/projects-list/Clean-Water-project'] img.std[@src='/en/image30_std.jpg?929831698949'][@width='440'][@height='400']", '!30!:21'
+    assert_zazen_match "p a[@href='/en/projects-list/Clean-Water-project'] img.std[@src='/en/image30_std.75a9a.jpg'][@width='440'][@height='400']", '!30!:21'
     # * [!26!:www.example.com] use an image for an outgoing link
-    assert_zazen_match "p a[@href='http://www.example.com'] img.std[@src='/en/image30_std.jpg?929831698949']", '!30!:http://www.example.com'
+    assert_zazen_match "p a[@href='http://www.example.com'] img.std[@src='/en/image30_std.75a9a.jpg']", '!30!:http://www.example.com'
   end
 
   def test_full
-    assert_zazen_match "div.img_left a[@href='/en/projects-list/Clean-Water-project'][@onclick*=window.open] img.std[@src='/en/projects-list/Clean-Water-project/image24_std.jpg?929831698949'][@width='545'][@height='400'][@alt*=lake]", '!<.24_3!:021'
+    assert_zazen_match "div.img_left a[@href='/en/projects-list/Clean-Water-project'][@onclick*=window.open] img.std[@src='/en/projects-list/Clean-Water-project/image24_std.75a9a.jpg'][@width='545'][@height='400'][@alt*=lake]", '!<.24_3!:021'
   end
 
   def test_empty_image_ref
@@ -139,7 +139,7 @@ class ZazenTest < Zena::View::TestCase
 
   def test_pseudo_id
     assert_zazen_match "a[@href='/en/contact15.html'][text()='people/Panthera Leo Verneyi']", 'This is a "link"::Leo.'
-    assert_zazen_match "a[@href='/en/image30_pv.jpg?967816914293'][text()='projects list/a wiki with Zena/bird_pv.jpg']", 'This is a "link"::bir_pv.data.'
+    assert_zazen_match "a[@href='/en/image30_pv.7f6f0.jpg'][text()='projects list/a wiki with Zena/bird_pv.jpg']", 'This is a "link"::bir_pv.data.'
   end
 
   context 'An absolute pseudo path' do
@@ -156,7 +156,7 @@ class ZazenTest < Zena::View::TestCase
     end
 
     should 'resolve as image without using the current node' do
-      assert_match %Q{img[@src='/en/image30_std.jpg?929831698949']}, zazen(%Q{See !#{subject}!})
+      assert_match %Q{img[@src='/en/image30_std.75a9a.jpg']}, zazen(%Q{See !#{subject}!})
     end
 
 
@@ -166,7 +166,7 @@ class ZazenTest < Zena::View::TestCase
       end
 
       should 'resolve with mode in image tag' do
-        assert_equal "<p>See <img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='bird' class='side'/></p>", zazen(%Q{See !#{subject}!})
+        assert_equal "<p>See <img src='/en/image30_side.9698b.jpg' width='220' height='500' alt='bird' class='side'/></p>", zazen(%Q{See !#{subject}!})
       end
 
       should 'resolve with mode as link' do
@@ -174,11 +174,11 @@ class ZazenTest < Zena::View::TestCase
       end
 
       should 'resolve with mode as link to image' do
-        assert_equal "<p>Read <a href=\"/en/image30_side.html\"><img src='/en/image30_std.jpg?929831698949' width='440' height='400' alt='bird' class='std'/></a></p>", zazen(%Q{Read !30!:#{subject}})
+        assert_equal "<p>Read <a href=\"/en/image30_side.html\"><img src='/en/image30_std.75a9a.jpg' width='440' height='400' alt='bird' class='std'/></a></p>", zazen(%Q{Read !30!:#{subject}})
       end
 
       should 'resolve with mode as link and image tag' do
-        assert_equal "<p>See <a href=\"/en/image30_side.html\"><img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='bird' class='side'/></a></p>", zazen(%Q{See !#{subject}!:#{subject}})
+        assert_equal "<p>See <a href=\"/en/image30_side.html\"><img src='/en/image30_side.9698b.jpg' width='220' height='500' alt='bird' class='side'/></a></p>", zazen(%Q{See !#{subject}!:#{subject}})
       end
     end
   end # An absolute pseudo path