kramdown-plantuml 1.0.5 → 1.1.4

data/lib/kramdown-plantuml/theme.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: false
+
+require_relative 'logger'
+
+module Kramdown
+  module PlantUml
+    # Provides theming support for PlantUML
+    class Theme
+      attr_reader :name, :directory
+
+      def initialize(options = {})
+        @logger = Logger.init
+        @name, @directory = theme_options(options)
+      end
+
+      def apply(plantuml)
+        if plantuml.nil? || !plantuml.is_a?(String) || plantuml.empty?
+          @logger.debug ' kramdown-plantuml: Empty diagram or not a String.'
+          return plantuml
+        end
+
+        if @name.nil? || @name.empty?
+          @logger.debug ' kramdown-plantuml: No theme to apply.'
+          return plantuml
+        end
+
+        theme(plantuml)
+      end
+
+      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] || {}
+        name = theme.key?(:name) ? theme[:name] : nil
+        directory = theme.key?(:directory) ? theme[:directory] : nil
+
+        [name, 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
+
+        return plantuml if startuml_index.nil?
+
+        theme_string = "\n!theme #{@name}"
+        theme_string << " from #{@directory}" unless @directory.nil?
+
+        @logger.debug " kramdown-plantuml: Applying #{theme_string.strip}"
+
+        /@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.0.5'
+    VERSION = '1.1.4'
   end
 end

data/lib/kramdown-plantuml.rb

@@ -1,11 +1,3 @@
 # frozen_string_literal: true
 
-require_relative 'kramdown-plantuml/version'
-require_relative 'kramdown-plantuml/converter'
 require_relative 'kramdown_html'
-
-module Kramdown
-  module PlantUml
-    class Error < StandardError; end
-  end
-end

data/lib/kramdown_html.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'kramdown'
-require_relative 'kramdown-plantuml/converter'
-
-PlantUmlConverter = Kramdown::PlantUml::Converter
+require 'kramdown-parser-gfm'
+require_relative 'kramdown-plantuml/logger'
+require_relative 'kramdown-plantuml/plantuml_error'
+require_relative 'kramdown-plantuml/diagram'
 
 module Kramdown
   module Converter
@@ -15,8 +16,10 @@ module Kramdown
       def convert_codeblock(element, indent)
         return super_convert_codeblock(element, indent) if element.attr['class'] != 'language-plantuml'
 
-        converter = PlantUmlConverter.new
-        converter.convert_plantuml_to_svg(element.value)
+        plantuml = element.value
+        plantuml_options = @options.key?(:plantuml) ? @options[:plantuml] : {}
+        diagram = ::Kramdown::PlantUml::Diagram.new(plantuml, plantuml_options)
+        diagram.convert_to_svg
       end
     end
   end

data/pom.xml

@@ -10,7 +10,7 @@
         <dependency>
             <groupId>net.sourceforge.plantuml</groupId>
             <artifactId>plantuml</artifactId>
-            <version>1.2020.18</version>
+            <version>1.2021.9</version>
         </dependency>
     </dependencies>
 </project>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.4
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: kramdown-parser-gfm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: open3
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +80,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.92'
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.92'
+        version: '2.4'
 description: 
 email:
 - opensource@swedbankpay.com
@@ -87,12 +143,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/codecov.yml"
+- ".github/dependabot.yml"
+- ".github/mergify.yml"
+- ".github/scripts/amend.sh"
 - ".github/scripts/build-gem.sh"
-- ".github/scripts/bundle-install.sh"
 - ".github/scripts/inspect-gem.sh"
 - ".github/scripts/publish-gem.sh"
 - ".github/scripts/test-gem.sh"
 - ".github/scripts/variables.sh"
+- ".github/workflows/amend.yml"
 - ".github/workflows/no-java.yml"
 - ".github/workflows/no-plantuml.yml"
 - ".github/workflows/ruby.yml"
@@ -102,13 +162,21 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- GitVersion.yml
 - LICENSE
 - README.md
 - Rakefile
-- bin/net/sourceforge/plantuml/plantuml/1.2020.18/plantuml-1.2020.18.jar
+- bin/net/sourceforge/plantuml/plantuml/1.2021.9/plantuml-1.2021.9.jar
 - kramdown-plantuml.gemspec
 - lib/kramdown-plantuml.rb
-- lib/kramdown-plantuml/converter.rb
+- lib/kramdown-plantuml/bool_env.rb
+- lib/kramdown-plantuml/console_logger.rb
+- lib/kramdown-plantuml/diagram.rb
+- lib/kramdown-plantuml/executor.rb
+- lib/kramdown-plantuml/logger.rb
+- lib/kramdown-plantuml/plantuml_error.rb
+- lib/kramdown-plantuml/plantuml_result.rb
+- lib/kramdown-plantuml/theme.rb
 - lib/kramdown-plantuml/version.rb
 - lib/kramdown_html.rb
 - lib/which.rb
@@ -127,16 +195,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: kramdown-plantuml allows you to use PlantUML syntax within fenced code blocks
-  with Kramdown (Jekyll's default Markdown parser)
+  with Kramdown (Jekyll's default Markdown parser).
 test_files: []

data/.github/scripts/bundle-install.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit # Abort if any command fails
-
-gem install bundler
-bundle config path vendor/bundle
-bundle install --jobs 4 --retry 3

data/lib/kramdown-plantuml/converter.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'open3'
-require_relative '../which'
-require_relative 'version'
-
-module Kramdown
-  module PlantUml
-    # Converts PlantUML markup to SVG
-    class Converter
-      def initialize
-        dir = File.dirname __dir__
-        jar_glob = File.join dir, '../bin/**/plantuml*.jar'
-        @plant_uml_jar_file = Dir[jar_glob].first
-
-        raise IOError, 'Java can not be found' unless Which.which('java')
-        raise IOError, "No 'plantuml.jar' file could be found" if @plant_uml_jar_file.nil?
-        raise IOError, "'#{@plant_uml_jar_file}' does not exist" unless File.exist? @plant_uml_jar_file
-      end
-
-      def convert_plantuml_to_svg(content)
-        cmd = "java -jar #{@plant_uml_jar_file} -tsvg -pipe"
-
-        stdout, stderr, = Open3.capture3(cmd, stdin_data: content)
-
-        # Circumvention of https://bugs.openjdk.java.net/browse/JDK-8244621
-        raise stderr unless stderr.empty? || stderr.include?('CoreText note:')
-
-        xml_prologue_start = '<?xml'
-        xml_prologue_end = '?>'
-
-        start_index = stdout.index(xml_prologue_start)
-        end_index = stdout.index(xml_prologue_end, xml_prologue_start.length) + xml_prologue_end.length
-
-        stdout.slice! start_index, end_index
-
-        wrapper_element_start = '<div class="plantuml">'
-        wrapper_element_end = '</div>'
-
-        "#{wrapper_element_start}#{stdout}#{wrapper_element_end}"
-      end
-    end
-  end
-end