wikicloth 0.5.0 → 0.6.0

data/README

@@ -26,7 +26,7 @@ Install
   git clone git://github.com/nricciar/wikicloth.git
   cd wikicloth/
   rake gem
-  sudo gem install pkg/wikicloth-0.2.0.gem
+  sudo gem install pkg/wikicloth-0.5.0.gem
 
 Usage
 ---------------------------------------------------

data/Rakefile

@@ -2,18 +2,12 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
-require 'init'
+require File.join(File.dirname(__FILE__),'init')
 
-desc 'Default: run unit tests.'
-task :default => :test
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-desc 'Test the wikicloth plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+task :default => :test
 
 desc 'Generate documentation for the wikicloth plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -24,26 +18,21 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-spec = Gem::Specification.new do |s|
-  s.name = "wikicloth"
-  s.version = WikiCloth::VERSION
-  s.author = "David Ricciardi"
-  s.email = "nricciar@gmail.com"
-  s.homepage = "http://github.com/nricciar/wikicloth"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "An implementation of the mediawiki markup in ruby"
-  s.files = FileList["{lib,tasks}/**/*"].to_a +
-    FileList["sample_documents/*.wiki"].to_a +
-    ["init.rb","uninstall.rb","Rakefile","install.rb"]
-  s.require_path = "lib"
-  s.description = File.read("README")
-  s.test_files = FileList["{test}/*.rb"].to_a + ["run_tests.rb"]
-  s.has_rdoc = false
-  s.extra_rdoc_files = ["README","MIT-LICENSE"]
-  s.description = %q{mediawiki parser}
-  s.add_dependency 'builder'
-  s.add_dependency 'expression_parser'
+find_file = lambda do |name|
+  file_name = lambda {|path| File.join(path, "#{name}.rb")}
+  root = $:.detect do |path|
+    File.exist?(file_name[path])
+  end
+  file_name[root] if root
 end
-Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_tar = true
+
+TEST_LOADER = find_file['rake/rake_test_loader']
+multiruby = lambda do |glob|
+  system 'multiruby', TEST_LOADER, *Dir.glob(glob)
+end
+
+Rake::TestTask.new(:test) do |test|
+  test.ruby_opts << "-W"
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
 end

data/lib/wikicloth/core_ext.rb

@@ -1,22 +1,27 @@
-class Object
-  module InstanceExecHelper; end
-  include InstanceExecHelper
-  def instance_exec(*args, &block)
-    begin
-      old_critical, Thread.critical = Thread.critical, true
-      n = 0
-      n += 1 while respond_to?(mname="__instance_exec#{n}")
-      InstanceExecHelper.module_eval{ define_method(mname, &block) }
-    ensure
-      Thread.critical = old_critical
-    end
-    begin
-      ret = send(mname, *args)
-    ensure
-      InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+if RUBY_VERSION < '1.9'
+  READ_MODE = "r"
+  class Object
+    module InstanceExecHelper; end
+    include InstanceExecHelper
+    def instance_exec(*args, &block)
+      begin
+        old_critical, Thread.critical = Thread.critical, true
+        n = 0
+        n += 1 while respond_to?(mname="__instance_exec#{n}")
+        InstanceExecHelper.module_eval{ define_method(mname, &block) }
+      ensure
+        Thread.critical = old_critical
+      end
+      begin
+        ret = send(mname, *args)
+      ensure
+        InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+      end
+      ret
     end
-    ret
   end
+else
+  READ_MODE = "r:UTF-8"
 end
 
 module Math

data/lib/wikicloth/lexer.rb

