html-pipeline-mrkdwn 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2dfeab3c84eb8110568dc1a451d9ce63b8d3e8aa6f2c3b59196688e1dc8a594
-  data.tar.gz: d90e5103e49125f9637cac6e50a86babdfc0164e5f9c3c75c2a28a46810ee6d0
+  metadata.gz: 9547e478a23018b8b15dce6d5c1546172c1fc1c69dd42935e40c32d528c5cf4a
+  data.tar.gz: 4e8d92217071e0c78c2426ca887f7f6522e4c25f72afeb0c5689fbc340f28ae8
 SHA512:
-  metadata.gz: 58923a44df98b0b10e5c1711364d56c9ace23120079f23b746bac061b607a1bf92a6eb2604bd4a1068b5a0e7598d4b013a302da08d5169676e5dcae233f034cd
-  data.tar.gz: 7cafac882065e58eccaced03bcff7cbfeeb018b876b8c130d9570bf32a1be4e34730eb59dc4bd1dc8e4beb377e92832e64d90b95f7965409dbc0b6ca7cc35baf
+  metadata.gz: 286afc3419b578befe9da101d992acc0f63b32b3e7169f7a3ba687a6a28cba4e39adf7650e692c696238f95d457d36e7a20f224a4dfcd69066fcd9b355b00574
+  data.tar.gz: bcd82b1de9518d162aa088ecbf8f89266d2ef3124ebe98d14a8de4c85a759549ca2fc864f6df11c2c4675d9123afa9e0cd26dd2c1b7cafe68a595ece70e535c1

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,8 @@ 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
+
       MULTILINE_CODE_PATTERN = /```(.+?)```/m.freeze
 
       CODE_PATTERN = /`(?=\S)(.+?)(?<=\S)`/.freeze
@@ -33,7 +35,11 @@ module HTML
 
       LINE_BREAK_PATTERN = /\n/.freeze
 
-      EMOJI_PATTERN = /:([\w+-]+):/.freeze
+      EMOJI_PATTERN = /:([\w+-_]+?):/.freeze
+
+      EMOJI_AND_WHITESPACE_PATTERN = /(?::[\w+-_]+?:|\s)+/.freeze
+
+      NON_CAPTURING_EMOJI_PATTERN = /:[\w+-_]+?:/.freeze
 
       STYLE_PATTERN = /
         ([`*_~])
@@ -55,18 +61,25 @@ module HTML
       }.freeze
 
       def initialize(doc, context = nil, result = nil)
-        super(doc, context, result)
+        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 +93,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."
@@ -107,7 +125,7 @@ module HTML
       end
 
       def call_filter(filter_name, content)
-        method = "#{filter_name}_filter".to_sym
+        method = :"#{filter_name}_filter"
         send method, content
       end
 
@@ -147,10 +165,10 @@ module HTML
           (text, klass, prefix) =
             case mention
             when /\A#(C.+)\Z/ # slack channels
-              [@slack_channels.dig(Regexp.last_match[1]) || Regexp.last_match[1], "channel", "#"]
+              [@slack_channels[Regexp.last_match[1]] || Regexp.last_match[1], "channel", "#"]
 
             when /\A@([UB].+)\Z/ # slack users or bots
-              [@slack_users.dig(Regexp.last_match[1]) || Regexp.last_match[1], "user", "@"]
+              [@slack_users[Regexp.last_match[1]] || Regexp.last_match[1], "user", "@"]
 
             when /\A!(here|channel|everyone)\Z/ # special mentions
               [Regexp.last_match[1], "mention", "@"]
@@ -184,7 +202,15 @@ module HTML
           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
+            else
+              emoji.raw
+            end
           else
             match
           end
@@ -212,6 +238,22 @@ module HTML
           end
         end
       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.9"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-mrkdwn
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Gorst
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-27 00:00:00.000000000 Z
+date: 2024-10-30 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