mato 2.1.3 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae49205cffd8bb04eda2cb06753f69b22fa00fe306e5bfb1b6272aa6798548df
-  data.tar.gz: 4c81ac4ccd5452847ac8bee9f5da87923c91f0aa11b4808497ce278a82f4308c
+  metadata.gz: 74c9936ed1ef8bc63b7b0785597f92f4100dad15c432ebf5b6b0bfa5681a2d03
+  data.tar.gz: 8234e66b936b71bbb25d60e5a2df5cbd1a11903c724fab6a0f2c64e22dcc3c3d
 SHA512:
-  metadata.gz: 9d9d711ec47f52a5b5835172c3884b2ccc1b3b23ca0bc7374b7693d72c562ce0546f8e427a957b20c4527e1d434efef1fb20409199516fba9ed057b7a4725be5
-  data.tar.gz: fcbab2b0c37a2d7272361c41e972a6ae7531ee2c10e349342fb526556b5a78ea7d1ba9729596a173d814e9673cc7403535da0517c6076b4c0969f7374055cfab
+  metadata.gz: b21e6c3a89540d0775ff30eccefa0f755b5c9f9dd2ac17d40c0d6818430b68222b34bfa06d6337e55c4c52f890dbf308d5cb8b466c02a0f87fb345d45352372c
+  data.tar.gz: 8fb4996b32a9bbaf34091f7c34fc2e6b03a7fb2899561b98b40cc0e130a024063d0d3e190b751817444e23b9b6c063d67e702dcde77a651aaaffcda5076226f4

data/.rubocop.yml

@@ -1,11 +1,16 @@
 # See also https://github.com/onk/onkcop/blob/master/config/rubocop.yml
+require:
+  - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
   Exclude:
     - bin/**/*
 
+Metrics:
+  Enabled: false
+
 Lint/UnusedBlockArgument:
   Enabled: false
 
@@ -21,31 +26,7 @@ Layout/MultilineMethodCallIndentation:
 Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
-Metrics/AbcSize:
-  Max: 35
-
-Metrics/PerceivedComplexity:
-  Max: 10
-
-Metrics/CyclomaticComplexity:
-  Max: 10
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Max: 45
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/ParameterLists:
+Layout/LineLength:
   Enabled: false
 
 Style/RescueStandardError:
@@ -63,6 +44,12 @@ Style/Documentation:
 Naming/FileName:
   Enabled: false
 
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+
 Style/GuardClause:
   Enabled: false
 
@@ -120,6 +107,9 @@ Style/AsciiComments:
 Style/EmptyMethod:
   EnforcedStyle: expanded
 
+Style/RaiseArgs:
+  Enabled: false
+
 Naming/VariableNumber:
   Enabled: false
 
@@ -146,3 +136,20 @@ Style/NonNilCheck:
 
 Performance/RedundantBlockCall:
   Enabled: false
+
+# Configure pending cops
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true

data/.travis.yml

@@ -1,8 +1,7 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.3
-  - 2.4
+  - 2.7
+  - 3.0
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # The revision history of Mato
 
+## v2.3.2 - 2021/01/08
+
+* Fix error on mention link with Nokogiri v1.11.0+. [#26](https://github.com/bitjourney/mato/pull/26)
+
+## v2.3.1 - 2020/07/15
+
+* Allow loose task list. [#24](https://github.com/bitjourney/mato/pull/24)
+
+## v2.3.0 - 2020/06/16
+
+* Add `convert_empty_task_list` option to TaskList filter to convert task list event if the text is empty. [#23](https://github.com/bitjourney/mato/pull/23)
+
+## v2.2.0 - 2020/05/08
+
+https://github.com/bitjourney/mato/compare/v2.1.4...v2.2.0
+
+* BREAKING: Drop support for Ruby 2.3
+* Display code block as plan text if Rouge raises an error [#21](https://github.com/bitjourney/mato/pull/21)
+
+
+## v2.1.4 - 2019/4/11
+
+https://github.com/bitjourney/mato/compare/v2.1.3...v2.1.4
+
+* Fix broken mention link process in case of including unexpected text
+
 ## v2.1.3 - 2019/1/15
 
 https://github.com/bitjourney/mato/compare/v2.1.2...v2.1.3

data/Gemfile

@@ -12,4 +12,6 @@ gem "m"
 gem "minitest"
 gem "minitest-power_assert"
 gem "rake", ">= 10.0"
-gem "rubocop"
+gem 'rr'
+gem "rubocop", '>= 0.78.0'
+gem 'rubocop-performance'

data/lib/mato/html_filters/mention_link.rb

@@ -37,7 +37,9 @@ module Mato
           next if text_node.content == candidate_html
 
           candidate_fragment = text_node.replace(candidate_html)
-          candidate_fragment.css('span').each do |mention_element|
+          candidate_fragment.css('span.mention-candidate').each do |mention_element|
+            next unless mention_element.child
+
             (candidate_map[mention_element.child.content] ||= []) << mention_element
           end
 
@@ -50,6 +52,13 @@ module Mato
           # cleanup
           candidates.each do |candidate_fragment|
             candidate_fragment.css('span.mention-candidate').each do |node|
+              next unless node.child
+              # If link_builder calls Node#replace for a node,
+              # the node's parent becames nil.
+              # Node#replace doesn't accept node that doesn't have parent since Nokogiri v1.11.0,
+              # so we need to skip it.
+              next unless node.parent
+
               node.replace(node.child.content)
             end
           end

data/lib/mato/html_filters/syntax_highlight.rb

@@ -5,6 +5,12 @@
 module Mato
   module HtmlFilters
     class SyntaxHighlight
+      class RougeError < StandardError
+      end
+
+      def initialize(on_rouge_error: ->(ex) { warn ex })
+        @on_rouge_error = on_rouge_error
+      end
 
       # @param [Nokogiri::HTML::DocumentFragment] doc
       def call(doc)
@@ -57,11 +63,21 @@ module Mato
 
         lexer = guess_lexer(language, filename, source)
 
-        document = Nokogiri::HTML.fragment(%{<div class="code-frame"/>})
-
-        div = document.at('div')
-        div.add_child(label_fragment(filename || language || lexer.tag)) if filename || !lexer.is_a?(Rouge::Lexers::PlainText)
-        div.add_child(%{<pre class="highlight"><code data-lang="#{lexer.tag}">#{format(lexer, source)}</code></pre>})
+        begin
+          document = Nokogiri::HTML.fragment(%{<div class="code-frame"/>})
+          div = document.at('div')
+          div.add_child(label_fragment(filename || language || lexer.tag)) if filename || !lexer.is_a?(Rouge::Lexers::PlainText)
+          div.add_child(%{<pre class="highlight"><code data-lang="#{lexer.tag}">#{format(lexer, source)}</code></pre>})
+        rescue => ex
+          if ex.is_a?(RougeError) && !lexer.is_a?(Rouge::Lexers::PlainText)
+            # Retry highlighting with PlainText lexer if Rouge raises an error.
+            # It avoids to affect the error to whole of converting.
+            lexer = Rouge::Lexers::PlainText.new
+            retry
+          else
+            raise ex
+          end
+        end
 
         document
       end
@@ -79,6 +95,9 @@ module Mato
       def format(lexer, source)
         tokens = lexer.lex(source)
         formatter.format(tokens)
+      rescue => ex
+        @on_rouge_error.call(ex)
+        raise RougeError.new
       end
     end
   end

data/lib/mato/html_filters/task_list.rb

@@ -3,15 +3,18 @@
 module Mato
   module HtmlFilters
     class TaskList
-      CHECKED_MARK = "[x] "
-      UNCHECKED_MARK = "[ ] "
+      CHECKED_MARK = /\A\[x\] /
+      UNCHECKED_MARK = /\A\[ \] /
+      CHECKED_MARK_FOR_EMPTY_TASK_LIST = /\A\[x\] ?/
+      UNCHECKED_MARK_FOR_EMPTY_TASK_LIST = /\A\[ \] ?/
 
       DEFAULT_TASK_LIST_CLASS = "task-list-item"
       DEFAULT_CHECKBOX_CLASS = "task-list-item-checkbox"
 
-      def initialize(task_list_class: DEFAULT_TASK_LIST_CLASS, checkbox_class: DEFAULT_CHECKBOX_CLASS)
+      def initialize(task_list_class: DEFAULT_TASK_LIST_CLASS, checkbox_class: DEFAULT_CHECKBOX_CLASS, convert_empty_task_list: false)
         @task_list_class = task_list_class
         @checkbox_class = checkbox_class
+        @convert_empty_task_list = convert_empty_task_list
       end
 
       # @param [Nokogiri::HTML::DocumentFragment] doc
@@ -23,7 +26,7 @@ module Mato
 
       # @param [Nokogiri::XML::Node] li
       def weave(li)
-        text_node = li.xpath('.//text()').first
+        text_node = li.xpath('./p[1]/text()').first || li.xpath('.//text()').first
         checked = has_checked_mark?(text_node)
         unchecked = has_unchecked_mark?(text_node)
 
@@ -37,18 +40,34 @@ module Mato
       end
 
       def has_checked_mark?(text_node)
-        text_node&.content&.start_with?(CHECKED_MARK)
+        text_node&.content&.match?(checked_mark)
       end
 
       def has_unchecked_mark?(text_node)
-        text_node&.content&.start_with?(UNCHECKED_MARK)
+        text_node&.content&.match?(unchecked_mark)
       end
 
       def trim_mark(content, checked)
         if checked
-          content.sub(CHECKED_MARK, '')
+          content.sub(checked_mark, '')
         else
-          content.sub(UNCHECKED_MARK, '')
+          content.sub(unchecked_mark, '')
+        end
+      end
+
+      def checked_mark
+        if @convert_empty_task_list
+          CHECKED_MARK_FOR_EMPTY_TASK_LIST
+        else
+          CHECKED_MARK
+        end
+      end
+
+      def unchecked_mark
+        if @convert_empty_task_list
+          UNCHECKED_MARK_FOR_EMPTY_TASK_LIST
+        else
+          UNCHECKED_MARK
         end
       end
 

data/lib/mato/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mato
-  VERSION = "2.1.3"
+  VERSION = "2.3.2"
 end

data/mato.gemspec

@@ -13,6 +13,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/bitjourney/mato"
   spec.license       = "MIT"
 
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = 'https://github.com/bitjourney/mato/blob/master/CHANGELOG.md'
+  spec.metadata['bug_tracker_uri'] = 'https://github.com/bitjourney/mato/issues'
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(?:test|spec|features|example)/})
   end
@@ -20,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.4"
 
   spec.add_runtime_dependency "commonmarker", ">= 0.18.1"
   spec.add_runtime_dependency "nokogiri", ">= 1.6"

data/sider.yml

@@ -0,0 +1,4 @@
+linter:
+  rubocop:
+    gems:
+      - "rubocop-performance"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mato
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.3.2
 platform: ruby
 authors:
 - FUJI Goro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -89,11 +89,16 @@ files:
 - lib/mato/timeout.rb
 - lib/mato/version.rb
 - mato.gemspec
+- sider.yml
 homepage: https://github.com/bitjourney/mato
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/bitjourney/mato
+  source_code_uri: https://github.com/bitjourney/mato
+  changelog_uri: https://github.com/bitjourney/mato/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/bitjourney/mato/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,15 +106,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: MArkdown TOolkit
 test_files: []