slack_mrkdwn 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b38208ce080dffeea4bbdacfcc5b455b78b91d872391cb96a0127d52feb98be7
-  data.tar.gz: aea90c46698e27b6b5d2290352773bd60b6e5446cdfe3932babdab647038c027
+SHA1:
+  metadata.gz: 877c12bc0b46fa2981153e30dc6e9de24eb7ffd8
+  data.tar.gz: f2fa6d26df6fa513b5d3765242658fee957f7ba4
 SHA512:
-  metadata.gz: 8ce667a87b45df0569e24ee3af209ceae51b2ef7108d95ed211c521ed6fa1e6a836f10bc0bcbd1c54474f68363665f14a50a824bdde6807a188c5a6139db3523
-  data.tar.gz: b2f82329e82c219743f6cdf418eb0ed00310988424e0b5b10b1014044c124abb8289c9f26b6ad84ab8e9e5a1d656b9a48e7f094bd64a501fcea0880ce2303460
+  metadata.gz: 6f0544a7dbd781eb5d4f72e775f07859990bd31ee0de89f13cc5c26bab179decec645cfa6618124f5c094f3d438fb980f4da54f5b64dedafb4d32d6af01c340f
+  data.tar.gz: 23d95a4c135e33696534b95068139236e990c1c3ff8bcbd7f4d1fedd9f52f565434a18aef12a7798abb67f8d379b740ae952ce145ba783cc68be5256cd0d47bd

data/lib/slack_mrkdwn.rb

@@ -2,6 +2,13 @@
 require 'redcarpet'
 
 class SlackMrkdwn < Redcarpet::Render::Base
+  class << self
+    def from(markdown)
+      renderer = SlackMrkdwn.new
+      Redcarpet::Markdown.new(renderer, strikethrough: true, underline: true, fenced_code_blocks: true).render(markdown)
+    end
+  end
+
   # Methods where the first argument is the text content
   [
     # block-level calls
@@ -28,7 +35,7 @@ class SlackMrkdwn < Redcarpet::Render::Base
       args.first
     end
   end
-  
+
   # Encode Slack restricted characters
   def preprocess(content)
     content.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;')
@@ -83,48 +90,78 @@ class SlackMrkdwn < Redcarpet::Render::Base
     "<#{link}|#{content}>"
   end
 
-  # lists
-  def list(entries, list_type)
-    reset_list(list_type)
+  # list. Called when all list items have been consumed
+  def list(entries, style)
+    entries = format_list(entries, style)
+    remember_last_list_entries(entries)
     entries
   end
 
-  def reset_list(list_type)
-    @list_item_count = 0 if list_type == :ordered
+  # list item
+  def list_item(entry, _style)
+    if @last_entries && entry.end_with?(@last_entries)
+      entry = indent_list_items(entry)
+      @last_entries = nil
+    end
+    entry
   end
 
-  def list_prefix(list_type)
-    return "-" if list_type == :unordered
-    @list_item_count = 0 unless @list_item_count
-    @list_item_count += 1
-    "#{@list_item_count}."
+  # ![](image)
+  def image(link, _title, _content)
+    link
   end
 
-  def list_item(entry, list_type)
-    "#{list_prefix(list_type)} #{entry}"
+  def paragraph(text)
+    clear_last_list_entries
+    "#{text}\n"
   end
 
-  # ![](image)
-  def image(link, _title, _alt_text)
-    link
+  # # Header
+  def header(text, _header_level)
+    "*#{text}*\n"
   end
 
   def linebreak()
     "\n"
   end
 
-  def paragraph(text)
-    "#{text}\n"
+  private
+
+  def format_list(entries, style)
+    case style
+    when :ordered
+      number_list(entries)
+    when :unordered
+      add_dashes(entries)
+    end
   end
 
-  def header(text, _header_level)
-    "*#{text}*\n"
+  def add_dashes(entries)
+    entries.gsub(/^(\S+.*)$/, '- \1')
   end
 
-  class << self
-    def from(markdown)
-      renderer = SlackMrkdwn.new
-      Redcarpet::Markdown.new(renderer, strikethrough: true, underline: true, fenced_code_blocks: true).render(markdown)
+  def number_list(entries)
+    count = 0
+    entries.gsub(/^(\S+.*)$/) do
+      match = Regexp.last_match
+      count += 1
+      "#{count}. #{match[0]}"
     end
   end
+
+  def remember_last_list_entries(entries)
+    @last_entries = entries
+  end
+
+  def clear_last_list_entries
+    @last_entries = nil
+  end
+
+  def nest_list_entries(entries)
+    entries.gsub(/^(.+)$/, '   \1')
+  end
+
+  def indent_list_items(entry)
+    entry.gsub(@last_entries, nest_list_entries(@last_entries))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slack_mrkdwn
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Simon Cousineau
@@ -92,7 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Convert markdown to Slack's message format 'mrkdwn'.