kramdown-plantuml 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 716bd98dfc84efc97e64f12e8c1f68c1ee7a982e1d1ea33eabdf0f74b4560c04
-  data.tar.gz: 56254a3d065d7c69f2744cca59d32974e37f3e773bceccc2c63ab8dc151a5ace
+  metadata.gz: 1b755b8fc90e54aada29c40ce3b4391858d2b978487a82a9965bef5da8084b08
+  data.tar.gz: 0afb90a2bc66c705f7efb6e5c48d26c3e7e3ab83f1fd4ba2300090121b844958
 SHA512:
-  metadata.gz: 4e19ff0d0e8b1b90f5a5e19595c95982c9e6c126b1b54b5238c0ee1ac81463aaf63350be0ea90c04844cbc7fca5c126cadd86fec50073ed9af0bf83b9800a706
-  data.tar.gz: c0dea81be5cd8bbf9c9541b4941cfd4c0ab05700a092a6b4672ec7adfe96f5e2212c22861dfcd0e86d1e90611b8bf2734da12d12b05853239ffa582b3b67bcc5
+  metadata.gz: fc479376cac81326afd561679f65d84ae110a762cf85ecd6936713f7dcaf019dbb7031890ea038dd4874955ffcdf7ca71fdca3ad30756d7526579cde89385d87
+  data.tar.gz: 605bcc56726601a048cc69599c0b8a72f6845cb1145af7549d35cb832b3aff515aae6dbf560294145509897b86ca698fde5848d21f34cc9230360a0f01517b9a

data/.github/mergify.yml

@@ -9,10 +9,15 @@ pull_request_rules:
   - name: Automatic merge on approval
     conditions:
       - author~=^dependabot(|-preview)\[bot\]$
+      - '#commits-behind=0' # Only merge up to date pull requests
+      - check-success=test
+      - check-success=version
+      - check-success=plantuml
+      - check-success=gem
+      - check-success=shellcheck
+      - check-success=license/cla
     actions:
       merge:
-        method: merge
-        strict: smart
 
   - name: Thank contributor
     conditions:

data/.github/workflows/amend.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/amend')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: amend

data/.github/workflows/no-java.yml

@@ -13,7 +13,7 @@ jobs:
       image: ruby:2.7.2
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Bundle install
       run: bundle install --jobs 4 --retry 3

data/.github/workflows/no-plantuml.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby 2.7
       uses: ruby/setup-ruby@v1

data/.github/workflows/ruby.yml

@@ -10,18 +10,18 @@ jobs:
       version: ${{ steps.variables.outputs.version }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Setup GitVersion
-      uses: gittools/actions/gitversion/setup@v0.9.11
+      uses: gittools/actions/gitversion/setup@v0.9.13
       with:
         versionSpec: '5.x.x'
 
     - name: Execute GitVersion
       id: gitversion
-      uses: gittools/actions/gitversion/execute@v0.9.11
+      uses: gittools/actions/gitversion/execute@v0.9.13
 
     - name: Create variables
       id: variables
@@ -34,16 +34,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: adopt
         java-version: 14
 
     - name: Cache Maven dependencies
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -56,7 +56,7 @@ jobs:
       run: mvn install
 
     - name: Upload plantuml.jar artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: plantuml.jar
         path: ~/.m2/repository/**/plantuml*.jar
@@ -69,9 +69,9 @@ jobs:
       name: ${{ steps.gem.outputs.name }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: plantuml.jar
         path: bin/
@@ -97,7 +97,7 @@ jobs:
       run: bundle exec rspec --format documentation --tag debug
 
     - name: Upload code coverage (debug)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: rspec-debug-coverage
         path: ./coverage
@@ -109,7 +109,7 @@ jobs:
       run: bundle exec rake
 
     - name: Upload code coverage
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: rspec-coverage
         path: ./coverage
@@ -125,7 +125,7 @@ jobs:
         git checkout HEAD -- Gemfile
 
     - name: Upload code coverage (Jekyll)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: rspec-jekyll-coverage
         path: ./coverage
@@ -138,7 +138,7 @@ jobs:
       run: .github/scripts/build-gem.sh --ref ${{ github.ref }} --verbose
 
     - name: Upload gem
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ steps.gem.outputs.name }}
         path: ${{ steps.gem.outputs.name }}
@@ -150,7 +150,7 @@ jobs:
       run: .github/scripts/test-gem.sh --workdir "${{ github.workspace }}/spec/examples" --gemdir "${{ github.workspace }}" --verbose
 
     - name: Upload code coverage (gem)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: gem-coverage
         path: ./coverage
@@ -166,15 +166,15 @@ jobs:
         (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]')
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       if: ${{ github.event_name != 'pull_request_target' }}
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       if: ${{ github.event_name == 'pull_request_target' }}
       with:
         ref: ${{ github.event.pull_request.head.sha }}
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: ${{ needs.gem.outputs.name }}
 
@@ -200,7 +200,7 @@ jobs:
       run: .github/scripts/test-gem.sh --workdir "${{ github.workspace }}/spec/examples" --version ${{ needs.version.outputs.version }} --token "${{ secrets.GPR_TOKEN }}" --verbose --theme-name c2a3b0 --theme-directory "${{ github.workspace }}/spec/examples"
 
     - name: Upload Jekyll site
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v3
       if: always()
       with:
         name: site
@@ -212,9 +212,9 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/') # Only publish tagged commits
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: ${{ needs.gem.outputs.name }}
 

data/lib/kramdown-plantuml/converter_extension.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Kramdown
+  module PlantUml
+    # Plugs into Kramdown::Converter::Html to provide conversion of PlantUML markup
+    # into beautiful SVG.
+    module ConverterExtension
+      def convert_codeblock(element, indent)
+        return super(element, indent) unless plantuml? element
+
+        convert_plantuml(element.value)
+      end
+
+      private
+
+      def plantuml?(element)
+        element.attr['class'] == 'language-plantuml'
+      end
+
+      def convert_plantuml(plantuml)
+        puml_opts = PlantUml::Options.new(@options)
+        diagram = PlantUml::PlantUmlDiagram.new(plantuml, puml_opts)
+        diagram.svg.to_s
+      rescue StandardError => e
+        raise e if puml_opts.nil? || puml_opts.raise_errors?
+
+        logger = PlantUml::LogWrapper.init
+        logger.error "Error while converting diagram: #{e.inspect}"
+      end
+    end
+  end
+end

data/lib/kramdown-plantuml/version.rb

@@ -2,6 +2,6 @@
 
 module Kramdown
   module PlantUml
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
   end
 end

data/lib/kramdown_html.rb

@@ -6,36 +6,6 @@ require_relative 'kramdown-plantuml/log_wrapper'
 require_relative 'kramdown-plantuml/plantuml_error'
 require_relative 'kramdown-plantuml/options'
 require_relative 'kramdown-plantuml/plantuml_diagram'
+require_relative 'kramdown-plantuml/converter_extension'
 
-module Kramdown
-  module Converter
-    # Plugs into Kramdown::Converter::Html to provide conversion of PlantUML markup
-    # into beautiful SVG.
-    class Html
-      alias super_convert_codeblock convert_codeblock
-
-      def convert_codeblock(element, indent)
-        return super_convert_codeblock(element, indent) unless plantuml? element
-
-        convert_plantuml(element.value)
-      end
-
-      private
-
-      def plantuml?(element)
-        element.attr['class'] == 'language-plantuml'
-      end
-
-      def convert_plantuml(plantuml)
-        puml_opts = ::Kramdown::PlantUml::Options.new(@options)
-        diagram = ::Kramdown::PlantUml::PlantUmlDiagram.new(plantuml, puml_opts)
-        diagram.svg.to_s
-      rescue StandardError => e
-        raise e if puml_opts.nil? || puml_opts.raise_errors?
-
-        logger = ::Kramdown::PlantUml::LogWrapper.init
-        logger.error "Error while converting diagram: #{e.inspect}"
-      end
-    end
-  end
-end
+Kramdown::Converter::Html.prepend Kramdown::PlantUml::ConverterExtension

data/pom.xml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -194,11 +194,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/net/sourceforge/plantuml/plantuml/1.2021.16/plantuml-1.2021.16.jar
+- bin/net/sourceforge/plantuml/plantuml/1.2022.6/plantuml-1.2022.6.jar
 - kramdown-plantuml.gemspec
 - lib/kramdown-plantuml.rb
 - lib/kramdown-plantuml/bool_env.rb
 - lib/kramdown-plantuml/console_logger.rb
+- lib/kramdown-plantuml/converter_extension.rb
 - lib/kramdown-plantuml/executor.rb
 - lib/kramdown-plantuml/jekyll_provider.rb
 - lib/kramdown-plantuml/log_wrapper.rb