clwiki 3.2.4 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02100a0da4730f0b55e02af7d6002d4b28e4a08e1ea533d3eeb83879e2897bf5
-  data.tar.gz: 8aba5f51a34813c34918b85929b4d3ad503e46dfb57a65996adf3ca87b648d33
+  metadata.gz: 88f3646fc174c186690fa0704bf8eea487dd0b9aa04192d1dada2048215a84b1
+  data.tar.gz: 19e1e949c5db182f1ccd98069f9a6bbe8b251db3d3cd557d7229c1d4204f0d75
 SHA512:
-  metadata.gz: 13bbeaa5aea8dcd25047d0d2d0bfe4af2ab6e6e0f4dd234911af9d2b7fa942167181508be37e9f7272efa20dad02326f7fce85df0c8be12946571b7d0dcfbf1d
-  data.tar.gz: 78813c39844cda040d32324449836f695f2fc81dd168e5b080433f0586e75dabd33644c10086b2f5b9f3d45202e84042925e06302e4efd6b7c482e6ad38cfff9
+  metadata.gz: adb5a002ccaaf9eb214008caf18922f55e4f1c64aea000f46cc15815c7d0b72d54b36ba78440aba9a2e4d95740453c0de1b6a0d5ee04e8f2cc1c99403519e423
+  data.tar.gz: 7de2d1f85a2f7b42aeea640da0822c6a81a269a4ee7f07d5efacfccee5e649ce801f01fa8bbd585e21fc4265657ffc0ad98f4e605d4754424bab64df591add23

data/lib/cl_wiki/engine.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+# This seems a little unnecessary here, having done a bunch of zeitwerk stuff
+# for auto-loading, but the formatters need to be referenced somehow in order to
+# be loaded, and then registered ... but - this is working, and this ain't for
+# nothing but my silly website.
+require_relative '../cl_wiki_lib'
+
 module ClWiki
   class Engine < ::Rails::Engine
     isolate_namespace ClWiki

data/lib/cl_wiki/format_blockquote.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
-class FormatBlockquote < ClWiki::CustomFormatter
-  def self.match_re
-    %r{\[\].*\[/\]}m
-  end
+module ClWiki
+  class FormatBlockquote < ClWiki::CustomFormatter
+    def self.match_re
+      %r{\[\].*\[/\]}m
+    end
 
-  def self.format_content(content, page)
-    if content
-      content.gsub!(/\[\]/, '<blockquote>')
-      content.gsub!(%r{\[/\]}, '</blockquote>')
-      content
+    def self.format_content(content, page)
+      if content
+        content.gsub!(/\[\]/, '<blockquote>')
+        content.gsub!(%r{\[/\]}, '</blockquote>')
+        content
+      end
     end
   end
 end
 
-ClWiki::CustomFormatters.instance.register(FormatBlockquote)
+ClWiki::CustomFormatters.instance.register(ClWiki::FormatBlockquote)

data/lib/cl_wiki/format_graphviz_di_graph.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
-class FormatGraphVizDiGraph < ClWiki::CustomFormatter
-  def self.match_re
-    /digraph.*\}/m
-  end
+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}\">
+    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
+      content
+    end
   end
 end
 
-ClWiki::CustomFormatters.instance.register(FormatGraphVizDiGraph)
+ClWiki::CustomFormatters.instance.register(ClWiki::FormatGraphVizDiGraph)

data/lib/cl_wiki/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

@@ -2,16 +2,18 @@
 
 require 'cgi'
 
-class FormatPreBlockquote < ClWiki::CustomFormatter
-  def self.match_re
-    %r{\[p\].*?\[/p\]}mi
-  end
+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>')
+    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(FormatPreBlockquote)
+ClWiki::CustomFormatters.instance.register(ClWiki::FormatPreBlockquote)

data/lib/cl_wiki/format_simple_table.rb

@@ -1,27 +1,29 @@
 # 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>'
+module ClWiki
+  class FormatSimpleTable < ClWiki::CustomFormatter
+    def self.match_re
+      %r{<simpletable.*?>.*?</simpletable>}m
     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>"
+    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(FormatSimpleTable)
+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.4'
+  VERSION = '3.2.6'
 end

data/lib/cl_wiki_lib.rb

@@ -16,7 +16,7 @@ require File.expand_path('cl_wiki/custom_footers', __dir__)
 require File.expand_path('cl_wiki/custom_formatter', __dir__)
 require File.expand_path('cl_wiki/custom_formatters', __dir__)
 
-Dir[File.join(__dir__, 'cl_wiki', 'format', '*.rb')].each do |fn|
+Dir[File.join(__dir__, 'cl_wiki', 'format_*.rb')].each do |fn|
   require fn
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clwiki
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.6
 platform: ruby
 authors:
 - chrismo