clwiki 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d12f7ee8fbce5a07c527e9a05dd90703f5ff5f91fdb66c728295fc9c565539
-  data.tar.gz: 72daa353d7a40ebc6774c6b2a99aa665fa0483d53e40dd16af34cd22838a7c59
+  metadata.gz: 18900683f87266b7a2c5b8b449910761885c1b8560833c2c1552a1dcc06ea422
+  data.tar.gz: 4de460a24cd59205616b0cf3cbe8ce627f0fc4a9af1542593e22a3b6454f3254
 SHA512:
-  metadata.gz: 46b443d65f1bdc2403b33690e67310d07361e5b159cee18ed480932a8003685b8e6eb35004e0c18473c726c24a434fcc1b562ebca8eeac1d4555119ae988a973
-  data.tar.gz: ccf1ac19ed5f3f8f1b9ee7a013a27777f5183287ca80d3124409e2a07e642818b2da6b8368fe82738d0d9f5b6f36d566eeb338bd1fb2e61588747c9743497c8b
+  metadata.gz: 56c8759000fdfb0bc0bdfdcdc8996f90f788161d33b95e1289de60c9513504bcd5a739b6defb066a1489ec08df65f9eaf5028ea8f8c5851be0bcb1cc0b592091
+  data.tar.gz: 97ff51ddb7b6840bed6df586f1a92c4137b124a8a0bbc8a8cb894d4b1ed7f65f6b442a5a53006355fe9d17be1fd5e37b0d87a4fea628e4f124e9783c1edd1259

data/lib/cl_wiki/format_graphviz_di_graph.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ClWiki
+  class FormatGraphVizDiGraph < ClWiki::CustomFormatter
+    def self.match_re
+      /digraph.*\}/m
+    end
+
+    def self.format_content(content, page)
+      content.sub!(/digraph.*\}/m,
+                   "<a href=\"dot.rb?fn=#{page.file_full_path_and_name}\">
+                  <img src=\"dot.rb?fn=#{page.file_full_path_and_name}\">
+                  </a>")
+      content
+    end
+  end
+end
+
+ClWiki::CustomFormatters.instance.register(ClWiki::FormatGraphVizDiGraph)

data/lib/cl_wiki/{format/format_opml.rb → format_opml.rb}

@@ -5,33 +5,35 @@ if $PROGRAM_NAME == __FILE__
   require 'clwikipage'
 end
 
-class FormatOPML < ClWiki::CustomFormatter
-  def self.match_re
-    %r{<opml.*?>.*?</opml>}m
-  end
+module ClWiki
+  class FormatOPML < ClWiki::CustomFormatter
+    def self.match_re
+      %r{<opml.*?>.*?</opml>}m
+    end
 
