kramdown-plantuml 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488e793ad6c95b20619319fdec43866b7a96369321767eb415c441b2d8946c0c
-  data.tar.gz: 2f9b7957b2b7d09ebe2758d1fc3f3600c7464f2ccee53d5ea11f04bf25b0df33
+  metadata.gz: 494e1d003f565fb2e076daa61be11c187248776f6ab76145d7c4f6963d771355
+  data.tar.gz: 2acbb2c1e2142dbfb1e732013a63f70a9a70d65a6e77c4107970b151a25736b9
 SHA512:
-  metadata.gz: 4e4547033622f876ea2c63eb4af2f73433e57fa4cbe8bdd818bbcb5261f4bef829f50da55b9f5485023e5c040d7c260844f27fcf2a67f17858839aa4e9f0dab3
-  data.tar.gz: cd38086b669bf27b64ccae97f45005a23a508fdfd94647e40c2f8e9960a89edc0abd2781c74fb42493c1b1df7bd5c0aaee6c19acd63cf20394d594c077cc072d
+  metadata.gz: ed8130982476ebe4b9bda233ef2f9bef82bcc9519d5ad9bc463b5d4f2bc858b9357d2a190567261616f7fbf2b485554e4e6895235a104d0159a25a42abe87af1
+  data.tar.gz: 2423d0759e06ff233f11904c94aaccb5d61d37aa3f2748352b6df3990d7ed49d683c7e5b4456e34ac32db7592bb3a65a3e668f549a08b4e768c0800a0fe281a2

data/lib/kramdown-plantuml/bool_env.rb

@@ -9,8 +9,8 @@ module Kramdown
 
       def initialize(name)
         @name = name
-        @value = ENV.key?(name) ? ENV[name] : nil
-        @value = @value.to_s.downcase unless @value.nil?
+        value = ENV.fetch(name, nil)
+        @value = value.to_s.downcase unless value.nil?
       end
 
       def true?

data/lib/kramdown-plantuml/console_logger.rb

@@ -34,7 +34,7 @@ module Kramdown
         return false unless write_message?(level)
 
         pipe = pipe_for(level)
-        pipe.write("\n#{message}")
+        pipe.write("#{message}\n")
       end
 
       def write_message?(level_of_message)

data/lib/kramdown-plantuml/converter.rb

@@ -17,9 +17,14 @@ module Kramdown
       end
 
       def convert_plantuml_to_svg(plantuml)
+        if plantuml.nil? || plantuml.empty?
+          @logger.warn 'kramdown-plantuml: PlantUML diagram is empty'
+          return plantuml
+        end
+
         plantuml = @themer.apply_theme(plantuml)
         plantuml = plantuml.strip
-        @logger.debug "PlantUML converting diagram:\n#{plantuml}"
+        log(plantuml)
         result = @executor.execute(plantuml)
         result.validate(plantuml)
         svg = result.without_xml_prologue
@@ -37,6 +42,11 @@ module Kramdown
 
         "#{wrapper_element_start}#{svg}#{wrapper_element_end}"
       end
+
+      def log(plantuml)
+        @logger.debug 'kramdown-plantuml: PlantUML converting diagram:'
+        @logger.debug_with_prefix 'kramdown-plantuml: ', plantuml
+      end
     end
   end
 end

data/lib/kramdown-plantuml/executor.rb

@@ -26,11 +26,11 @@ module Kramdown
                  ' -nometadata'
                end
 
-        @logger.debug "PlantUML executing: #{cmd}"
+        @logger.debug "kramdown-plantuml: Executing '#{cmd}'."
 
         stdout, stderr, status = Open3.capture3 cmd, stdin_data: stdin
 
-        @logger.debug "PlantUML exit code: #{status.exitstatus}"
+        @logger.debug "kramdown-plantuml: PlantUML exit code '#{status.exitstatus}'."
 
         PlantUmlResult.new(stdout, stderr, status)
       end

data/lib/kramdown-plantuml/logger.rb

@@ -17,19 +17,28 @@ module Kramdown
       end
 
       def debug(message)
-        @logger.debug(message)
+        @logger.debug message
+      end
+
+      def debug_with_prefix(prefix, string)
+        return if string.nil? || string.empty?
+
+        lines = string.lines
+        lines.each do |line|
+          @logger.debug "#{prefix}#{line.rstrip}"
+        end
       end
 
       def info(message)
-        @logger.info(message)
+        @logger.info message
       end
 
       def warn(message)
-        @logger.warn(message)
+        @logger.warn message
       end
 
       def error(message)
-        @logger.error(message)
+        @logger.error message
       end
 
       def debug?
@@ -44,10 +53,10 @@ module Kramdown
             require 'jekyll'
             inner = Jekyll.logger
           rescue LoadError
-            inner = ConsoleLogger.new(level)
+            inner = ConsoleLogger.new level
           end
 
-          Logger.new(inner)
+          Logger.new inner
         end
 
         def level

data/lib/kramdown-plantuml/plantuml_result.rb

@@ -42,7 +42,8 @@ module Kramdown
 
         return if @stderr.nil? || @stderr.empty?
 
-        @logger.debug("PlantUML log:\n#{@stderr}")
+        @logger.debug 'kramdown-plantuml: PlantUML log:'
+        @logger.debug_with_prefix 'kramdown-plantuml: ', @stderr
       end
     end
   end

data/lib/kramdown-plantuml/themer.rb

@@ -10,34 +10,30 @@ module Kramdown
       attr_reader :theme_name, :theme_directory
 
       def initialize(options = {})
-        options = options.symbolize_keys
+        options = options.symbolize_keys unless options.nil?
         @logger = Logger.init
-        @logger.debug(options)
+        @logger.debug "kramdown-plantuml: Options: #{options}"
         @theme_name, @theme_directory = theme_options(options)
       end
 
       def apply_theme(plantuml)
-        return plantuml if plantuml.nil? || plantuml.empty? || @theme_name.nil? || @theme_name.empty?
-
-        startuml = '@startuml'
-        startuml_index = plantuml.index(startuml) + startuml.length
-
-        return plantuml if startuml_index.nil?
-
-        /@startuml.*/.match(plantuml) do |match|
-          theme_string = "\n!theme #{@theme_name}"
-          theme_string << " from #{@theme_directory}" unless @theme_directory.nil?
+        if plantuml.nil? || plantuml.empty?
+          @logger.debug 'kramdown-plantuml: Empty diagram.'
+          return plantuml
+        end
 
-          return plantuml.insert match.end(0), theme_string
+        if @theme_name.nil? || @theme_name.empty?
+          @logger.debug 'kramdown-plantuml: No theme to apply.'
+          return plantuml
         end
 
-        plantuml
+        theme(plantuml)
       end
 
       private
 
       def theme_options(options)
-        return nil unless options.key?(:theme)
+        return nil if options.nil? || !options.key?(:theme)
 
         theme = options[:theme] || {}
         theme_name = theme.key?(:name) ? theme[:name] : nil
@@ -45,6 +41,24 @@ module Kramdown
 
         [theme_name, theme_directory]
       end
+
+      def theme(plantuml)
+        startuml = '@startuml'
+        startuml_index = plantuml.index(startuml) + startuml.length
+
+        return plantuml if startuml_index.nil?
+
+        theme_string = "\n!theme #{@theme_name}"
+        theme_string << " from #{@theme_directory}" unless @theme_directory.nil?
+
+        @logger.debug "kramdown-plantuml: Applying #{theme_string}"
+
+        /@startuml.*/.match(plantuml) do |match|
+          return plantuml.insert match.end(0), theme_string
+        end
+
+        plantuml
+      end
     end
   end
 end

data/lib/kramdown-plantuml/version.rb

@@ -2,6 +2,6 @@
 
 module Kramdown
   module PlantUml
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown