deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed wiki/export_html, ticket:147

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-05-05 09:42:25 +00:00
parent dd10e838c5
commit 8755935bf6
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/wiki_controller.rb
View file

@ -260,13 +260,8 @@ class WikiController < ApplicationController
# add an index file, if exporting to HTML # add an index file, if exporting to HTML
if file_type.to_s.downcase == 'html' if file_type.to_s.downcase == 'html'
zip_out.put_next_entry 'index.html' zip_out.put_next_entry 'index.html'
zip_out.puts <<-EOL zip_out.puts "<html><head>" +
<html> "<META HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=HomePage.#{file_type}\"></head></html>"
<head>
<META HTTP-EQUIV="Refresh" CONTENT="0;URL=HomePage.#{file_type}">
</head>
</html>
EOL
end end
end end
FileUtils.rm_rf(Dir[File.join(@wiki.storage_path, file_prefix + '*.zip')]) FileUtils.rm_rf(Dir[File.join(@wiki.storage_path, file_prefix + '*.zip')])
@ -338,9 +333,12 @@ class WikiController < ApplicationController
def render_to_string(template_name, with_layout = false) def render_to_string(template_name, with_layout = false)
add_variables_to_assigns add_variables_to_assigns
@content_for_layout = @template.render_file(template_name) self.assigns['content_for_layout'] = @template.render_file(template_name)
if with_layout then @template.render_file('layouts/default'); if with_layout
else @content_for_layout; end @template.render_file('layouts/default')
else
self.assigns['content_for_layout']
end
end end
def rss_with_content_allowed? def rss_with_content_allowed?

20
test/functional/wiki_controller_test.rb
View file

@ -7,6 +7,8 @@
require File.dirname(__FILE__) + '/../test_helper' require File.dirname(__FILE__) + '/../test_helper'
require 'wiki_controller' require 'wiki_controller'
require 'rexml/document' require 'rexml/document'
require 'tempfile'
require 'zip/zipfilesystem'
# Raise errors beyond the default web-based presentation # Raise errors beyond the default web-based presentation
class WikiController; def rescue_action(e) logger.error(e); raise e end; end class WikiController; def rescue_action(e) logger.error(e); raise e end; end
@ -115,6 +117,24 @@ class WikiControllerTest < Test::Unit::TestCase
content = r.binary_content content = r.binary_content
assert_equal 'PK', content[0..1], 'Content is not a zip file' assert_equal 'PK', content[0..1], 'Content is not a zip file'
assert_equal :export, r.template_objects['link_mode'] assert_equal :export, r.template_objects['link_mode']
# Tempfile doesn't know how to open files with binary flag, hence the two-step process
Tempfile.open('instiki_export_file') { |f| @tempfile_path = f.path }
begin
File.open(@tempfile_path, 'wb') { |f| f.write(content); @exported_file = f.path }
Zip::ZipFile.open(@exported_file) do |zip|
assert_equal %w(Elephant.html HomePage.html Oak.html index.html), zip.dir.entries('.').sort
assert_match /.*<html .*All about elephants.*<\/html>/,
zip.file.read('Elephant.html').gsub(/\s+/, ' ')
assert_match /.*<html .*All about oak.*<\/html>/,
zip.file.read('Oak.html').gsub(/\s+/, ' ')
assert_match /.*<html .*First revision of the.*HomePage.*end.*<\/html>/,
zip.file.read('HomePage.html').gsub(/\s+/, ' ')
assert_equal '<html><head><META HTTP-EQUIV="Refresh" CONTENT="0;URL=HomePage.html"></head></html> ', zip.file.read('index.html').gsub(/\s+/, ' ')
end
ensure
File.delete(@tempfile_path) if File.exist?(@tempfile_path)
end
end end
def test_export_html_no_layout def test_export_html_no_layout