kramdown-plantuml 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 178996116d7a833c324db54da1b3c367fe13c1d55fabc47026df12bec25b6f9d
-  data.tar.gz: d5dc3e4824ab5095b42b33e4b01cc6cb38735fe0bb220472f02e8014f069261b
+  metadata.gz: f873d08b8ab86ebe4ea964c30ad59a43a75c28d042d6627af1694d1ff262cbfd
+  data.tar.gz: cca59110bbdac25b41dc4c7ef41f9df0f84b17aa4a6da662feab19a73ca61724
 SHA512:
-  metadata.gz: 5dd2e36fc7b66a4a8948ba801d75107c04fedbbb612fe525cabac758de15e3908368999d8779126a082dfcef70f990194c3abf0bace90eea019b182e3d26626c
-  data.tar.gz: 166be327fab188558c365c5284739d57ed7b851ce953e616b98d7f9002a20f89ab6af7527134a148eefdf547c4465adfe469d597eb8919af26a51cf3615e2b57
+  metadata.gz: bbe10bc2e73c25b0a2bd09651e9bd73b2aeb612fa26f0470df0e9f0477c8f8f69f3c69d428b136826264e975068dc073724fcf4ab5e10b93e59585001983ada8
+  data.tar.gz: b74471596aadcf0bde3bf7878864918fb5bd6297172f69b5f9d30c214f84c1f67dfe2c11b7b6e1dc78bfb85c817c0a2c4a26e5bb9c420c519d490b5567b29fe8

data/kramdown-plantuml.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'htmlentities', '~> 4'
   spec.add_dependency 'kramdown', '~> 2.3'
   spec.add_dependency 'kramdown-parser-gfm', '~> 1.1'
   spec.add_dependency 'open3', '~> 0.1'

data/lib/kramdown-plantuml/jekyll_provider.rb

@@ -2,7 +2,7 @@
 
 require 'json'
 require 'English'
-require 'rexml/document'
+require 'htmlentities'
 require_relative 'log_wrapper'
 require_relative 'diagram'
 
@@ -62,27 +62,32 @@ module Kramdown
           html.gsub(/<!--#kramdown-plantuml\.start#-->(?<json>.*?)<!--#kramdown-plantuml\.end#-->/m) do
             json = $LAST_MATCH_INFO[:json]
             return replace_needle(json)
+          end
+        end
+
+        def replace_needle(json)
+          hash = JSON.parse(json)
+          options_hash = hash['options']
+          options = ::Kramdown::PlantUml::Options.new({ plantuml: options_hash })
+
+          begin
+            decode_and_convert(hash, options)
           rescue StandardError => e
             raise e if options.raise_errors?
 
-            logger.error "Error while replacing needle: #{e.inspect}"
+            logger.error 'Error while replacing needle.'
+            logger.error e.to_s
+            logger.debug_multiline json
           end
         end
 
-        def replace_needle(json)
-          hash = JSON.parse(json)
+        def decode_and_convert(hash, options)
           encoded_plantuml = hash['plantuml']
-          plantuml = decode_html_entities(encoded_plantuml)
-          options = ::Kramdown::PlantUml::Options.new({ plantuml: hash['options'] })
+          plantuml = HTMLEntities.new.decode encoded_plantuml
           diagram = ::Kramdown::PlantUml::Diagram.new(plantuml, options)
           diagram.convert_to_svg
         end
 
-        def decode_html_entities(encoded_plantuml)
-          doc = REXML::Document.new "<plantuml>#{encoded_plantuml}</plantuml>"
-          doc.root.text
-        end
-
         def load_jekyll
           require 'jekyll'
           ::Jekyll

data/lib/kramdown-plantuml/version.rb

@@ -2,6 +2,6 @@
 
 module Kramdown
   module PlantUml
-    VERSION = '1.1.7'
+    VERSION = '1.1.8'
   end
 end

data/lib/kramdown_html.rb

@@ -28,7 +28,7 @@ module Kramdown
         options = ::Kramdown::PlantUml::Options.new(@options)
         return jekyll.needle(element.value, options) if jekyll.installed?
 
-        convert_plantuml(element.value)
+        convert_plantuml(element.value, options)
       end
 
       private
@@ -37,10 +37,13 @@ module Kramdown
         element.attr['class'] == 'language-plantuml'
       end
 
-      def convert_plantuml(plantuml)
-        options = ::Kramdown::PlantUml::Options.new(@options)
+      def convert_plantuml(plantuml, options)
         diagram = ::Kramdown::PlantUml::Diagram.new(plantuml, options)
         diagram.convert_to_svg
+      rescue StandardError => e
+        raise e if options.raise_errors?
+
+        logger.error "Error while replacing needle: #{e.inspect}"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Swedbank Pay
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement