slack_markdown 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016d968b230dd5f9dacc5eed9861e709c05d6828dc3c2a8319e2e6ed3565ebe0
-  data.tar.gz: 4514bd3743a64de9358fca7184bd8230bd524fd5838cb83cf94074171007b7f4
+  metadata.gz: 1931dd5c91dc9b27769a94bd81486fa30701b1e69ac3a5b927e3718e780ab4dc
+  data.tar.gz: 92759f5c90effb4668698593a9c32e28f1a2d8620ef20068441e89f89b03f85e
 SHA512:
-  metadata.gz: 8ba0c318dd04fbf67e3df50fe0d842f28cb14632c974cdff050a645fec11a1606a5b35c7afb3d6ccdc5ef7e43b15e6e0f8a65c81cceb8f00e0f994292e5551fc
-  data.tar.gz: 85f5dd26de3cd1f3d78f83886d1c9f769fe4c58bc56f338e1df951b0c200812686145776642c4f9c999de355262d7617e114e5ce70819f733ca10462fa46d02a
+  metadata.gz: 543e199083ecfd05a3408eac0d99fd59fb39c4befb06d9d4acc70aba43eef06185b946c176a04355e6779fbce735708f71967867972d048a8a046182d18e03bd
+  data.tar.gz: 6ce0750daa0bc6e14e6ea94abdecdc88057dd16ac8037dd79cf4d76b258099ae9c8613991038c1e5a7adcfaf78ce391226a1be9b52922e0e3e9818035552f145

data/.github/workflows/spec.yml

@@ -0,0 +1,17 @@
+name: spec
+on: [push, pull_request]
+jobs:
+  spec:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7, 3.0, head]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rubocop
+      - run: bundle exec rake spec

data/.rubocop.yml

@@ -1,32 +1,16 @@
-AllCops:
-  Exclude:
-    - tmp/**/*
-    - vendor/**/*
-
-SpecialGlobalVars:
-  Enabled: false
-
-AsciiComments:
-  Enabled: false
+inherit_from: .rubocop_todo.yml
 
-ClassLength:
-  Max: 200
+AllCops:
+  NewCops: enable
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-LineLength:
-  Max: 137
+Layout/LineLength:
+  Max: 140
   Exclude:
     - spec/**/*
 
-MethodLength:
-  Max: 39
-
-PerlBackrefs:
-  Enabled: false
-
-TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
-
-inherit_from: .rubocop_todo.yml
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*

data/.rubocop_todo.yml

@@ -1,38 +1,41 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-05-29 14:43:54 +0900 using RuboCop version 0.40.0.
+# on 2021-10-30 04:14:18 UTC using RuboCop version 1.22.3.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'slack_markdown.gemspec'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 38
+  Max: 42
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 16
 
-# Offense count: 1
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 137
-
-# Offense count: 1
-# Configuration parameters: CountComments.
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 39
+  Max: 40
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 19
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: final_newline, final_blank_line
-Style/TrailingBlankLines:
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+Naming/HeredocDelimiterNaming:
   Exclude:
-    - 'spec/spec_helper.rb'
+    - 'spec/slack_markdown/processor_spec.rb'

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in slack_markdown.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/slack_markdown/filters/bold_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/ignorable_ancestor_tags'
@@ -13,8 +13,10 @@ module SlackMarkdown
           content = node.to_html
           next if has_ancestor?(node, ignored_ancestor_tags)
           next unless content.include?('*')
+
           html = bold_filter(content)
           next if html == content
+
           node.replace(html)
         end
         doc
@@ -22,11 +24,11 @@ module SlackMarkdown
 
       def bold_filter(text)
         text.gsub(BOLD_PATTERN) do
-          "<b>#{$1}</b>"
+          "<b>#{Regexp.last_match(1)}</b>"
         end
       end
 
-      BOLD_PATTERN = /(?<=^|\W)\*(.+)\*(?=\W|$)/
+      BOLD_PATTERN = /(?<=^|\W)\*(.+)\*(?=\W|$)/.freeze
     end
   end
 end

data/lib/slack_markdown/filters/code_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/ignorable_ancestor_tags'
@@ -13,8 +13,10 @@ module SlackMarkdown
           content = node.to_html
           next if has_ancestor?(node, ignored_ancestor_tags)
           next unless content.include?('`')
+
           html = code_filter(content)
           next if html == content
+
           node.replace(html)
         end
         doc
@@ -24,11 +26,11 @@ module SlackMarkdown
 
       def code_filter(text)
         text.gsub(CODE_PATTERN) do
-          "<code>#{$1}</code>"
+          "<code>#{Regexp.last_match(1)}</code>"
         end
       end
 
-      CODE_PATTERN = /(?<=^|\W)`(.+?)`(?=\W|$)/
+      CODE_PATTERN = /(?<=^|\W)`(.+?)`(?=\W|$)/.freeze
     end
   end
 end

data/lib/slack_markdown/filters/convert_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'escape_utils'
@@ -8,9 +8,9 @@ module SlackMarkdown
     # https://api.slack.com/docs/formatting
     class ConvertFilter < ::HTML::Pipeline::TextFilter
       def call
-        html = @text.gsub(/<([^>\|]+)(?:\|([^>]+))?>/) do |_match|
-          link_data = $1
-          link_text = $2
+        html = @text.gsub(/<([^>|]+)(?:\|([^>]+))?>/) do |_match|
+          link_data = Regexp.last_match(1)
+          link_text = Regexp.last_match(2)
           create_link(link_data, link_text)
         end
         Nokogiri::HTML.fragment(html)
@@ -22,21 +22,22 @@ module SlackMarkdown
         klass, link, text =
           case data
           when /\A#(C.+)\z/ # channel
-            channel = context.include?(:on_slack_channel_id) ? context[:on_slack_channel_id].call($1) : nil
+            channel = context.include?(:on_slack_channel_id) ? context[:on_slack_channel_id].call(Regexp.last_match(1)) : nil
             if channel
+              override_text = nil
               ['channel', channel[:url], "##{channel[:text]}"]
             else
               ['channel', data, data]
             end
           when /\A@((?:U|B).+)/ # user or bot
-            user = context.include?(:on_slack_user_id) ? context[:on_slack_user_id].call($1) : nil
+            user = context.include?(:on_slack_user_id) ? context[:on_slack_user_id].call(Regexp.last_match(1)) : nil
             if user
               ['mention', user[:url], "@#{user[:text]}"]
             else
               ['mention', nil, data]
             end
           when /\A@(.+)/ # user name
-            user = context.include?(:on_slack_user_name) ? context[:on_slack_user_name].call($1) : nil
+            user = context.include?(:on_slack_user_name) ? context[:on_slack_user_name].call(Regexp.last_match(1)) : nil
             if user
               ['mention', user[:url], "@#{user[:text]}"]
             else

data/lib/slack_markdown/filters/emoji_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 
@@ -26,7 +26,13 @@ module SlackMarkdown
       end
 
       def original_emoji_path(name)
-        original_emoji_set[name]
+        path = original_emoji_set[name]
+
+        if (matches = path.match(/\Aalias:(.+)\z/))
+          emoji_url(matches[1])
+        else
+          path
+        end
       end
     end
   end

data/lib/slack_markdown/filters/ignorable_ancestor_tags.rb

@@ -1,9 +1,9 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module SlackMarkdown
   module Filters
     module IgnorableAncestorTags
-      DEFAULT_IGNORED_ANCESTOR_TAGS = %w(pre code tt).freeze
+      DEFAULT_IGNORED_ANCESTOR_TAGS = %w[pre code tt].freeze
       def ignored_ancestor_tags
         if context[:ignored_ancestor_tags]
           DEFAULT_IGNORED_ANCESTOR_TAGS | context[:ignored_ancestor_tags]

data/lib/slack_markdown/filters/italic_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/ignorable_ancestor_tags'
@@ -13,8 +13,10 @@ module SlackMarkdown
           content = node.to_html
           next if has_ancestor?(node, ignored_ancestor_tags)
           next unless content.include?('_')
+
           html = italic_filter(content)
           next if html == content
+
           node.replace(html)
         end
         doc
@@ -22,11 +24,11 @@ module SlackMarkdown
 
       def italic_filter(text)
         text.gsub(ITALIC_PATTERN) do
-          "<i>#{$1}</i>"
+          "<i>#{Regexp.last_match(1)}</i>"
         end
       end
 
-      ITALIC_PATTERN = /(?<=^|\W)_(.+)_(?=\W|$)/
+      ITALIC_PATTERN = /(?<=^|\W)_(.+)_(?=\W|$)/.freeze
     end
   end
 end

data/lib/slack_markdown/filters/line_break_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/ignorable_ancestor_tags'
@@ -13,8 +13,10 @@ module SlackMarkdown
           content = node.to_html
           next if has_ancestor?(node, ignored_ancestor_tags)
           next unless content.include?("\n")
+
           html = content.gsub("\n", '<br>')
           next if html == content
+
           node.replace(html)
         end
         doc

data/lib/slack_markdown/filters/multiple_code_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/ignorable_ancestor_tags'
@@ -13,8 +13,10 @@ module SlackMarkdown
           content = node.to_html
           next if has_ancestor?(node, ignored_ancestor_tags)
           next unless content.include?('`')
+
           html = multiple_code_filter(content)
           next if html == content
+
           node.replace(html)
         end
         doc
@@ -24,11 +26,11 @@ module SlackMarkdown
 
       def multiple_code_filter(text)
         text.gsub(CODE_PATTERN) do
