mato 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f98ac00c95a368f2a81c27f5a44db4cbda10822f277e9ab95d3dced807dd7d
-  data.tar.gz: f1d1bd02baf2fa8facd9237f484b4fbfd555fcaf0629da7847c7eaba1cc80b8a
+  metadata.gz: d94a4026d7fadd8bc561d9489f2a89238ce6b4100e4e8d887832be86304feb33
+  data.tar.gz: fb26a18fa1f92dfc655f2b53a5aac5af2b3fe945bf2a42cbc8c0966d8f964044
 SHA512:
-  metadata.gz: 6ee8be2d2dd1044edd529505aa336cadbfd4d472444d782427872e27bc39ae4b8b3bdbe236ff8507c33786ab5af42da07469dc9dc5f654a0b9464f2f2b6afb1a
-  data.tar.gz: e69736d4e45aab72a7607fcc0ba15f3a5d4a5534d2e2efb537010de14517cbc69fdee2a0b9a64c06d841c19c11cea48ee48e5a8f743946f3e6bd8a333eaac537
+  metadata.gz: d698ea373d885e1c9716077dffd1aefc50426c398b68038c288e83f05fb016f26aa1302a1fc93447ec9d8c1b409f2c6f03e2474315075cfdb6e72037c20dfb1a
+  data.tar.gz: c39ed1a90becdb01f2d3b8447b67b79f3ce6efa8dcfbfce39d4c4c5d7e315ae69941655ff0d831829e955b6fd0102db592923501354c6cc74208f3065b8926ad

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,10 +1,9 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # The revision history of Mato
 
+## v2.2.0 - 2020/05/08
+
+https://github.com/bitjourney/mato/compare/v2.1.4...v2.2.0
+
+* 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

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/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/version.rb

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

data/mato.gemspec

@@ -20,7 +20,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.4
+  version: 2.2.0
 platform: ruby
 authors:
 - FUJI Goro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -89,6 +89,7 @@ files:
 - lib/mato/timeout.rb
 - lib/mato/version.rb
 - mato.gemspec
+- sider.yml
 homepage: https://github.com/bitjourney/mato
 licenses:
 - MIT
@@ -101,14 +102,14 @@ 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
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: MArkdown TOolkit