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 2010-01-25 18:46:11 -06:00
parent 50d0e04624 9dc59b7b7c
commit 820d2a94eb
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/chunks/engines.rb
View file

@ -90,7 +90,7 @@ module Engines
:html_math_output_png => true, :html_math_output_png => true,
:html_png_engine => 'blahtex', :html_png_engine => 'blahtex',
:html_png_dir => @content.web.files_path.join('pngs').to_s, :html_png_dir => @content.web.files_path.join('pngs').to_s,
:html_png_url => '../files/pngs/', :html_png_url => @content.options[:png_url],
:content_only => true, :content_only => true,
:author => @content.options[:engine_opts][:author], :author => @content.options[:engine_opts][:author],
:title => @content.options[:engine_opts][:title]}) :title => @content.options[:engine_opts][:title]})
@ -104,7 +104,7 @@ module Engines
:html_math_output_png => true, :html_math_output_png => true,
:html_png_engine => 'blahtex', :html_png_engine => 'blahtex',
:html_png_dir => @content.web.files_path.join('pngs').to_s, :html_png_dir => @content.web.files_path.join('pngs').to_s,
:html_png_url => '../files/pngs/'}).to_html :html_png_url => @content.options[:png_url]}).to_html
html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1') html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
end end
end end

2
lib/url_generator.rb
View file

@ -7,6 +7,8 @@ class AbstractUrlGenerator
@controller = controller @controller = controller
end end
attr :controller
# Create a link for the given page (or file) name and link text based # Create a link for the given page (or file) name and link text based
# on the render mode in options and whether the page (file) exists # on the render mode in options and whether the page (file) exists
# in the web. # in the web.

6
lib/wiki_content.rb
View file

@ -143,6 +143,12 @@ class WikiContent < String
@options[:active_chunks] = (ACTIVE_CHUNKS - [WikiChunk::Word] ) if @web.brackets_only? @options[:active_chunks] = (ACTIVE_CHUNKS - [WikiChunk::Word] ) if @web.brackets_only?
@options[:hide_chunks] = (HIDE_CHUNKS - [Literal::Math] ) unless @options[:hide_chunks] = (HIDE_CHUNKS - [Literal::Math] ) unless
[Engines::MarkdownMML, Engines::MarkdownPNG].include?(@options[:engine]) [Engines::MarkdownMML, Engines::MarkdownPNG].include?(@options[:engine])
if @options[:engine] == Engines::MarkdownPNG
@options[:png_url] =
@options[:mode] == :export ? 'files/pngs/' :
(@url_generator.controller.url_for :controller => 'file', :web => @web.address,
:action => 'file', :id => 'pngs', :only_path => true) + '/'
end
@not_rendered = @pre_rendered = nil @not_rendered = @pre_rendered = nil

6
test/test_helper.rb
View file

@ -104,7 +104,11 @@ end
class StubUrlGenerator < AbstractUrlGenerator class StubUrlGenerator < AbstractUrlGenerator
def initialize def initialize
super(:doesnt_need_controller) controller = Object.new
def controller.url_for(options = {})
'../files/pngs'
end
super(controller)
end end
def file_link(mode, name, text, web_name, known_file, description) def file_link(mode, name, text, web_name, known_file, description)