Skip to content

Commit

Permalink
Some small efficiencies in the Chunk-handler
Browse files Browse the repository at this point in the history
Also, log Maruku's processing time, out of perverse
interest.
  • Loading branch information
distler committed Aug 5, 2011
1 parent 52da76f commit 14592f5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 1 addition & 2 deletions lib/chunks/chunk.rb
Expand Up @@ -45,12 +45,11 @@ def initialize(match_data, content)

# Find all the chunks of the given type in content
# Each time the pattern is matched, create a new
# chunk for it, and replace the occurance of the chunk
# chunk for it, and replace the occurrence of the chunk
# in this content with its mask.
def self.apply_to(content)
text = content.to_str
text.gsub!( self.pattern ) do |match|
# content.replace text
new_chunk = self.new($~, content)
content.add_chunk(new_chunk)
new_chunk.mask
Expand Down
2 changes: 2 additions & 0 deletions lib/chunks/engines.rb
Expand Up @@ -71,9 +71,11 @@ def mask
@content.options[:renderer].s5_theme = my_content.s5_theme
my_content.to_s5
else
(t = Time.now; nil)
html = Maruku.new(@content.delete("\r").to_utf8,
{:math_enabled => true,
:math_numbered => ['\\[','\\begin{equation}']}).to_html
(ApplicationController.logger.info("Maruku took " + (Time.now-t).to_s + " seconds."); nil)
html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
end
end
Expand Down
5 changes: 3 additions & 2 deletions lib/wiki_content.rb
Expand Up @@ -8,6 +8,7 @@
require 'chunks/nowiki'
require 'sanitizer'
require 'instiki_stringsupport'
require 'set'


# Wiki content is just a string that can process itself with a chain of
Expand Down Expand Up @@ -53,10 +54,10 @@ module ChunkManager
def init_chunk_manager
@chunks_by_type = Hash.new
Chunk::Abstract::derivatives.each{|chunk_type|
@chunks_by_type[chunk_type] = Array.new
@chunks_by_type[chunk_type] = Set.new
}
@chunks_by_id = Hash.new
@chunks = []
@chunks = Set.new
@chunk_id = 0
end

Expand Down

0 comments on commit 14592f5

Please sign in to comment.