@@ -68,6 +68,8 @@ class TextDocument < Document else if new_src = helper.send(:template_url_for_asset, :src => src, :current_folder=>current_folder, :parse_assets => true) "url(#{quote}#{new_src}#{quote})" + elsif !(src =~ /\.\./) && File.exist?(File.join(SITES_ROOT, current_site.public_path, src)) + "url(#{quote}#{src}?#{File.mtime(File.join(SITES_ROOT, current_site.public_path, src)).to_i}#{quote})" else errors.add('asset', '{{asset}} not found', :asset => src.inspect) "url(#{quote}#{src}#{quote})" @@ -93,17 +95,20 @@ class TextDocument < Document $& else quote, url = $1, $2 - if url =~ /\A\/\w\w.*?(\d+)(_\w+|)\./ + if url =~ /\A\/\w\w\/.*?(\d+)(_\w+|)\./ zip, mode = $1, $2 - unless asset = secure(Node) { Node.find_by_zip(zip) } + if asset = secure(Node) { Node.find_by_zip(zip) } + if asset.fullpath =~ /\A#{current_folder}\/(.+)/ + "url(#{quote}#{$1}#{mode}.#{asset.version.content.ext}#{quote})" + else + "url(#{quote}/#{asset.fullpath}#{mode}.#{asset.version.content.ext}#{quote})" + end + else errors.add('asset', '{{zip}} not found', :zip => zip) "url(#{quote}#{url}#{quote})" end - if asset.fullpath =~ /\A#{current_folder}\/(.+)/ - "url(#{quote}#{$1}#{mode}.#{asset.version.content.ext}#{quote})" - else - "url(#{quote}/#{asset.fullpath}#{mode}.#{asset.version.content.ext}#{quote})" - end + elsif File.exist?(File.join(SITES_ROOT, current_site.public_path, url.sub(/\?\d+\Z/,''))) + "url(#{quote}#{url.sub(/\?\d+\Z/,'')}#{quote})" else # bad format errors.add('base', "cannot unparse asset url #{url.inspect}") app/models/text_document.rb @@ -54,7 +54,7 @@ class TextDocumentTest < Zena::Unit::TestCase assert bird.update_attributes(:parent_id => node[:parent_id]) Zena::Db.set_attribute(bird, :updated_at, b_at) start =<<-END_CSS - body { font-size:10px; } + body { font-size:10px; behavior:url("/stylesheets/csshover2.htc"); } #header { background:url('bird.jpg') } #pv { background:url('bird_pv.jpg') } #footer { background:url('/projects/wiki/flower.jpg') } @@ -68,7 +68,7 @@ class TextDocumentTest < Zena::Unit::TestCase text = node.parse_assets(start, helper, 'v_text') assert node.errors.empty? res =<<-END_CSS - body { font-size:10px; } + body { font-size:10px; behavior:url("/stylesheets/csshover2.htc?1256556568"); } #header { background:url('/en/image30.jpg?1144713600') } #pv { background:url('/en/image30_pv.jpg?967816914293') } #footer { background:url('/en/image31.jpg?1144713600') } @@ -80,7 +80,7 @@ class TextDocumentTest < Zena::Unit::TestCase assert_equal res, text text = node.unparse_assets(text, helper, 'v_text') unparsed =<<-END_CSS - body { font-size:10px; } + body { font-size:10px; behavior:url("/stylesheets/csshover2.htc"); } #header { background:url('bird.jpg') } #pv { background:url('bird_pv.jpg') } #footer { background:url('/projects/wiki/flower.jpg') } test/unit/text_document_test.rb 45f2c64174c2bbb0f9d1d27c3c33192e47f23526 Gaspard Bucher gaspard@teti.ch http://github.com/zena/zena/commit/ab96ca37cc3a5cfd4ab1fdb1ae1c39adba20db1e ab96ca37cc3a5cfd4ab1fdb1ae1c39adba20db1e 2009-11-09T05:34:34-08:00 2009-11-09T05:34:34-08:00 CSS should parser static assets from the site's public directory and add proper timestamp. d50061879672a9e851e7e1f69ca74912b081f823 Gaspard Bucher gaspard@teti.ch