jekyll-diagrams 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45645fc482eb66caa1e9dcc420f1da9f500c5c3c4735df834f51a265b9ab5234
-  data.tar.gz: 630469bb87099ce469e507f03e3b2567bd9e7eb6cc16b9d295427c39c3e8cd5a
+  metadata.gz: e3f1fe990807c62c25fe99620086be43c6ee2686466a343ca5ae3c46bc22a62b
+  data.tar.gz: be24cab35d4b8afdd58956532d200b9010d3e4ef33a1961e532b9d1a857eac41
 SHA512:
-  metadata.gz: b1fe97c25a68ebe37dccc5e5583dcb6ac0768c76922e89d5a033c4205dcf5005aa8abe1e1cb7a2f0261046a0329dd87d24c3c92b20761b41b0fa5e96fc2e22c4
-  data.tar.gz: bd1017c5fd734b0a080cec05a309e4c829475ec34644d76af6df934644dd920e1e3371543c36a4038f6fe185e3708d51d9e8fbc55ecbbfe9a31a8c66d3a8cded
+  metadata.gz: 2852b19ce85eef87ae1e362d63047aadf101f3867c8027650c49c3f9118533ba4615a36b1f748ea16cf373ab774729f04c8870c6a15d2f2268b447e926209901
+  data.tar.gz: 448d85033efb665594918b9ef20a0827de05407757afc3440311f43e45f4d184cae890f8bfc63fd900c3ee4e092e3ceb9557c42aac01263bdbc867bd1d659154

data/.gitignore

@@ -1,5 +1,5 @@
+.bundle
 .jekyll-cache
-Gemfile.lock
-/.bundle/
-/pkg/
-/test/dummy_site/_site/
+_site
+pkg
+Gemfile.lock

data/.travis.yml

@@ -1,25 +1,90 @@
 language: ruby
-cache: bundler
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-
-addons:
-  apt:
-    packages:
-      - cabal-install
-      - default-jre
-      - gnuplot
-      - graphviz
-      - npm
-      - python3
-      - python3-pip
-      - python3-setuptools
-
-before_install:
-  - sudo cabal update && sudo cabal install erd
-  - sudo gem update --system && sudo gem install bundler
-  - sudo npm install -g mermaid.cli state-machine-cat wavedrom-cli 
-  - sudo pip3 install blockdiag seqdiag actdiag nwdiag syntrax
+
+dist: bionic
+
+cache:
+  apt: true
+  bundler: true
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    - name: Cabal Packages
+      env: DIAGRAM=cabal
+      cache:
+        directories:
+          - "$HOME/.cabal"
+      addons:
+        apt:
+          update: true
+          packages:
+            - cabal-install
+      before_install:
+        - cabal update
+        - cabal install erd
+  include:
+    - name: Apt Packages
+      env: DIAGRAM=apt
+      addons:
+        apt:
+          update: true
+          packages:
+            - graphviz
+
+    - name: Cargo Packages
+      env: DIAGRAM=cargo
+      cache: cargo
+      addons:
+        apt:
+          update: true
+          packages:
+            - cargo
+      before_install:
+        - cargo install svgbob_cli
+
+    - name: Java Packages
+      env: DIAGRAM=java
+      addons:
+        apt:
+          update: true
+          packages:
+            - default-jre-headless
+
+    - name: Npm Packages
+      env: DIAGRAM=npm
+      cache: npm
+      addons:
+        apt:
+          update: true
+          packages:
+            - npm
+      before_install:
+        - npm install -g mermaid.cli nomnoml state-machine-cat
+        - npm install -g vega-cli vega-lite wavedrom-cli
+
+    - name: Pip Packages
+      env: DIAGRAM=pip
+      cache: pip
+      addons:
+        apt:
+          update: true
+          packages:
+            - libpython3-dev
+            - libpango1.0-dev
+            - python3-pip
+            - python3-setuptools
+            - python3-cairo
+            - python3-gi
+      before_install:
+        - pip3 install blockdiag seqdiag actdiag nwdiag syntrax
+
+script: bundle exec rake 'dummy_site:build[$DIAGRAM]'
+
+deploy:
+  provider: rubygems
+  api_key:
+    secure: b8mpSmo1IqW0DWhqwbZtrNWS/XIUGdLvtFuvBptdA979lpb9aDFfWaFgHnZ6IahP2djRT1yRx6fg/6cp2ZShC/FdpekeASEUn4KGz+1kNh/rfSYPQV5Cs7nkw9i2/WWmze4al5cS7IhnOr2vYXlGTZZeC6Lb+3eQHtVJYQpG3bGwg9ozyekYC2VWQdzFVAvLsjAGMEi2S5GQobbmfN5FvUZb4dnnl3crI+q0NoDkafpzZBcH8ITTZyttZDU26JIptXM5qRGZGGYSREzCc3frLpoIbAB1Vbz/A4+RF8wecsmBMOPNCPWWMvjtgkII5fHmDF/cXAnbktVzG3ECNIGmv7UPA64Mjgl9WZKZH1rujDievVz9aRryA8jIIBbbfqNZeQ+SwP3401vPLSW7yWWJdkPrFMe9+OpV47azmdTVG0PmIdPhkSOI4s3sR0BAFp6TPgaLEH1zrm3sPfLkkVD5XGfQTlI7KIS4e68qGHC2mO5LGXby8SMMp+5/+A5Pzo0dbtXtOJxNwI+iZEhNJh49Qgwc/Cd0cRbFXGWOBMNDozW95LlrDWw9rdwWE4HjuEWfwRbQGydymp+CskkKne7bz4F27UbHI0ougdekI+TaY5w6UL12rZhwbutxASLH0d+dT2OR+rC7prbJRjcwpxEFt/DwiGsVepgB8Uwge8CPSYI=
+  gem: jekyll-diagrams
+  on:
+    tags: true
+    repo: zhustec/jekyll-diagrams

data/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:bionic
+
+RUN set -eux; \
+        apt-get update; \
+        apt-get install -y --no-install-recommends build-essential cabal-install \
+                cargo default-jre-headless git graphviz libpango1.0-dev \
+                libpython3-dev npm python3-pip python3-cairo python3-gi \
+                python3-setuptools ruby ruby-dev
+
+RUN set -eux; \
+        gem update -N --system; \
+        gem install -N bundler; \
+        npm install -g --silent mermaid.cli nomnoml state-machine-cat wavedrom-cli; \
+        pip3 install blockdiag seqdiag actdiag nwdiag syntrax
+
+WORKDIR /opt/jekyll-diagrams
+
+COPY . .
+
+# RUN set -eux; \
+#         apt-get install -y --no-install-recommends cabal-install; \
+#         cabal update; \
+#         cabal install erd
+
+# RUN bundle install

data/README.md

@@ -7,19 +7,33 @@
 
 Jekyll Diagrams is a jekyll plugins for creating amazing diagrams, including:
 
-- [**Blockdiag**](#blockdiag)
-- [**Erd**](#erd)
-- [**Graphviz**](#graphviz)
-- [**Mermaid**](#mermaid)
-- [**PlantUML**](#plantUML)
-- [**State Machine Cat**](#state-machine-cat)
-- [**Syntrax**](#syntrax)
+- [Installation](#installation)
+- [Configuration](#configuration)
+- [Usage](#usage)
+  - [Blockdiag](#blockdiag)
+  - [Erd](#erd)
+  - [Graphviz](#graphviz)
+  - [Mermaid](#mermaid)
+  - [Nomnoml](#nomnoml)
+  - [PlantUML](#plantuml)
+  - [State Machine Cat](#state-machine-cat)
+  - [Svgbob](#svgbob)
+  - [Syntrax](#syntrax)
+  - [Vega](#vega)
+  - [Wavedrom](#wavedrom)
+- [Contributing](#contributing)
+- [License](#license)
 
 ## Installation
 
-### When using bundler
+Add the following to your site's `_config.yml`:
 
-Add these lines to your application's `Gemfile` file:
+```yaml
+plugins:
+  - jekyll-diagrams
+```
+
+And the following to your site's `Gemfile`:
 
 ```ruby
 group :jekyll_plugins do
@@ -27,23 +41,23 @@ group :jekyll_plugins do
 end
 ```
 
-And then execute:
+Finally run:
 
 ```bash
-$ bundle
+$ bundle install
 ```
 
-### Or installing manually
+## Configuration
 
-```bash
-$ gem install jekyll-diagrams
-```
-
-And then add this line to your application's `_config.yml` file:
+All configurations are at `_config.yml` file under `jekyll-diagrams`, e.g:
 
 ```yaml
-plugins:
-  - jekyll-diagrams
+jekyll-diagrams:
+  graphviz:
+    # configurations for graphviz
+  blockdiag:
+    # configurations for blockdiag
+  # and so on
 ```
 
 ## Usage
@@ -210,6 +224,35 @@ jekyll-diagrams:
 - `height`: Height of the page. (default: 600)
 - `backgroundColor`: Background color. Example: transparent, red, '#F0F0F0'. (default: white)
 
+### Nomnoml
+
+#### Examples
+
+```text
+{% nomnoml %}
+[Pirate|eyeCount: Int|raid();pillage()|
+  [beard]--[parrot]
+  [beard]-:>[foul mouth]
+]
+
+[<abstract>Marauder]<:--[Pirate]
+[Pirate]- 0..7[mischief]
+[jollyness]->[Pirate]
+[jollyness]->[rum]
+[jollyness]->[singing]
+[Pirate]-> *[rum|tastiness: Int|swig()]
+[Pirate]->[singing]
+[singing]<->[rum]
+
+[<start>st]->[<state>plunder]
+[plunder]->[<choice>more loot]
+[more loot]->[st]
+[more loot] no ->[<end>e]
+
+[<actor>Sailor] - [<usecase>shiver me;timbers]
+{% endnomnoml %}
+```
+
 ### PlantUML
 
 #### Prerequisites
@@ -273,6 +316,8 @@ jekyll-diagrams:
 - `engine`: `dot|circo|fdp|neato|osage|twopi` (Default: `dot`)
 - `direction`: `top-down|bottom-top|left-right|right-left` (Default: `top-down`)
 
+### Svgbob
+
 ### Syntrax
 
 #### Prerequisites
@@ -303,6 +348,10 @@ jekyll-diagrams:
     transparent: 'Transparent background'
 ```
 
+### Vega
+
+### Wavedrom
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/zhustec/jekyll-diagrams. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/Rakefile

@@ -9,13 +9,20 @@ end
 
 task default: :test
 
-desc 'Run dummy site'
-task :dummy_site do
-  dummy_site_path = File.expand_path('test/dummy_site', __dir__)
+namespace :dummy_site do
+  DUMMY_SITE_PATH = File.expand_path('test/dummy_site', __dir__)
+  DIAGRAMS = %w(apt cabal cargo java npm pip)
 
-  Dir.chdir(dummy_site_path) do
-    puts "Current directory: #{Dir.pwd}"
+  %w(build serve).each do |action|
+    desc "#{action.capitalize} the dummy site"
+    task action.to_sym, :diagram do |t, args|
+      args.with_defaults(diagram: '')
+      diagram = args[:diagram]
+      path = File.join(DUMMY_SITE_PATH, diagram)
 
-    %x(bundle exec jekyll serve --trace)
+      Dir.chdir(DUMMY_SITE_PATH) do
+        %x(bundle install && bundle exec jekyll #{action} --config _config.yml -s #{path})
+      end
+    end
   end
 end

data/lib/jekyll-diagrams/block.rb

@@ -2,6 +2,7 @@ module Jekyll
   module Diagrams
     class Block < Liquid::Block
       include Renderer
+      include Util
 
       def render(context)
         svg = render_svg(super.to_s, read_config(context))
@@ -13,9 +14,9 @@ module Jekyll
       end
 
       def read_config(context)
-        Util.config_for(context, block_name)
+        config_for(context, block_name)
       end
-      
+
       def wrap_class(content)
         "<div class='jekyll-diagrams diagrams #{block_name}'>#{content}</div>"
       end

data/lib/jekyll-diagrams/blockdiag.rb

@@ -1,23 +1,18 @@
-require 'open3'
-require 'tempfile'
-
 module Jekyll
   module Diagrams
     class BlockdiagBlock < Block
-      CONFIGURATIONS = %w(config font fontmap size).freeze
+      CONFIGURATIONS = %w( config font fontmap size ).freeze
 
       def render_svg(code, config)
         command = build_command(config)
-        
+
         render_with_tempfile(command, code) do |command, input, output|
           "#{command} #{input} -o #{output}"
         end
       end
 
       def read_config(context)
-        Util.config_for(context, 'blockdiag').merge(
-          Util.config_for(context, block_name)
-        )
+        config_for(context, 'blockdiag').merge(config_for(context, block_name))
       end
 
       def build_command(config)

data/lib/jekyll-diagrams/erd.rb

@@ -1,25 +1,27 @@
 module Jekyll
-    module Diagrams
-      class ErdBlock < Block
-        CONFIGURATIONS = %w(config edge).freeze
-        
-        def render_svg(code, config)
-          svg = render_with_stdin_stdout(build_command(config), code)
-          svg.sub!(/^<\?xml(([^>]|\n)*>\n?){2}/, '')
-        end
-  
-        def build_command(config)
-          command = 'erd --fmt=svg'
-          command << ' --dot-entity' if config.has_key?('dot-entity')
+  module Diagrams
+    class ErdBlock < Block
+      CONFIGURATIONS = %w( config edge ).freeze
+
+      def render_svg(code, config)
+        command = build_command(config)
+
+        svg = render_with_stdin_stdout(command, code)
+        svg.sub!(/^<\?xml(([^>]|\n)*>\n?){2}/, '')
+      end
 
-          CONFIGURATIONS.each do |conf|
-            command << " --#{conf}=#{config[conf]}" if config.has_key?(conf)
-          end
+      def build_command(config)
+        command = 'erd --fmt=svg'
+        command << ' --dot-entity' if config.has_key?('dot-entity')
 
-          command
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf}=#{config[conf]}" if config.has_key?(conf)
         end
+
+        command
       end
     end
   end
-  
-  Liquid::Template.register_tag(:erd, Jekyll::Diagrams::ErdBlock)
+end
+
+Liquid::Template.register_tag(:erd, Jekyll::Diagrams::ErdBlock)

data/lib/jekyll-diagrams/graphviz.rb

@@ -7,9 +7,11 @@ module Jekyll
         'N' => 'node_attribute',
         'E' => 'edge_attribute'
       }.freeze
-      
+
       def render_svg(code, config)
-        svg = render_with_stdin_stdout(build_command(config), code)
+        command = build_command(config)
+
+        svg = render_with_stdin_stdout(command, code)
         svg.sub!(/^<\?xml(([^>]|\n)*>\n?){2}/, '')
       end
 
@@ -18,9 +20,9 @@ module Jekyll
 
         CONFIGRATIONS.each do |prefix, conf|
           next unless config.has_key?(conf)
-            
+
           attrs = config[conf]
-          
+
           attrs = case attrs
           when String
             attrs

data/lib/jekyll-diagrams/mermaid.rb

@@ -1,26 +1,23 @@
 module Jekyll
     module Diagrams
       class MermaidBlock < Block
-        CONFIGURATIONS = {
-          'theme' => 'default',
-          'width' => 800,
-          'height' => 600,
-          'backgroundColor' => 'white'
-        }.freeze
+        CONFIGURATIONS = %w( backgroundColor height theme width).freeze
 
         def render_svg(code, config)
-          render_with_tempfile(build_command(config), code) do |command, input, output|
+          command = build_command(config)
+
+          render_with_tempfile(command, code) do |command, input, output|
             "#{command} --input #{input} --output #{output}"
           end
         end
-  
+
         def build_command(config)
           command = 'mmdc'
           command << ' --transparent' if config.has_key?('transparent')
-          command << " --puppeteerConfigFile #{Util.vendor_path('mermaid_puppeteer_config.json')}"
+          command << " --puppeteerConfigFile #{vendor_path('mermaid_puppeteer_config.json')}"
 
-          CONFIGURATIONS.merge(config).each do |conf, value|
-            command << " --#{conf} #{value}"
+          CONFIGURATIONS.each do |conf|
+            command << " --#{conf} #{config[conf]}" if config.has_key?(conf)
           end
 
           command
@@ -28,5 +25,5 @@ module Jekyll
       end
     end
   end
-  
+
   Liquid::Template.register_tag(:mermaid, Jekyll::Diagrams::MermaidBlock)

data/lib/jekyll-diagrams/nomnoml.rb

@@ -0,0 +1,19 @@
+module Jekyll
+  module Diagrams
+    class NomnomlBlock < Block
+      def render_svg(code, config)
+        command = build_command(config)
+
+        render_with_stdout(command, code) do |command, input|
+          "#{command} #{input}"
+        end
+      end
+
+      def build_command(config)
+        'nomnoml'
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag(:nomnoml, Jekyll::Diagrams::NomnomlBlock)

data/lib/jekyll-diagrams/plantuml.rb

@@ -2,7 +2,9 @@ module Jekyll
   module Diagrams
     class PlantUMLBlock < Block
       def render_svg(code, config)
-        svg = render_with_stdin_stdout(build_command(config), code)
+        command = build_command(config)
+
+        svg = render_with_stdin_stdout(command, code)
         svg.sub!(/^<\?xml([^>]|\n)*>\n?/, '')
       end
 
@@ -10,7 +12,7 @@ module Jekyll
         options = 'java'
         options << ' -Djava.awt.headless=true'
         options << ' -jar '
-        options << Util.vendor_path('plantuml.1.2020.1.jar')
+        options << vendor_path('plantuml.1.2020.1.jar')
         options << ' -tsvg -pipe'
       end
     end

data/lib/jekyll-diagrams/renderer.rb

@@ -4,6 +4,8 @@ require 'tempfile'
 module Jekyll
   module Diagrams
     module Renderer
+      extend self
+
       def render_with_stdin_stdout(command, content)
         command = yield command if block_given?
 
@@ -13,19 +15,29 @@ module Jekyll
       def render_with_stdin(command, content)
         Tempfile.open(['jekyll_diagrams_output', ".svg"]) do |output|
           output.close
-          command = yield command, output.path
+          command = yield command, output.path if block_given?
 
           render_with_command(command, output.path, stdin_data: content)
         end
       end
 
+      def render_with_stdout(command, content)
+        Tempfile.open('jekyll_diagrams_input') do |input|
+          File.write(input.path, content)
+
+          command = yield command, input.path if block_given?
+
+          render_with_command(command, :stdout)
+        end
+      end
+
       def render_with_tempfile(command, content)
         Tempfile.open('jekyll_diagrams_input') do |input|
           File.write(input.path, content)
-          
+
           Tempfile.open(['jekyll_diagrams_output', ".svg"]) do |output|
             output.close
-            command = yield command, input.path, output.path
+            command = yield command, input.path, output.path if block_given?
 
             render_with_command(command, output.path)
           end
@@ -39,7 +51,7 @@ module Jekyll
           raise "#{command} failed: #{stdout.empty? ? stderr : stdout}"
         end
 
-        output == :stdout ? stdout : File.read(output)        
+        output == :stdout ? stdout : File.read(output)
       end
     end
   end

data/lib/jekyll-diagrams/smcat.rb

@@ -1,31 +1,29 @@
 module Jekyll
-    module Diagrams
-      class SMCatBlock < Block
-        CONFIGURATIONS = {
-          'input-type' => 'smcat',
-          'engine' => 'dot',
-          'direction' => 'top-down'
-        }.freeze
+  module Diagrams
+    class SMCatBlock < Block
+      CONFIGURATIONS = %w( direction engine input-type ).freeze
 
-        def render_svg(code, config)
-          svg = render_with_tempfile(build_command(config), code) do |command, input, output|
-            "#{command} #{input} --output-to #{output}"
-          end
+      def render_svg(code, config)
+        command = build_command(config)
 
-          svg.sub!(/^<\?xml(([^>]|\n)*>\n?){2}/, '')
+        svg = render_with_stdout(command, code) do |command, input|
+          "#{command} #{input} -"
         end
-  
-        def build_command(config)
-          command = 'smcat'
 
-          CONFIGURATIONS.merge(config).each do |conf, value|
-            command << " --#{conf} #{value}"
-          end
+        svg.sub!(/^<\?xml(([^>]|\n)*>\n?){2}/, '')
+      end
+
+      def build_command(config)
+        command = 'smcat'
 
-          command
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf} #{config[conf]}" if config.has_key?(conf)
         end
+
+        command
       end
     end
   end
-  
-  Liquid::Template.register_tag(:smcat, Jekyll::Diagrams::SMCatBlock)
+end
+
+Liquid::Template.register_tag(:smcat, Jekyll::Diagrams::SMCatBlock)

data/lib/jekyll-diagrams/svgbob.rb

@@ -0,0 +1,25 @@
+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.has_key?(conf)
+        end
+
+        command
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag(:svgbob, Jekyll::Diagrams::SvgbobBlock)

data/lib/jekyll-diagrams/syntrax.rb

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

data/lib/jekyll-diagrams/util.rb

@@ -1,27 +1,27 @@
 module Jekyll
   module Diagrams
     module Util
-      class << self
-        def diagrams_config(context)
-          site_config = context.registers[:site].config
-          new_config = site_config.fetch('jekyll-diagrams', {})   
-          old_config = site_config.fetch('diagrams', {})
-          
-          return new_config if old_config.empty?
-          
-          Jekyll.warn "Configuration `diagram` in _config.yml will be depreated"
-          Jekyll.warn "    Rename it to `jekyll-diagram` instead."
+      extend self
 
-          old_config.merge(new_config)
-        end
-        
-        def config_for(context, name)
-          diagrams_config(context).fetch(name, {})
-        end
+      def diagrams_config(context)
+        site_config = context.registers[:site].config
+        new_config = site_config.fetch('jekyll-diagrams', {})
+        old_config = site_config.fetch('diagrams', {})
 
-        def vendor_path(file = '')
-          File.join(File.expand_path('../../vendor', __dir__), file)
-        end
+        return new_config if old_config.empty?
+
+        Jekyll.warn "Configuration `diagram` in _config.yml will be depreated"
+        Jekyll.warn "    Rename it to `jekyll-diagram` instead."
+
+        old_config.merge(new_config)
+      end
+
+      def config_for(context, name)
+        diagrams_config(context).fetch(name, {})
+      end
+
+      def vendor_path(file = '')
+        File.join(File.expand_path('../../vendor', __dir__), file)
       end
     end
   end

data/lib/jekyll-diagrams/vega.rb

@@ -0,0 +1,30 @@
+module Jekyll
+  module Diagrams
+    class VegaBlock < Block
+      CONFIGURATIONS = %w( scale )
+
+      def render_svg(code, config)
+        command = build_command(config)
+
+        render_with_stdin_stdout(command, code)
+      end
+
+      def build_command(config)
+        command = case block_name
+        when 'vega'
+          'vg2svg'
+        when 'vegalite'
+          'vl2svg'
+        end
+
+        CONFIGURATIONS.each do |conf|
+          command << " --#{conf} #{config[conf]}" if config.has_key?(conf)
+        end
+      end
+    end
+  end
+end
+
+%i(vega vegalite).each do |tag|
+  Liquid::Template.register_tag(tag, Jekyll::Diagrams::VegaBlock)
+end

data/lib/jekyll-diagrams/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Diagrams
-    VERSION = '0.7.1'
+    VERSION = '0.8.0'
   end
 end

data/lib/jekyll-diagrams/wavedrom.rb

@@ -1,17 +1,19 @@
 module Jekyll
-    module Diagrams
-      class WavedromBlock < Block
-        def render_svg(code, config)
-          render_with_tempfile(build_command(config), code) do |command, input, output|
-            "#{command} --input #{input} --svg #{output}"
-          end
-        end
-  
-        def build_command(config)
-          'wavedrom-cli'
+  module Diagrams
+    class WavedromBlock < Block
+      def render_svg(code, config)
+        command = build_command(config)
+
+        render_with_tempfile(command, code) do |command, input, output|
+          "#{command} --input #{input} --svg #{output}"
         end
       end
+
+      def build_command(config)
+        'wavedrom-cli'
+      end
     end
   end
-  
-  Liquid::Template.register_tag(:wavedrom, Jekyll::Diagrams::WavedromBlock)
+end
+
+Liquid::Template.register_tag(:wavedrom, Jekyll::Diagrams::WavedromBlock)

data/lib/jekyll-diagrams.rb

@@ -6,6 +6,9 @@ require_relative 'jekyll-diagrams/blockdiag'
 require_relative 'jekyll-diagrams/erd'
 require_relative 'jekyll-diagrams/graphviz'
 require_relative 'jekyll-diagrams/mermaid'
+require_relative 'jekyll-diagrams/nomnoml'
 require_relative 'jekyll-diagrams/plantuml'
+require_relative 'jekyll-diagrams/svgbob'
 require_relative 'jekyll-diagrams/smcat'
+require_relative 'jekyll-diagrams/vega'
 require_relative 'jekyll-diagrams/wavedrom'

data/test/dummy_site/{_posts/2020-01-01-graphviz-test.md → apt/graphviz.md}

@@ -1,11 +1,8 @@
 ---
-layout: post
+layout: home
 title: Graphviz Test
-date: 2020-01-01 00:00:00 +0800
 ---
 
-# Graphviz Test
-
 {% graphviz %}
 digraph {
   node [shape=circle, style=filled];

data/test/dummy_site/{_posts/2020-01-07-erd-test.md → cabal/erd.md}

@@ -1,7 +1,6 @@
 ---
-layout: post
+layout: home
 title: Erd Test
-date: 2020-01-07 00:00:00 +0800
 ---
 
 # Erd Test

data/test/dummy_site/cargo/svgbob.md

@@ -0,0 +1,14 @@
+---
+layout: home
+title: Svgbob Test
+---
+
+{% svgbob %}
+       .---.
+      /-o-/--
+   .-/ / /->
+  ( *  \/
+   '-.  \
+      \ /
+       '
+{% endsvgbob %}

data/test/dummy_site/index.md

@@ -1,3 +1,7 @@
 ---
 layout: home
 ---
+
+{% for page in site.pages %}
+- [**{{ page.title }}**]({{ page.url }})
+{% endfor %}

data/test/dummy_site/{_posts/2020-01-03-plantuml-test.md → java/plantuml.md}

@@ -1,11 +1,8 @@
 ---
-layout: post
+layout: home
 title: PlantUML Test
-date: 2020-01-03 00:00:00 +0800
 ---
 
-# PlantUML Test
-
 {% plantuml %}
 @startuml
 actor Foo1

data/test/dummy_site/{_posts/2020-01-04-mermaid-test.md → npm/mermaid.md}

@@ -1,11 +1,8 @@
 ---
-layout: post
+layout: home
 title: Mermaid Test
-date: 2020-01-04 00:00:00 +0800
 ---
 
-# Mermaid Test
-
 {% mermaid %}
 graph TB
     c1-->a2

data/test/dummy_site/npm/nomnoml.md

@@ -0,0 +1,27 @@
+---
+layout: home
+title: Nomnoml Test
+---
+
+{% nomnoml %}
+[Pirate|eyeCount: Int|raid();pillage()|
+  [beard]--[parrot]
+  [beard]-:>[foul mouth]
+]
+
+[<abstract>Marauder]<:--[Pirate]
+[Pirate]- 0..7[mischief]
+[jollyness]->[Pirate]
+[jollyness]->[rum]
+[jollyness]->[singing]
+[Pirate]-> *[rum|tastiness: Int|swig()]
+[Pirate]->[singing]
+[singing]<->[rum]
+
+[<start>st]->[<state>plunder]
+[plunder]->[<choice>more loot]
+[more loot]->[st]
+[more loot] no ->[<end>e]
+
+[<actor>Sailor] - [<usecase>shiver me;timbers]
+{% endnomnoml %}

data/test/dummy_site/{_posts/2020-01-06-smcat-test.md → npm/smcat.md}

@@ -1,11 +1,8 @@
 ---
-layout: post
+layout: home
 title: State Machine Cat Test
-date: 2020-01-06 00:00:00 +0800
 ---
 
-# State Machine Cat Test
-
 {% smcat %}
 initial,
 doing: entry/ write unit test

data/test/dummy_site/npm/vega.md

@@ -0,0 +1,103 @@
+---
+layout: home
+title: Vega Test
+---
+
+{% vega %}
+{
+  "$schema": "https://vega.github.io/schema/vega/v5.json",
+  "description": "A basic bar chart example, with value labels shown upon mouse hover.",
+  "width": 400,
+  "height": 200,
+  "padding": 5,
+
+  "data": [
+    {
+      "name": "table",
+      "values": [
+        {"category": "A", "amount": 28},
+        {"category": "B", "amount": 55},
+        {"category": "C", "amount": 43},
+        {"category": "D", "amount": 91},
+        {"category": "E", "amount": 81},
+        {"category": "F", "amount": 53},
+        {"category": "G", "amount": 19},
+        {"category": "H", "amount": 87}
+      ]
+    }
+  ],
+
+  "signals": [
+    {
+      "name": "tooltip",
+      "value": {},
+      "on": [
+        {"events": "rect:mouseover", "update": "datum"},
+        {"events": "rect:mouseout",  "update": "{}"}
+      ]
+    }
+  ],
+
+  "scales": [
+    {
+      "name": "xscale",
+      "type": "band",
+      "domain": {"data": "table", "field": "category"},
+      "range": "width",
+      "padding": 0.05,
+      "round": true
+    },
+    {
+      "name": "yscale",
+      "domain": {"data": "table", "field": "amount"},
+      "nice": true,
+      "range": "height"
+    }
+  ],
+
+  "axes": [
+    { "orient": "bottom", "scale": "xscale" },
+    { "orient": "left", "scale": "yscale" }
+  ],
+
+  "marks": [
+    {
+      "type": "rect",
+      "from": {"data":"table"},
+      "encode": {
+        "enter": {
+          "x": {"scale": "xscale", "field": "category"},
+          "width": {"scale": "xscale", "band": 1},
+          "y": {"scale": "yscale", "field": "amount"},
+          "y2": {"scale": "yscale", "value": 0}
+        },
+        "update": {
+          "fill": {"value": "steelblue"}
+        },
+        "hover": {
+          "fill": {"value": "red"}
+        }
+      }
+    },
+    {
+      "type": "text",
+      "encode": {
+        "enter": {
+          "align": {"value": "center"},
+          "baseline": {"value": "bottom"},
+          "fill": {"value": "#333"}
+        },
+        "update": {
+          "x": {"scale": "xscale", "signal": "tooltip.category", "band": 0.5},
+          "y": {"scale": "yscale", "signal": "tooltip.amount", "offset": -2},
+          "text": {"signal": "tooltip.amount"},
+          "fillOpacity": [
+            {"test": "datum === tooltip", "value": 0},
+            {"value": 1}
+          ]
+        }
+      }
+    }
+  ]
+}
+{% endvega %}

data/test/dummy_site/{_posts/2020-01-05-wavedrom-test.md → npm/wavedrom.md}

@@ -1,11 +1,8 @@
 ---
-layout: post
+layout: home
 title: Wavedrom Test
-date: 2020-01-05 00:00:00 +0800
 ---
 
-# Wavedrom Test
-
 {% wavedrom %}
 {signal: [
   {name: 'clk', wave: 'p.....|...'},

data/test/dummy_site/{_posts/2020-01-02-blockdiag-test.md → pip/blockdiag.md}

@@ -1,11 +1,8 @@
 ---
-layout: post
+layout: home
 title: Blockdiag Test
-date: 2020-01-02 00:00:00 +0800
 ---
 
-# Blockdiag Test
-
 ## Blockdiag
 
 {% blockdiag %}

data/test/dummy_site/pip/syntrax.md

@@ -0,0 +1,13 @@
+---
+layout: home
+title: Syntrax Test
+---
+
+{% syntrax %}
+indentstack(10,
+  line(opt('-'), choice('0', line('1-9', loop(None, '0-9'))),
+    opt('.', loop('0-9', None))),
+
+  line(opt(choice('e', 'E'), choice(None, '+', '-'), loop('0-9', None)))
+)
+{% endsyntrax %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-diagrams
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - zhustec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -81,6 +81,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
@@ -92,23 +93,30 @@ files:
 - lib/jekyll-diagrams/erd.rb
 - lib/jekyll-diagrams/graphviz.rb
 - lib/jekyll-diagrams/mermaid.rb
+- lib/jekyll-diagrams/nomnoml.rb
 - lib/jekyll-diagrams/plantuml.rb
 - lib/jekyll-diagrams/renderer.rb
 - lib/jekyll-diagrams/smcat.rb
+- lib/jekyll-diagrams/svgbob.rb
 - lib/jekyll-diagrams/syntrax.rb
 - lib/jekyll-diagrams/util.rb
+- lib/jekyll-diagrams/vega.rb
 - lib/jekyll-diagrams/version.rb
 - lib/jekyll-diagrams/wavedrom.rb
 - test/dummy_site/Gemfile
 - test/dummy_site/_config.yml
-- test/dummy_site/_posts/2020-01-01-graphviz-test.md
-- test/dummy_site/_posts/2020-01-02-blockdiag-test.md
-- test/dummy_site/_posts/2020-01-03-plantuml-test.md
-- test/dummy_site/_posts/2020-01-04-mermaid-test.md
-- test/dummy_site/_posts/2020-01-05-wavedrom-test.md
-- test/dummy_site/_posts/2020-01-06-smcat-test.md
-- test/dummy_site/_posts/2020-01-07-erd-test.md
+- test/dummy_site/apt/graphviz.md
+- test/dummy_site/cabal/erd.md
+- test/dummy_site/cargo/svgbob.md
 - test/dummy_site/index.md
+- test/dummy_site/java/plantuml.md
+- test/dummy_site/npm/mermaid.md
+- test/dummy_site/npm/nomnoml.md
+- test/dummy_site/npm/smcat.md
+- test/dummy_site/npm/vega.md
+- test/dummy_site/npm/wavedrom.md
+- test/dummy_site/pip/blockdiag.md
+- test/dummy_site/pip/syntrax.md
 - test/test_helper.rb
 - vendor/mermaid_puppeteer_config.json
 - vendor/plantuml.1.2020.1.jar
@@ -131,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Jekyll plugins for diagrams support, including Graphviz, Blockdiag, PlantUML
@@ -140,12 +147,16 @@ summary: Jekyll plugins for diagrams support, including Graphviz, Blockdiag, Pla
 test_files:
 - test/dummy_site/Gemfile
 - test/dummy_site/_config.yml
-- test/dummy_site/_posts/2020-01-01-graphviz-test.md
-- test/dummy_site/_posts/2020-01-02-blockdiag-test.md
-- test/dummy_site/_posts/2020-01-03-plantuml-test.md
-- test/dummy_site/_posts/2020-01-04-mermaid-test.md
-- test/dummy_site/_posts/2020-01-05-wavedrom-test.md
-- test/dummy_site/_posts/2020-01-06-smcat-test.md
-- test/dummy_site/_posts/2020-01-07-erd-test.md
+- test/dummy_site/apt/graphviz.md
+- test/dummy_site/cabal/erd.md
+- test/dummy_site/cargo/svgbob.md
 - test/dummy_site/index.md
+- test/dummy_site/java/plantuml.md
+- test/dummy_site/npm/mermaid.md
+- test/dummy_site/npm/nomnoml.md
+- test/dummy_site/npm/smcat.md
+- test/dummy_site/npm/vega.md
+- test/dummy_site/npm/wavedrom.md
+- test/dummy_site/pip/blockdiag.md
+- test/dummy_site/pip/syntrax.md
 - test/test_helper.rb