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

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-08-28 11:15:37 -05:00
parent 205fbcb898 336e57d6b4
commit 23890d6ec0
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/file_controller.rb
View file

@ -26,7 +26,7 @@ class FileController < ApplicationController
end end
else else
# no form supplied, this is a request to download the file # no form supplied, this is a request to download the file
file = @web.files_path + '/' + @file_name file = @web.files_path.join(@file_name)
if File.exists?(file) if File.exists?(file)
send_file(file) send_file(file)
else else
@ -38,7 +38,7 @@ class FileController < ApplicationController
end end
def blahtex_png def blahtex_png
send_file(@web.blahtex_pngs_path + '/' + params['id']) send_file(@web.blahtex_pngs_path.join(params['id']))
end end
def delete def delete

13
app/models/web.rb
View file

@ -128,21 +128,18 @@ class Web < ActiveRecord::Base
"#{File.expand_path(dir)} and add files to it." "#{File.expand_path(dir)} and add files to it."
end end
end end
def files_path def files_path
path = Rails.root.join("webs")
if default_web? if default_web?
"#{RAILS_ROOT}/webs/files" path.join("files")
else else
"#{RAILS_ROOT}/webs/#{self.address}/files" path.join(address, "files")
end end
end end
def blahtex_pngs_path def blahtex_pngs_path
if default_web? files_path.join("pngs")
"#{RAILS_ROOT}/webs/files/pngs"
else
"#{RAILS_ROOT}/webs/#{self.address}/files/pngs"
end
end end
private private

2
app/models/wiki_file.rb
View file

@ -46,7 +46,7 @@ class WikiFile < ActiveRecord::Base
end end
def content_path def content_path
web.files_path + '/' + file_name web.files_path.join(file_name)
end end
def write_content_to_file def write_content_to_file

11
test/unit/page_renderer_test.rb
View file

@ -211,6 +211,13 @@ END_THM
end end
def test_have_latest_itex2mml def test_have_latest_itex2mml
assert_markup_parsed_as(
%{<p>equation <math class='maruku-mathml' displa} +
%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
%{MathML'><munder><mi>A</mi><mo>\314\262</mo></m} +
%{under></math></p>},
"equation $\\underline{A}$")
assert_markup_parsed_as( assert_markup_parsed_as(
%{<p>equation <math class='maruku-mathml' } + %{<p>equation <math class='maruku-mathml' } +
%{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} + %{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
@ -220,13 +227,13 @@ END_THM
assert_markup_parsed_as( assert_markup_parsed_as(
%{<p>blackboard digits: <math class='maruku-mathml' display='} + %{<p>blackboard digits: <math class='maruku-mathml' display='} +
%{inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>math} + %{inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>math} +
%{bb</mi><mn>123 </mn></math></p>}, %{bb</mi><mn>123</mn></math></p>},
"blackboard digits: $\mathbb{123}$") "blackboard digits: $\mathbb{123}$")
assert_markup_parsed_as( assert_markup_parsed_as(
%{<p>\\rlap: <math class='maruku-mathml' display='} + %{<p>\\rlap: <math class='maruku-mathml' display='} +
%{inline' xmlns='http://www.w3.org/1998/Math/MathML'><mpadded} + %{inline' xmlns='http://www.w3.org/1998/Math/MathML'><mpadded} +
%{ width='0'><mn>123 </mn></mpadded></math></p>}, %{ width='0'><mn>123</mn></mpadded></math></p>},
'\rlap: $\rlap{123}$') '\rlap: $\rlap{123}$')
end end