kramdown-plantuml 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f873d08b8ab86ebe4ea964c30ad59a43a75c28d042d6627af1694d1ff262cbfd
-  data.tar.gz: cca59110bbdac25b41dc4c7ef41f9df0f84b17aa4a6da662feab19a73ca61724
+  metadata.gz: 4ffc24d5b020aac9204946744f85793d0ae07da2fe95a27b9301f104aee78c13
+  data.tar.gz: 83ae8392c10526f3382d327497fee2b85c297f9eb7599798f1e789f947084800
 SHA512:
-  metadata.gz: bbe10bc2e73c25b0a2bd09651e9bd73b2aeb612fa26f0470df0e9f0477c8f8f69f3c69d428b136826264e975068dc073724fcf4ab5e10b93e59585001983ada8
-  data.tar.gz: b74471596aadcf0bde3bf7878864918fb5bd6297172f69b5f9d30c214f84c1f67dfe2c11b7b6e1dc78bfb85c817c0a2c4a26e5bb9c420c519d490b5567b29fe8
+  metadata.gz: 38a1e20a6a08fc178d25737ff9443fecfd8f48bbbc10f1b69eda8fd929f472a05f39150ad91d17cbaf94285757c156101510c16346aecee06f7a712e74c9908b
+  data.tar.gz: 9d6d3192043170c20829ab97fc5513bc392d5eb8af92eb8017042d6ebbd19000730427a5b8c3ac3809095d4a8ec74945424fe854c0d1667ecce1340b3e88b78a

data/lib/kramdown-plantuml/jekyll_provider.rb

@@ -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,7 +50,34 @@ 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
@@ -66,16 +87,19 @@ module Kramdown
         end
 
         def replace_needle(json)
-          hash = JSON.parse(json)
-          options_hash = hash['options']
+          logger.debug 'Replacing Jekyll needle.'
+
+          needle_hash = JSON.parse(json)
+          options_hash = needle_hash['options']
+          options_hash[:site_destination_dir] = @site_destination_dir
           options = ::Kramdown::PlantUml::Options.new({ plantuml: options_hash })
 
           begin
-            decode_and_convert(hash, options)
+            decode_and_convert(needle_hash, options)
           rescue StandardError => e
             raise e if options.raise_errors?
 
-            logger.error 'Error while replacing needle.'
+            logger.error 'Error while replacing Jekyll needle.'
             logger.error e.to_s
             logger.debug_multiline json
           end

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.8'
+    VERSION = '1.1.9'
   end
 end

data/lib/kramdown_html.rb

@@ -43,6 +43,7 @@ module Kramdown
       rescue StandardError => e
         raise e if options.raise_errors?
 
+        logger = ::Kramdown::PlantUml::LogWrapper.init
         logger.error "Error while replacing needle: #{e.inspect}"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities