wikicloth 0.7.1 → 0.8.0

data/lib/wikicloth/wiki_buffer/html_element.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'builder'
 require 'rexml/document'
 
 module WikiCloth
@@ -11,10 +9,10 @@ class WikiBuffer::HTMLElement < WikiBuffer
 	'h1','h2','h3','h4','h5','h6','p','table','tr','td','th','tbody','thead','tfoot']
   ALLOWED_ATTRIBUTES = ['src','id','name','style','class','href','start','value','colspan','align','border',
         'cellpadding','cellspacing','name','valign','color','rowspan','nowrap','title','rel','for']
-  ESCAPED_TAGS = [ 'nowiki', 'pre', 'code' ]
+  ESCAPED_TAGS = [ 'nowiki','pre','code' ]
   SHORT_TAGS = [ 'meta','br','hr']
   NO_NEED_TO_CLOSE = ['li','p'] + SHORT_TAGS
-  DISABLE_GLOBALS_FOR = ESCAPED_TAGS + [ 'math' ]
+  DISABLE_GLOBALS_FOR = ESCAPED_TAGS
 
   def initialize(d="",options={},check=nil)
     super("",options)
@@ -38,78 +36,41 @@ class WikiBuffer::HTMLElement < WikiBuffer
     end
   end
 
+  def skip_html?
+    return Extension.skip_html?(self.element_name) if Extension.element_exists?(self.element_name)
+    DISABLE_GLOBALS_FOR.include?(self.element_name) ? true : false
+  end
+
   def run_globals?
+    return false if self.in_template? && self.element_name == "noinclude"
+    return false if !self.in_template? && self.element_name == "includeonly"
+    return Extension.run_globals?(self.element_name) if Extension.element_exists?(self.element_name)
     return DISABLE_GLOBALS_FOR.include?(self.element_name) ? false : true
   end
 
-  def to_s
+  def to_html
     if NO_NEED_TO_CLOSE.include?(self.element_name)
       return "<#{self.element_name} />" if SHORT_TAGS.include?(self.element_name)
       return "</#{self.element_name}><#{self.element_name}>" if @tag_check == self.element_name
     end
 
     if ESCAPED_TAGS.include?(self.element_name)
+      # remove empty first line
+      self.element_content = $1 if self.element_content =~ /^\s*\n(.*)$/m
       # escape all html inside this element
       self.element_content = self.element_content.gsub('<','&lt;').gsub('>','&gt;')
       # hack to fix <code><nowiki> nested mess
       self.element_content = self.element_content.gsub(/&lt;[\/]*\s*nowiki\s*&gt;/,'')
     end
 
-    lhandler = @options[:link_handler]
     case self.element_name
-    when "math"
-      blahtex_path = @options[:blahtex_path] || '/usr/bin/blahtex'
-      blahtex_png_path = @options[:blahtex_png_path] || '/tmp'
-
-      if File.exists?(blahtex_path)
-        begin
-          response = `echo '#{self.element_content}' | #{blahtex_path} --png --mathml --png-directory #{blahtex_png_path}`
-          xml_response = REXML::Document.new(response).root
-          if @options[:blahtex_html_prefix]
-            file_md5 = xml_response.elements["png/md5"].text
-            return "<img src=\"#{File.join(@options[:blahtex_html_prefix],"#{file_md5}.png")}\" />"
-          else
-            html = xml_response.elements["mathml/markup"].text
-            eattr = { "xmlns" => "http://www.w3.org/1998/Math/MathML" }.merge(self.element_attributes)
-            return elem.tag!(self.element_name, eattr) { |x| x << xml_response.elements["mathml/markup"].children.to_s }
-          end
-        rescue => err
-          return "<span class=\"error\">Unable to parse MathML: #{err}</span>"
-        end
-      else
-        return "<span class=\"error\">blatex binary not found</span>"
-      end
     when "template"
+      @options[:link_handler].cache({ :name => self.element_attributes["__name"], :content => self.element_content, :md5 => self.element_attributes["__hash"] })
       return self.element_content
     when "noinclude"
       return self.in_template? ? "" : self.element_content
     when "includeonly"
       return self.in_template? ? self.element_content : ""
-    when "ref"
-      self.element_name = "sup"
-      named_ref = self.name_attribute
-      ref = lhandler.find_reference_by_name(named_ref) unless named_ref.nil?
-      if ref.nil?
-        lhandler.references << { :name => named_ref, :value => self.element_content, :count => 0 }
-        ref = lhandler.references.last
-      end
-      ref_id = (named_ref.nil? ? "" : "#{named_ref}_") + "#{lhandler.reference_index(ref)}-#{ref[:count]}"
-      self.params << { :name => "id", :value => "cite_ref-#{ref_id}" }
-      self.params << { :name => "class", :value => "reference" }
-      self.element_content = "[<a href=\"#cite_note-" + (named_ref.nil? ? "" : "#{named_ref}_") + 
-	"#{lhandler.reference_index(ref)}\">#{lhandler.reference_index(ref)}</a>]"
-      ref[:count] += 1
-    when "references"
-      ref_count = 0
-      self.element_name = "ol"
-      self.element_content = lhandler.references.collect { |r| 
-        ref_count += 1
-        ref_name = (r[:name].nil? ? "" : r[:name].to_slug + "_")
-        ret = "<li id=\"cite_note-#{ref_name}#{ref_count}\"><b>"
-        1.upto(r[:count]) { |x| ret += "<a href=\"#cite_ref-#{ref_name}#{ref_count}-#{x-1}\">" + 
-		(r[:count] == 1 ? "^" : (x-1).to_s(26).tr('0-9a-p', 'a-z')) + "</a> " }
-        ret += "</b> #{r[:value]}</li>"
-      }.to_s
     when "nowiki"
       return self.element_content
     when "a"
@@ -119,6 +80,10 @@ class WikiBuffer::HTMLElement < WikiBuffer
         # if a element has no href attribute, or href starts with / or ?
         return elem.tag!(self.element_name, self.element_attributes) { |x| x << self.element_content }
       end
+    else
+      if Extension.element_exists?(self.element_name)
+        return Extension.html_elements[self.element_name][:klass].new(@options).instance_exec( self, &Extension.html_elements[self.element_name][:block] ).to_s
+      end
     end
 
     tmp = elem.tag!(self.element_name, self.element_attributes) { |x| x << self.element_content }
@@ -129,9 +94,9 @@ class WikiBuffer::HTMLElement < WikiBuffer
     tmp
   end
 
-  def name_attribute
-    params.each { |p| return p[:value].to_slug if p.kind_of?(Hash) && p[:name] == "name" }
-    return nil
+  def get_attribute_by_name(name)
+    params.each { |p| return p[:value] if p.kind_of?(Hash) && p[:name] == name }
+    nil
   end
 
   def element_attributes
@@ -267,7 +232,7 @@ class WikiBuffer::HTMLElement < WikiBuffer
           self.data = "</#{self.data}>"
           return false
         else
-          self.element_content += "&lt;/#{self.data}&gt;"
+          self.element_content += skip_html? ? "</#{self.data}>" : "&lt;/#{self.data}&gt;"
           @start_tag = 0
           self.data = ""
         end
@@ -275,9 +240,9 @@ class WikiBuffer::HTMLElement < WikiBuffer
 
     else
       if @start_tag == 0 && ESCAPED_TAGS.include?(self.element_name)
-        self.data += self.escape_char(current_char)
+        self.data << self.escape_char(current_char)
       else
-        self.data += current_char
+        self.data << current_char
       end
     end
     return true

data/lib/wikicloth/wiki_buffer/link.rb

@@ -12,7 +12,7 @@ class WikiBuffer::Link < WikiBuffer
     @internal_link ||= false
   end
 
-  def to_s
+  def to_html
     link_handler = @options[:link_handler]
     unless self.internal_link || params[0].strip !~ /^\s*(([a-z]+):\/\/|[\?\/])/
       return link_handler.external_link("#{params[0]}".strip, "#{params[1]}".strip)
@@ -22,9 +22,10 @@ class WikiBuffer::Link < WikiBuffer
         return "[#{params[0]}]"        
       when params[0] =~ /^:(.*)/
         return link_handler.link_for(params[0],params[1])
-      when params[0] =~ /^\s*([a-zA-Z0-9-]+)\s*:(.*)$/
+      when params[0] =~ /^\s*([^\]\s:]+)\s*:(.*)$/
         return link_handler.link_for_resource($1,$2,params[1..-1])
       else
+        return "" if params[0].blank? && params[1].blank?
         return link_handler.link_for(params[0],params[1])
       end
     end

data/lib/wikicloth/wiki_buffer/table.rb

@@ -24,7 +24,7 @@ class WikiBuffer::Table < WikiBuffer
     @rows ||= [ [] ]
   end
 
-  def to_s
+  def to_html
     row_count = 0
     ret = "<table" + (params[0].blank? ? "" : " #{params[0].strip}") + ">"
     ret += "<caption" + (self.table_caption_attributes.blank? ? "" : " #{table_caption_attributes.strip}") + 
@@ -180,7 +180,7 @@ class WikiBuffer::Table < WikiBuffer
       @start_row = true
 
     else
-      self.data += current_char
+      self.data << current_char
     end
 
     return true

data/lib/wikicloth/wiki_buffer/var.rb

@@ -1,4 +1,5 @@
 require 'expression_parser'
+require 'digest/md5'
 require 'uri'
 
 module WikiCloth
@@ -24,7 +25,7 @@ class WikiBuffer::Var < WikiBuffer
   end
 
   def skip_links?
-    true
+    false
   end
 
   def skip_html?
@@ -40,18 +41,24 @@ class WikiBuffer::Var < WikiBuffer
   end
 
   def function_name
-    @fname
+    @fname.nil? ? nil : @fname.strip
   end
 
-  def to_s
+  def to_html
+    return "" if will_not_be_rendered
+
     if self.is_function?
+      if Extension.function_exists?(function_name)
+        return Extension.functions[function_name][:klass].new(@options).instance_exec( params.collect { |p| p.strip }, &Extension.functions[function_name][:block] ).to_s
+      end
       ret = default_functions(function_name,params.collect { |p| p.strip })
       ret ||= @options[:link_handler].function(function_name, params.collect { |p| p.strip })
       ret.to_s
     elsif self.is_param?
       ret = nil
       @options[:buffer].buffers.reverse.each do |b|
-        ret = b.get_param(params[0].downcase,params[1]) if b.instance_of?(WikiBuffer::HTMLElement) && b.element_name == "template"
+        ret = b.get_param(params[0],params[1]) if b.instance_of?(WikiBuffer::HTMLElement) && b.element_name == "template"
+        break unless ret.nil?
       end
       ret.to_s
     else
@@ -60,25 +67,46 @@ class WikiBuffer::Var < WikiBuffer
         b.element_name == "template" }.compact
       if template_stack.last == params[0]
         debug_tree = @options[:buffer].buffers.collect { |b| b.debug }.join("-->")
-        "<span class=\"error\">Template loop detected: &#123;&#123;#{debug_tree}&#125;&#125;</span>"
+        "<span class=\"error\">#{I18n.t('template loop detected', :tree => debug_tree)}</span>"
       else
-        ret = @options[:link_handler].include_resource("#{params[0]}".strip,params[1..-1]).to_s
+        key = params[0].to_s.strip
+        key_options = params[1..-1].collect { |p| p.is_a?(Hash) ? { :name => p[:name].strip, :value => p[:value].strip } : p.strip }
+        key_options ||= []
+        key_digest = Digest::MD5.hexdigest(key_options.to_a.sort {|x,y| (x.is_a?(Hash) ? x[:name] : x) <=> (y.is_a?(Hash) ? y[:name] : y) }.inspect)
+
+        return @options[:params][key] if @options[:params].has_key?(key)
+        # if we have a valid cache fragment use it
+        return @options[:cache][key][key_digest] unless @options[:cache].nil? || @options[:cache][key].nil? || @options[:cache][key][key_digest].nil?
+
+        ret = @options[:link_handler].include_resource(key,key_options).to_s
+
         ret.gsub!(/<!--(.|\s)*?-->/,"")
         count = 0
-        tag_attr = self.params[1..-1].collect { |p|
+        tag_attr = key_options.collect { |p|
           if p.instance_of?(Hash)
-            "#{p[:name].downcase}=\"#{p[:value]}\""
+            "#{p[:name]}=\"#{p[:value].gsub(/"/,'&quot;')}\""
           else
             count += 1
-            "#{count}=\"#{p}\""
+            "#{count}=\"#{p.gsub(/"/,'&quot;')}\""
           end
         }.join(" ")
-        self.data = ret.blank? ? "" : "<template __name=\"#{params[0]}\" #{tag_attr}>#{ret}</template>"
+
+        self.data = ret.blank? ? "" : "<template __name=\"#{key}\" __hash=\"#{key_digest}\" #{tag_attr}>#{ret}</template>"
         ""
       end
     end
   end
 
