kramdown-plantuml 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51da02b82f51bd70b685e9d5286ca34cab9a8b9a3f3621998874638e94adfcc
-  data.tar.gz: 0ce4c33a2185a964aa36efd4f3112ca8144d2222ce80831aa79f95eb0bfaa848
+  metadata.gz: df85b61ecd8a5b15d5288e03f95f70064926f71f144d245dfe693ea36e190d7b
+  data.tar.gz: 88de76e1cf968e5365b1af85bc0266b3de41ff58c131583771b7d63b61f93544
 SHA512:
-  metadata.gz: 705fb1c0c560dc1fd6b601155e2cbb50f5fd8e49f78e0f28c1a1d1f370cb706684370184db0be718acac8c84a625fd6b404c194471772d74805ce65c927fcdb6
-  data.tar.gz: a07b250f306da8269ec7a7250245ddbb98093cf05b5c38947f255e91d51ada5f4f2567f65d49ff795aadc44fbf5c38c51654bd69cbe0a369f79d9654428f3622
+  metadata.gz: 3f13d2f50b9cfeb43e221654345a2d882eb1c310611f1f7f4f2ebac94214d17aa7d95e1b6bd8133419fdf722a72f1bf87249ac91bc239650f32a371520a42845
+  data.tar.gz: 4b3d5fd4af58e295265e7af2577d0ee9993b98258f95f6919ae1f648e5e8a7e5b31b648b94736c027ac338ee59b545717cc72d78d0f5da77669abd311215668e

data/.github/workflows/ruby.yml

@@ -49,14 +49,9 @@ jobs:
               return ref.substring(tagPrefix.length);
             }
 
-            const escapedBranchName = '${{ steps.gitversion.outputs.escapedBranchName }}';
-            const commitsSinceVersionSource = '${{ steps.gitversion.outputs.commitsSinceVersionSourcePadded }}';
-            const preReleaseLabel = escapedBranchName + '.' + commitsSinceVersionSource;
-            const majorMinorPatch = '${{ steps.gitversion.outputs.majorMinorPatch }}';
-            return majorMinorPatch + preReleaseLabel;
+            return '${{ steps.gitversion.outputs.legacySemVerPadded }}';
           })();
 
-          core.debug('Gem version: ' + gemVersion);
           core.setOutput('version', gemVersion);
 
     - name: Set up Ruby 2.6
@@ -109,7 +104,11 @@ jobs:
         touch $HOME/.gem/credentials
         chmod 0600 $HOME/.gem/credentials
         printf -- "---\n:github: Bearer ${GITHUB_TOKEN}\n" > $HOME/.gem/credentials
-        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} ${{ steps.gem.outputs.name }}
+        set -e
+        gem push --KEY github \
+                 --host https://rubygems.pkg.github.com/${OWNER} \
+                 ${{ steps.gem.outputs.name }} \
+          || echo "push failed ($?) probably due to version '${{ steps.gemversion.outputs.version }}' already existing in GPR."
 
     - name: Publish to RubyGems
       if: startsWith(github.ref, 'refs/tags/') # Only publish tagged commits

data/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+[opensource@swedbankpay.com][contact].
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
@@ -115,15 +115,17 @@ the community.
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+version 2.0, available at [contributor-covenant.org][concov20].
 
 Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
+enforcement ladder][mozilla-cocel].
 
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+For answers to common questions about this code of conduct, see the [FAQ][faq].
+[Translations are available][translations].
 
+[concov20]:         https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[contact]:          mailto:opensource@swedbankpay.com
+[faq]:              https://www.contributor-covenant.org/faq
+[homepage]:         https://www.contributor-covenant.org
+[mozilla-cocel]:    https://github.com/mozilla/diversity
+[translations]:     https://www.contributor-covenant.org/translations

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in kramdown-plantuml.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "kramdown"
 gem "open3"
 

data/README.md

@@ -1,9 +1,12 @@
 # Kramdown::PlantUml
 
-[![Contributor Covenant][coc-badge]][coc]
+[![Gem Version][gem-badge]][gem-url]
 ![Build][build-badge]
 ![No Java][no-java-build-badge]
 ![No PlantUML][no-plantuml-badge]