@@ -0,0 +1,105 @@
+# not actually used by wikicloth atm
+module WikiCloth
+
+  class Lexer
+
+    def initialize(input)
+      @input = input
+      @return_previous_token = false
+    end
+
+    def get_next_token
+      if @return_previous_token
+	@return_previous_token = false
+	return @previous_token
+      end
+
+      token = Token.new
+      prepend_input = nil
+
+      case @input
+      when /\A\s+/
+        token.kind = Token::Space
+      when /\A:/
+        token.kind = Token::Colon
+      when /\A([']{2,5})/
+        token.kind = Token::BoldItalic
+      when /\A\n([*]{1,})/
+        token.kind = Token::ListItem
+      when /\A~~~~/
+        token.kind = Token::Signature
+      when /\A<!--/
+        token.kind = Token::BeginComment
+      when /\A-->/
+        token.kind = Token::EndComment
+      when /\A[\w\(\)\.\%;\#\-\/,'&\*~]+/
+        # swallowed bold/italic
+        if $&[-2,2] == "''"
+          prepend_input = "''"
+          token.value = $&[0..-3]
+        elsif $&[-3,3] == "'''"
+          prepend_input = "'''"
+          token.value = $&[0..-4]
+        elsif $&[-5,5] == "'''''"
+          prepend_input = "'''''"
+          token.value = $&[0..-6]
+        # accidently swallowed closing comment
+        elsif $&[-2,2] == "--" && $'[0,1] == '>'
+          prepend_input = '--'
+          token.value = $&[0..-3]
+        else
+          token.value = $&
+        end
+        token.kind = Token::Word
+      when /\A\{\|/
+        token.kind = Token::BeginTable
+      when /\A\|\}/
+        token.kind = Token::EndTable
+      when /\A\|/
+        token.kind = Token::Pipe
+      when /\A=/
+        token.kind = Token::Equals
+      when /\A"/
+        token.kind = Token::Quote
+      when /\A\n/
+        token.kind = Token::NewLine
+      when /\A\{\{/
+        token.kind = Token::OpenRes
+      when /\A\}\}/
+        token.kind = Token::CloseRes
+      when /\A\[\[/
+        token.kind = Token::OpenLink
+        token.value = $&
+      when /\A\]\]/
+        token.kind = Token::CloseLink
+        token.value = $&
+      when /\A\[/
+        token.kind = Token::OpenLink
+        token.kind = $&
+      when /\A\]/
+        token.kind = Token::CloseLink
+        token.kind = $&
+      when /\A\<\s*\//
+        token.kind = Token::OpenElement
+      when /\A\</
+        token.kind = Token::OpenElement
+      when /\A\>/
+        token.kind = Token::CloseElement
+      when ''
+        token.kind = Token::End
+      end
+      token.value ||= $&
+
+      raise "Unknown token #{@input}" if token.unknown?
+      @input = "#{prepend_input}#{$'}"
+
+      @previous_token = token
+      token
+    end
+
+    def revert
+      @return_previous_token = true
+    end
+  end
+
+end

data/lib/wikicloth/parser.rb

@@ -80,21 +80,21 @@ module WikiCloth
 
     # Replace a section, along with any sub-section in the document
     def put_section(id,data)
-      data = @wikicloth.sections.first.wikitext({ :replace => { id => data.last(1) == "\n" ? data : "#{data}\n" } })
+      data = @wikicloth.sections.collect { |s| s.wikitext({ :replace => { id => data.last(1) == "\n" ? data : "#{data}\n" } }) }.join
       @wikicloth = WikiCloth.new(:data => data, :link_handler => self, :params => @params)
     end
 
     # Get the section, along with any sub-section of the document
     def get_section(id)
-      @wikicloth.sections.first.get_section(id)
+      @wikicloth.sections.collect { |s| s.get_section(id) }.join
     end
 
     def sections
       @wikicloth.sections
     end
 
-    def to_html
-      @wikicloth.to_html
+    def to_html(opts = {})
+      @wikicloth.to_html(opts)
     end
 
     def to_wiki
@@ -102,7 +102,7 @@ module WikiCloth
     end
 
     def to_wikitext
-      @wikicloth.sections.first.wikitext()
+      @wikicloth.sections.collect { |s| s.wikitext() }.join
     end
 
   end

data/lib/wikicloth/section.rb

@@ -6,6 +6,8 @@ module WikiCloth
       self.title = title
       @children = []
       @id = id
+      @template = nil
+      @auto_toc = nil
     end
 
     def children

data/lib/wikicloth/token.rb

@@ -0,0 +1,41 @@
+# not actually used by wikicloth atm
+module WikiCloth
+
+  class Token
+    OpenRes      = 1
+    CloseRes     = 2
+    OpenLink     = 3
+    CloseLink    = 4
+    Heading      = 5
+    Word         = 6
+    NewLine      = 7
+    OpenElement  = 8
+    CloseElement = 9
+    Equals       = 10
+    Quote        = 11
+    BeginComment = 12
+    EndComment   = 13
+    BeginTable   = 14
+    EndTable     = 15
+    Pipe         = 16
+    BoldItalic   = 17
+    ListItem     = 18
+    Signature    = 19
+    Space        = 20
+    Colon        = 21
+    End          = 22
+
+    attr_accessor :kind
+    attr_accessor :value
+
+    def initialize
+      @kind = nil
+      @value = nil
+    end
+
+    def unknown?
+      @kind.nil?
+    end
+  end
+
+end

data/lib/wikicloth/wiki_buffer/html_element.rb

@@ -20,7 +20,19 @@ class WikiBuffer::HTMLElement < WikiBuffer
     @in_quotes = false
     @in_single_quotes = false
     @start_tag = 1
-    @tag_check = check unless check.nil?
+    @tag_check = check
+  end
+
+  def debug
+    case self.element_name
+    when "template"
+      self.get_param("__name")
+    else
+      ret = self.element_name
+      tmp = self.get_param("id")
+      ret += tmp.nil? ? "" : "##{tmp}"
+      ret
+    end
   end
 
   def run_globals?
@@ -42,6 +54,12 @@ class WikiBuffer::HTMLElement < WikiBuffer
 
     lhandler = @options[:link_handler]
     case self.element_name
+    when "template"
+      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
@@ -69,6 +87,8 @@ class WikiBuffer::HTMLElement < WikiBuffer
       }.to_s
     when "nowiki"
       return self.element_content
+    when "a"
+      return @options[:link_handler].external_link(self.element_attributes['href'], self.element_content)
     end
 
     tmp = elem.tag!(self.element_name, self.element_attributes) { |x| x << self.element_content }

data/lib/wikicloth/wiki_buffer/var.rb

@@ -8,10 +8,30 @@ class WikiBuffer::Var < WikiBuffer
     super(data,options)
     self.buffer_type = "var"
     @in_quotes = false
+    @tag_start = true
+    @tag_size = 2
+    @close_size = 2
+    @fname = nil
+  end
+
+  def tag_size
+    @tag_size
+  end
+
+  def tag_size=(val)
+    @tag_size = val
   end
 
   def skip_html?
-    true
+    false
+  end
+
+  def tag_start
+    @tag_start
+  end
+
+  def tag_start=(val)
+    @tag_start = val
   end
 
   def function_name
@@ -23,27 +43,35 @@ class WikiBuffer::Var < WikiBuffer
       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],params[1]) if b.instance_of?(WikiBuffer::HTMLElement) && b.element_name == "template"
+      end
+      ret.to_s
     else
-      ret = @options[:link_handler].include_resource("#{params[0]}".strip,params[1..-1])
-      # template params
-      ret = ret.to_s.gsub(/\{\{\{\s*([A-Za-z0-9]+)+(|\|+([^}]+))\s*\}\}\}/) { |match| get_param($1.strip,$3.to_s.strip) }
       # put template at beginning of buffer
-      self.data = ret
-      ""
-    end
-  end
-
-  def get_param(name,default=nil)
-    ret = nil
-    # numbered params
-    if name =~ /^[0-9]+$/
-      ret = self.params[name.to_i].instance_of?(Hash) ? self.params[name.to_i][:value] : self.params[name.to_i]
-    end
-    # named params
-    self.params.each do |param|
-      ret = param[:value] if param[:name] == name
+      template_stack = @options[:buffer].buffers.collect { |b| b.get_param("__name") if b.instance_of?(WikiBuffer::HTMLElement) && 
+        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>"
+      else
+        ret = @options[:link_handler].include_resource("#{params[0]}".strip,params[1..-1]).to_s
+        ret.gsub!(/<!--(.|\s)*?-->/,"")
+        count = 0
+        tag_attr = self.params[1..-1].collect { |p|
+          if p.instance_of?(Hash)
+            "#{p[:name]}=\"#{p[:value]}\""
+          else
+            count += 1
+            "#{count}=\"#{p}\""
+          end
+        }.join(" ")
+        self.data = ret.blank? ? "" : "<template __name=\"#{params[0]}\" #{tag_attr}>#{ret}</template>"
+        ""
+      end
     end
-    ret.nil? ? default : ret
   end
 
   def default_functions(name,params)
@@ -51,11 +79,19 @@ class WikiBuffer::Var < WikiBuffer
     when "#if"
       params.first.blank? ? params[2] : params[1]
     when "#switch"
-      params.length.times do |i|
-        temp = params[i].split("=")
-        return temp[1].strip if temp[0].strip == params[0] && i != 0
+      match = params.first
+      default = nil
+      for p in params[1..-1]
+        temp = p.split("=")
+        if temp.length == 1 && p == params.last
+          return p
+        elsif temp.instance_of?(Array) && temp.length > 1
+          test = temp.first.strip
+          default = temp[1].strip if test == "#default"
+          return temp[1].strip if test == match
+        end
       end
-      return ""
+      default.nil? ? "" : default
     when "#expr"
       begin
         ExpressionParser::Parser.new.parse(params.first)
@@ -96,9 +132,32 @@ class WikiBuffer::Var < WikiBuffer
       params.first[0,1].downcase + params.first[1,-1]
     when "plural"
       params.first.to_i > 1 ? params[1] : params[2]
+    when "debug"
+      ret = nil
+      case params.first
+      when "param"
+        @options[:buffer].buffers.reverse.each do |b|
+          if b.instance_of?(WikiBuffer::HTMLElement) && b.element_name == "template"
+             ret = b.get_param(params[1])
+          end
+        end
+        ret
+      when "buffer"
+        ret = "<pre>"
+        buffer = @options[:buffer].buffers
+        buffer.each do |b|
+          ret += " --- #{b.class}"
+          ret += b.instance_of?(WikiBuffer::HTMLElement) ? " -- #{b.element_name}\n" : " -- #{b.data}\n"
+        end
+        "#{ret}</pre>"
+      end
     end
   end
 
+  def is_param?
+    @tag_size == 3 ? true : false
+  end
+
   def is_function?
     self.function_name.nil? || self.function_name.blank? ? false : true
   end
@@ -129,13 +188,30 @@ class WikiBuffer::Var < WikiBuffer
 
     # End of a template, variable, or function
     when current_char == '}' && previous_char == '}'
-      self.data.chop!
-      self.current_param = self.data
-      self.data = ""
-      return false
+      if @close_size == @tag_size
+        self.data.chop!
+        self.current_param = self.data
+        self.data = ""
+        return false
+      else
+        @close_size += 1
+      end
 
     else
       self.data += current_char
+      if @tag_start
+        # FIXME: template params and templates colliding
+        if @tag_size > 3
+          if @tag_size == 5
+            @options[:buffer].buffers << WikiBuffer::Var.new(self.data,@options)
+            @options[:buffer].buffers[-1].tag_start = false
+            self.data = ""
+            @tag_size = 3
+            return true
+          end
+        end
+        @tag_start = false
+      end
     end
 
     return true

data/lib/wikicloth/wiki_buffer.rb

@@ -3,18 +3,29 @@ class WikiBuffer
 
   def initialize(data="",options={})
     @options = options
+    @options[:buffer] ||= self
     self.data = data
     self.buffer_type = nil
     @section_count = 0
     @buffers ||= [ ]
     @buffers << self
     @list_data = []
+    @check_new_tag = false
+    @indent = nil
+  end
+
+  def debug
+    self.params[0]
   end
 
   def run_globals?
     true
   end
 
+  def buffers
+    @buffers
+  end
+
   def skip_html?
     false
   end
@@ -27,6 +38,21 @@ class WikiBuffer
     @params ||= [ "" ]
   end
 
+  def get_param(name,default=nil)
+    ret = nil
+    self.params.each do |param|
+      ret = param[:value] if param.instance_of?(Hash) && param[:name] == name
+    end
+    ret.nil? ? default : ret
+  end
+
+  def in_template?
+    @options[:buffer].buffers.each do |b|
+      return true if b.instance_of?(WikiBuffer::HTMLElement) && b.element_name == "template"
+    end
+    false
+  end
+
   def buffer_type
     @buffer_type
   end
@@ -68,8 +94,12 @@ class WikiBuffer
       case
       # start variable
       when previous_char == '{' && current_char == '{'
-        @buffers[-1].data.chop!
-        @buffers << WikiBuffer::Var.new("",@options)
+        if @buffers[-1].instance_of?(WikiBuffer::Var) && @buffers[-1].tag_start == true
+          @buffers[-1].tag_size += 1
+        else
+          @buffers[-1].data.chop!
+          @buffers << WikiBuffer::Var.new("",@options)
+        end
         return true
 
       # start link
@@ -102,7 +132,7 @@ class WikiBuffer
         @buffers[-1].data += tmp.to_s
         # any data left in the buffer we feed into the parent
         unless tmp.data.blank?
-          tmp.data.each_char { |c| self.add_char(c) }
+          tmp.data.each_char { |x| self.add_char(x) }
         end
       end
     end

data/lib/wikicloth/wiki_link_handler.rb

@@ -45,6 +45,10 @@ class WikiLinkHandler
     @external_links ||= []
   end
 
+  def internal_links
+    @internal_links ||= []
+  end
+
   def find_reference_by_name(n)
     references.each { |r| return r if !r[:name].nil? && r[:name].strip == n }
     return nil
@@ -72,6 +76,10 @@ class WikiLinkHandler
     @external_links = val
   end
 
+  def internal_links=(val)
+    @internal_links = val
+  end
+
   def url_for(page)
     "javascript:void(0)"
   end
@@ -81,6 +89,7 @@ class WikiLinkHandler
   end
 
   def link_for(page, text)
+    self.internal_links << page
     ltitle = !text.nil? && text.blank? ? self.pipe_trick(page) : text
     ltitle = page if text.nil?
     elem.a(link_attributes_for(page)) { |x| x << ltitle.strip }
@@ -90,11 +99,6 @@ class WikiLinkHandler
     if self.params.has_key?(resource)
       self.params[resource]
     else
-      # FIXME: hack to keep template loops from raising havoc
-      @include_count ||= 0
-      @include_count += 1
-      raise "Page reached maximum number of includes [1000] (possible template loop?)" if @include_count > 100
-
       ret = template(resource)
       unless ret.nil?
         @included_templates ||= {}

data/lib/wikicloth.rb

@@ -4,17 +4,19 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "wiki_b
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "wiki_link_handler")
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "parser")
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "section")
+require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "token")
+require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "lexer")
 String.send(:include, ExtendedString)
 
 module WikiCloth
 
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 
   class WikiCloth
 
     def initialize(opt={})
       self.options[:link_handler] = opt[:link_handler] unless opt[:link_handler].nil?
