clwiki 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051dbf9e39cf68f41e5c69a886a10557804c72e6e5db49ea07960c6276da83f1
-  data.tar.gz: 467f17ad5a7c80f357507c4db86c5d508cb9206508fd0f2ea91ebfc5af56f118
+  metadata.gz: a48a499dff277e3edadd047bb0640cbc41ded713baa5699d61af0a8a90fa6c22
+  data.tar.gz: 3359f86f9dfe77c17ee77f99c12ba80e11c7819d2a9c5708b096213bda0bdcc2
 SHA512:
-  metadata.gz: d5e2a0a569e6d24a7a80b19c78586a76fef848fe68415c6b22278fd008fcd90cb4af631a5fb87ee29e6c7f46d5071e286aad157552c39d74a1e1791c21410b03
-  data.tar.gz: 5706ffbcb5220cb91a44eee7005eb5a9c14af1f89ae33d67f614ff688663def87610d66a987f6c2323c0fff48d4e8cc5b4b0a28c0cc0b1b354cdba6ce5a32592
+  metadata.gz: 6e527090fcb89733c91ae4345b97756469d54754312b474f80d93b01028a0c26aaeffa0c148fb075d35e0fb21757765052f65cb2be6e300113645d3f6e59706f
+  data.tar.gz: cad24e201ee77c7cacdcd223fd3b00bb49ed7f41fc93f4803b85bd193e9d4b4475d40981df180fd27b552dcbb192616c54aadf7bcfb0661811f46baefd20d716

data/lib/cl_wiki/format_blockquote.rb

@@ -8,8 +8,21 @@ module ClWiki
 
     def self.format_content(content, page)
       if content
+        # I wanted to bring this in, similar to my last change to
+        # format_pre_blockquote.rb. But somehow this is impacting how
+        # @content.each_line works in convert_newline_to_br leading to
+        # unexpected results there. I can't figure it out right now and this
+        # isn't that important, so I'm not going to do it right now.
+
+        # Remove 0 or 1 newline at the front of the block
+        # content.gsub!(/\[\]\n?/, '<blockquote>')
+
+        # Remove 0 to 2 newlines after the block to keep things tidy.
+        # content.gsub!(%r{\[/\]\n{0,2}}, '</blockquote>')
+
         content.gsub!(/\[\]/, '<blockquote>')
         content.gsub!(%r{\[/\]}, '</blockquote>')
+
         content
       end
     end

data/lib/cl_wiki/format_pre_blockquote.rb

@@ -8,12 +8,21 @@ module ClWiki
       %r{\[p\].*?\[/p\]}mi
     end
 
+    # Only matched text is passed in, and whatever is returned is used (i.e. you
+    # don't have to use gsub! you're not modifying the page's) ivar of content.
     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>')
+
+      # Remove 0 or 1 newline at the front of the block, to remove the
+      # almost-always-there first newline and prevent a gap always at the top of
+      # every block, but allow additional newlines if the page really wants
+      # newlines at the top of the block
+      content.gsub!(/\[p\]\n?/i, '<blockquote><pre>')
+
+      # Remove 0 to 2 newlines after the block, to remove unnecessary blank
+      # lines in most cases, but keep 3 or more, to allow the page to
+      # intentionally put some blank space after something if necessary.
+      content.gsub!(%r{\[/p\]\n{0,2}}i, '</pre></blockquote>')
     end
   end
 end

data/lib/cl_wiki/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clwiki
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - chrismo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt