kramdown-plantuml 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494e1d003f565fb2e076daa61be11c187248776f6ab76145d7c4f6963d771355
-  data.tar.gz: 2acbb2c1e2142dbfb1e732013a63f70a9a70d65a6e77c4107970b151a25736b9
+  metadata.gz: 51cbb0be0b06278afe3b3d1eb572190a9f7a04fc869454b023854d5d8012e596
+  data.tar.gz: 0e7cb4345aeab6972d3b0009b71ddc714f046f5b558ae1d37b334697af39575b
 SHA512:
-  metadata.gz: ed8130982476ebe4b9bda233ef2f9bef82bcc9519d5ad9bc463b5d4f2bc858b9357d2a190567261616f7fbf2b485554e4e6895235a104d0159a25a42abe87af1
-  data.tar.gz: 2423d0759e06ff233f11904c94aaccb5d61d37aa3f2748352b6df3990d7ed49d683c7e5b4456e34ac32db7592bb3a65a3e668f549a08b4e768c0800a0fe281a2
+  metadata.gz: c18e9c35a4fef278f506106c1365839e7f58b0b45c8b352912187cd324df373b342400e56f51b9c13278ab199fd5fb6101c63cd02aa25ce9efef07722d7c517a
+  data.tar.gz: d822db2c31c38db0f7ce0a5b92221ebf30a55be1f5d011141199d07d94a01b5ddba99a1ba127d13b88219f6135a384d90741315b6e00b88d0e72c20fa1220d2f

data/lib/kramdown-plantuml/converter.rb

@@ -18,7 +18,7 @@ module Kramdown
 
       def convert_plantuml_to_svg(plantuml)
         if plantuml.nil? || plantuml.empty?
-          @logger.warn 'kramdown-plantuml: PlantUML diagram is empty'
+          @logger.warn ' kramdown-plantuml: PlantUML diagram is empty'
           return plantuml
         end
 
@@ -44,8 +44,8 @@ module Kramdown
       end
 
       def log(plantuml)
-        @logger.debug 'kramdown-plantuml: PlantUML converting diagram:'
-        @logger.debug_with_prefix 'kramdown-plantuml: ', plantuml
+        @logger.debug ' kramdown-plantuml: PlantUML converting diagram:'
+        @logger.debug_with_prefix ' kramdown-plantuml: ', plantuml
       end
     end
   end

data/lib/kramdown-plantuml/executor.rb

@@ -26,11 +26,11 @@ module Kramdown
                  ' -nometadata'
                end
 
-        @logger.debug "kramdown-plantuml: Executing '#{cmd}'."
+        @logger.debug " kramdown-plantuml: Executing '#{cmd}'."
 
         stdout, stderr, status = Open3.capture3 cmd, stdin_data: stdin
 
-        @logger.debug "kramdown-plantuml: 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

@@ -4,7 +4,7 @@ require_relative 'console_logger'
 
 module Kramdown
   module PlantUml
-    # Provides theming support for PlantUML
+    # Logs stuff
     class Logger
       def initialize(logger)
         raise ArgumentError, 'logger cannot be nil' if logger.nil?
@@ -45,6 +45,10 @@ module Kramdown
         self.class.level == :debug
       end
 
+      def level
+        @level ||= level_from_logger || self.class.env
+      end
+
       class << self
         def init
           inner = nil
@@ -72,6 +76,14 @@ module Kramdown
           :warn
         end
       end
+
+      private
+
+      def level_from_logger
+        return @logger.level if @logger.respond_to? :level
+
+        nil
+      end
     end
   end
 end

data/lib/kramdown-plantuml/plantuml_result.rb

@@ -42,8 +42,8 @@ module Kramdown
 
         return if @stderr.nil? || @stderr.empty?
 
-        @logger.debug 'kramdown-plantuml: PlantUML log:'
-        @logger.debug_with_prefix 'kramdown-plantuml: ', @stderr
+        @logger.debug ' kramdown-plantuml: PlantUML log:'
+        @logger.debug_with_prefix ' kramdown-plantuml: ', @stderr
       end
     end
   end

data/lib/kramdown-plantuml/themer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_relative 'hash'
 require_relative 'logger'
 
 module Kramdown
@@ -10,20 +9,18 @@ module Kramdown
       attr_reader :theme_name, :theme_directory
 
       def initialize(options = {})
-        options = options.symbolize_keys unless options.nil?
         @logger = Logger.init
-        @logger.debug "kramdown-plantuml: Options: #{options}"
         @theme_name, @theme_directory = theme_options(options)
       end
 
       def apply_theme(plantuml)
         if plantuml.nil? || plantuml.empty?
-          @logger.debug 'kramdown-plantuml: Empty diagram.'
+          @logger.debug ' kramdown-plantuml: Empty diagram.'
           return plantuml
         end
 
         if @theme_name.nil? || @theme_name.empty?
-          @logger.debug 'kramdown-plantuml: No theme to apply.'
+          @logger.debug ' kramdown-plantuml: No theme to apply.'
           return plantuml
         end
 
@@ -33,6 +30,10 @@ module Kramdown
       private
 
       def theme_options(options)
+        options = symbolize_keys(options)
+
+        @logger.debug " kramdown-plantuml: Options: #{options}"
+
         return nil if options.nil? || !options.key?(:theme)
 
         theme = options[:theme] || {}
@@ -42,6 +43,17 @@ module Kramdown
         [theme_name, theme_directory]
       end
 
+      def symbolize_keys(options)
+        return options if options.nil?
+
+        array = options.map do |key, value|
+          value = value.is_a?(Hash) ? symbolize_keys(value) : value
+          [key.to_sym, value]
+        end
+
+        array.to_h
+      end
+
       def theme(plantuml)
         startuml = '@startuml'
         startuml_index = plantuml.index(startuml) + startuml.length
@@ -51,7 +63,7 @@ module Kramdown
         theme_string = "\n!theme #{@theme_name}"
         theme_string << " from #{@theme_directory}" unless @theme_directory.nil?
 
-        @logger.debug "kramdown-plantuml: Applying #{theme_string}"
+        @logger.debug " kramdown-plantuml: Applying #{theme_string.strip}"
 
         /@startuml.*/.match(plantuml) do |match|
           return plantuml.insert match.end(0), theme_string

data/lib/kramdown-plantuml/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -173,7 +173,6 @@ files:
 - lib/kramdown-plantuml/console_logger.rb
 - lib/kramdown-plantuml/converter.rb
 - lib/kramdown-plantuml/executor.rb
-- lib/kramdown-plantuml/hash.rb
 - lib/kramdown-plantuml/logger.rb
 - lib/kramdown-plantuml/plantuml_error.rb
 - lib/kramdown-plantuml/plantuml_result.rb

data/lib/kramdown-plantuml/hash.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-# Ruby's Hash class.
-class ::Hash
-  # Via https://stackoverflow.com/a/25835016/2257038
-  def symbolize_keys
-    h = map do |k, v|
-      v_sym = v.instance_of?(Hash) ? v.symbolize_keys : v
-      [k.to_sym, v_sym]
-    end
-
-    h.to_h
-  end
-end