wikicloth 0.8.2 → 0.8.3

data/lib/wikicloth.rb

@@ -58,43 +58,45 @@ module WikiCloth
     end
 
     def render(opt={})
-      self.options = { :noedit => false, :locale => I18n.default_locale, :fast => true, :output => :html, :link_handler => self.link_handler, 
+      self.options = { :noedit => false, :fast => true, :output => :html, :link_handler => self.link_handler, 
 	:params => self.params, :sections => self.sections }.merge(self.options).merge(opt)
       self.options[:link_handler].params = options[:params]
 
-      I18n.locale = self.options[:locale]
-
-      data = self.sections.collect { |s| s.render(self.options) }.join
-      data.gsub!(/<!--(.|\s)*?-->/,"")
-      data << "\n" if data.last(1) != "\n"
-      data << "garbage"
-
-      buffer = WikiBuffer.new("",options)
-
-      begin
-        if self.options[:fast]
-          until data.empty?
-            case data
-            when /\A\w+/
-              data = $'
-              @current_row += $&.length
-              buffer.add_word($&)
-            when /\A[^\w]+(\w|)/m
-              data = $'
-              $&.each_char { |c| add_current_char(buffer,c) }
+      locale = self.options[:locale] || I18n.locale
+
+      I18n.with_locale(locale) do
+        data = self.sections.collect { |s| s.render(self.options) }.join
+        data.gsub!(/<!--(.|\s)*?-->/,"")
+        data << "\n" if data.last(1) != "\n"
+        data << "garbage"
+
+        buffer = WikiBuffer.new("",options)
+
+        begin
+          if self.options[:fast]
+            until data.empty?
+              case data
+              when /\A\w+/
+                data = $'
+                @current_row += $&.length
+                buffer.add_word($&)
+              when /\A[^\w]+(\w|)/m
+                data = $'
+                $&.each_char { |c| add_current_char(buffer,c) }
+              end
             end
+          else
+            data.each_char { |c| add_current_char(buffer,c) }
           end
-        else
-          data.each_char { |c| add_current_char(buffer,c) }
+        rescue => err
+          debug_tree = buffer.buffers.collect { |b| b.debug }.join("-->")
+          puts I18n.t("unknown error on line", :line => @current_line, :row => @current_row, :tree => debug_tree)
+          raise err
         end
-      rescue => err
-        debug_tree = buffer.buffers.collect { |b| b.debug }.join("-->")
-        puts I18n.t("unknown error on line", :line => @current_line, :row => @current_row, :tree => debug_tree)
-        raise err
-      end
 
-      buffer.eof()
-      buffer.send("to_#{self.options[:output]}")
+        buffer.eof()
+        buffer.send("to_#{self.options[:output]}")
+      end
     end
 
     def sections

data/lib/wikicloth/core_ext.rb

@@ -2,6 +2,8 @@ begin
   require 'rinku'
 rescue LoadError
   require 'twitter-text'
+  require 'nokogiri'
+  require 'htmlentities'
 end
 
 READ_MODE = "r:UTF-8"
@@ -34,7 +36,13 @@ module ExtendedString
     end
   else
     def auto_link
-      Twitter::Autolink.auto_link(to_s)
+      doc = Nokogiri::HTML::DocumentFragment.parse(to_s)
+      doc.xpath(".//text()").each do |node|
+        autolink = Twitter::Autolink.auto_link_urls(node.to_s, :suppress_no_follow => true, :target_blank => false)
+        autolink = HTMLEntities.new.decode(autolink) if node.parent.name == "pre"
+        node.replace autolink
+      end
+      doc.to_s
     end
   end
 

data/lib/wikicloth/version.rb

@@ -1,3 +1,3 @@
 module WikiCloth
-  VERSION = "0.8.2" unless defined?(::WikiCloth::VERSION)
+  VERSION = "0.8.3" unless defined?(::WikiCloth::VERSION)
 end

data/lib/wikicloth/wiki_buffer.rb

@@ -218,6 +218,8 @@ class WikiBuffer
         (@paragraph_open ? "</p>" : "") + gen_heading($1.length,$2)
       }
 
+      self.data = self.data.auto_link
+
       # Paragraphs
       if is_heading
         @paragraph_open = false
@@ -232,7 +234,7 @@ class WikiBuffer
         end
       end
 
-      self.params << self.data.auto_link
+      self.params << self.data
       self.data = ""
     else
       self.data << current_char

data/test/test_helper.rb

@@ -1,8 +1,5 @@
-
 require 'rubygems'
-gem "test-unit", ">= 2.0.5"
-require 'active_support'
-require 'active_support/test_case'
 require 'test/unit'
+require 'active_support'
 I18n.load_path << File.join(File.dirname(__FILE__),'locales.yml')
 require File.join(File.dirname(__FILE__),'../init')

data/test/wiki_cloth_test.rb

@@ -37,7 +37,7 @@ class WikiParser < WikiCloth::Parser
   end
 end
 
-class WikiClothTest < ActiveSupport::TestCase
+class WikiClothTest < Test::Unit::TestCase
 
   test "a url should be automaticly linked" do
     wiki = WikiCloth::Parser.new(:data => "\n\n\nhttp://www.google.com/")
@@ -51,10 +51,16 @@ class WikiClothTest < ActiveSupport::TestCase
     assert data.include?('<a href="http://www.google.com/">')
     wiki = WikiCloth::Parser.new(:data => "[https://github.com/repo/README.md README]")
     data = wiki.to_html
-    assert data.include?('https://github.com/repo/README.md')
+    assert_equal data, "\n<p><a href=\"https://github.com/repo/README.md\" target=\"_blank\">README</a></p>"
     assert data =~ /\>\s*README\s*\</
   end
 
+  test "autolinking keeps html entities intact" do
+    wiki = WikiCloth::Parser.new(:data => "<div>&amp; &gt;</div><pre>&amp; &lt;</pre> https://github.com/repo/README.md &gt; &amp;")
+    data = wiki.to_html
+    assert_equal "\n<p><div>&amp; &gt;</div><pre>&amp; &lt;</pre> <a href=\"https://github.com/repo/README.md\">https://github.com/repo/README.md</a> &gt; &amp;</p>", data
+  end
+
   test "image url override" do
     wiki = WikiCloth::Parser.new(:data => "[[Image:test.jpg]]")
     data = wiki.to_html
@@ -279,7 +285,7 @@ class WikiClothTest < ActiveSupport::TestCase
   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;/
+    assert data =~ /\{\{\{1\}\}\}/
   end
 
   test "[[ links ]] should not work inside pre tags" do
@@ -391,7 +397,7 @@ EOS
   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")
+    wiki = WikiParser.new(:data => "<pre>&lt;test</pre><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/)
@@ -440,7 +446,7 @@ EOS
   test "empty item in toc" do
     wiki = WikiCloth::WikiCloth.new({:data => "__TOC__\n=A="})
     data = wiki.render
-    assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td><div id=\"toctitle\"><h2>Table of Contents</h2></div><ul></li><li><a href=\"#A\">A</a></li></ul></td></tr></table>")
+    assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td>\n<div id=\"toctitle\"><h2>Table of Contents</h2></div>\n<ul><li><a href=\"#A\">A</a></li></ul>\n</td></tr></table>")
   end
 
   test "pre at beginning" do
@@ -452,12 +458,12 @@ EOS
   test "toc declared as list" do
     wiki = WikiCloth::WikiCloth.new({:data => "__TOC__\n=A=\n==B==\n===C==="})
     data = wiki.render
-    assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td><div id=\"toctitle\"><h2>Table of Contents</h2></div><ul></li><li><a href=\"#A\">A</a><ul><li><a href=\"#B\">B</a><ul><li><a href=\"#C\">C</a></li></ul></ul></ul></td></tr></table>")
+    assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td>\n<div id=\"toctitle\"><h2>Table of Contents</h2></div>\n<ul><li>\n<a href=\"#A\">A</a><ul><li>\n<a href=\"#B\">B</a><ul><li><a href=\"#C\">C</a></li></ul>\n</li></ul>\n</li></ul>\n</td></tr></table>")
   end
 
   test "toc numbered" do
     wiki = WikiCloth::WikiCloth.new({:data => "=A=\n=B=\n==C==\n==D==\n===E===\n===F===\n====G====\n====H====\n==I==\n=J=\n=K=\n===L===\n===M===\n====N====\n====O===="})
     data = wiki.render(:noedit => true, :toc_numbered => true)