+  def will_not_be_rendered
+    @options[:buffer].buffers.reverse.each do |buffer|
+      if buffer.instance_of?(WikiBuffer::Var) && buffer.is_function?
+        return true if buffer.function_name == "#if" && buffer.params.size == 2 && buffer.params[0].strip.blank?
+        return true if buffer.function_name == "#if" && buffer.params.size == 3 && !buffer.params[0].strip.blank?
+      end
+    end
+    false
+  end
+
   def default_functions(name,params)
     case name
     when "#if"
@@ -88,12 +116,12 @@ class WikiBuffer::Var < WikiBuffer
       default = nil
       for p in params[1..-1]
         temp = p.split("=")
-        if temp.length == 1 && p == params.last
+        if p !~ /=/ && temp.length == 1 && p == params.last
           return p
-        elsif temp.instance_of?(Array) && temp.length > 1
+        elsif temp.instance_of?(Array) && temp.length > 0
           test = temp.first.strip
-          default = temp[1].strip if test == "#default"
-          return temp[1].strip if test == match
+          default = temp[1..-1].join("=").strip if test == "#default"
+          return temp[1..-1].join("=").strip if test == match || (test == "none" && match.blank?)
         end
       end
       default.nil? ? "" : default
@@ -101,7 +129,7 @@ class WikiBuffer::Var < WikiBuffer
       begin
         ExpressionParser::Parser.new.parse(params.first)
       rescue RuntimeError
-        "Expression error: #{$!}"
+        I18n.t('expression error', :error => $!)
       end
     when "#ifexpr"
       val = false
@@ -147,20 +175,40 @@ class WikiBuffer::Var < WikiBuffer
     when "ucfirst"
       params.first.capitalize
     when "lcfirst"
-      params.first[0,1].downcase + params.first[1,-1]
+      params.first[0,1].downcase + params.first[1..-1]
+    when "anchorencode"
+      params.first.gsub(/\s+/,'_')
     when "plural"
-      params.first.to_i > 1 ? params[1] : params[2]
+      begin
+        expr_value = ExpressionParser::Parser.new.parse(params.first)
+        expr_value.to_i == 1 ? params[1] : params[2]
+      rescue RuntimeError
+        I18n.t('expression error', :error => $!)
+      end
     when "ns"
-      values = { "" => "", "0" => "", "1" => "Talk", "talk" => "Talk", "2" => "User", "user" => "User",
-	"3" => "User talk", "user_talk" => "User talk", "4" => "Meta", "project" => "Meta",
-	"5" => "Meta talk", "project_talk" => "Meta talk", "6" => "File", "image" => "File",
-	"7" => "File talk", "image_talk" => "File talk", "8" => "MediaWiki", "mediawiki" => "MediaWiki",
-	"9" => "MediaWiki talk", "mediawiki_talk" => "MediaWiki talk", "10" => "Template",
-	"template" => "Template", "11" => "Template talk", "template_talk" => "Template talk",
-	"12" => "Help", "help" => "Help", "13" => "Help talk", "help_talk" => "Help talk",
-	"14" => "Category", "category" => "Category", "15" => "Category talk", "category_talk" => "Category talk",
-	"-2" => "Media", "media" => "Media", "-1" => "Special", "special" => "Special" }
-      values[params.first.gsub(/\s+/,'_').downcase]
+      values = {
+        "" => "", "0" => "",
+        "1" => localise_ns("Talk"), "talk" => localise_ns("Talk"),
+        "6" => localise_ns("File"), "file" => localise_ns("File"), "image" => localise_ns("File"),
+        "10" => localise_ns("Template"), "template" => localise_ns("Template"),
+        "14" => localise_ns("Category"), "category" => localise_ns("Category"),
+        "-1" => localise_ns("Special"), "special" => localise_ns("Special"),
+        "12" => localise_ns("Help"), "help" => localise_ns("Help"),
+        "-2" => localise_ns("Media"), "media" => localise_ns("Media") }
+
+      values[localise_ns(params.first,:en).gsub(/\s+/,'_').downcase]
+    when "#language"
+      WikiNamespaces.language_name(params.first)
+    when "#tag"
+      return "" if params.empty?
+      elem = Builder::XmlMarkup.new
+      return elem.tag!(params.first) if params.length == 1
+      return elem.tag!(params.first) { |e| e << params.last } if params.length == 2
+      tag_attrs = {}
+      params[1..-2].each do |attr|
+        tag_attrs[$1] = $2 if attr =~ /^\s*([\w]+)\s*=\s*"(.*)"\s*$/
+      end
+      elem.tag!(params.first,tag_attrs) { |e| e << params.last }
     when "debug"
       ret = nil
       case params.first
@@ -183,6 +231,10 @@ class WikiBuffer::Var < WikiBuffer
     end
   end
 
+  def localise_ns(name,lang=nil)
+    WikiNamespaces.localise_ns(name,lang)
+  end
+
   def is_param?
     @tag_size == 3 ? true : false
   end
@@ -227,7 +279,7 @@ class WikiBuffer::Var < WikiBuffer
       end
 
     else
-      self.data += current_char
+      self.data << current_char
       if @tag_start
         # FIXME: template params and templates colliding
         if @tag_size > 3

data/lib/wikicloth/wiki_link_handler.rb

@@ -1,19 +1,12 @@
-require 'rubygems'
-require 'builder'
-
+# encoding: utf-8
 module WikiCloth
 
-class WikiLinkHandler
+class WikiLinkHandler < WikiNamespaces
 
-  FILE_NAMESPACES = ["datei","image","file","media"]
-  CATEGORY_NAMESPACES = ['kategorie','category']
-  LANGUAGE_NAMESPACES = ['af','am','ang','ar','arc','ast','az','bn','zh-min-nan','ba','be','be-x-old','bar','bs','br','bg','ca',
-	'ceb','cs','co','cy','da','de','dv','et','el','es','eo','eu','fa','fo','fr','fy','ga','gd','gl','gan','ko','hy','hi','hr',
-	'io','id','is','it','he','jv','kn','pam','ka','sw','ku','la','lv','lb','lt','hu','mk','mg','ml','mr','arz','ms','nah','nl',
-	'ja','no','nn','oc','uz','pap','nds','pl','pt','ksh','ro','qu','ru','sa','sco','sq','scn','simple','sk','sl','sr','sh',
-	'fi','sv','tl','ta','th','tg','tr','uk','ur','vi','zh-classical','yi','bat-smg','zh','lo','en','gn','map-bms','pdc','eml',
-	'ki','hak','ia','ky','lad','nds-nl','ne','nrm','nov','sm','si','su','kab','te','vec','fiu-vro','wa','war','wuu','zh-yue',
-	'diq']
+  FILE_NAMESPACES = file_namespace_names
+  MEDIA_NAMESPACES = media_namespace_names
+  CATEGORY_NAMESPACES = category_namespace_names
+  LANGUAGE_NAMESPACES = language_namespace_names
 
   def references
     @references ||= []
@@ -31,6 +24,10 @@ class WikiLinkHandler
     nil
   end
 
+  def cache(item)
+    nil
+  end
+
   def section_list(root=nil)
     ret = []
     root = sections[0].children if root.nil?
@@ -44,7 +41,7 @@ class WikiLinkHandler
   end
 
   def toc(sections, toc_numbered=false)
-    ret = "<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td><div style=\"font-weight:bold\">Table of Contents</div><ul>"
+    ret = "<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td><div style=\"font-weight:bold\">#{I18n.t('table of contents')}</div><ul>"
     previous_depth = 1
     indices = []
     section_list(sections).each do |section|
@@ -146,23 +143,19 @@ class WikiLinkHandler
   end
 
   def include_resource(resource, options=[])
-    if self.params.has_key?(resource)
-      self.params[resource]
+    @template_cache ||= {}
+    if @template_cache[resource]
+      @included_templates[resource] += 1
+      @template_cache[resource]
     else
-      @template_cache ||= {}
-      if @template_cache[resource]
+      ret = template(resource)
+      unless ret.nil?
+        @included_templates ||= {}
+        @included_templates[resource] ||= 0
         @included_templates[resource] += 1
-        @template_cache[resource]
-      else
-        ret = template(resource)
-        unless ret.nil?
-          @included_templates ||= {}
-          @included_templates[resource] ||= 0
-          @included_templates[resource] += 1
-        end
-        @template_cache[resource] = ret
-        ret
       end
+      @template_cache[resource] = ret
+      ret
     end
   end
 
@@ -178,7 +171,7 @@ class WikiLinkHandler
     ret = ""
     prefix.downcase!
     case
-    when FILE_NAMESPACES.include?(prefix)
+    when (MEDIA_NAMESPACES+FILE_NAMESPACES).include?(prefix)
       ret += wiki_image(resource,options)
     when CATEGORY_NAMESPACES.include?(prefix)
       self.categories << resource