wikicloth 0.6.1 → 0.6.2

data/README

@@ -25,8 +25,7 @@ Install
 
   git clone git://github.com/nricciar/wikicloth.git
   cd wikicloth/
-  rake gem
-  sudo gem install pkg/wikicloth-0.5.0.gem
+  rake install
 
 Usage
 ---------------------------------------------------
@@ -52,24 +51,22 @@ Most features of WikiCloth can be overriden as needed...
       { :href => url_for(page) }
     end
 
-    include_resource do |resource,options|
-      case resource
-      when "date"
-        Time.now.to_s
-      else
-        params[resource] unless params[resource].nil?
-      end
+    template do |template|
+      "Hello {{{1}}}" if template == "hello"
+    end
+
+    external_link do |url,text|
+      "<a href=\"#{url}\" target=\"_blank\" class=\"exlink\">#{text.blank? ? url : text}</a>"
     end
 
   end
 
   @wiki = WikiParser.new({ 
     :params => { "PAGENAME" => "Testing123" }, 
-    :data => "[[ Hello World ]] From {{ PAGENAME }} on {{ date }}\n" 
+    :data => "{{hello|world}} From {{ PAGENAME }} -- [www.google.com]" 
   })
 
   @wiki.to_html =>
   <p>
-  <a href="javascript:alert('You clicked on: Hello World');">Hello World</a> From Testing123 on Wed Jul 08 22:23:44 -0400 2009
+  Hello world From Testing123 -- <a href="http://www.google.com" target="_blank" class="exlink">http://www.google.com</a>
   </p>
-

data/lib/wikicloth.rb

@@ -10,7 +10,7 @@ String.send(:include, ExtendedString)
 
 module WikiCloth
 
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 
   class WikiCloth
 
@@ -54,7 +54,7 @@ module WikiCloth
 
     def render(opt={})
       noedit = false
-      self.params.merge!({ 'WIKI_VERSION' => ::WikiCloth::VERSION })
+      self.params.merge!({ 'WIKI_VERSION' => ::WikiCloth::VERSION, 'RUBY_VERSION' => RUBY_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.collect { |s| s.render(self.options) }.join

data/lib/wikicloth/section.rb

@@ -75,9 +75,10 @@ module WikiCloth
         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}>"
+          "<span id=\"#{self.id}\" class=\"mw-headline\"><a name=\"#{self.id}\">#{self.title}</a></span></h#{self.depth}>"
       end
-      ret += @template ? self.gsub(/\{\{\{\s*([A-Za-z0-9]+)\s*\}\}\}/,'\1') : self
+      #ret += @template ? self.gsub(/\{\{\{\s*([A-Za-z0-9]+)\s*\}\}\}/,'\1') : self
+      ret += self
       ret += "__TOC__" if @auto_toc
       ret += @children.collect { |c| c.render(options) } .join
       ret

data/lib/wikicloth/wiki_buffer.rb

@@ -147,7 +147,14 @@ class WikiBuffer
         self.data.gsub!(/---([^-]+)---/,"<strike>\\1</strike>")
         self.data.gsub!(/_([^_]+)_/,"<u>\\1</u>")
       end
-      self.data.gsub!(/__TOC__/) { |r| @options[:link_handler].toc(@options[:sections]) }
+      self.data.gsub!(/__([A-Z]+)__/) { |r|
+        case $1
+        when "TOC"
+          @options[:link_handler].toc(@options[:sections])
+        else
+          ""
+        end
+      }
       self.data.gsub!(/^([-]{4,})/) { |r| "<hr />" }
       self.data.gsub!(/^([=]{1,6})\s*(.*?)\s*(\1)/) { |r|
         "<h#{$1.length}>#{$2}</h#{$1.length}>"

data/lib/wikicloth/wiki_buffer/html_element.rb

@@ -8,8 +8,8 @@ class WikiBuffer::HTMLElement < WikiBuffer
   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 = ['src','id','name','style','class','href','start','value','colspan','align','boder',
-        'cellpadding','cellspacing']
+  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' ]
   SHORT_TAGS = [ 'meta','br','hr']
   NO_NEED_TO_CLOSE = ['li','p'] + SHORT_TAGS
@@ -88,7 +88,12 @@ class WikiBuffer::HTMLElement < WikiBuffer
     when "nowiki"
       return self.element_content
     when "a"
-      return @options[:link_handler].external_link(self.element_attributes['href'], self.element_content)
+      if self.element_attributes['href'] =~ /:\/\//
+        return @options[:link_handler].external_link(self.element_attributes['href'], self.element_content)
+      elsif self.element_attributes['href'].nil? || self.element_attributes['href'] =~ /^\s*([\?\/])/
+        # 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
     end
 
     tmp = elem.tag!(self.element_name, self.element_attributes) { |x| x << self.element_content }

data/lib/wikicloth/wiki_buffer/link.rb

@@ -14,7 +14,10 @@ class WikiBuffer::Link < WikiBuffer
   def to_s
     link_handler = @options[:link_handler]
     unless self.internal_link
-      return link_handler.external_link("#{params[0]}".strip, "#{params[1]}".strip)
+      url = "#{params[0]}".strip
+      url = 'http://' + url if url !~ /^\s*(([a-z]+):\/\/|[\?\/])/
+
+      return link_handler.external_link(url, "#{params[1]}".strip)
     else
       case
       when params[0] =~ /^:(.*)/

data/lib/wikicloth/wiki_buffer/var.rb

@@ -94,7 +94,6 @@ class WikiBuffer::Var < WikiBuffer
       default.nil? ? "" : default
     when "#expr"
       begin
-puts params.first.inspect
         ExpressionParser::Parser.new.parse(params.first)
       rescue RuntimeError
         "Expression error: #{$!}"

data/lib/wikicloth/wiki_link_handler.rb

@@ -69,7 +69,7 @@ class WikiLinkHandler
 
   def external_link(url,text)
     self.external_links << url
-    elem.a({ :href => url }) { |x| x << (text.blank? ? url : text) }
+    elem.a({ :href => url, :target => "_blank" }) { |x| x << (text.blank? ? url : text) }
   end
 
   def external_links=(val)

data/test/wiki_cloth_test.rb

@@ -27,11 +27,59 @@ class WikiClothTest < ActiveSupport::TestCase
   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.external_links.size == 41
     assert wiki.references.size == 76
     assert wiki.internal_links.size == 560
   end
 
+  test "behavior switch should not show up in the html output" do
+    wiki = WikiParser.new(:data => "__NOTOC__hello world")
+    data = wiki.to_html
+    assert data !~ /TOC/
+  end
+
+  test "template vars should not be parsed inside a pre tag" do
+    wiki = WikiCloth::Parser.new(:data => "<pre>{{{1}}}</pre>")
+    data = wiki.to_html
+    assert data =~ /&#123;&#123;&#123;1&#125;&#125;&#125;/
+  end
+
+  test "[[ links ]] should not work inside pre tags" do
+    data = <<EOS 
+Now instead of calling WikiCloth::Parser directly call your new class.
+
+<pre>  @wiki = WikiParser.new({
+    :params => { "PAGENAME" => "Testing123" },
+    :data => "[[test]] {{hello|world}} From {{ PAGENAME }} -- [www.google.com]"
+  })
+
+  @wiki.to_html</pre>
+EOS
+    wiki = WikiCloth::Parser.new(:data => data)
+    data = wiki.to_html
+    assert data !~ /href/
+    assert data !~ /\{/
+    assert data !~ /\]/
+  end
+
+  test "external links without a http:// prefix" do
+    wiki = WikiCloth::Parser.new(:data => "[www.google.com]")
+    data = wiki.to_html
+    assert data =~ /http/
+  end
+
+  test "auto pre at end of document" do
+    wiki = WikiParser.new(:data => "test\n\n hello\n world\nend")
+    data = wiki.to_html
+    assert data =~ /hello/
+    assert data =~ /world/
+
+    wiki = WikiParser.new(:data => "test\n\n hello\n world")
+    data = wiki.to_html
+    assert data =~ /hello/
+    assert data =~ /world/
+  end
+
   test "template params" do
     wiki = WikiParser.new(:data => "{{testparams|test|test=bla|it worked|bla=whoo}}\n")
     data = wiki.to_html
@@ -102,7 +150,6 @@ class WikiClothTest < ActiveSupport::TestCase
     data = wiki.to_html
     assert !(data =~ /<script/)
     assert !(data =~ /onmouseover/)
-    assert data =~ /exlink/
   end
 
   test "nowiki and code tags" do
@@ -115,10 +162,10 @@ class WikiClothTest < ActiveSupport::TestCase
   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>"
+    assert_equal data, "<p>\n<h1><span class=\"editsection\">&#91;<a href=\"?section=Hallo\" title=\"Edit section: Hallo\">edit</a>&#93;</span> <span class=\"mw-headline\" id=\"Hallo\"><a name=\"Hallo\">Hallo</a></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>"
+    assert_equal data, "<p>\n<h1><span class=\"mw-headline\" id=\"Hallo\"><a name=\"Hallo\">Hallo</a></span></h1>\n</p>"
 
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wikicloth
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - David Ricciardi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +00:00
+date: 2011-01-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency