jekyll-diagrams 0.9.3 → 0.10.0

data/lib/jekyll-diagrams/plantuml.rb

@@ -1,25 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'plantuml/renderer'
+require_relative 'plantuml/block'
+
 module Jekyll
   module Diagrams
-    class PlantUMLBlock < Block
-      XML_REGEX = /^<\?xml([^>]|\n)*>\n?/.freeze
-
-      def render_svg(code, config)
-        command = build_command(config)
-
-        svg = render_with_stdin_stdout(command, code)
-        svg.sub!(XML_REGEX, '')
-      end
-
-      def build_command(_config)
-        jar = Diagrams.vendor_path('plantuml.1.2020.1.jar')
-
-        options = +Diagrams.run_jar(jar)
-        options << ' -tsvg -pipe'
-      end
-    end
+    Liquid::Template.register_tag(:plantuml, PlantUMLBlock)
   end
 end
-
-Liquid::Template.register_tag(:plantuml, Jekyll::Diagrams::PlantUMLBlock)

data/lib/jekyll-diagrams/plantuml/block.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class PlantUMLBlock < BasicBlock
+    end
+  end
+end

data/lib/jekyll-diagrams/plantuml/renderer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class PlantUMLRenderer < BasicRenderer
+      XML_REGEX = /^<\?xml([^>]|\n)*>\n?/.freeze
+
+      def render_svg(code, config)
+        command = build_command(config)
+
+        svg = render_with_stdin_stdout(command, code)
+        svg.sub!(XML_REGEX, '')
+      end
+
+      def build_command(_config)
+        jar = Utils.vendor_path('plantuml.1.2020.1.jar')
+
+        options = +Utils.run_jar(jar)
+        options << ' -tsvg -pipe'
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/smcat.rb

@@ -1,32 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'smcat/renderer'
+require_relative 'smcat/block'
+
 module Jekyll
   module Diagrams
-    class SMCatBlock < Block
-      XML_REGEX = /^<\?xml(([^>]|\n)*>\n?){2}/.freeze
-      CONFIGURATIONS = %w[direction engine input-type].freeze
-
-      def render_svg(code, config)
-        command = build_command(config)
-
-        svg = render_with_tempfile(command, code) do |input, output|
-          "#{input} --output-to #{output}"
-        end
-
-        svg.sub!(XML_REGEX, '')
-      end
-
-      def build_command(config)
-        command = +'smcat'
-
-        CONFIGURATIONS.each do |conf|
-          command << " --#{conf} #{config[conf]}" if config.key?(conf)
-        end
-
-        command
-      end
-    end
+    Liquid::Template.register_tag(:smcat, SMCatBlock)
   end
 end
-
-Liquid::Template.register_tag(:smcat, Jekyll::Diagrams::SMCatBlock)

data/lib/jekyll-diagrams/smcat/block.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class SMCatBlock < BasicBlock
+    end
+  end
+end

data/lib/jekyll-diagrams/smcat/renderer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class SMCatRenderer < BasicRenderer
+      XML_REGEX = /^<\?xml(([^>]|\n)*>\n?){2}/.freeze
+      CONFIGURATIONS = %w[direction engine input-type].freeze
+
+      def render_svg(code, config)
+        command = build_command(config)
+
+        svg = render_with_tempfile(command, code) do |input, output|
+          "#{input} --output-to #{output}"
+        end
+
+        svg.sub!(XML_REGEX, '')
+      end
+
+      def build_command(config)
+        command = +'smcat'
+
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf} #{config[conf]}" if config.key?(conf)
+        end
+
+        command
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/svgbob.rb

@@ -1,27 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'svgbob/renderer'
+require_relative 'svgbob/block'
+
 module Jekyll
   module Diagrams
-    class SvgbobBlock < Block
-      CONFIGURATIONS = %w[font-family font-size scale stroke-width].freeze
-
-      def render_svg(code, config)
-        command = build_command(config)
-
-        render_with_stdin_stdout(command, code)
-      end
-
-      def build_command(config)
-        command = +'svgbob'
-
-        CONFIGURATIONS.each do |conf|
-          command << " --#{conf} #{config[conf]}" if config.key?(conf)
-        end
-
-        command
-      end
-    end
+    Liquid::Template.register_tag(:svgbob, SvgbobBlock)
   end
 end
-
-Liquid::Template.register_tag(:svgbob, Jekyll::Diagrams::SvgbobBlock)

data/lib/jekyll-diagrams/svgbob/block.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class SvgbobBlock < BasicBlock
+    end
+  end
+end

data/lib/jekyll-diagrams/svgbob/renderer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class SvgbobRenderer < BasicRenderer
+      CONFIGURATIONS = %w[font-family font-size scale stroke-width].freeze
+
+      def render_svg(code, config)
+        command = build_command(config)
+
+        render_with_stdin_stdout(command, code)
+      end
+
+      def build_command(config)
+        command = +'svgbob'
+
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf} #{config[conf]}" if config.key?(conf)
+        end
+
+        command
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/syntrax.rb

@@ -1,29 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'syntrax/renderer'
+require_relative 'syntrax/block'
+
 module Jekyll
   module Diagrams
-    class SyntraxBlock < Block
-      CONFIGURATIONS = %w[scale style].freeze
-
-      def render_svg(code, config)
-        command = build_command(config)
-
-        render_with_tempfile(command, code) do |input, output|
-          "--input #{input} --output #{output}"
-        end
-      end
-
-      def build_command(config)
-        command = +'syntrax'
-
-        CONFIGURATIONS.each do |conf|
-          command << " --#{conf} #{config[conf]}" if config.key?(conf)
-        end
-
-        command
-      end
-    end
+    Liquid::Template.register_tag(:syntrax, SyntraxBlock)
   end
 end
-
-Liquid::Template.register_tag(:syntrax, Jekyll::Diagrams::SyntraxBlock)

data/lib/jekyll-diagrams/syntrax/block.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class SyntraxBlock < BasicBlock
+    end
+  end
+end

data/lib/jekyll-diagrams/syntrax/renderer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class SyntraxRenderer < BasicRenderer
+      CONFIGURATIONS = %w[scale style].freeze
+
+      def render_svg(code, config)
+        command = build_command(config)
+
+        render_with_tempfile(command, code) do |input, output|
+          "--input #{input} --output #{output}"
+        end
+      end
+
+      def build_command(config)
+        command = +'syntrax'
+
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf} #{config[conf]}" if config.key?(conf)
+        end
+
+        command
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/utils.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    module Utils
+      module_function
+
+      # Return configuration of Jekyll Diagrams
+      #
+      # @param context Liquid::Template
+      # @return Configuration
+      def configuration(context)
+        site_config = context.registers[:site].config
+        page_config = context.registers[:page]
+
+        site_config.merge(page_config)
+      end
+
+      # @param context Liquid::Template
+      def config_for(context, name)
+        configuration(context).dig(Diagrams.config_name, name) || {}
+      end
+
+      # Return error mode in user configuration
+      #
+      # @param context Liquid::Template
+      def error_mode(context)
+        key = 'error_mode'
+        config = configuration(context)
+
+        liquid_mode = config.dig('liquid', key)
+        custom_mode = config.dig(Diagrams.config_name, key)
+
+        (custom_mode || liquid_mode || Diagrams.default_error_mode).to_sym
+      end
+
+      def handle_error(context, error)
+        topic = Diagrams.logger_topic
+        mode = error_mode(context)
+
+        case mode
+        when :lax
+          ''
+        when :warn
+          Jekyll.logger.warn topic, error
+          error
+        when :strict
+          Jekyll.logger.abort_with topic, error
+        else
+          raise Errors::UnkownErrorModeError, mode
+        end
+      end
+
+      def vendor_path(file = '')
+        File.join(File.expand_path('../../vendor', __dir__), file)
+      end
+
+      def run_jar(jar)
+        "java -Djava.awt.headless=true -jar #{jar} "
+      end
+
+      def normalized_attrs(attrs, prefix:, sep: '=')
+        attrs =
+          case attrs
+          when String
+            attrs
+          when Array
+            attrs.join(prefix)
+          when Hash
+            attrs.map { |k, v| "#{k}#{sep}#{v}" }.join(prefix)
+          end
+
+        "#{prefix}#{attrs}"
+      end
+
+      def wrap_class(content, class_names)
+        <<~CONTENT
+          <div class='#{Diagrams.config_name} diagrams #{class_names}'>
+            #{content}
+          </div>
+        CONTENT
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/vega.rb

@@ -1,33 +1,12 @@
 # frozen_string_literal: true
 
+require_relative 'vega/renderer'
+require_relative 'vega/block'
+
 module Jekyll
   module Diagrams
-    class VegaBlock < Block
-      CONFIGURATIONS = %w[scale].freeze
-
-      def render_svg(code, config)
-        if block_name == 'vegalite'
-          code = render_with_stdin_stdout('vl2vg', code)
-        end
-
-        command = build_command(config)
-
-        render_with_stdin_stdout(command, code)
-      end
-
-      def build_command(config)
-        command = +'vg2svg'
-
-        CONFIGURATIONS.each do |conf|
-          command << " --#{conf} #{config[conf]}" if config.key?(conf)
-        end
-
-        command
-      end
+    %i[vega vegalite].each do |name|
+      Liquid::Template.register_tag(name, const_get("#{name.capitalize}Block"))
     end
   end
 end
-
-%i[vega vegalite].each do |tag|
-  Liquid::Template.register_tag(tag, Jekyll::Diagrams::VegaBlock)
-end

data/lib/jekyll-diagrams/vega/block.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    %w[vega vegalite].each do |name|
+      const_set "#{name.capitalize}Block", Class.new(BasicBlock)
+    end
+  end
+end

data/lib/jekyll-diagrams/vega/renderer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    %i[vega vegalite].each do |name|
+      renderer = Class.new(BasicRenderer) do
+        const_set :CONFIGURATIONS, %w[scale].freeze
+
+        def render_svg(code, config)
+          if @block_name == 'vegalite'
+            code = render_with_stdin_stdout('vl2vg', code)
+          end
+
+          command = build_command(config)
+
+          render_with_stdin_stdout(command, code)
+        end
+
+        def build_command(config)
+          command = +'vg2svg'
+
+          self.class.const_get(:CONFIGURATIONS).each do |conf|
+            command << " --#{conf} #{config[conf]}" if config.key?(conf)
+          end
+
+          command
+        end
+      end
+
+      const_set "#{name.capitalize}Renderer", renderer
+    end
+  end
+end