trac-wiki 0.1.3 → 0.1.5

data/Rakefile

@@ -1,6 +1,12 @@
 task :default => :test
 
+
 desc 'Run tests with bacon'
 task :test => FileList['test/*_test.rb'] do |t|
   sh "bacon -q -Ilib:test #{t.prerequisites.join(' ')}"
 end
+
+desc  $stderr.puts("Goodbye, World!") 
+task :test2 => FileList['test/*_test.rb'] do |t|
+  sh "bacon -q -Ilib:test #{t.prerequisites.join(' ')}"
+end

data/bin/trac-wiki.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require 'trac-wiki'
+
+options = {}
+wiki = ARGF.read;
+print TracWiki.render(wiki, options)
+

data/lib/trac-wiki/parser.rb

@@ -43,11 +43,6 @@ module TracWiki
     # Examples: http https ftp ftps
     attr_accessor :allowed_schemes
 
-    # Non-standard wiki text extensions enabled?
-    # E.g. underlined, deleted text etc
-    attr_writer :extensions
-    def extensions?; @extensions; end
-
     # Disable url escaping for local links
     # Escaping: [[/Test]] --> %2FTest
     # No escaping: [[/Test]] --> Test
@@ -59,11 +54,14 @@ module TracWiki
     attr_writer :no_link
     def no_link?; @no_link; end
 
+    attr_writer :math
+    def math?; @math; end
+
     # Create a new Parser instance.
     def initialize(text, options = {})
       @allowed_schemes = %w(http https ftp ftps)
       @text = text
-      @extensions = @no_escape = nil
+      @no_escape = nil
       options.each_pair {|k,v| send("#{k}=", v) }
     end
 
@@ -73,7 +71,7 @@ module TracWiki
     #
     # Example:
     #
-    # parser = CreoleParser.new("**Hello //World//**", :extensions => true)
+    # parser = Parser.new("**Hello //World//**")
     # parser.to_html
     # #=> "<p><strong>Hello <em>World</em></strong></p>"
     def to_html
@@ -239,8 +237,12 @@ module TracWiki
        return ' ' + a.map{|k,v| "#{k}=\"#{v}\"" }.sort.join(' ')
     end
 
-    def make_headline(level, text)
-      "<h#{level}>" << escape_html(text) << "</h#{level}>"
+    def make_headline(level, text, aname)
+      ret = "<h#{level}>" << escape_html(text) << "</h#{level}>"
+      if aname
+        ret = "<a name=\"#{ escape_html(aname) }\"/>" + ret
+      end
+      ret
     end
 
     def make_explicit_link(link)
@@ -319,11 +321,14 @@ module TracWiki
     end
 
     def parse_inline_tag(str)
-      case str
-      when /\A\{\{\{(.*?\}*)\}\}\}/     # inline pre (tt)
+      case
+      when str =~ /\A\{\{\{(.*?\}*)\}\}\}/     # inline pre (tt)
         @out << '<tt>' << escape_html($1) << '</tt>'
-      when /\A`(.*?)`/                  # inline pre (tt)
+      when str =~ /\A`(.*?)`/                  # inline pre (tt)
         @out << '<tt>' << escape_html($1) << '</tt>'
+
+      when math? && str =~ /\A\$(.+?)\$/       # inline math  (tt)
+        @out << '\( ' << escape_html($1) << ' \)'
 #      when /\A\[\[Image\(([^|].*?)(\|(.*?))?\)\]\]/   # image 
 #       @out << make_image($1, $3)
 
@@ -334,35 +339,31 @@ module TracWiki
 #          @out << escape_html($&)
 #        end                             # link
 
-      when /\A([:alpha:]|[:digit:])+/
+      when str =~ /\A([:alpha:]|[:digit:])+/
         @out << $&                      # word
-      when /\A\s+/
+      when str =~ /\A\s+/
         @out << ' ' if @out[-1] != ?\s  # spaces
-      when /\A'''''/
+      when str =~ /\A'''''/
         toggle_tag 'strongem', $&       # bolditallic
-      when /\A\*\*/, /\A'''/
+      when str =~ /\A\*\*/ || str =~ /\A'''/
         toggle_tag 'strong', $&         # bold
-      when /\A''/, /\A\/\//
+      when str =~ /\A''/ || str =~ /\A\/\//
         toggle_tag 'em', $&             # italic
-      when /\A\\\\/, /\A\[\[br\]\]/i
+      when str =~ /\A\\\\/ || str =~ /\A\[\[br\]\]/i
         @out << '<br/>'                 # newline
-      when /\A__/
+      when str =~ /\A__/
         toggle_tag 'u', $&              # underline
-      when /\A~~/
+      when str =~ /\A~~/
         toggle_tag 'del', $&            # delete
 #      when /\A\+\+/
 #        toggle_tag 'ins', $&           # insert
-      when /\A\^/
+      when str =~ /\A\^/
         toggle_tag 'sup', $&            # ^{}
-      when /\A,,/
+      when str =~ /\A,,/
         toggle_tag 'sub', $&            # _{}
-      when /\A\(R\)/i
-        @out << '&#174;'                # (R)
-      when /\A\(C\)/i
-        @out << '&#169;'                # (C)
-      when /\A!([^\s])/
+      when str =~ /\A!([^\s])/
         @out << escape_html($1)         # !neco
-      when /./
+      when str =~ /./
         @out << escape_html($&)         # ordinal char
       end
       return $'
@@ -472,27 +473,33 @@ module TracWiki
 
     def parse_block(str)
       until str.empty?
-        case str
-
+        case
         # pre {{{ ... }}}
-        when /\A\{\{\{\r?\n(.*?)\r?\n\}\}\}/m
+        when math? && str =~ /\A\$\$(.*?)\$\$/
+          end_paragraph
+          nowikiblock = make_nowikiblock($1)
+          @out << "$$" << escape_html(nowikiblock) << "$$\n"
+        when str =~ /\A\{\{\{\r?\n(.*?)\r?\n\}\}\}/m
           end_paragraph
           nowikiblock = make_nowikiblock($1)
           @out << '<pre>' << escape_html(nowikiblock) << '</pre>'
 
         # horizontal rule
-        when /\A\s*-{4,}\s*$/
+        when str =~ /\A\s*-{4,}\s*$/
           end_paragraph
           @out << '<hr/>'
 
         # heading == Wiki Ruless ==
-        when /\A\s*(={1,6})\s*(.*?)\s*=*\s*$(\r?\n)?/
-          end_paragraph
+        # heading == Wiki Ruless ==  #tag
+        when str =~ /\A\s*(={1,6})\s*(.*?)\s*=*\s*(#(\S*))?\s*$(\r?\n)?/
           level = $1.size
-          @out << make_headline(level, $2)
+          title= $2
+          aname= $4
+          end_paragraph
+          @out << make_headline(level, title, aname)
 
         # table row
-        when /\A[ \t]*\|\|(.*)$(\r?\n)?/
+        when str =~ /\A[ \t]*\|\|(.*)$(\r?\n)?/
           if !@stack.include?('table')
             end_paragraph
             start_tag('table')
@@ -500,9 +507,9 @@ module TracWiki
           parse_table_row($1)
 
         # empty line
-        when /\A\s*$(\r?\n)?/
+        when str =~ /\A\s*$(\r?\n)?/
           end_paragraph
-        when /\A([:\w\s]+)::(\s+|\r?\n)/
+        when str =~ /\A([:\w\s]+)::(\s+|\r?\n)/
           term = $1
           start_tag('dl')
           start_tag('dt')
@@ -511,10 +518,10 @@ module TracWiki
           start_tag('dd')
 
         # li
-        when /\A(\s*)([*-]|[aAIi\d]\.)\s+(.*?)$(\r?\n)?/
+        when str =~ /\A(\s*)([*-]|[aAIi\d]\.)\s+(.*?)$(\r?\n)?/
           parse_li_line($1.size, $2, $3)
 
-        when /\A(>[>\s]*)(.*?)$(\r?\n)?/
+        when str =~ /\A(>[>\s]*)(.*?)$(\r?\n)?/
           # citation
           level, quote =  $1.count('>'), $2
 
@@ -524,7 +531,7 @@ module TracWiki
 
 
         # ordinary line
-        when /\A(\s*)(\S+.*?)$(\r?\n)?/
+        when str =~ /\A(\s*)(\S+.*?)$(\r?\n)?/
           spc_size, text =  $1.size, $2
           text.rstrip!
 

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

data/test/parser_test.rb

@@ -4,10 +4,6 @@ class Bacon::Context
   def tc(html, wiki, options = {})
     TracWiki.render(wiki, options).should.equal html
   end
-
-  def tce(html, wiki)
-    tc(html, wiki, :extensions => true)
-  end
 end
 
 describe TracWiki::Parser do
@@ -123,11 +119,27 @@ describe TracWiki::Parser do
     tc "<p><em>This is <strong>also</strong> good.</em></p>\n", "''This is **also** good.''"
   end
 
+  it 'should parse math' do
+    tc "<p>\\( the \\)</p>\n", '$the$', math: true
+    tc "<p>test \\( the \\) west</p>\n", 'test $the$ west', math: true
+    tc "<p>test \\( e^{i\\pi} \\) test</p>\n", 'test $e^{i\pi}$ test', math: true
+    tc "<p>test $ e<sup>{i\\pi} test</sup></p>\n", 'test $ e^{i\pi} test', math: true
+    tc "<p>$the$</p>\n", '$the$', math: false
+
+    tc "<p>ahoj</p>\n$$e^{i\\pi}$$\n<p>nazdar</p>\n", "ahoj\n$$e^{i\\pi}$$\nnazdar", math: true
+    tc "<p>ahoj $$e<sup>{i\\pi}$$ nazdar</sup></p>\n", "ahoj\n$$e^{i\\pi}$$\nnazdar", math: false
+  end
   it 'should parse headings' do
     # Only three differed sized levels of heading are required.
     tc "<h1>Heading 1</h1>", "= Heading 1 ="
     tc "<h2>Heading 2</h2>", "== Heading 2 =="
     tc "<h3>Heading 3</h3>", "=== Heading 3 ==="
+    tc "<a name=\"HE3\"/><h3>Heading 3</h3>", "=== Heading 3 === #HE3"
+    tc "<a name=\"Heading-3\"/><h3>Heading 3</h3>", "=== Heading 3 === #Heading-3"
+    tc "<a name=\"Heading/3\"/><h3>Heading 3</h3>", "=== Heading 3 === #Heading/3"
+    tc "<a name=\"Heading/3\"/><h3>Heading 3</h3>", "=== Heading 3 === #Heading/3  "
+    tc "<a name=\"Heading&lt;3&gt;\"/><h3>Heading 3</h3>", "=== Heading 3 === #Heading<3>"
+    tc "<a name=\"Heading'&quot;3&quot;'\"/><h3>Heading 3</h3>", "=== Heading 3 === #Heading'\"3\"'"
     # WARNING: Optional feature, not specified in 
     tc "<h4>Heading 4</h4>", "==== Heading 4 ===="
     tc "<h5>Heading 5</h5>", "===== Heading 5 ====="
@@ -748,23 +760,25 @@ describe TracWiki::Parser do
        "**bold and\n||table||\nend**")
   end
 
-  it 'should support extensions' do
-    tce("<p>This is <u>underlined</u></p>\n",
-        "This is __underlined__")
+  it 'should support font styles below' do
+    tc("<p>This is <u>underlined</u></p>\n",
+       "This is __underlined__")
 
-    tce("<p>This is <del>deleted</del></p>\n",
-        "This is ~~deleted~~")
+    tc("<p>This is <del>deleted</del></p>\n",
+       "This is ~~deleted~~")
 
-    tce("<p>This is <sup>super</sup></p>\n",
-        "This is ^super^")
+    tc("<p>This is <sup>super</sup></p>\n",
+       "This is ^super^")
 
-    tce("<p>This is <sub>sub</sub></p>\n",
-        "This is ,,sub,,")
+    tc("<p>This is <sub>sub</sub></p>\n",
+       "This is ,,sub,,")
+  end
 
-    tce("<p>&#174;</p>\n", "(R)")
-    tce("<p>&#174;</p>\n", "(r)")
-    tce("<p>&#169;</p>\n", "(C)")
-    tce("<p>&#169;</p>\n", "(c)")
+  it 'should not support signs' do
+    TracWiki.render("(R)").should.not.equal "<p>&#174;</p>\n"
+    TracWiki.render("(r)").should.not.equal "<p>&#174;</p>\n"
+    TracWiki.render("(C)").should.not.equal "<p>&#169;</p>\n"
+    TracWiki.render("(c)").should.not.equal "<p>&#169;</p>\n"
   end
 
   it 'should support no_escape' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -47,7 +47,8 @@ description: TracWiki markup language render (http://trac.edgewall.org/wiki/Wiki
   ).
 email:
 - vitas@matfyz.cz
-executables: []
+executables:
+- trac-wiki.rb
 extensions: []
 extra_rdoc_files:
 - README
@@ -55,6 +56,7 @@ files:
 - Gemfile
 - README
 - Rakefile
+- bin/trac-wiki.rb
 - lib/trac-wiki.rb
 - lib/trac-wiki/parser.rb
 - lib/trac-wiki/version.rb
@@ -85,4 +87,3 @@ signing_key:
 specification_version: 3
 summary: Trac Wiki markup language
 test_files: []
-has_rdoc: