trac-wiki 0.1.6 → 0.1.7

data/lib/trac-wiki/parser.rb

@@ -58,6 +58,9 @@ module TracWiki
     attr_writer :math
     def math?; @math; end
 
+    attr_writer :merge
+    def merge?; @merge; end
+
     # Create a new Parser instance.
     def initialize(text, options = {})
       @allowed_schemes = %w(http https ftp ftps)
@@ -487,6 +490,15 @@ module TracWiki
           nowikiblock = make_nowikiblock($1)
           @out << "$$" << escape_html(nowikiblock) << "$$\n"
           @was_math = true
+        when merge? && str =~ /\A(<<<<<<<|=======|>>>>>>>)\s+(\S+).*$(\r?\n)?/
+          who = $2
+          merge_class = case $1[0]
+                          when '<' ; 'merge-mine'
+                          when '=' ; 'merge-orig'
+                          when '>' ; 'merge-your'
+                        end
+          end_paragraph
+          @out << "<div class='merge #{merge_class}'>" << escape_html(who) << "</div>\n"
         when str =~ /\A\{\{\{\r?\n(.*?)\r?\n\}\}\}/m
           end_paragraph
           nowikiblock = make_nowikiblock($1)

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/test/parser_test.rb

@@ -131,6 +131,10 @@ describe TracWiki::Parser do
 
     tc "$$\\\\$$\n", "$$\\\\$$", math: true
     tc "$$\n^test\n$$\n", "$$\n^test\n$$", math: true
+
+    tc "<p>$a<sup>b</sup>c$</p>\n", "!$a^b^c$", math: true
+    tc "<p>$a<strong>b</strong>c$</p>\n", "!$a**b**c$", math: true
+    tc "<p>!$a$</p>\n", "!!!$a$", math: true
   end
   it 'should parse headings' do
     # Only three differed sized levels of heading are required.
@@ -789,5 +793,11 @@ describe TracWiki::Parser do
     tc("<p><a href=\"a%2Fb%2Fc\">a/b/c</a></p>\n", "[a/b/c]")
     tc("<p><a href=\"a/b/c\">a/b/c</a></p>\n", "[[a/b/c]]", :no_escape => true)
   end
+  it 'should support merge' do
+    tc "<div class='merge merge-orig'>original</div>\n", "======= original", :merge => true
+    tc "<div class='merge merge-mine'>mine</div>\n",     "<<<<<<< mine", :merge => true
+    tc "<div class='merge merge-your'>your</div>\n",     ">>>>>>> your", :merge => true
+    tc "<p>bhoj</p>\n<div class='merge merge-your'>your</div>\n<p>ahoj</p>\n",     "bhoj\n>>>>>>> your\nahoj", :merge => true
+  end
 end
 # vim: tw=0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon