trac-wiki 0.3.40 → 0.3.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2cc59b201d74034ccd7a22ddbadcc73f4463c897d0d5089511eed575e7f7f3c
-  data.tar.gz: 7159e56186fe4bb58e851c1d113b349b517e9902afe1e3e2229c929887c55b31
+  metadata.gz: da5b84d08ceac06bedc95d89d654940c7e1b05c8eba3042bfd784ecf08eb21e0
+  data.tar.gz: a4b93d5254d4ffbf10e0dc198ed82857cf8ddaeb3d232b5236f73f32f9c94fb0
 SHA512:
-  metadata.gz: 0b9f8005e113c147a8e1a8783f708168dc10cd69884381954342a9e3e6e9d710bce5a5253b80924790ff1974e858eb4c5aa60a33715a4fa3dca2a80462693dd1
-  data.tar.gz: 3ec1447013b053b389e49d8b9b0b3879b7ddab02fc6ea9e777ac0cbaedd0639fa40f627bdcbd62786affe08e1df7afd0b86782de943f4c53017d598f27bca15c
+  metadata.gz: 86d8fc6548aad350d59e0192f2e8dc22f14c386ccf9d818fa9670b0f7aabf2666617d34ad4e1499fc7d529748bf32f4d96a48f7a4a5e4447949d7f66234bc8ae
+  data.tar.gz: ddd0a3f39865504896627119656a0dfab77cf666cccfd4730010e5ee54166b6b24930dc87064bd37e1a4ffce8b4fc40404cd4c305ad519ec0d810d2e91be06e4

data/Gemfile.lock

@@ -15,7 +15,7 @@ PLATFORMS
 
 DEPENDENCIES
   bacon (~> 0)
-  rake (~> 0)
+  rake (~> 12.3.3)
   trac-wiki!
   unicode_utils
 

data/lib/trac-wiki/parser.rb

@@ -350,6 +350,7 @@ module TracWiki
       else
         @tree.tag_beg(tag, args)
       end
+      @tree.cur
     end
 
     def end_tag
@@ -771,7 +772,9 @@ module TracWiki
 
     def do_wikimedia_table(text)
       end_paragraph
-      start_tag('div', class: 'table-div') if div_around_table?
+      if div_around_table?
+        start_tag('div', class: 'table-div table-wikimedia', 'data-from-line' => @line_no, 'data-to-line' => @line_no + text.count("\n") + 2)
+      end
       start_tag(:table)
       start_tag(:tr)
       offset = 0
@@ -782,6 +785,7 @@ module TracWiki
           start_tag(:tr)
         elsif line =~ /^([!\|])(.*)/
           end_to_tag :td
+          end_to_tag :th
           fst, rest = $1, $2
           start_tag($1 == '|'  ? :td : :th)
           parse_inline(rest.strip, offset)
@@ -842,9 +846,10 @@ module TracWiki
     def do_table_row(text)
       if !@stack.include?('table')
         end_paragraph
-        start_tag('div', class: 'table-div') if div_around_table?
+        @table_node = start_tag('div', class: 'table-div', 'data-from-line' => @line_no) if div_around_table?
         start_tag('table')
       end
+      @table_node.attrs['data-to-line'] = @line_no if @table_node
       parse_table_row(text)
     end
     def do_term(term)

data/lib/trac-wiki/tree.rb

@@ -29,6 +29,7 @@ module TracWiki
       end
     end
     class Tree
+      attr_accessor :cur
 
       def initialize
         @root = Node.new(nil)

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.40'
+  VERSION = '0.3.44'
 end

data/test/parser_test.rb

@@ -190,10 +190,9 @@ describe 'TracWiki::Parser' do
     tc("<table><tr><td>This is <em>italic</em></td>\n</tr>\n</table>\n",
        "||This is ''italic''||")
 
-
     # table with div_around_table
-    tc("<div class=\"table-div\"><table><tr><td>This is <em>italic</em></td>\n</tr>\n</table>\n</div>\n",
-       "||This is ''italic''||", div_around_table: true)
+    tc("<div class=\"table-div\" data-from-line=\"1\" data-to-line=\"2\"><table><tr><td>A</td>\n</tr>\n<tr><td>B</td>\n</tr>\n</table>\n</div>\n",
+       "||A||\n||B||\n", div_around_table: true)
 
     # Links can appear inside italic text:
     tc("<p>A italic link: <em><a href=\"http://example.org/\">http://example.org/</a> nice! </em></p>\n",
@@ -679,6 +678,8 @@ describe 'TracWiki::Parser' do
     tc "<table><tr><td>Hello</td>\n<th>World!</th>\n</tr>\n<tr><td>Hello</td>\n<td>World!</td>\n</tr>\n</table>\n", "{|\n|Hello\n!World!\n|-\n|Hello\n|World!\n|}\n\n"
     tc "<table><tr><td><strong>Hello</strong></td>\n<td>World!</td>\n</tr>\n<tr><td>Hello</td>\n<td>World!</td>\n</tr>\n</table>\n", "{|\n|**Hello**\n|World!\n|-\n|Hello\n|World!\n|}\n\n"
     tc "<table><tr><td><strong>Hello</strong></td>\n<td>Wor ld</td>\n</tr>\n</table>\n", "{|\n|**Hello**\n|Wor\nld\n|}\n\n"
+    tc("<div class=\"table-div table-wikimedia\" data-from-line=\"1\" data-to-line=\"3\"><table><tr><td>A</td>\n</tr>\n</table>\n</div>\n",
+       "{|\n|A\n|}\n", div_around_table: true)
   end
   it 'should parse table' do
     tc "<table><tr><td>Hello</td>\n<td>World!</td>\n</tr>\n</table>\n", "||Hello||World!||"

data/trac-wiki.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/vitstradal/trac-wiki'
 
   s.add_development_dependency('bacon', '~> 0')
-  s.add_development_dependency('rake', '~> 0')
+  s.add_development_dependency('rake',  ">= 12.3.3" )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.3.40
+  version: 0.3.44
 platform: ruby
 authors:
 - Vitas Stradal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 description: TracWiki markup language render (http://trac.edgewall.org/wiki/WikiFormatting
   ).
 email:
@@ -81,8 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: trac-wiki
-rubygems_version: 2.7.6
+rubygems_version: 3.2.27
 signing_key: 
 specification_version: 4
 summary: Trac Wiki markup language