-          "<pre><code>#{$1}</code></pre>"
+          "<pre><code>#{Regexp.last_match(1)}</code></pre>"
         end
       end
 
-      CODE_PATTERN = /(?<=^|\W)```\n?((?:.|\n)+?)```(?=\W|$)/
+      CODE_PATTERN = /(?<=^|\W)```\n?((?:.|\n)+?)```(?=\W|$)/.freeze
     end
   end
 end

data/lib/slack_markdown/filters/multiple_quote_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/ignorable_ancestor_tags'
@@ -13,8 +13,10 @@ module SlackMarkdown
           content = node.to_html
           next if has_ancestor?(node, ignored_ancestor_tags)
           next unless content.include?('>>>')
+
           html = multiple_quote_filter(content)
           next if html == content
+
           node.replace(html)
         end
         doc

data/lib/slack_markdown/filters/quote_filter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/ignorable_ancestor_tags'
@@ -17,7 +17,7 @@ module SlackMarkdown
 
       def replace_quote_line(str)
         str.gsub(/^>\s*(.+)(?:\n|$)/) do
-          "<blockquote>#{$1}\n</blockquote>"
+          "<blockquote>#{Regexp.last_match(1)}\n</blockquote>"
         end
       end
 
@@ -25,6 +25,7 @@ module SlackMarkdown
         doc = Nokogiri::HTML.fragment(html)
         doc.search('blockquote + blockquote').each do |node|
           next unless node.previous.name == 'blockquote'
+
           html = "<blockquote>#{node.previous.inner_html}#{node.inner_html}</blockquote>"
           node.previous.remove
           node.replace(html)

data/lib/slack_markdown/filters/strike_filter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'html/pipeline'
+require 'slack_markdown/filters/ignorable_ancestor_tags'
+
+module SlackMarkdown
+  module Filters
+    class StrikeFilter < ::HTML::Pipeline::Filter
+      include IgnorableAncestorTags
+
+      def call
+        doc.search('.//text()').each do |node|
+          content = node.to_html
+          next if has_ancestor?(node, ignored_ancestor_tags)
+          next unless content.include?('~')
+
+          html = strike_filter(content)
+          next if html == content
+
+          node.replace(html)
+        end
+        doc
+      end
+
+      def strike_filter(text)
+        text.gsub(STRIKE_PATTERN) do
+          "<strike>#{Regexp.last_match(1)}</strike>"
+        end
+      end
+
+      STRIKE_PATTERN = /(?<=^|\W)~(.+)~(?=\W|$)/.freeze
+    end
+  end
+end

data/lib/slack_markdown/processor.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'html/pipeline'
 require 'slack_markdown/filters/convert_filter'
@@ -9,6 +9,7 @@ require 'slack_markdown/filters/code_filter'
 require 'slack_markdown/filters/emoji_filter'
 require 'slack_markdown/filters/bold_filter'
 require 'slack_markdown/filters/italic_filter'
+require 'slack_markdown/filters/strike_filter'
 require 'slack_markdown/filters/line_break_filter'
 
 module SlackMarkdown
@@ -28,7 +29,8 @@ module SlackMarkdown
         SlackMarkdown::Filters::EmojiFilter,
         SlackMarkdown::Filters::BoldFilter,
         SlackMarkdown::Filters::ItalicFilter,
-        SlackMarkdown::Filters::LineBreakFilter,
+        SlackMarkdown::Filters::StrikeFilter,
+        SlackMarkdown::Filters::LineBreakFilter
       ]
     end
 

data/lib/slack_markdown/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SlackMarkdown
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'
 end

data/lib/slack_markdown.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'slack_markdown/version'
 require 'slack_markdown/processor'

data/slack_markdown.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'slack_markdown/version'
 
@@ -19,13 +20,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'html-pipeline', '~> 2.0'
   spec.add_dependency 'escape_utils'
   spec.add_dependency 'gemoji'
+  spec.add_dependency 'html-pipeline', '~> 2.0'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rubocop', '~> 0.40.0'
+  spec.add_development_dependency 'rubocop', '~> 1.22.3'
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: slack_markdown
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ru/MuckRu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: html-pipeline
+  name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: escape_utils
+  name: gemoji
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gemoji
+  name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,47 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 1.22.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 1.22.3
 description: Convert Slack message markdown to HTML.
 email:
 - ru_shalm@hazimu.com
@@ -129,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -148,6 +148,7 @@ files:
 - lib/slack_markdown/filters/multiple_code_filter.rb
 - lib/slack_markdown/filters/multiple_quote_filter.rb
 - lib/slack_markdown/filters/quote_filter.rb
+- lib/slack_markdown/filters/strike_filter.rb
 - lib/slack_markdown/processor.rb
 - lib/slack_markdown/version.rb
 - slack_markdown.gemspec

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - ruby-head
-before_install:
-  - gem install bundler
-script:
-  - bundle exec rubocop
-  - bundle exec rake
-