kramdown-plantuml 1.1.6 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ad198f4e3e4e733d4e12d7e4281131c5ececd42896a0d14bd5815b6a06c5b7a
-  data.tar.gz: d2e558280a863d76b9554845ea31c52d37db234648cd1e2f9dae4fab22f8220f
+  metadata.gz: 0f3079884f4be0aff2684c326ba38d338463bdeb7948fadb809e5291da704e24
+  data.tar.gz: 626333b50918dabde967923545195585060f83198db77df1827fecd12a14308a
 SHA512:
-  metadata.gz: a7258a0fcf799cbfd27088342d6030a25115118bda6b2c3d188984200d91821df537ab3f863470e497e9331165e06a88dd538650a41177972bb79bde02bb0704
-  data.tar.gz: 774cf7d37cf2968225a0889118e8cafb3f7234ce0caf26b3a969f088418d2c3ba3ce7438b54dfbab3209c81295756c9c1c5f260f5c96ce75f1e8aacc2ebf0c28
+  metadata.gz: 54fd75fec2cd706bcdbaeeac660449a4b7c0c406689baa0cb234353607dc03042ddd2da796b427d42d93d1ccbc3dfe8fbd4fb4c97e8b629f68feb30686023c76
+  data.tar.gz: cb3e10de50b8a30d2522982b941003df0fab61d5ef641008d35acfe13d230ead829e729d6293c65159c3d7d645bb33be368a2e443362ef727dac3c58c234f473

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'
 
@@ -11,6 +11,8 @@ module Kramdown
     # Provides an instance of Jekyll if available.
     module JekyllProvider
       class << self
+        attr_reader :site_destination_dir
+
         def jekyll
           return @jekyll if defined? @jekyll
 
@@ -20,16 +22,8 @@ module Kramdown
         def install
           return @installed = false if jekyll.nil?
 
-          logger.debug 'Jekyll detected, hooking into :site:post_render'
-
-          Jekyll::Hooks.register :site, :post_render do |site|
-            logger.debug ':site:post_render triggered.'
-
-            site.pages.each do |page|
-              page.output = replace_needles(page.output)
-            end
-          end
-
+          find_site_destination_dir
+          register_hook
           @installed = true
         end
 
@@ -56,31 +50,67 @@ module Kramdown
 
         private
 
-        def replace_needles(html)
+        def find_site_destination_dir
+          if jekyll.sites.nil? || jekyll.sites.empty?
+            logger.debug 'Jekyll detected, hooking into :site:post_write.'
+            return nil
+          end
+
+          @site_destination_dir = jekyll.sites.first.dest
+          logger.debug "Jekyll detected, hooking into :site:post_write of '#{@site_destination_dir}'."
+          @site_destination_dir
+        end
+
+        def register_hook
+          Jekyll::Hooks.register :site, :post_write do |site|
+            logger.debug ':site:post_write triggered.'
+
+            @site_destination_dir ||= site.dest
+
+            site.pages.each do |page|
+              page.output = replace_needles(page)
+              page.write(@site_destination_dir)
+            end
+          end
+        end
+
+        def replace_needles(page)
+          logger.debug "Replacing Jekyll needle in #{page.path}"
+
+          html = page.output
+          return html if html.nil? || html.empty? || !html.is_a?(String)
+
           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)
+          logger.debug 'Replacing Jekyll needle.'
+
+          needle_hash = JSON.parse(json)
+          options_hash = needle_hash['options']
+          options = ::Kramdown::PlantUml::Options.new({ plantuml: options_hash })
+
+          begin
+            decode_and_convert(needle_hash, options)
           rescue StandardError => e
             raise e if options.raise_errors?
 
-            logger.error "Error while replacing needle: #{e.inspect}"
+            logger.error 'Error while replacing Jekyll 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/theme.rb

@@ -2,6 +2,7 @@
 
 require_relative 'options'
 require_relative 'log_wrapper'
+require_relative 'jekyll_provider'
 
 module Kramdown
   module PlantUml
@@ -13,9 +14,10 @@ module Kramdown
         raise ArgumentError, 'options cannot be nil' if options.nil?
         raise ArgumentError, "options must be a '#{Options}'." unless options.is_a?(Options)
 
+        @raise_errors = options.raise_errors?
         @logger = LogWrapper.init
         @name = options.theme_name
-        @directory = options.theme_directory
+        @directory = resolve options.theme_directory
       end
 
       def apply(plantuml)
@@ -34,6 +36,28 @@ module Kramdown
 
       private
 
+      def resolve(directory)
+        jekyll = JekyllProvider
+
+        return directory if directory.nil? || directory.empty? || !jekyll.installed?
+
+        directory = File.absolute_path(directory, jekyll.site_destination_dir)
+
+        log_or_raise "The theme directory '#{directory}' cannot be found" unless Dir.exist?(directory)
+
+        theme_path = File.join(directory, "puml-theme-#{@name}.puml")
+
+        log_or_raise "The theme '#{theme_path}' cannot be found" unless File.exist?(theme_path)
+
+        directory
+      end
+
+      def log_or_raise(message)
+        raise IOError, message if @raise_errors
+
+        logger.warn message
+      end
+
       def theme(plantuml)
         startuml = '@startuml'
         startuml_index = plantuml.index(startuml) + startuml.length

data/lib/kramdown-plantuml/version.rb

@@ -2,6 +2,6 @@
 
 module Kramdown
   module PlantUml
-    VERSION = '1.1.6'
+    VERSION = '1.1.10'
   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,14 @@ 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 = ::Kramdown::PlantUml::LogWrapper.init
+        logger.error "Error while replacing needle: #{e.inspect}"
       end
     end
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.10
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-04 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