html-pipeline-mrkdwn 0.1.10 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a719d28f9a177bf2309038577b5fa5ca0fde8becbe75596bb6c802b836a92f00
-  data.tar.gz: 1a7233f84889b309b7e32517ff302327507c577c19dfd5b0a655dab73738fe75
+  metadata.gz: 865e7c4e26f60927fe0ee325097aead119cffa7ae67bb8c607ec515516a81484
+  data.tar.gz: 899c386db5debf2898fe4e7a42aebe1332a09456bb6dde00a9b64f15fa659dbc
 SHA512:
-  metadata.gz: 5ebe821d1f8aa9216bf46b10d1c1bc91f09d5561131896f6eb60817e53949aa5c222aa84617b6f69653042d2f6ed046f408388b94f8f373c29b5a10e2fc93cc3
-  data.tar.gz: 7e4836e583e4f76a845a0c21bed986947242dcd2938db8446ae11d3af03b56eec9249992d23d7922a03076c05e1b005b7e1184c870bb4753fdfa0cacb47c35b9
+  metadata.gz: 72a042625fb8173c6b645ad0d1620b18a928ef36849f7e62593a52a1ce728ae033d137c89c4858da6d69da8acdb208966163385d463222d481b602c373d71ebc
+  data.tar.gz: 1c00cc52f3bfed425c2aecc6363ccdeb94e7bbf4062382f7b940fa16e20b48deb91543f82451da2c0ef57d16798cc5c1f82e5919bf3dd90c3be907f319d47dc6

data/lib/html/pipeline/mrkdwn/helpers/pipeline.rb

@@ -0,0 +1,3 @@
+require_relative "../../mrkdwn"
+
+PIPELINE = HTML::Pipeline.new [ HTML::Pipeline::PlainTextInputFilter, HTML::Pipeline::Mrkdwn ]

data/lib/html/pipeline/mrkdwn/mrkdwn_filter.rb

@@ -12,6 +12,12 @@ module HTML
     #   :slack_channels - a hash of Slack channel ids and channel names
     #   :slack_users - a hash of Slack user or bot ids and display names
     class Mrkdwn < Filter
+      attr_reader :large_emoji
+
+      EMOJI_AND_WHITESPACE_PATTERN = /(?::[\w+-_]+?:|\s)+/.freeze
+
+      NON_CAPTURING_EMOJI_PATTERN = /:[\w+-_]+?:/.freeze
+
       MULTILINE_CODE_PATTERN = /```(.+?)```/m.freeze
 
       CODE_PATTERN = /`(?=\S)(.+?)(?<=\S)`/.freeze
@@ -33,7 +39,7 @@ module HTML
 
       LINE_BREAK_PATTERN = /\n/.freeze
 
-      EMOJI_PATTERN = /:([\w+-_]+):/.freeze
+      EMOJI_PATTERN = /:([\w+-_]+?):/.freeze
 
       STYLE_PATTERN = /
         ([`*_~])
@@ -51,22 +57,30 @@ module HTML
         link: %w[&lt;],
         line_break: %W[\n \r\n],
         emoji: %w[:],
-        style: %w[* _ ~]
+        style: %w[* _ ~],
+        unescape: %w[&amp;lowbar;]
       }.freeze
 
       def initialize(doc, context = nil, result = nil)
         super
 
-        @emoji_image_tag = ->(emoji) { "<img src=\"#{emoji.image_filename}\" alt=\"#{emoji.name}\" class=\"emoji\">" }
-        @slack_channels = {}
-        @slack_users = {}
+        default_emoji_image_tag = ->(emoji) { "<img src=\"#{emoji.image_filename}\" alt=\"#{emoji.name}\" class=\"emoji\">" }
 
-        @emoji_image_tag = @context[:emoji_image_tag] if @context[:emoji_image_tag]
-        @slack_channels = @context[:slack_channels] if @context[:slack_channels]
-        @slack_users = @context[:slack_users] if @context[:slack_users]
+        @emoji_image_tag = @context[:emoji_image_tag] || default_emoji_image_tag
+        @large_emoji_image_tag = @context[:large_emoji_image_tag] || @emoji_image_tag
+        @large_emoji_class = @context[:large_emoji_class] || "emoji-lg"
+        @slack_channels = @context[:slack_channels] || {}
+        @slack_users = @context[:slack_users] || {}
       end
 
       def call
+        div = doc.at_css("div")
+
+        if wants_large_emoji?(div.content)
+          @large_emoji = true
+          div.add_class(@large_emoji_class)
+        end
+
         ELEMENTS.each do |element, includes|
           process_text_nodes(includes) { |content| call_filter(element, content) }
         end
@@ -80,6 +94,11 @@ module HTML
                 "context[:emoji_image_tag] should return a Proc that takes an Emoji object as in the 'gemoji' gem."
         end
 
+        if context[:large_emoji_image_tag] && !context[:large_emoji_image_tag].is_a?(Proc)
+          raise ArgumentError,
+                "context[:large_emoji_image_tag] should return a Proc that takes an Emoji object as in the 'gemoji' gem."
+        end
+
         if context[:slack_channels] && !context[:slack_channels].is_a?(Hash)
           raise ArgumentError,
                 "context[:slack_channels] should return a Hash whose keys are Slack channel ids and values are their names."
@@ -183,10 +202,16 @@ module HTML
         content.gsub(EMOJI_PATTERN) do |match|
           emoji = Emoji.find_by_alias(Regexp.last_match[1])
 
-          if emoji
-            emoji.raw || @emoji_image_tag.call(emoji) || match
+          if emoji&.custom?
+            if @large_emoji
+              @large_emoji_image_tag.call(emoji)
+            else
+              @emoji_image_tag.call(emoji)
+            end
+          elsif emoji
+            emoji.raw
           else
-            match
+            match.gsub(/_/, "&lowbar;")
           end
         end
       end
@@ -212,6 +237,26 @@ module HTML
           end
         end
       end
+
+      def unescape_filter(content)
+        content.gsub("&amp;lowbar;", "_")
+      end
+
+      private
+
+      def only_emoji_and_whitespace?(string)
+        matchdata = EMOJI_AND_WHITESPACE_PATTERN.match(string)
+
+        matchdata && matchdata[0] == string
+      end
+
+      def emoji_count(string)
+        string.scan(NON_CAPTURING_EMOJI_PATTERN).size
+      end
+
+      def wants_large_emoji?(string)
+        only_emoji_and_whitespace?(string) && emoji_count(string).between?(1, 23)
+      end
     end
   end
 end

data/lib/html/pipeline/mrkdwn/version.rb

@@ -5,7 +5,7 @@ require "html/pipeline"
 module HTML
   class Pipeline
     class Mrkdwn < Filter
-      VERSION = "0.1.10"
+      VERSION = "0.2.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-mrkdwn
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Gorst
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -138,6 +138,7 @@ files:
 - Rakefile
 - bin/mrkdwn
 - lib/html/pipeline/mrkdwn.rb
+- lib/html/pipeline/mrkdwn/helpers/pipeline.rb
 - lib/html/pipeline/mrkdwn/mrkdwn_filter.rb
 - lib/html/pipeline/mrkdwn/version.rb
 homepage: https://github.com/jasongorst/html-pipeline-mrkdwn