-    assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td><div id=\"toctitle\"><h2>Table of Contents</h2></div><ul></li><li><a href=\"#A\">1 A</a></li><li><a href=\"#B\">2 B</a><ul><li><a href=\"#C\">2.1 C</a></li><li><a href=\"#D\">2.2 D</a><ul><li><a href=\"#E\">2.2.1 E</a></li><li><a href=\"#F\">2.2.2 F</a><ul><li><a href=\"#G\">2.2.2.1 G</a></li><li><a href=\"#H\">2.2.2.2 H</a></li></ul></ul><li><a href=\"#I\">2.3 I</a></li></ul><li><a href=\"#J\">3 J</a></li><li><a href=\"#K\">4 K</a><ul><ul><li><a href=\"#L\">4.1 L</a></li><li><a href=\"#M\">4.2 M</a><ul><li><a href=\"#N\">4.2.1 N</a></li><li><a href=\"#O\">4.2.2 O</a></li></ul></ul></ul></ul></td></tr></table>")
+    assert data.include?("<table id=\"toc\" class=\"toc\" summary=\"Contents\"><tr><td>\n<div id=\"toctitle\"><h2>Table of Contents</h2></div>\n<ul>\n<li><a href=\"#A\">1 A</a></li>\n<li>\n<a href=\"#B\">2 B</a><ul>\n<li><a href=\"#C\">2.1 C</a></li>\n<li>\n<a href=\"#D\">2.2 D</a><ul>\n<li><a href=\"#E\">2.2.1 E</a></li>\n<li>\n<a href=\"#F\">2.2.2 F</a><ul>\n<li><a href=\"#G\">2.2.2.1 G</a></li>\n<li><a href=\"#H\">2.2.2.2 H</a></li>\n</ul>\n</li>\n</ul>\n</li>\n<li><a href=\"#I\">2.3 I</a></li>\n</ul>\n</li>\n<li><a href=\"#J\">3 J</a></li>\n<li>\n<a href=\"#K\">4 K</a><ul><ul>\n<li><a href=\"#L\">4.1 L</a></li>\n<li>\n<a href=\"#M\">4.2 M</a><ul>\n<li><a href=\"#N\">4.2.1 N</a></li>\n<li><a href=\"#O\">4.2.2 O</a></li>\n</ul>\n</li>\n</ul></ul>\n</li>\n</ul>\n</td></tr></table>")
   end
 end

data/wikicloth.gemspec

@@ -23,6 +23,8 @@ spec = Gem::Specification.new do |s|
   s.add_dependency 'builder'
   s.add_dependency 'expression_parser'
   s.add_dependency 'twitter-text'
+  s.add_dependency 'nokogiri'
+  s.add_dependency 'htmlentities'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'activesupport'
   s.add_development_dependency 'i18n'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikicloth
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &17717700 !ruby/object:Gem::Requirement
+  requirement: &21800440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17717700
+  version_requirements: *21800440
 - !ruby/object:Gem::Dependency
   name: expression_parser
-  requirement: &17717280 !ruby/object:Gem::Requirement
+  requirement: &21800020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17717280
+  version_requirements: *21800020
 - !ruby/object:Gem::Dependency
   name: twitter-text
-  requirement: &17716860 !ruby/object:Gem::Requirement
+  requirement: &21799600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17716860
+  version_requirements: *21799600
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &21799180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21799180
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: &21798760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21798760
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &17768360 !ruby/object:Gem::Requirement
+  requirement: &21798340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17768360
+  version_requirements: *21798340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17767940 !ruby/object:Gem::Requirement
+  requirement: &21797920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17767940
+  version_requirements: *21797920
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &17767520 !ruby/object:Gem::Requirement
+  requirement: &21835860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17767520
+  version_requirements: *21835860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17767100 !ruby/object:Gem::Requirement
+  requirement: &21835440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17767100
+  version_requirements: *21835440
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17766680 !ruby/object:Gem::Requirement
+  requirement: &21835020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17766680
+  version_requirements: *21835020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &17766260 !ruby/object:Gem::Requirement
+  requirement: &21834600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17766260
+  version_requirements: *21834600
 description: mediawiki parser
 email: nricciar@gmail.com
 executables: []