kramdown-plantuml 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22eb0afc1243816120df8e8acfcf9344e652f376b5b3b06a30bf9ad5968977d5
-  data.tar.gz: ba1ddb45bb16802cd21b4e138a2914b56c7d8405edbaec0c17dbdef0da2a9843
+  metadata.gz: bc1234f77cba369797da8b8efd79b0a1913e65cd07f14ab26189c0acb2fa4900
+  data.tar.gz: 445fea556a2c3f248a3158e3f8fd9383624a1aceefb1e03e549e48ce87a6a4de
 SHA512:
-  metadata.gz: 715ab104a048c524ef11da13d607e8701f90b6125bbcf251688204ad8011c46f673a94e188c23b5635a01c0af7f057e7d077e62df4d405d9353ac9df5a403ffc
-  data.tar.gz: cc532b7f4548e2a457971e4267113976d5422ce9772fae2ba71f7480a81e1d80dc1f752bcd2a979387e18024cb9a89b2bab55b043e539f31b15d9e7834083dfc
+  metadata.gz: 62dea36dfd6f811cb0861db862a938ae6e10f4d36fa1783ef33ec2338355710cfe8c718fcaf246cc73974d652729ea99560220997ef12c44174a8b6b1adbab1b
+  data.tar.gz: b9b72275e8eec577c9a249802191f8e9a457b1dfdb4e83328e2e4a942f43077ab39c08fbff2790af23f7c1c3c6d451250bfab7effa7b47455d994472bea1c439

data/README.md

@@ -132,20 +132,26 @@ kramdown:
 
 ### Dimensions and Styling
 
-It's possible to customize the dimensions of the diagram by providing the
-`width` and `height` configuration keys. It's also possible to add arbitrary
-styling with the `style` key.
+It's possible to customize the dimensions and scale of the diagram by providing
+the `width`, `height` and `scale` configuration keys. It's also possible to add
+arbitrary styling with the `style` key.
+
+`scale` is applied before the diagram is generated, while `width` and `height`
+are applied after, meaning they can be combined (to most likely detrimental
+results, but YOLO).
 
 ```yaml
 kramdown:
   plantuml:
     width: 200px
     height: 100px
+    scale: 2
     style: "border: 1px solid black"
 ```
 
 To remove the `width`, `height` and `style` attributes from the `<svg />`
-element, set the key's value to `none`.
+element, set the key's value to `none`. `scale` does not support a value of
+`none` as it does not need to be removed.
 
 ```yaml
 kramdown:

data/lib/kramdown-plantuml/options.rb

@@ -7,7 +7,7 @@ module Kramdown
   module PlantUml
     # Options for PlantUML processing
     class Options
-      attr_reader :theme_name, :theme_directory, :width, :height, :style
+      attr_reader :theme_name, :theme_directory, :width, :height, :style, :scale
 
       def initialize(options_hash = {})
         @logger = LogWrapper.init
@@ -72,14 +72,15 @@ module Kramdown
         set_instance_property(:width, options)
         set_instance_property(:height, options)
         set_instance_property(:style, options)
+        set_instance_property(:scale, options)
       end
 
-      def set_instance_property(name, options)
-        return unless options.key? name
+      def set_instance_property(key, options)
+        return unless options.key? key
 
-        value = options[name]
+        value = options[key]
         value = :none if value.none_s?
-        prop_name = "@#{name}".to_sym
+        prop_name = "@#{key}".to_sym
         instance_variable_set(prop_name, value)
       end
 

data/lib/kramdown-plantuml/plantuml_diagram.rb

@@ -30,7 +30,7 @@ module Kramdown
         return @svg_diagram unless @svg_diagram.nil?
 
         @plantuml = @theme.apply(@plantuml)
-        log(plantuml)
+        log(@plantuml)
         @result = @executor.execute(self)
         @svg_diagram = SvgDiagram.new(@result)
       rescue StandardError => e

data/lib/kramdown-plantuml/theme.rb

@@ -8,7 +8,7 @@ module Kramdown
   module PlantUml
     # Provides theming support for PlantUML
     class Theme
-      attr_reader :name, :directory
+      attr_reader :name, :directory, :scale
 
       def initialize(options)
         raise ArgumentError, 'options cannot be nil' if options.nil?
@@ -17,6 +17,7 @@ module Kramdown
         @raise_errors = options.raise_errors?
         @logger = LogWrapper.init
         @name = options.theme_name
+        @scale = options.scale
         @directory = resolve options.theme_directory
       end
 
@@ -26,11 +27,6 @@ module Kramdown
           return plantuml
         end
 
-        if @name.nil? || @name.empty?
-          @logger.debug 'No theme to apply.'
-          return plantuml.strip
-        end
-
         theme(plantuml)
       end
 
@@ -59,13 +55,12 @@ module Kramdown
       end
 
       def theme(plantuml)
-        startuml = '@startuml'
-        startuml_index = plantuml.index(startuml) + startuml.length
+        theme_string = build_theme_string
 
-        return plantuml if startuml_index.nil?
-
-        theme_string = "\n!theme #{@name}"
-        theme_string << " from #{@directory}" unless @directory.nil?
+        if theme_string.empty?
+          @logger.debug 'No theme to apply.'
+          return plantuml
+        end
 
         @logger.debug "Applying #{theme_string.strip}"
 
@@ -75,6 +70,18 @@ module Kramdown
 
         plantuml.strip
       end
+
+      def build_theme_string
+        theme_string = ''
+
+        unless @name.nil? || @name.empty?
+          theme_string << "\n!theme #{@name}"
+          theme_string << " from #{@directory}" unless @directory.nil?
+        end
+
+        theme_string << "\nscale #{@scale}" unless @scale.nil?
+        theme_string
+      end
     end
   end
 end

data/lib/kramdown-plantuml/version.rb

@@ -2,6 +2,6 @@
 
 module Kramdown
   module PlantUml
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-plantuml
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Swedbank Pay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -194,7 +194,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/net/sourceforge/plantuml/plantuml/1.2021.14/plantuml-1.2021.14.jar
+- bin/net/sourceforge/plantuml/plantuml/1.2021.12/plantuml-1.2021.12.jar
 - kramdown-plantuml.gemspec
 - lib/kramdown-plantuml.rb
 - lib/kramdown-plantuml/bool_env.rb