clwiki 3.2.5 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18900683f87266b7a2c5b8b449910761885c1b8560833c2c1552a1dcc06ea422
-  data.tar.gz: 4de460a24cd59205616b0cf3cbe8ce627f0fc4a9af1542593e22a3b6454f3254
+  metadata.gz: 051dbf9e39cf68f41e5c69a886a10557804c72e6e5db49ea07960c6276da83f1
+  data.tar.gz: 467f17ad5a7c80f357507c4db86c5d508cb9206508fd0f2ea91ebfc5af56f118
 SHA512:
-  metadata.gz: 56c8759000fdfb0bc0bdfdcdc8996f90f788161d33b95e1289de60c9513504bcd5a739b6defb066a1489ec08df65f9eaf5028ea8f8c5851be0bcb1cc0b592091
-  data.tar.gz: 97ff51ddb7b6840bed6df586f1a92c4137b124a8a0bbc8a8cb894d4b1ed7f65f6b442a5a53006355fe9d17be1fd5e37b0d87a4fea628e4f124e9783c1edd1259
+  metadata.gz: d5e2a0a569e6d24a7a80b19c78586a76fef848fe68415c6b22278fd008fcd90cb4af631a5fb87ee29e6c7f46d5071e286aad157552c39d74a1e1791c21410b03
+  data.tar.gz: 5706ffbcb5220cb91a44eee7005eb5a9c14af1f89ae33d67f614ff688663def87610d66a987f6c2323c0fff48d4e8cc5b4b0a28c0cc0b1b354cdba6ce5a32592

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_pre_blockquote.rb

@@ -10,7 +10,9 @@ module ClWiki
 
     def self.format_content(content, page)
       content = CGI.escapeHTML(content)
+      content.gsub!(/\[p\]\n/i, '<blockquote><pre>')
       content.gsub!(/\[p\]/i, '<blockquote><pre>')
+      content.gsub!(%r{\[/p\]\n}i, '</pre></blockquote>')
       content.gsub!(%r{\[/p\]}i, '</pre></blockquote>')
     end
   end

data/lib/cl_wiki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClWiki
-  VERSION = '3.2.5'
+  VERSION = '3.3.0'
 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