+[![MIT License][license-badge]][license]
+[![CLA assistant][cla-badge]][cla]
+[![Contributor Covenant][coc-badge]][coc]
 
 `kramdown-plantuml` allows you to use [PlantUML][plantuml] syntax within [fenced
 code blocks][fenced] in [Jekyll] with its default [Kramdown][kramdown] Markdown
@@ -24,7 +27,17 @@ app -> client
 Using the `plantuml` language identifier in fenced code blocks will allow
 `kramdown-plantuml` to pick it up and replace it with a rendered [SVG][svg]
 diagram when the Markdown is rendered to HTML. The above diagram will be
-replaced with the following:
+replaced with the following (abbreviated) HTML code:
+
+```html
+<div class="plantuml">
+  <svg>
+    <!-- Snip converted SVG code -->
+  </svg>
+</div>
+```
+
+Which in place will be rendered as the following:
 
 ![Rendered SVG Diagram][diagram-svg]
 
@@ -74,27 +87,34 @@ git commits and tags, and push the `.gem` file to [rubygems.org][gems].
 
 Bug reports and pull requests are welcome on [GitHub][github]. This project is
 intended to be a safe, welcoming space for collaboration, and contributors are
-expected to adhere to the [code of conduct][coc].
+expected to adhere to the [code of conduct][coc] and sign the [contributor's
+license agreement][cla].
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License][mit].
+The gem is available as open source under the terms of the [MIT
+License][license].
 
 ## Code of Conduct
 
-Everyone interacting in the Kramdown::PlantUml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/kramdown-plantuml/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Kramdown::PlantUml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct][coc].
 
 [plantuml]: https://plantuml.com/
 [jekyll]: https://jekyllrb.com/
 [kramdown]: https://kramdown.gettalong.org/
 [gems]: https://rubygems.org
 [github]: https://github.com/SwedbankPay/kramdown-plantuml/
-[coc]: CODE_OF_CONDUCT.md
+[coc]: ./CODE_OF_CONDUCT.md
 [coc-badge]: https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg
-[mit]: https://opensource.org/licenses/MIT
+[cla]: https://cla-assistant.io/SwedbankPay/kramdown-plantuml
+[cla-badge]: https://cla-assistant.io/readme/badge/SwedbankPay/design.swedbankpay.com
+[license]: https://opensource.org/licenses/MIT
+[license-badge]: https://img.shields.io/github/license/SwedbankPay/kramdown-plantuml
 [fenced]: https://www.markdownguide.org/extended-syntax/#syntax-highlighting
 [svg]: https://developer.mozilla.org/en-US/docs/Web/SVG
 [diagram-svg]: spec/diagram.svg
+[gem-badge]: https://badge.fury.io/rb/kramdown-plantuml.svg
+[gem-url]: https://rubygems.org/gems/kramdown-plantuml
 [build-badge]: https://github.com/SwedbankPay/kramdown-plantuml/workflows/Ruby%20Gem/badge.svg?branch=master
 [no-java-build-badge]: https://github.com/SwedbankPay/kramdown-plantuml/workflows/No%20Java/badge.svg?branch=master
 [no-plantuml-badge]: https://github.com/SwedbankPay/kramdown-plantuml/workflows/No%20PlantUML/badge.svg?branch=master

data/kramdown-plantuml.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.2"
 end

data/lib/kramdown-plantuml/converter.rb

@@ -22,13 +22,24 @@ module Kramdown::PlantUml
     def convert_plantuml_to_svg(content)
       cmd = "java -jar #{@plant_uml_jar_file} -tsvg -pipe"
 
-      stdout, stderr, status = Open3.capture3(cmd, :stdin_data => content)
+      stdout, stderr, _ = Open3.capture3(cmd, :stdin_data => content)
 
       unless stderr.empty?
         raise stderr
       end
+      
+      xml_prologue_start = "<?xml"
+      xml_prologue_end = "?>"
 
-      return stdout
+      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>"
+
+      return "#{wrapper_element_start}#{stdout}#{wrapper_element_end}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Asbjørn Ulsberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement