wikicloth 0.6.2 → 0.6.3

data/lib/wikicloth/section.rb

@@ -75,7 +75,7 @@ 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\"><a name=\"#{self.id}\">#{self.title}</a></span></h#{self.depth}>"
+          "<span id=\"#{self.id}\" class=\"mw-headline\"><a name=\"#{self.id}\">#{self.title}</a></span></h#{self.depth}>\n"
       end
       #ret += @template ? self.gsub(/\{\{\{\s*([A-Za-z0-9]+)\s*\}\}\}/,'\1') : self
       ret += self

data/lib/wikicloth/wiki_buffer/link.rb

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

data/lib/wikicloth/wiki_buffer/var.rb

@@ -1,4 +1,5 @@
 require 'expression_parser'
+require 'uri'
 
 module WikiCloth
 
@@ -22,6 +23,10 @@ class WikiBuffer::Var < WikiBuffer
     @tag_size = val
   end
 
+  def skip_links?
+    true
+  end
+
   def skip_html?
     false
   end
@@ -46,7 +51,7 @@ class WikiBuffer::Var < WikiBuffer
     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"
+        ret = b.get_param(params[0].downcase,params[1]) if b.instance_of?(WikiBuffer::HTMLElement) && b.element_name == "template"
       end
       ret.to_s
     else
@@ -62,7 +67,7 @@ class WikiBuffer::Var < WikiBuffer
         count = 0
         tag_attr = self.params[1..-1].collect { |p|
           if p.instance_of?(Hash)
-            "#{p[:name]}=\"#{p[:value]}\""
+            "#{p[:name].downcase}=\"#{p[:value]}\""
           else
             count += 1
             "#{count}=\"#{p}\""
@@ -98,6 +103,17 @@ class WikiBuffer::Var < WikiBuffer
       rescue RuntimeError
         "Expression error: #{$!}"
       end
+    when "#ifexpr"
+      val = false
+      begin
+        val = ExpressionParser::Parser.new.parse(params.first)
+      rescue RuntimeError
+      end
+      if val
+        params[1]
+      else
+        params[2]
+      end
     when "#ifeq"
       if params[0] =~ /^[0-9A-Fa-f]+$/ && params[1] =~ /^[0-9A-Fa-f]+$/
         params[0].to_i == params[1].to_i ? params[2] : params[3]
@@ -122,6 +138,8 @@ class WikiBuffer::Var < WikiBuffer
     when "#capture"
       @options[:params][params.first] = params[1]
       ""
+    when "urlencode"
+      URI.escape(params.first, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     when "lc"
       params.first.downcase
     when "uc"
@@ -132,6 +150,17 @@ 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 "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]
     when "debug"
       ret = nil
       case params.first

data/lib/wikicloth/wiki_buffer.rb

@@ -30,6 +30,10 @@ class WikiBuffer
     false
   end
 
+  def skip_links?
+    false
+  end
+
   def data
     @data ||= ""
   end
@@ -58,7 +62,7 @@ class WikiBuffer
   end
 
   def to_s
-    "<p>" + self.params.join("\n") + "</p>"
+    self.params.join("\n")
   end
 
   def check_globals()
@@ -74,7 +78,7 @@ class WikiBuffer
         @indent = nil
         return true
       end
-      if current_char == " " && @indent.nil? && @buffers[-1].class != WikiBuffer::HTMLElement
+      if current_char == " " && @indent.nil? && ![WikiBuffer::HTMLElement,WikiBuffer::Var].include?(@buffers[-1].class)
         "\n<pre> ".each_char { |c| @buffers[-1].add_char(c) }
         @indent = @buffers[-1].object_id
         return true
@@ -103,7 +107,7 @@ class WikiBuffer
         return true
 
       # start link
-      when current_char == '[' && previous_char != '['
+      when current_char == '[' && previous_char != '[' && !@buffers[-1].skip_links?
         @buffers << WikiBuffer::Link.new("",@options)
         return true
 
@@ -217,11 +221,9 @@ class WikiBuffer
           @list_data = cdata
           tmp
         }
-        self.data += line + "\n"
+        self.data += line + ""
       end
 
-      self.data = "</p><p>" if self.data.blank?
-
       self.params << self.data.auto_link
       self.data = ""
     else

data/lib/wikicloth/wiki_link_handler.rb

@@ -81,7 +81,7 @@ class WikiLinkHandler
   end
 
   def url_for(page)
-    "javascript:void(0)"
+    "#{page}"
   end
 
   def link_attributes_for(page)
@@ -99,13 +99,20 @@ class WikiLinkHandler
     if self.params.has_key?(resource)
       self.params[resource]
     else
-      ret = template(resource)
-      unless ret.nil?
-        @included_templates ||= {}
-        @included_templates[resource] ||= 0
+      @template_cache ||= {}
+      if @template_cache[resource]
         @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
-      ret
     end
   end
 
@@ -146,7 +153,7 @@ class WikiLinkHandler
       type = nil
       w = 180
       h = nil
-      title = nil
+      title = ''
       ffloat = false
 
       options.each do |x|

data/lib/wikicloth.rb

@@ -10,7 +10,7 @@ String.send(:include, ExtendedString)
 
 module WikiCloth
 
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 
   class WikiCloth
 
@@ -62,7 +62,7 @@ module WikiCloth
       data << "\n" if data.last(1) != "\n"
       buffer = WikiBuffer.new("",options)
       data.each_char { |c| buffer.add_char(c) }
-      buffer.to_s
+      "<p>"+buffer.to_s.gsub(/\n\s*\n/m) { |p| "</p>\n\n<p>" }+"</p>"
     end
 
     def to_html(opt={})

data/run_tests.rb

@@ -29,7 +29,7 @@ puts @wiki.to_html
 
 @wiki = WikiParser.new({ 
   :params => { "PAGENAME" => "Testing123" }, 
-  :data => "\n[[Hello World]] From {{ PAGENAME }} on {{ date }}\n" 
+  :data => "[[Hello World]] From {{ PAGENAME }} on {{ date }}" 
 })
 puts @wiki.to_html
 

data/test/wiki_cloth_test.rb

@@ -27,9 +27,26 @@ 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 == 41
+    assert wiki.external_links.size == 38
     assert wiki.references.size == 76
-    assert wiki.internal_links.size == 560
+    assert wiki.internal_links.size == 450
+  end
+
+  test "Embedded images with no explicit title" do
+    wiki = WikiParser.new(:data => "[[Image:Rectangular coordinates.svg|left|thumb|250px]]")
+    test = true
+    begin
+      data = wiki.to_html
+    rescue
+      test = false 
+    end
+    assert test == true
+  end
+
+  test "First item in list not created when list is preceded by a heading" do
+    wiki = WikiParser.new(:data => "=Heading=\n* One\n* Two\n* Three")
+    data = wiki.to_html
+    assert data !~ /\*/
   end
 
   test "behavior switch should not show up in the html output" do
@@ -62,12 +79,6 @@ EOS
     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
@@ -162,10 +173,10 @@ EOS
   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\" title=\"Edit section: Hallo\">edit</a>&#93;</span> <span class=\"mw-headline\" id=\"Hallo\"><a name=\"Hallo\">Hallo</a></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></p>"
 
     data = wiki.to_html(:noedit => true)
-    assert_equal data, "<p>\n<h1><span class=\"mw-headline\" id=\"Hallo\"><a name=\"Hallo\">Hallo</a></span></h1>\n</p>"
+    assert_equal data, "<p>\n<h1><span class=\"mw-headline\" id=\"Hallo\"><a name=\"Hallo\">Hallo</a></span></h1></p>"
 
   end
 

metadata

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