-  def self.format_content(content, page)
-    out = ['<NoWikiLinks>']
-    content.grep(%r{<outline.*?>|</outline>}).each do |ln|
-      title = ln.scan(/title=\"(.*?)\"/).compact
-      html = ln.scan(/htmlUrl=\"(.*?)\"/).compact
-      xml = ln.scan(/xmlUrl=\"(.*?)\"/).compact
-      if html.empty? && xml.empty?
-        if !title.empty?
-          out << "<h4>#{title}</h4>"
-          out << '<blockquote>'
+    def self.format_content(content, page)
+      out = ['<NoWikiLinks>']
+      content.grep(%r{<outline.*?>|</outline>}).each do |ln|
+        title = ln.scan(/title=\"(.*?)\"/).compact
+        html = ln.scan(/htmlUrl=\"(.*?)\"/).compact
+        xml = ln.scan(/xmlUrl=\"(.*?)\"/).compact
+        if html.empty? && xml.empty?
+          if !title.empty?
+            out << "<h4>#{title}</h4>"
+            out << '<blockquote>'
+          else
+            out << '</blockquote>'
+          end
         else
-          out << '</blockquote>'
+          out << "<a href='#{xml}'>[xml]</a> <a href='#{html}'>#{title}</a>"
         end
-      else
-        out << "<a href='#{xml}'>[xml]</a> <a href='#{html}'>#{title}</a>"
       end
+      out.join("\n") + content
     end
-    out.join("\n") + content
   end
 end
 
-ClWiki::CustomFormatters.instance.register(FormatOPML)
+ClWiki::CustomFormatters.instance.register(ClWiki::FormatOPML)
 
 if $PROGRAM_NAME == __FILE__
   sample_opml = <<-OPMLTEXT

data/lib/cl_wiki/format_pre_blockquote.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'cgi'
+
+module ClWiki
+  class FormatPreBlockquote < ClWiki::CustomFormatter
+    def self.match_re
+      %r{\[p\].*?\[/p\]}mi
+    end
+
+    def self.format_content(content, page)
+      content = CGI.escapeHTML(content)
+      content.gsub!(/\[p\]/i, '<blockquote><pre>')
+      content.gsub!(%r{\[/p\]}i, '</pre></blockquote>')
+    end
+  end
+end
+
+ClWiki::CustomFormatters.instance.register(ClWiki::FormatPreBlockquote)

data/lib/cl_wiki/format_simple_table.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ClWiki
+  class FormatSimpleTable < ClWiki::CustomFormatter
+    def self.match_re
+      %r{<simpletable.*?>.*?</simpletable>}m
+    end
+
+    def self.format_content(content, page = nil)
+      table_attr = content.scan(/<simpletable(.*?)>/m).to_s.strip
+      table_attr = 'border="1"' if table_attr.empty?
+      content.gsub!(/<simpletable.*?>/m, '')
+      content.gsub!(%r{</simpletable>}m, '')
+      content.strip!
+      lines = content.split("\n")
+      lines.collect! do |ln|
+        ln.gsub!(/\t/, '  ')
+        '<tr><td>' + ln.gsub(/  +/, '</td><td>') + '</td></tr>'
+      end
+      lines.collect! { |ln| ln.gsub(%r{<td>\s*?</td>}, '<td>&nbsp;</td>') }
+
+      # if you do a .join("\n"), then the \n will be converted to <br>
+      # ... so don't do that
+      "<table #{table_attr}>\n#{lines.join('')}</table>"
+    end
+  end
+end
+
+ClWiki::CustomFormatters.instance.register(ClWiki::FormatSimpleTable)

data/lib/cl_wiki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClWiki
-  VERSION = '3.2.3'
+  VERSION = '3.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clwiki
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.5
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -92,11 +92,11 @@ files:
 - lib/cl_wiki/file.rb
 - lib/cl_wiki/file_error.rb
 - lib/cl_wiki/file_modified_since_read.rb
-- lib/cl_wiki/format/format_blockquote.rb
-- lib/cl_wiki/format/format_graphviz_di_graph.rb
-- lib/cl_wiki/format/format_opml.rb
-- lib/cl_wiki/format/format_pre_blockquote.rb
-- lib/cl_wiki/format/format_simple_table.rb
+- lib/cl_wiki/format_blockquote.rb
+- lib/cl_wiki/format_graphviz_di_graph.rb
+- lib/cl_wiki/format_opml.rb
+- lib/cl_wiki/format_pre_blockquote.rb
+- lib/cl_wiki/format_simple_table.rb
 - lib/cl_wiki/memory_indexer.rb
 - lib/cl_wiki/metadata.rb
 - lib/cl_wiki/page.rb

data/lib/cl_wiki/format/format_graphviz_di_graph.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class FormatGraphVizDiGraph < ClWiki::CustomFormatter
-  def self.match_re
-    /digraph.*\}/m
-  end
-
-  def self.format_content(content, page)
-    content.sub!(/digraph.*\}/m,
-                 "<a href=\"dot.rb?fn=#{page.file_full_path_and_name}\">
-                  <img src=\"dot.rb?fn=#{page.file_full_path_and_name}\">
-                  </a>")
-    content
-  end
-end
-
-ClWiki::CustomFormatters.instance.register(FormatGraphVizDiGraph)

data/lib/cl_wiki/format/format_pre_blockquote.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'cgi'
-
-class FormatPreBlockquote < ClWiki::CustomFormatter
-  def self.match_re
-    %r{\[p\].*?\[/p\]}mi
-  end
-
-  def self.format_content(content, page)
-    content = CGI.escapeHTML(content)
-    content.gsub!(/\[p\]/i, '<blockquote><pre>')
-    content.gsub!(%r{\[/p\]}i, '</pre></blockquote>')
-  end
-end
-
-ClWiki::CustomFormatters.instance.register(FormatPreBlockquote)

data/lib/cl_wiki/format/format_simple_table.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class FormatSimpleTable < ClWiki::CustomFormatter
-  def self.match_re
-    %r{<simpletable.*?>.*?</simpletable>}m
-  end
-
-  def self.format_content(content, page = nil)
-    table_attr = content.scan(/<simpletable(.*?)>/m).to_s.strip
-    table_attr = 'border="1"' if table_attr.empty?
-    content.gsub!(/<simpletable.*?>/m, '')
-    content.gsub!(%r{</simpletable>}m, '')
-    content.strip!
-    lines = content.split("\n")
-    lines.collect! do |ln|
-      ln.gsub!(/\t/, '  ')
-      '<tr><td>' + ln.gsub(/  +/, '</td><td>') + '</td></tr>'
-    end
-    lines.collect! { |ln| ln.gsub(%r{<td>\s*?</td>}, '<td>&nbsp;</td>') }
-
-    # if you do a .join("\n"), then the \n will be converted to <br>
-    # ... so don't do that
-    "<table #{table_attr}>\n#{lines.join('')}</table>"
-  end
-end
-
-ClWiki::CustomFormatters.instance.register(FormatSimpleTable)