jekyll-diagrams 0.9.3 → 0.10.0

data/lib/jekyll-diagrams/blockdiag.rb

@@ -1,38 +1,12 @@
 # frozen_string_literal: true
 
+require_relative 'blockdiag/renderer'
+require_relative 'blockdiag/block'
+
 module Jekyll
   module Diagrams
-    class BlockdiagBlock < Block
-      CONFIGURATIONS = %w[config font fontmap size].freeze
-      SWITCHES = {
-        'antialias' => false
-      }.freeze
-
-      def render_svg(code, config)
-        command = build_command(config)
-
-        render_with_tempfile(command, code) do |input, output|
-          "#{input} -o #{output}"
-        end
-      end
-
-      def build_command(config)
-        command = +"#{block_name} -T svg --nodoctype"
-
-        SWITCHES.merge(config.slice(*SWITCHES.keys)).each do |switch, value|
-          command << " --#{switch}" if value != false
-        end
-
-        CONFIGURATIONS.each do |conf|
-          command << " --#{conf}=#{config[conf]}" if config.key?(conf)
-        end
-
-        command
-      end
+    %i[blockdiag seqdiag actdiag nwdiag rackdiag packetdiag].each do |name|
+      Liquid::Template.register_tag(name, const_get("#{name.capitalize}Block"))
     end
   end
 end
-
-%i[blockdiag seqdiag actdiag nwdiag rackdiag packetdiag].each do |tag|
-  Liquid::Template.register_tag(tag, Jekyll::Diagrams::BlockdiagBlock)
-end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    %i[blockdiag seqdiag actdiag nwdiag rackdiag packetdiag].each do |name|
+      const_set "#{name.capitalize}Block", Class.new(BasicBlock)
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    %i[blockdiag seqdiag actdiag nwdiag rackdiag packetdiag].each do |name|
+      renderer = Class.new(BasicRenderer) do
+        const_set :CONFIGURATIONS, %w[config font fontmap size].freeze
+        const_set :SWITCHES, {
+          'antialias' => false
+        }.freeze
+
+        def render_svg(code, config)
+          command = build_command(config)
+
+          render_with_tempfile(command, code) do |input, output|
+            "#{input} -o #{output}"
+          end
+        end
+
+        def build_command(config)
+          command = +"#{@diagram} -T svg --nodoctype"
+
+          switches = self.class.const_get(:SWITCHES)
+
+          switches.merge(config.slice(*switches.keys)).each do |switch, value|
+            command << " --#{switch}" if value != false
+          end
+
+          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

data/lib/jekyll-diagrams/erd.rb

@@ -1,36 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'erd/renderer'
+require_relative 'erd/block'
+
 module Jekyll
   module Diagrams
-    class ErdBlock < Block
-      XML_REGEX = /^<\?xml(([^>]|\n)*>\n?){2}/.freeze
-      CONFIGURATIONS = %w[config edge].freeze
-      SWITCHES = {
-        'dot-entity' => false
-      }.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)
-        command = +'erd --fmt=svg'
-
-        SWITCHES.merge(config.slice(*SWITCHES.keys)).each do |switch, value|
-          command << " --#{switch}" if value != false
-        end
-
-        CONFIGURATIONS.each do |conf|
-          command << " --#{conf}=#{config[conf]}" if config.key?(conf)
-        end
-
-        command
-      end
-    end
+    Liquid::Template.register_tag(:erd, ErdBlock)
   end
 end
-
-Liquid::Template.register_tag(:erd, Jekyll::Diagrams::ErdBlock)

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

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

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class ErdRenderer < BasicRenderer
+      XML_REGEX = /^<\?xml(([^>]|\n)*>\n?){2}/.freeze
+      CONFIGURATIONS = %w[config edge].freeze
+      SWITCHES = {
+        'dot-entity' => false
+      }.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)
+        command = +'erd --fmt=svg'
+
+        SWITCHES.merge(config.slice(*SWITCHES.keys)).each do |switch, value|
+          command << " --#{switch}" if value != false
+        end
+
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf}=#{config[conf]}" if config.key?(conf)
+        end
+
+        command
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/errors.rb

@@ -3,23 +3,22 @@
 module Jekyll
   module Diagrams
     module Errors
-      BaseError = Class.new(::StandardError) do
-        def initialize(msg)
-          @msg = msg
-        end
-      end
+      class BasicError < ::StandardError
+        def initialize(val)
+          # Jekyll::...::CommandNotFoundError -> 'CommandNotFoundError'
+          klass = self.class.name.split('::').last
+          # 'CommandNotFound' -> 'Command Not Found'
+          prefix = klass.sub(/Error$/, '').split(/(?=[A-Z])/).join(' ')
 
-      CommandNotFoundError = Class.new(BaseError) do
-        def message
-          "Command Not Found: #{@msg}"
+          # "Command Not Found: raw message"
+          super("#{prefix}: #{val}")
         end
       end
 
-      RenderingFailedError = Class.new(BaseError) do
-        def message
-          "Rendering Failed: #{@msg}"
-        end
-      end
+      CommandNotFoundError = Class.new(BasicError)
+      RenderingFailedError = Class.new(BasicError)
+      RendererNotFoundError = Class.new(BasicError)
+      UnkownErrorModeError = Class.new(BasicError)
     end
   end
 end

data/lib/jekyll-diagrams/graphviz.rb

@@ -1,40 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'graphviz/renderer'
+require_relative 'graphviz/block'
+
 module Jekyll
   module Diagrams
-    class GraphvizBlock < Block
-      XML_REGEX = /^<\?xml(([^>]|\n)*>\n?){2}/.freeze
-      CONFIGRATIONS = {
-        'K' => 'default_layout',
-        'G' => 'graph_attributes',
-        'N' => 'node_attributes',
-        'E' => 'edge_attributes'
-      }.freeze
-
-      def render_svg(code, config)
-        command = build_command(config)
-
-        svg = render_with_stdin_stdout(command, code).force_encoding(
-          config.fetch('encoding', 'utf-8')
-        )
-
-        svg.sub!(XML_REGEX, '')
-      end
-
-      def build_command(config)
-        command = +'dot -Tsvg'
-
-        CONFIGRATIONS.each do |prefix, conf|
-          next unless config.key?(conf)
-
-          command << Diagrams.normalized_attrs(config[conf],
-                                               prefix: " -#{prefix}")
-        end
-
-        command
-      end
-    end
+    Liquid::Template.register_tag(:graphviz, GraphvizBlock)
   end
 end
-
-Liquid::Template.register_tag(:graphviz, Jekyll::Diagrams::GraphvizBlock)

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

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

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class GraphvizRenderer < BasicRenderer
+      XML_REGEX = /^<\?xml(([^>]|\n)*>\n?){2}/.freeze
+      CONFIGRATIONS = {
+        'K' => 'default_layout',
+        'G' => 'graph_attributes',
+        'N' => 'node_attributes',
+        'E' => 'edge_attributes'
+      }.freeze
+
+      def render_svg(code, config)
+        command = build_command(config)
+
+        svg = render_with_stdin_stdout(command, code).force_encoding(
+          config.fetch('encoding', 'utf-8')
+        )
+
+        svg.sub!(XML_REGEX, '')
+      end
+
+      def build_command(config)
+        command = +'dot -Tsvg'
+
+        CONFIGRATIONS.each do |prefix, conf|
+          next unless config.key?(conf)
+
+          command << Utils.normalized_attrs(
+            config[conf],
+            prefix: " -#{prefix}"
+          )
+        end
+
+        command
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/mermaid.rb

@@ -1,31 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'mermaid/renderer'
+require_relative 'mermaid/block'
+
 module Jekyll
   module Diagrams
-    class MermaidBlock < Block
-      CONFIGURATIONS = %w[theme width height backgroundColor
-                          configFile cssFile scale].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 = +'mmdc --puppeteerConfigFile '
-        command << Diagrams.vendor_path('mermaid_puppeteer_config.json')
-
-        CONFIGURATIONS.each do |conf|
-          command << " --#{conf} #{config[conf]}" if config.key?(conf)
-        end
-
-        command
-      end
-    end
+    Liquid::Template.register_tag(:mermaid, MermaidBlock)
   end
 end
-
-Liquid::Template.register_tag(:mermaid, Jekyll::Diagrams::MermaidBlock)

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

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

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class MermaidRenderer < BasicRenderer
+      CONFIGURATIONS = %w[theme width height backgroundColor
+                          configFile cssFile scale].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 = +'mmdc --puppeteerConfigFile '
+        command << Utils.vendor_path('mermaid_puppeteer_config.json')
+
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf} #{config[conf]}" if config.key?(conf)
+        end
+
+        command
+      end
+    end
+  end
+end

data/lib/jekyll-diagrams/nomnoml.rb

@@ -1,21 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'nomnoml/renderer'
+require_relative 'nomnoml/block'
+
 module Jekyll
   module Diagrams
-    class NomnomlBlock < Block
-      def render_svg(code, config)
-        command = build_command(config)
-
-        render_with_tempfile(command, code) do |input, output|
-          "#{input} #{output}"
-        end
-      end
-
-      def build_command(_config)
-        'nomnoml'
-      end
-    end
+    Liquid::Template.register_tag(:nomnoml, NomnomlBlock)
   end
 end
-
-Liquid::Template.register_tag(:nomnoml, Jekyll::Diagrams::NomnomlBlock)

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

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

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Diagrams
+    class NomnomlRenderer < BasicRenderer
+      def render_svg(code, config)
+        command = build_command(config)
+
+        render_with_tempfile(command, code) do |input, output|
+          "#{input} #{output}"
+        end
+      end
+
+      def build_command(_config)
+        'nomnoml'
+      end
+    end
+  end
+end