wikicloth 0.1.6 → 0.2.0

data/README

@@ -14,6 +14,7 @@ Supports
           o bold ('''), italic ('') or both (''''')
           o Horizontal rule (----)
           o Tables 
+          o Table of Contents [__NOTOC__, __FORCETOC__, __TOC__]
     * <code>,<nowiki>,<pre> (disable wiki markup)
           o space at the beginning of a line (<pre>) 
     * <ref> and <references/> support
@@ -24,54 +25,47 @@ Install
 
   git clone git://github.com/nricciar/wikicloth.git
   cd wikicloth/
-  gem build wikicloth.gemspec
-  sudo gem install wikicloth-0.1.6.gem
+  rake gem
+  sudo gem install pkg/wikicloth-0.2.0.gem
 
 Usage
 ---------------------------------------------------
 
-  include WikiCloth
-
-  @wiki = WikiCloth.new({ 
+  @wiki = WikiCloth::Parser.new({
     :data => "<nowiki>{{test}}</nowiki> ''Hello {{test}}!''\n",
     :params => { "test" => "World" } })
   @wiki.to_html => "<p>&#123;&#123;test&#125;&#125;  <i>Hello World!</i></p>"
 
 
-Wiki Links and Variable/Template Handling
+Advanced Usage
 ---------------------------------------------------
 
-Use the url_for and link_attributes_for methods to override the default URL for 
-an [[internal link]]. If you need even more control, the link_for can also be 
-used to return raw html.
+Most features of WikiCloth can be overriden as needed...
 
-  class CustomLinkHandler < WikiCloth::WikiLinkHandler
+  class WikiParser < WikiCloth::Parser
 
-    def url_for(page)
+    url_for do |page|
       "javascript:alert('You clicked on: #{page}');"
     end
 
-    def link_attributes_for(page)
-       { :href => url_for(page) }
+    link_attributes_for do |page|
+      { :href => url_for(page) }
     end
 
-    def include_resource(resource,options=[])
+    include_resource do |resource,options|
       case resource
       when "date"
         Time.now.to_s
       else
-        # default behavior
-        super(resource,options)
+        params[resource] unless params[resource].nil?
       end
     end
 
   end
 
-
-  @wiki = WikiCloth::WikiCloth.new({ 
+  @wiki = WikiParser.new({ 
     :params => { "PAGENAME" => "Testing123" }, 
-    :link_handler => CustomLinkHandler.new, 
-    :data => "Hello World From {{ PAGENAME }} on {{ date }}\n" 
+    :data => "[[ Hello World ]] From {{ PAGENAME }} on {{ date }}\n" 
   })
 
   @wiki.to_html =>

data/Rakefile

@@ -25,7 +25,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = "wikicloth"
-  s.version = %q{0.1.6}
+  s.version = %q{0.2.0}
   s.author = "David Ricciardi"
   s.email = "nricciar@gmail.com"
   s.homepage = "http://github.com/nricciar/wikicloth"
@@ -40,6 +40,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = false
   s.extra_rdoc_files = ["README","MIT-LICENSE"]
   s.description = %q{mediawiki parser}
+  s.add_dependency 'builder'
 end
 Rake::GemPackageTask.new(spec) do |pkg|
     pkg.need_tar = true

data/lib/wikicloth.rb

@@ -1,8 +1,9 @@
-require 'jcode'
+require 'jcode' if RUBY_VERSION < '1.9'
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "core_ext")
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "wiki_buffer")
 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")
 String.send(:include, ExtendedString)
 
 module WikiCloth
@@ -15,84 +16,37 @@ module WikiCloth
     end
 
     def load(data,p={})
-      self.sections = get_sections(data)
-      self.params = p
-      self.sections.first[:content] += "__TOC__" unless data =~ /__NOTOC__|__TOC__/
-      data = self.sections.collect { |s| s[:heading]+s[:content] }.join("")
-      data.gsub!(/<!--(.|\s)*?-->/,"")
-      data.gsub!(/^[^\s]*\{\{(.*?)\}\}/){ |match| expand_templates($1,["."]) }
-      self.html = data
-    end
-
-    def sections=(val)
-      @sections = val
-    end
-
-    def sections
-      @sections
-    end
-
-    def get_sections(data)
-      last_head = "1"
-      noedit = false
-      sections = [{ :title => "", :content => "", :id => "1", :heading => "" }]
-
-      for line in data
+      depth = 1
+      count = 0
+      root = [self.sections]
+      data.each_line do |line|
         if line =~ /^([=]{1,6})\s*(.*?)\s*(\1)/
-          sections << { :title => $2, :content => "", :heading => "", :id => "" }
-
-          section_depth = $1.length
-          section_title = $2
-
-          if last_head.nil?
-            last_head = "#{section_depth}"
-          else
-            tmp = last_head.split(".")
-            if tmp.last.to_i < section_depth
-              last_head = "#{tmp[0..-1].join(".")}.#{section_depth}"
-            elsif tmp.last.to_i == section_depth
-              last_head = "#{tmp[0..-1].join(".")}"
-            else
-              last_head = "#{tmp[0..-2].join(".")}"
-            end
-          end
-          sections.last[:id] = get_id_for(last_head)
-          sections.last[:heading] = "<h#{section_depth}>" + (noedit == true ? "" :
-            "<span class=\"editsection\">&#91;<a href=\"" + self.link_handler.section_link(sections.last[:id]) +
-            "\" title=\"Edit section: #{section_title}\">edit</a>&#93;</span>") +
-            " <span id=\"#{sections.last[:id]}\" class=\"mw-headline\">#{section_title}</span></h#{section_depth}>"
-        elsif line =~ /__NOEDITSECTION__/
-          noedit = true
+          root << root.last[-1].children if $1.length > depth
+          root.pop if $1.length < depth
+          depth = $1.length
+          root.last << Section.new(line, get_id_for($2.gsub(/\s+/,'_')))
+          count += 1
         else
-          sections.last[:content] += "#{line}\n"
+          root.last[-1] << line
         end
       end
-      sections
+      self.sections.first.auto_toc = true unless count < 4 || data =~ /__(NO|)TOC__/
+      self.params = p
     end
 
-    def expand_templates(template, stack)
-      template.strip!
-      article = link_handler.template(template)
-
-      if article.nil?
-        data = "{{template}}"
-      else
-        unless stack.include?(template) 
-          data = article
-        else
-          data = "WARNING: TEMPLATE LOOP"
-        end
-        data = data.gsub(/^[^\s]*\{\{(.*?)\}\}/){ |match| expand_templates($1,stack + [template])}
-      end
-
-      data
+    def sections
+      @sections ||= [Section.new]
     end
 
     def render(opt={})
+      noedit = false
       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.gsub!(/<!--(.|\s)*?-->/,"")
+      data.gsub!(/\{\{(.*?)(\|(.*?))?\}\}/){ |match| expand_templates($1,$3,["."]) }
       buffer = WikiBuffer.new("",options)
-      self.html.each_char { |c| buffer.add_char(c) }
+      data.each_char { |c| buffer.add_char(c) }
       buffer.to_s
     end
 
@@ -104,20 +58,39 @@ module WikiCloth
       self.options[:link_handler] ||= WikiLinkHandler.new
     end
 
-    def html
-      @page_data + (@page_data[-1,1] == "\n" ? "" : "\n")
-    end
-
     def params
       @page_params ||= {}
     end
 
     protected
+    def expand_templates(template, args, stack)
+      template.strip!
+      article = link_handler.template(template, args)
+
+      if article.nil?
+        data = "{{#{template}}}"
+      else
+        unless stack.include?(template)
+          data = article
+        else
+          data = "WARNING: TEMPLATE LOOP"
+        end
+        data = data.gsub(/\{\{(.*?)(?:\|(.*?))?\}\}?/){ |match| expand_templates($1, $2, stack + [template])}
+      end
+
+      data
+    end
+
+    def sections=(val)
+      @sections = val
+    end
+
     def get_id_for(val)
+      val.gsub!(/[^A-Za-z0-9_]+/,'')
       @idmap ||= {}
       @idmap[val] ||= 0
       @idmap[val] += 1
-      "#{val}-#{@idmap[val]}"
+      @idmap[val] == 1 ? val : "#{val}-#{@idmap[val]}"
     end
 
     def options=(val)
@@ -128,10 +101,6 @@ module WikiCloth
       @options ||= {}
     end
 
-    def html=(val)
-      @page_data = val
-    end
-
     def params=(val)
       @page_params = val
     end

data/lib/wikicloth/core_ext.rb

@@ -1,3 +1,24 @@
+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
+end
+
 module ExtendedString
 
   def blank?

data/lib/wikicloth/parser.rb

@@ -6,7 +6,7 @@ module WikiCloth
       opt.each { |k,v|
         if v.instance_of?(Proc)
           self.class.send :define_method, k.to_sym do |*args|
-            v.call(args)
+            self.instance_exec(args,&v)
           end
         end
       }
@@ -17,65 +17,94 @@ module WikiCloth
     class << self
       def url_for(&block)
         self.send :define_method, 'url_for' do |url|
-          block.call(url)
+          self.instance_exec(url, &block)
         end
       end
 
       def toc(&block)
         self.send :define_method, 'toc' do |sections|
-          block.call(sections)
+          self.instance_exec(sections, &block)
         end
       end
 
+      def function(&block)
+	self.send :define_method, 'function' do |name, params|
+	  self.instance_exec(name, params, &block)
+	end
+      end
+
       def external_link(&block)
 	self.send :define_method, 'external_link' do |url,text|
-	  block.call(url,text)
+	  self.instance_exec(url,text,&block)
 	end
       end
 
       def include_resource(&block)
 	self.send :define_method, 'include_resource' do |resource,options|
 	  options ||= []
-	  block.call(resource,options)
+	  self.instance_exec(resource,options,&block)
 	end
       end
 
       def link_for_resource(&block)
 	self.send :define_method, 'link_for_resource' do |prefix,resource,options|
 	  options ||= []
-	  block.call(prefix,resource,options)
+	  self.instance_exec(prefix,resource,options,&block)
 	end
       end
 
       def section_link(&block)
         self.send :define_method, 'section_link' do |section|
-          block.call(section)
+          self.instance_exec(section,&block)
         end
       end
 
       def template(&block)
         self.send :define_method, 'template' do |template|
-          block.call(template)
+          self.instance_exec(template,&block)
         end
       end
 
       def link_for(&block)
 	self.send :define_method, 'link_for' do |page,text|
-	  block.call(page,text)
+	  self.instance_exec(page,text,&block)
 	end
       end
 
       def link_attributes_for(&block)
 	self.send :define_method, 'link_attributes_for' do |page|
-	  block.call(page)
+	  self.instance_exec(page,&block)
 	end
       end
     end
 
+    # Replace a section, along with any sub-section in the document
+    def put_section(id,data)
+      data = @wikicloth.sections.first.wikitext({ :replace => { id => data } })
+      @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)
+    end
+
+    def sections
+      @wikicloth.sections
+    end
+
     def to_html
       @wikicloth.to_html
     end
 
+    def to_wiki
+      to_wikitext
+    end
+
+    def to_wikitext
+      @wikicloth.sections.first.wikitext()
+    end
+
   end
 
 end

data/lib/wikicloth/section.rb

@@ -0,0 +1,82 @@
+module WikiCloth
+
+  class Section < String
+
+    def initialize(title=nil, id=nil)
+      self.title = title
+      @children = []
+      @id = id
+    end
+
+    def children
+      @children
+    end
+
+    def id
+      @id
+    end
+
+    def auto_toc=(val)
+      @auto_toc = val
+    end
+
+    def title=(val)
+      if val =~ /^([=]{1,6})\s*(.*?)\s*(\1)/
+        @depth = $1.length
+        @clean_title = $2
+        @title = val
+      else
+        @depth = 1
+        @clean_title = val
+        @title = val
+      end
+    end
+
+    def title
+      @clean_title
+    end
+
+    def depth
+      @depth ||= 1
+    end
+
+    def get_section(id)
+      return self.wikitext() if self.id == id
+      @children.each do |child|
+        ret = child.get_section(id)
+        return ret unless ret.nil?
+      end
+      nil
+    end
+
+    def wikitext(opt={})
+      options = { :replace => {} }.merge(opt)
+
+      if options[:replace][self.id].nil?
+        ret = "#{@title}#{self}"
+        ret += @children.collect { |c| c.wikitext(options) }.join
+        ret
+      else
+        options[:replace][self.id]
+      end
+    end
+
+    def render(opt={})
+      options = { :noedit => opt[:link_handler].nil? ? true : false }.merge(opt)
+      if self.title.nil?
+        ret = ""
+      else
+        ret = "<h#{self.depth}>" + (options[:noedit] == true ? "" :
+          "<span class=\"editsection\">&#91;<a href=\"" + options[:link_handler].section_link(self.id) +
+          "\" title=\"Edit section: #{self.title}\">edit</a>&#93;</span>") +
+          " <span id=\"#{self.id}\" class=\"mw-headline\">#{self.title}</span></h#{self.depth}>"
+      end
+      ret += self
+      ret += "__TOC__" if @auto_toc
+      ret += @children.collect { |c| c.render(options) } .join
+      ret
+    end
+
+  end
+
+end

data/lib/wikicloth/wiki_buffer/html_element.rb

@@ -5,12 +5,13 @@ module WikiCloth
 
 class WikiBuffer::HTMLElement < WikiBuffer
 
-  ALLOWED_ELEMENTS = ['a','b','i','div','span','sup','sub','strike','s','u','font','big','ref','tt','del',
+  ALLOWED_ELEMENTS = ['a','b','i','img','div','span','sup','sub','strike','s','u','font','big','ref','tt','del',
 	'small','blockquote','strong','pre','code','references','ol','li','ul','dd','dt','dl','center',
 	'h1','h2','h3','h4','h5','h6','p','table','tr','td','th','tbody','thead','tfoot']
-  ALLOWED_ATTRIBUTES = ['id','name','style','class','href','start','value','colspan']
+  ALLOWED_ATTRIBUTES = ['src','id','name','style','class','href','start','value','colspan','align','boder',
+        'cellpadding','cellspacing']
   ESCAPED_TAGS = [ 'nowiki', 'pre', 'code' ]
-  SHORT_TAGS = [ 'meta','br','hr','img' ]
+  SHORT_TAGS = [ 'meta','br','hr']
   NO_NEED_TO_CLOSE = ['li','p'] + SHORT_TAGS
 
   def initialize(d="",options={},check=nil)

data/lib/wikicloth/wiki_buffer/table.rb

@@ -9,7 +9,6 @@ class WikiBuffer::Table < WikiBuffer
     @start_row = false
     @start_caption = false
     @in_quotes = false
-    @attribute_name = nil
   end
 
   def table_caption
@@ -35,7 +34,8 @@ class WikiBuffer::Table < WikiBuffer
       unless row.empty?
         ret += "<tr" + (params[row_count].nil? || params[row_count].blank? ? "" : " #{params[row_count].strip}") + ">"
         for cell in row
-            cell_attributes = cell[:style].blank? ? "" : " #{cell[:style].strip}"
+            cell_attributes = cell[:style].blank? ? "" : parse_attributes(cell[:style].strip).collect { |k,v| "#{k}=\"#{v}\"" }.join(" ")
+            cell_attributes = cell_attributes.blank? ? "" : " #{cell_attributes}"
             ret += "<#{cell[:type]}#{cell_attributes}> #{cell[:value].strip}\n</#{cell[:type]}>"
         end
         ret += "</tr>"
@@ -45,6 +45,35 @@ class WikiBuffer::Table < WikiBuffer
   end
 
   protected
+  def parse_attributes(data)
+    attribute_name = nil
+    in_quotes = false
+    quote_type = nil
+    ret = {}
+    d = ""
+    prev_char = nil
+
+    for char in data.each_char
+      case
+      when char == "=" && attribute_name.nil? && in_quotes == false
+        attribute_name = d.strip
+        d = ""
+      when (char == '"' || char == "'") && in_quotes == false && !attribute_name.nil?
+        in_quotes = true
+        quote_type = char
+      when char == quote_type && in_quotes == true && prev_char != '\\'
+        ret[attribute_name] = d if WikiBuffer::HTMLElement::ALLOWED_ATTRIBUTES.include?(attribute_name)
+        attribute_name = nil
+        in_quotes = false
+        d = ""
+      else
+        prev_char = char
+        d += char
+      end
+    end
+    ret
+  end
+
   def rows=(val)
     @rows = val
   end
@@ -87,10 +116,6 @@ class WikiBuffer::Table < WikiBuffer
     end
 
     case
-    when @check_cell_data == 1 && current_char == "="
-      @attribute_name = self.data.chop!
-      self.data = ""
-
     # Next table cell in row (TD)
     when current_char == "|" && (previous_char == "\n" || previous_char == "|") && @in_quotes == false
       self.data.chop!
@@ -129,9 +154,6 @@ class WikiBuffer::Table < WikiBuffer
     when current_char == '"' && previous_char != '\\'
       @in_quotes = !@in_quotes
       self.data += '"'
-      if @attribute_name && @in_quotes == false
-        puts "ATTR #{@attribute_name} = #{self.data}"
-      end
 
     # Table params
     when current_char == "\n" && @start_table == true && @in_quotes == false

data/lib/wikicloth/wiki_buffer/var.rb

@@ -18,14 +18,16 @@ class WikiBuffer::Var < WikiBuffer
 
   def to_s
     if self.is_function?
-      ret = "#{buffer_type}"
-      ret += " function #{function_name}"
-      ret += "(#{params.inspect})"
-      ret += " [#{data}]"
+#      ret = "#{buffer_type}"
+#      ret += " function #{function_name}"
+#      ret += "(#{params.inspect})"
+#      ret += " [#{data}]"
+      ret = @options[:link_handler].function(function_name, params.collect { |p| p.strip })
     else
       ret = @options[:link_handler].include_resource("#{params[0]}".strip,params[1..-1])
     end
-    ret ||= "<!-- TEMPLATE[#{params[0]}] NOT FOUND -->"
+#    ret ||= "<!-- TEMPLATE[#{params[0]}] NOT FOUND -->"
+    ret ||= ""
     ret
   end
 
@@ -49,7 +51,6 @@ class WikiBuffer::Var < WikiBuffer
     when current_char == ':' && @in_quotes == false && self.params.size <= 1
       self.function_name = self.data
       self.data = ""
-      puts "[found var function (#{function_name})"
 
     # Dealing with variable names within functions
     # and variables

data/lib/wikicloth/wiki_link_handler.rb

@@ -17,32 +17,34 @@ class WikiLinkHandler
     @params ||= {}
   end
 
-  def toc(sections)
-    parent = sections.first
-    nest_depth = 0
+  def function(name, params)
+    case name
+    when "#if"
+      params.first.blank? ? params[2] : params[1]
+    end
+  end
 
-    ret = "<div style=\"font-weight:bold\">Table of Contents</div><ul>"
-    for section in sections[1..-1]
-      sid = section[:id].split("-").first
-      prev_sid = sid if prev_sid.nil?
+  def toc_children(children)
+    ret = "<ul>"
+    for child in children
+      ret += "<li><a href=\"##{child.id}\">#{child.title}</a>"
+      ret += toc_children(child.children) unless child.children.empty?
+      ret += "</li>"
+    end
+    "#{ret}</ul>"
+  end
 
-      if sid.split(".").length > prev_sid.split(".").length
-        ret += "<ul>"
-        nest_depth += 1
-      end
-      if sid.split(".").length < prev_sid.split(".").length
-        ret += "</ul>"
-        nest_depth -= 1
-      end
-      ret += "<li><a href=\"##{section[:id]}\">#{section[:title]}</a></li>"
-      prev_sid = sid
+  def toc(sections)
+    ret = "<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td><div style=\"font-weight:bold\">Table of Contents</div><ul>"
+    for section in sections[0].children
+      ret += "<li><a href=\"##{section.id}\">#{section.title}</a>"
+      ret += toc_children(section.children) unless section.children.empty?
+      ret += "</li>"
     end
-    ret += "</ul>"
-    nest_depth.times { ret += "</ul>" }
-    ret
+    "#{ret}</ul></td></tr></table>"
   end
 
-  def template(template)
+  def template(template, args)
     nil
   end
 

data/run_tests.rb

@@ -1,30 +1,34 @@
 require 'init'
 include WikiCloth
 
-class CustomLinkHandler < WikiLinkHandler
-  def include_resource(resource,options=[])
+class WikiParser < WikiCloth::Parser
+
+  include_resource do |resource,options|
     case resource
     when "date"
       Time.now.to_s
     else
-      # default behavior
-      super(resource,options)
+      params[resource].nil? ? "" : params[resource]
     end
   end
-  def url_for(page)
+
+  url_for do |page|
     "javascript:alert('You clicked on: #{page}');"
   end
-  def link_attributes_for(page)
-     { :href => url_for(page) }
+
+  link_attributes_for do |page|
+    { :href => url_for(page) }
   end
+
 end
-@wiki = WikiCloth::WikiCloth.new({ 
+
+@wiki = WikiCloth::Parser.new({ 
   :data => "\n  {{test}}\n\n<nowiki>{{test}}</nowiki> ''Hello {{test}}!''\n",
   :params => { "test" => "World" } })
 puts @wiki.to_html
-@wiki = WikiCloth::WikiCloth.new({ 
+
+@wiki = WikiParser.new({ 
   :params => { "PAGENAME" => "Testing123" }, 
-  :link_handler => CustomLinkHandler.new, 
   :data => "\n[[Hello World]] From {{ PAGENAME }} on {{ date }}\n" 
 })
 puts @wiki.to_html
@@ -35,14 +39,16 @@ Dir.glob("sample_documents/*.wiki").each do |x|
   out_name = "#{x}.html"
   data = File.open(x) { |x| x.read }
 
-  tmp = WikiCloth::WikiCloth.new()
-  tmp.load(data, { "PAGENAME" => "HelloWorld" })
-  out = tmp.render({ :output => :html })
+  tmp = WikiCloth::Parser.new({
+    :data => data,
+    :params => { "PAGENAME" => "HelloWorld" }
+  })
+  out = tmp.to_html
   out = "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\" dir=\"ltr\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><link rel=\"stylesheet\" href=\"default.css\" type=\"text/css\" /></head><body>#{out}</body></html>"
 
   File.open(out_name, "w") { |x| x.write(out) }
   end_time = Time.now
-  puts "#{out_name}: Completed (#{end_time - start_time} sec) | External Links: #{tmp.link_handler.external_links.size} -- References: #{tmp.link_handler.references.size}"
+  puts "#{out_name}: Completed (#{end_time - start_time} sec) | External Links: #{tmp.external_links.size} -- References: #{tmp.references.size}"
 
 end
 

data/sample_documents/random.wiki

@@ -1,4 +1,4 @@
-<!-- TEST
+<!-- TEST
 
 -->----
 
@@ -52,4 +52,4 @@ _hello world_
 
 <nowiki>hello {{ BOO }} world</nowiki>
 
-{{#if: {{PAGENAME}} | sucka foo | {{ BLA |1=foo|bla}} }}
+{{#if: {{PAGENAME}} | pagename exists | pagename does not exist }}

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Ricciardi
@@ -15,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 -04:00
+date: 2010-09-15 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: mediawiki parser
 email: nricciar@gmail.com
 executables: []
@@ -29,33 +42,33 @@ extra_rdoc_files:
 - README
 - MIT-LICENSE
 files: 
+- lib/wikicloth.rb
 - lib/wikicloth/core_ext.rb
-- lib/wikicloth/parser.rb
 - lib/wikicloth/wiki_buffer/html_element.rb
-- lib/wikicloth/wiki_buffer/link.rb
-- lib/wikicloth/wiki_buffer/table.rb
 - lib/wikicloth/wiki_buffer/var.rb
-- lib/wikicloth/wiki_buffer.rb
+- lib/wikicloth/wiki_buffer/table.rb
+- lib/wikicloth/wiki_buffer/link.rb
+- lib/wikicloth/parser.rb
+- lib/wikicloth/section.rb
 - lib/wikicloth/wiki_link_handler.rb
-- lib/wikicloth.rb
+- lib/wikicloth/wiki_buffer.rb
 - tasks/wikicloth_tasks.rake
-- sample_documents/air_force_one.wiki
-- sample_documents/cheatsheet.wiki
-- sample_documents/elements.wiki
 - sample_documents/george_washington.wiki
 - sample_documents/images.wiki
+- sample_documents/wiki_tables.wiki
 - sample_documents/lists.wiki
-- sample_documents/pipe_trick.wiki
-- sample_documents/random.wiki
+- sample_documents/elements.wiki
 - sample_documents/tv.wiki
-- sample_documents/versioning.wiki
-- sample_documents/wiki_tables.wiki
+- sample_documents/random.wiki
+- sample_documents/air_force_one.wiki
+- sample_documents/cheatsheet.wiki
+- sample_documents/pipe_trick.wiki
 - init.rb
 - uninstall.rb
 - Rakefile
 - install.rb
-- test/test_helper.rb
 - test/wiki_cloth_test.rb
+- test/test_helper.rb
 - run_tests.rb
 - README
 - MIT-LICENSE
@@ -94,6 +107,6 @@ signing_key:
 specification_version: 3
 summary: An implementation of the mediawiki markup in ruby
 test_files: 
-- test/test_helper.rb
 - test/wiki_cloth_test.rb
+- test/test_helper.rb
 - run_tests.rb

data/sample_documents/versioning.wiki

@@ -1,76 +0,0 @@
-{| style='width: 35em; margin: 1em auto; border-spacing: 0; text-align: center'
-|-
-| colspan='4' |
-| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #999; background: #eeeeee' | 0
-| colspan='2' width='1%' style='font-size: 200%; padding: 0' | .
-| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #9df; background: #eef5ff' | 0
-| colspan='2' width='1%' style='font-size: 200%; padding: 0' | .
-| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #db8; background: #fff5ee' | 17
-| colspan='2' width='1%' style='font-size: 200%; padding: 0' | .
-| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #bd8; background: #f5ffee' | 0
-| colspan='1' width='1%' style='font-size: 200%; padding: 0' | .
-| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #999; background: #eeeeee' | 246
-| colspan='4' |
-|-
-| style='height: 1em' |
-| style='border-bottom: 1px solid #999' |
-| style='width: 1em; border-bottom: 1px solid #999' |
-| style='width: 15em' style='border-bottom: 1px solid #999' |
-| width='1%' style='border-right: 1px solid #999; border-bottom: 1px solid #999' |
-| width='1%' style='border-left: 1px solid #999' |
-| width='1%' style='border-bottom: 1px solid #9df' |
-| width='1%' style='border-bottom: 1px solid #9df' |
-| width='1%' style='border-right: 1px solid #9df; border-bottom: 1px solid #9df' |
-| width='1%' style='border-left: 1px solid #9df' |
-||
-||
-| width='1%' style='border-right: 1px solid #db8' |
-| width='1%' style='border-left: 1px solid #db8' |
-||
-||
-| width='1%' style='border-right: 1px solid #bd8' |
-| width='1%' style='border-left: 1px solid #bd8; border-bottom: 1px solid #bd8' |
-| width='1%' style='border-bottom: 1px solid #bd8' |
-| style='border-right: 1px solid #999' |
-| width='1%' style='border-bottom: 1px solid #999; border-left: 1px solid #999' |
-| style='width: 3em; border-bottom: 1px solid #999'|
-| style='width: 3em; border-bottom: 1px solid #999' |
-| style='border-bottom: 1px solid #999' |
-| style='height: 1em' |
-|-
-| style='height: 1em; border-right: 1px solid #999' |
-| style='border-left: 1px solid #999; border-top: 1px solid #999' |
-| style='border-top: 1px solid #999' |
-| style='border-top: 1px solid #999' |
-| style='border-top: 1px solid #999' |
-| style='border-right: 1px solid #9df' |
-| style='border-left: 1px solid #9df; border-top: 1px solid #9df' |
-| style='border-top: 1px solid #9df' |
-| width='1%' style='border-top: 1px solid #9df' |
-| width='1%' |
-||
-||
-| width='1%' style='border-right: 1px solid #db8' |
-| width='1%' style='border-left: 1px solid #db8' |
-||
-||
-||
-| width='1%' style='border-top: 1px solid #bd8' |
-| width='1%' style='border-right: 1px solid #bd8; border-top: 1px solid #bd8' |
-| width='1%' style='border-left: 1px solid #bd8' |
-| width='1%' style='border-top: 1px solid #999' |
-| style='border-top: 1px solid #999' |
-| style='border-top: 1px solid #999' |
-| style='border-right: 1px solid #999; border-top: 1px solid #999' |
-| width='40' style='border-left: 1px solid #999' |
-|-
-| colspan='2' style='padding: 0.25em; border: 2px solid #999; background: #eeeeee' | Major version number.
-| colspan='1' | <div style='width: 1.5em'></div>
-| colspan='5' style='padding: 0.25em; border: 2px solid #9df; background: #eef5ff' | Level of magma (0-6/7), new major version when it reaches 7.
-| colspan='1' | <div style='width: 0.5em'></div>
-| colspan='8' style='padding: 0.25em; border: 2px solid #db8; background: #fff5ee' | Minor feature version.
-| colspan='1' | <div style='width: 0.5em'></div>
-| colspan='4' style='padding: 0.25em; border: 2px solid #bd8; background: #f5ffee' | Bug/security fixes on current "major.magma.minor" version combo.
-| colspan='1' | <div style='width: 1.5em'></div>
-| colspan='2' style='padding: 0.25em; border: 2px solid #999; background: #eeeeee' | Number of expletives uttered during development. 
-|}