trac-wiki 0.1.9 → 0.1.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5c3c0e79552d6d60ecbb77c54fbaa434d208ca56
+  data.tar.gz: dd2e9ab2b74410c6b3abf6265d43185fcaec19cd
+SHA512:
+  metadata.gz: c173fe3e96fdceaa1e587c2a41e75e50fa731bfb3403270463d3352014e8223dd459ba7df0e5ea9d6377be54d701d19ec3a00dfb3b259583cd70325ab9d5bc15
+  data.tar.gz: b7c6a4d413d44ea1bb30d9e49454420a5ecd639601ea79ef19f80a73e1831c1165bac4d94b9da75757d5ca440fc301ff5a062554329293f8bb5821e41a296e0f

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org/'
 gemspec
+gem 'iconv'

data/lib/trac-wiki.rb

@@ -13,4 +13,7 @@ module TracWiki
   def self.render(text, options = {})
     Parser.new(text, options).to_html
   end
+  def self.parser(text, options = {})
+    Parser.new(text, options)
+  end
 end

data/lib/trac-wiki/parser.rb

@@ -1,5 +1,6 @@
 require 'cgi'
 require 'uri'
+require 'iconv'
 
 # :main: TracWiki
 
@@ -43,6 +44,8 @@ module TracWiki
     # Examples: http https ftp ftps
     attr_accessor :allowed_schemes
 
+    attr_accessor :headings
+
 
     # Disable url escaping for local links
     # Escaping: [[/Test]] --> %2FTest
@@ -58,12 +61,30 @@ module TracWiki
     attr_writer :math
     def math?; @math; end
 
+    attr_writer :edit_heading
+    def edit_heading?; @edit_heading; end
+
+    # understand merge tags  (see diff3(1))
+    # >>>>>>> mine
+    # ||||||| orig
+    # =======
+    # <<<<<<< yours
+    # convert to <div class="merge merge-mine">mine</div>
     attr_writer :merge
     def merge?; @merge; end
 
+    # every heading will had id, generated from heading text
+    attr_writer :id_from_heading
+    def id_from_heading?; @id_from_heading; end
+
+    # when id_from_heading, non ascii char are transliterated to ascii
+    attr_writer :id_translit
+    def id_translit?; @id_translit; end
+
     # Create a new Parser instance.
     def initialize(text, options = {})
       @allowed_schemes = %w(http https ftp ftps)
+      @anames = {}
       @text = text
       @no_escape = nil
       options.each_pair {|k,v| send("#{k}=", v) }
@@ -83,20 +104,33 @@ module TracWiki
     # #=> "<p><strong>Hello <em>World</em></strong></p>"
     def to_html
       @out = ''
+      @edit_heading_class = 'editheading'
+      @headings = [ {level: 0, sline: 1 } ]
       @p = false
       @stack = []
       @stacki = []
       @was_math = false
+      @line_no = 1
       parse_block(@text)
       @out
     end
 
+    def make_toc_html
+      @out = ''
+      parse_block(make_toc)
+    end
+
     protected
 
     # Escape any characters with special meaning in HTML using HTML
-    # entities.
+    # entities. (&<>" not ')
     def escape_html(string)
-      CGI::escapeHTML(string)
+      #CGI::escapeHTML(string)
+      Parser.escapeHTML(string)
+    end
+
+    def self.escapeHTML(string)
+      string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
     end
 
     # Escape any characters with special meaning in URLs using URL
@@ -176,7 +210,10 @@ module TracWiki
     # make_local_link("LocalLink") #=> "/LocalLink"
     # make_local_link("Wikipedia:Bread") #=> "http://en.wikipedia.org/wiki/Bread"
     def make_local_link(link) #:doc:
-      no_escape? ? link : escape_url(link)
+      return link if no_escape?
+      link, anch = link.split(/#/, 2)
+      return escape_url(link) if ! anch
+      "#{escape_url(link)}##{escape_url(anch)}"
     end
 
     # Sanatize a direct url (e.g. http://wikipedia.org/). The default
@@ -246,13 +283,24 @@ module TracWiki
     end
 
     def make_headline(level, text, aname)
-      ret = "<h#{level}>" << escape_html(text) << "</h#{level}>"
+      ret = "<h#{level}"
       if aname
-        ret = "<a name=\"#{ escape_html(aname) }\"/>" + ret
+        ret += " id=\"#{ escape_html(aname) }\""
+      end
+      ret += ">" + escape_html(text)
+
+      if edit_heading?
+        ret += edit_heading_link(@headings.size - 1)
       end
+
+      ret += "</h#{level}>"
       ret
     end
 
+    def edit_heading_link(section)
+        "<a class='#{@edit_heading_class}' href=\"?edit=#{section}\">edit</a>"
+    end
+
     def make_explicit_link(link)
       begin
         uri = URI.parse(link)
@@ -262,6 +310,18 @@ module TracWiki
       make_local_link(link)
     end
 
+
+    def make_toc
+        @headings.map do |h|
+           if h[:level] < 1
+             ''
+           else
+             ind = "  " * (h[:level] - 1)
+             "#{ind}* [[##{h[:aname]}|#{h[:title]}]]\n"
+           end
+        end.join
+    end
+
     def parse_inline(str)
       until str.empty?
         case str
@@ -512,10 +572,12 @@ module TracWiki
 
         # heading == Wiki Ruless ==
         # heading == Wiki Ruless ==  #tag
-        when str =~ /\A\s*(={1,6})\s*(.*?)\s*=*\s*(#(\S*))?\s*$(\r?\n)?/
+        when str =~ /\A[[:blank:]]*(={1,6})\s*(.*?)\s*=*\s*(#(\S*))?\s*$(\r?\n)?/
           level = $1.size
           title= $2
-          aname= $4
+          aname= aname_nice($4, title)
+          @headings.last[:eline] = @line_no - 1
+          @headings.push({ :title =>  title, :sline => @line_no, :aname => aname, :level => level, })
           end_paragraph
           @out << make_headline(level, title, aname)
 
@@ -576,10 +638,34 @@ module TracWiki
         else # case str
           raise "Parse error at #{str[0,30].inspect}"
         end
+        @line_no += ($`+$&).count("\n")
         str = $'
       end
       end_paragraph
+      @headings.last[:eline] = @line_no - 1 
       @out
     end
+
+    def aname_nice(aname, title)
+
+      if aname.nil? && id_from_heading?
+        aname = title.gsub /\s+/, '_'
+        if id_translit?
+          aname = Iconv.iconv('ascii//translit', 'utf-8', aname).join
+        end
+      end
+      return nil if aname.nil?
+      aname_ori = aname
+      count = 2
+      while @anames[aname]
+        aname = aname_ori + ".#{count}"
+        count+=1
+      end
+      @anames[aname] = true
+      aname
+    end
+
+
+
   end
 end

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.1.9'
+  VERSION = '0.1.12'
 end

data/test/parser_test.rb

@@ -1,9 +1,17 @@
 require 'trac-wiki'
+require 'pp'
+
 
 class Bacon::Context
   def tc(html, wiki, options = {})
     TracWiki.render(wiki, options).should.equal html
   end
+  def  h(hash, wiki, opts = {})
+    parser = TracWiki.parser(wiki, opts)
+    parser.to_html
+    #pp parser.headers
+    parser.headings.should == hash
+  end
 end
 
 describe TracWiki::Parser do
@@ -141,12 +149,14 @@ describe TracWiki::Parser do
     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\"'"
+    tc "<h3 id=\"HE3\">Heading 3</h3>", "=== Heading 3 === #HE3"
+    tc "<h3 id=\"Heading-3\">Heading 3</h3>", "=== Heading 3 === #Heading-3"
+    tc "<h3 id=\"Heading/3\">Heading 3</h3>", "=== Heading 3 === #Heading/3"
+    tc "<h3 id=\"Heading/3\">Heading 3</h3>", "=== Heading 3 === #Heading/3  "
+    tc "<h3 id=\"Heading/3\">Heading 3</h3><h3 id=\"Heading/3.2\">Heading 3</h3>",
+       "=== Heading 3 === #Heading/3\n=== Heading 3 === #Heading/3\n  "
+    tc "<h3 id=\"Heading&lt;3&gt;\">Heading 3</h3>", "=== Heading 3 === #Heading<3>"
+    tc "<h3 id=\"Heading'&quot;3&quot;'\">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 ====="
@@ -182,6 +192,8 @@ describe TracWiki::Parser do
   it 'should parse links' do
     #  Links
     tc "<p><a href=\"link\">link</a></p>\n", "[[link]]"
+    tc "<p><a href=\"link#link\">link#link</a></p>\n", "[[link#link]]"
+    tc "<p><a href=\"#link\">#link</a></p>\n", "[[#link]]"
 
     #  Links can appear in paragraphs (i.e. inline item)
     tc "<p>Hello, <a href=\"world\">world</a></p>\n", "Hello, [[world]]"
@@ -191,11 +203,12 @@ describe TracWiki::Parser do
 
     #  URLs
     tc "<p><a href=\"http://www.example.org/\">http://www.example.org/</a></p>\n", "[[http://www.example.org/]]"
+    tc "<p><a href=\"http://www.example.org/#anch\">http://www.example.org/#anch</a></p>\n", "[[http://www.example.org/#anch]]"
 
     #  Single punctuation characters at the end of URLs
     # should not be considered a part of the URL.
     [',','.','?','!',':',';','\'','"'].each do |punct|
-      esc_punct = CGI::escapeHTML(punct)
+      esc_punct = TracWiki::Parser.escapeHTML(punct)
       tc "<p><a href=\"http://www.example.org/\">http://www.example.org/</a>#{esc_punct}</p>\n", "http://www.example.org/#{punct}"
     end
     #  Nameds URLs (by example)
@@ -803,5 +816,43 @@ describe TracWiki::Parser do
 
     tc "<h6></h6><p>ahoj</p>\n", "=======\nahoj\n", :merge => false
   end
+  it 'should compute headers' do
+    h( [ {:level=>0, :sline=>1, :eline=>2},
+         {:title=>"ahoj", :sline=>3, :eline=> 5, :aname=>nil, :level=>2},
+       ],
+       "\nahoj\n== ahoj ==\nbhoj\nchoj\n")
+    h( [ {:level=>0, :sline=>1, :eline=>2},
+         {:title=>"ahoj", :sline=>3, :eline => 5, :aname=>nil, :level=>2},
+         {:title=>"dhoj", :sline=>6, :eline => 7, :aname=>nil, :level=>3},
+       ],
+       "\nahoj\n== ahoj ==\nbhoj\nchoj\n===dhoj===\nkuk\n")
+    h( [ {:level=>0, :sline=>1, :eline=>2},
+         {:title=>"ahoj", :sline=>3, :eline => 7, :aname=>nil, :level=>2},
+         {:title=>"dhoj", :sline=>8, :eline => 9, :aname=>nil, :level=>3},
+       ],
+       "\nahoj\n== ahoj ==\nbhoj\nchoj\n\n\n===dhoj===\nkuk\n")
+    h( [ {:level=>0, :sline=>1, :eline=>2},
+         {:title=>"ah o ~'j", :sline=>3, :eline => 5, :aname=>nil, :level=>2},
+         {:title=>"*dhoj",    :sline=>6, :eline => 7, :aname=>'ble', :level=>3},
+       ],
+       "\nahoj\n== ah o ~'j ==\nbhoj\nchoj\n===*dhoj   ===#ble\nkuk\n")
+    h( [ {:level=>0, :sline=>1, :eline=>2},
+         {:title=>"ah o ~'j", :sline=>3, :eline => 8, :aname=>nil, :level=>2},
+         {:title=>"*dhoj", :sline=>9, :eline => 11, :aname=>'ble', :level=>3},
+       ], <<eos)
+
+ahoj
+== ah o ~'j ==
+{{{
+==a1.5hoj==
+}}}
+
+
+===*dhoj   ===#ble
+kuk
+
+eos
+
+  end
 end
 # vim: tw=0

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.1.9
-  prerelease: 
+  version: 0.1.12
 platform: ruby
 authors:
 - Vitas Stradal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: TracWiki markup language render (http://trac.edgewall.org/wiki/WikiFormatting
@@ -65,26 +60,25 @@ files:
 homepage: http://github.com/vitstradal/trac-wiki
 licenses:
 - GPL-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: trac-wiki
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Trac Wiki markup language
 test_files: []