-      self.load(opt[:data],opt[:params]) unless opt[:data].nil? || opt[:data].blank?
+      self.load(opt[:data],opt[:params]) unless opt[:data].nil?
     end
 
     def load(data,p={})
@@ -55,8 +57,9 @@ module WikiCloth
       self.params.merge!({ 'WIKI_VERSION' => ::WikiCloth::VERSION })
       self.options = { :output => :html, :link_handler => self.link_handler, :params => self.params, :sections => self.sections }.merge(opt)
       self.options[:link_handler].params = options[:params]
-      data = self.sections.first.render(self.options)
+      data = self.sections.collect { |s| s.render(self.options) }.join
       data.gsub!(/<!--(.|\s)*?-->/,"")
+      data << "\n" if data.last(1) != "\n"
       buffer = WikiBuffer.new("",options)
       data.each_char { |c| buffer.add_char(c) }
       buffer.to_s

data/run_tests.rb

@@ -1,4 +1,4 @@
-require 'init'
+require File.join(File.dirname(__FILE__),'init')
 include WikiCloth
 
 class WikiParser < WikiCloth::Parser
@@ -37,7 +37,7 @@ Dir.glob("sample_documents/*.wiki").each do |x|
 
   start_time = Time.now
   out_name = "#{x}.html"
-  data = File.open(x) { |x| x.read }
+  data = File.open(x, READ_MODE) { |x| x.read }
 
   tmp = WikiCloth::Parser.new({
     :data => data,

data/test/test_helper.rb

@@ -1,3 +1,7 @@
+
 require 'rubygems'
+gem "test-unit", ">= 2.0.5"
 require 'active_support'
 require 'active_support/test_case'
+require 'test/unit'
+require File.join(File.dirname(__FILE__),'../init')

data/test/wiki_cloth_test.rb

@@ -1,8 +1,125 @@
-require 'test_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),'test_helper'))
+
+class WikiParser < WikiCloth::Parser
+  template do |template|
+    case template
+    when "noinclude"
+      "<noinclude>hello world</noinclude><includeonly>testing</includeonly>"
+    when "test"
+      "busted"
+    when "nowiki"
+      "hello world"
+    when "testparams"
+      "{{{def|hello world}}} {{{1}}} {{{test}}} {{{nested|{{{2}}}}}}"
+    when "moreparamtest"
+      "{{{{{test|bla}}|wtf}}}"
+    when "loop"
+      "{{loop}}"
+    end
+  end
+  external_link do |url,text|
+    "<a href=\"#{url}\" target=\"_blank\" class=\"exlink\">#{text.blank? ? url : text}</a>"
+  end
+end
 
 class WikiClothTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+
+  test "links and references" do
+    wiki = WikiCloth::Parser.new(:data => File.open(File.join(File.dirname(__FILE__), '../sample_documents/george_washington.wiki'), READ_MODE) { |f| f.read })
+    data = wiki.to_html
+    assert wiki.external_links.size == 62
+    assert wiki.references.size == 76
+    assert wiki.internal_links.size == 560
+  end
+
+  test "template params" do
+    wiki = WikiParser.new(:data => "{{testparams|test|test=bla|it worked|bla=whoo}}\n")
+    data = wiki.to_html
+    assert data =~ /hello world/
+    assert data =~ /test/
+    assert data =~ /bla/
+    assert data =~ /it worked/ # nested default param
+
+    wiki = WikiParser.new(:data => "{{moreparamtest|p=othervar}}")
+    data = wiki.to_html
+    assert data =~ /wtf/
+
+    wiki = WikiParser.new(:data => "{{moreparamtest|p=othervar|busted=whoo}}")
+    data = wiki.to_html
+    assert data =~ /whoo/
+  end
+
+  test "horizontal rule" do
+    wiki = WikiParser.new(:data => "----\n")
+    data = wiki.to_html
+    assert data =~ /hr/
+  end
+
+  test "template loops" do
+    wiki = WikiParser.new(:data => "{{#iferror:{{loop}}|loop detected|wtf}}")
+    data = wiki.to_html
+    assert data =~ /loop detected/
+  end
+
+  test "input with no newline" do
+    wiki = WikiParser.new(:data => "{{test}}")
+    data = wiki.to_html
+    assert data =~ /busted/
   end
+
+  test "lists" do
+    wiki = WikiParser.new(:data => "* item 1\n* item 2\n* item 3\n")
+    data = wiki.to_html
+    assert data =~ /ul/
+    count = 0
+    # should == 6.. 3 <li>'s and 3 </li>'s
+    data.gsub(/li/) { |ret| 
+      count += 1 
+      ret
+    }
+    assert count == 6
+  end
+
+  test "noinclude and includeonly tags" do
+    wiki = WikiParser.new(:data => "<noinclude>main page</noinclude><includeonly>never seen</includeonly>{{noinclude}}\n")
+    data = wiki.to_html
+    assert data =~ /testing/
+    assert data =~ /main page/
+    assert !(data =~ /never seen/)
+    assert !(data =~ /hello world/)
+  end
+
+  test "bold/italics" do
+    wiki = WikiParser.new(:data => "test ''testing'' '''123''' '''''echo'''''\n")
+    data = wiki.to_html
+    assert data =~ /<i>testing<\/i>/
+    assert data =~ /<b>123<\/b>/
+    assert data =~ /<b><i>echo<\/i><\/b>/
+  end
+
+  test "sanitize html" do
+    wiki = WikiParser.new(:data => "<script type=\"text/javascript\" src=\"bla.js\"></script>\n<a href=\"test.html\" onmouseover=\"alert('hello world');\">test</a>\n")
+    data = wiki.to_html
+    assert !(data =~ /<script/)
+    assert !(data =~ /onmouseover/)
+    assert data =~ /exlink/
+  end
+
+  test "nowiki and code tags" do
+    wiki = WikiParser.new(:data => "<nowiki>{{test}}</nowiki><code>{{test}}</code>{{nowiki}}\n")
+    data = wiki.to_html
+    assert !(data =~ /busted/)
+    assert data =~ /hello world/
+  end
+
+  test "disable edit stuff" do
+    wiki = WikiParser.new(:data => "= Hallo =")
+    data = wiki.to_html
+    assert_equal data, "<p>\n<h1><span class=\"editsection\">&#91;<a href=\"?section=Hallo\" target=\"_blank\" class=\"exlink\">edit</a>&#93;</span> <span class=\"mw-headline\" id=\"Hallo\">Hallo</span></h1>\n</p>"
+
+    data = wiki.to_html(:noedit => true)
+    assert_equal data, "<p>\n<h1> <span class=\"mw-headline\" id=\"Hallo\">Hallo</span></h1>\n</p>"
+ 
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wikicloth
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - David Ricciardi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +00:00
+date: 2010-12-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: mediawiki parser
 email: nricciar@gmail.com
 executables: []
@@ -57,14 +85,13 @@ extra_rdoc_files:
 - MIT-LICENSE
 files: 
 - lib/wikicloth.rb
-- lib/wikicloth/calc.citrus
-- lib/wikicloth/math.rb
 - lib/wikicloth/core_ext.rb
 - lib/wikicloth/wiki_buffer/html_element.rb
 - lib/wikicloth/wiki_buffer/var.rb
 - lib/wikicloth/wiki_buffer/table.rb
-- lib/wikicloth/wiki_buffer/template.rb
 - lib/wikicloth/wiki_buffer/link.rb
+- lib/wikicloth/token.rb
+- lib/wikicloth/lexer.rb
 - lib/wikicloth/parser.rb
 - lib/wikicloth/section.rb
 - lib/wikicloth/wiki_link_handler.rb
@@ -84,11 +111,11 @@ files:
 - uninstall.rb
 - Rakefile
 - install.rb
+- README
+- MIT-LICENSE
 - test/wiki_cloth_test.rb
 - test/test_helper.rb
 - run_tests.rb
-- README
-- MIT-LICENSE
 has_rdoc: true
 homepage: http://github.com/nricciar/wikicloth
 licenses: []

data/lib/wikicloth/calc.citrus

@@ -1,133 +0,0 @@
-# A grammar for mathematical formulas that apply basic mathematical operations
-# to all numbers, respecting operator precedence and grouping of expressions
-# while ignoring whitespace.
-#
-# An identical grammar that is written using pure Ruby can be found in calc.rb.
-grammar Calc
-
-  ## Hierarchy
-
-  rule term
-    additive | factor
-  end
-
-  rule additive
-    (factor additive_operator term) {
-      def value
-        additive_operator.apply(factor.value, term.value)
-      end
-    }
-  end
-
-  rule factor
-    multiplicative | prefix
-  end
-
-  rule multiplicative
-    (prefix multiplicative_operator factor) {
-      def value
-        multiplicative_operator.apply(prefix.value, factor.value)
-      end
-    }
-  end
-
-  rule prefix
-    prefixed | exponent
-  end
-
-  rule prefixed
-    (unary_operator prefix) {
-      def value
-        unary_operator.apply(prefix.value)
-      end
-    }
-  end
-
-  rule exponent
-    exponential | primary
-  end
-
-  rule exponential
-    (primary exponential_operator exponent) {
-      def value
-        exponential_operator.apply(primary.value, exponent.value)
-      end
-    }
-  end
-
-  rule primary
-    group | number
-  end
-
-  rule group
-    (lparen term rparen) {
-      def value
-        term.value
-      end
-    }
-  end
-
-  ## Syntax
-
-  rule number
-    float | integer
-  end
-
-  rule float
-    (digits '.' digits space) {
-      def value
-        text.strip.to_f
-      end
-    }
-  end
-
-  rule integer
-    (digits space) {
-      def value
-        text.strip.to_i
-      end
-    }
-  end
-
-  rule digits
-    [0-9]+ ('_' [0-9]+)*
-  end
-
-  rule additive_operator
-    (('+' | '-') space) {
-      def apply(n1, n2)
-        n1.send(text.strip, n2)
-      end
-    }
-  end
-
-  rule multiplicative_operator
-    (('*' | '/' | '%') space) {
-      def apply(n1, n2)
-        n1.send(text.strip, n2)
-      end
-    }
-  end
-
-  rule exponential_operator
-    ('**' space) {
-      def apply(n1, n2)
-        n1 ** n2
-      end
-    }
-  end
-
-  rule unary_operator
-    (('~' | '+' | '-') space) {
-      def apply(n)
-        op = text.strip
-        # Unary + and - require an @.
-        n.send(op == '~' ? op : '%s@' % op)
-      end
-    }
-  end
-
-  rule lparen '(' space end
-  rule rparen ')' space end
-  rule space [ \t\n\r]* end
-end

data/lib/wikicloth/math.rb

@@ -1,155 +0,0 @@
-# The following code taken from http://lukaszwrobel.pl/blog/math-parser-part-3-implementation
-module WikiCloth
-
-class Token
-  Plus     = 0
-  Minus    = 1
-  Multiply = 2
-  Divide   = 3
-  
-  Number   = 4
-  
-  LParen   = 5
-  RParen   = 6
-  
-  End      = 7
-  
-  attr_accessor :kind
-  attr_accessor :value
-  
-  def initialize
-    @kind = nil
-    @value = nil
-  end
-
-  def unknown?
-    @kind.nil?
-  end
-end
-
-class Lexer
-  def initialize(input)
-    @input = input
-    @return_previous_token = false
-  end
-  
-  def get_next_token
-    if @return_previous_token
-      @return_previous_token = false
-      return @previous_token
-    end
-    
-    token = Token.new
-    
-    @input.lstrip!
-
-    case @input
-      when /\A\+/ then
-        token.kind = Token::Plus
-      when /\A-/ then
-        token.kind = Token::Minus
-      when /\A\*/ then
-        token.kind = Token::Multiply
-      when /\A\// then
-        token.kind = Token::Divide
-      when /\A\d+(\.\d+)?/
-        token.kind = Token::Number
-        token.value = $&.to_f
-      when /\A\(/
-        token.kind = Token::LParen
-      when /\A\)/
-        token.kind = Token::RParen
-      when ''
-        token.kind = Token::End
-    end
-    
-    raise 'Unknown token' if token.unknown?
-    @input = $'
-
-    @previous_token = token
-    token
-  end
-  
-  def revert
-    @return_previous_token = true
-  end
-end
-
-class MathParser
-  def parse(input)
-    @lexer = Lexer.new(input)
-    
-    expression_value = expression
-
-    token = @lexer.get_next_token
-    if token.kind == Token::End
-      expression_value
-    else
-      raise 'End expected'
-    end
-  end
-  
-  protected
-  def expression
-    component1 = factor
-
-    additive_operators = [Token::Plus, Token::Minus]
-
-    token = @lexer.get_next_token
-    while additive_operators.include?(token.kind)
-      component2 = factor
-      
-      if token.kind == Token::Plus
-        component1 += component2
-      else
-        component1 -= component2
-      end
-
-      token = @lexer.get_next_token
-    end
-    @lexer.revert
-
-    component1
-  end
-  
-  def factor
-    factor1 = number
-    
-    multiplicative_operators = [Token::Multiply, Token::Divide]
-    
-    token = @lexer.get_next_token
-    while multiplicative_operators.include?(token.kind)
-      factor2 = number
-      
-      if token.kind == Token::Multiply
-        factor1 *= factor2
-      else
-        factor1 /= factor2
-      end
-      
-      token = @lexer.get_next_token
-    end
-    @lexer.revert
-
-    factor1
-  end
-    
-  def number
-    token = @lexer.get_next_token
-    
-    if token.kind == Token::LParen
-      value = expression
-      
-      expected_rparen = @lexer.get_next_token
-      raise 'Unbalanced parenthesis' unless expected_rparen.kind == Token::RParen
-    elsif token.kind == Token::Number
-      value = token.value
-    else
-      raise 'Not a number'
-    end
-    
-    value
-  end
-end
-
-end

data/lib/wikicloth/wiki_buffer/template.rb

@@ -1,32 +0,0 @@
-module WikiCloth
-
-class WikiBuffer::Template < WikiBuffer
-
-  def initialize(data="",options={})
-    super(data,options)
-    @in_quotes = false
-  end
-
-  def to_s
-    "WICKED COOL"
-  end
-
-  protected
-  def new_char()
-    case
-    # End of a template, variable, or function
-    when current_char == '}' && previous_char == '}'
-      puts "TEMP: #{self.data} ----"
-      self.data = ""
-      return false
-
-    else
-      self.data += current_char
-    end
-
-    return true
-  end
-
-end
-
-end