jekyll-diagrams 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7a08e5324e821b0b1958e73575be47055fb70eadb246fdf10ee026fdf86297
-  data.tar.gz: 717098d97341644e3c99bbd72b0e1aa71e6365267819731852d71e200aba7029
+  metadata.gz: 94652913742bd24e2f69b464a8836a424358ecd5babb10724428b8c3991a70b3
+  data.tar.gz: b6b21032b1dfb7cc19c986cdfcf55d7eeee43d5aa54657a9fb58928965dfad31
 SHA512:
-  metadata.gz: 6e926f6a15028e3e903eb59ee2f30fc3e409402e7a87fe9e5ea63ae6010820e2e6a1ef1619c23b3759b1e9ca7bbbc7ac41c1e3d55eff15e4756bcbcbe1f991af
-  data.tar.gz: 358c0bb931fe98b75e153e5475375e7f65d199c0f9ad1541406bb3e481abdc4b98921812c9e4853d3cd2512c5a5ae747600f83f1d19d6d5b84a87706f84be241
+  metadata.gz: 552cf35767c1a2d057acfd791f819b24050d352b8797a6a9809689ac67be94ea23bec365a006cee4b4807b6a87f728f67e3bf30b5251901d667b487a3174fb5d
+  data.tar.gz: 2565847c3a1fdbd14dc10d574ca9f92d0069010da7748d1d4a6f0be16274a3a5e35f8c1a7c05b4742a39e0e68c9d0ad28ae86869ff1732e2e7a1880580c9505a

data/.gitignore

@@ -1,10 +1,8 @@
 /.bundle/
-/.yardoc
 /Gemfile.lock
-/_yardoc/
-/coverage/
 /doc/
 /pkg/
-/spec/reports/
+/test/dest/
+/test/fixtures/.jekyll-cache/
 /tmp/
 *.gem

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
+cache: bundler
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.4
+  - 2.5
+  - 2.6
 
 before_install:
-  - gem update --system
-  - gem install bundler
+  - sudo apt update && sudo apt install -y graphviz
+  - sudo apt install -y python3 python3-pip python3-setuptools
+  - sudo pip3 install blockdiag seqdiag actdiag nwdiag
+  - gem update --system && gem install bundler

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'coveralls', require: false
-
 gemspec

data/README.md

@@ -2,7 +2,6 @@
 
 [![Travis](https://img.shields.io/travis/zhustec/jekyll-diagrams.svg?style=flat-square)](https://travis-ci.com/zhustec/jekyll-diagrams)
 [![Gem](https://img.shields.io/gem/v/jekyll-diagrams.svg?style=flat-square)](https://rubygems.org/gems/jekyll-diagrams)
-[![Coveralls github](https://img.shields.io/coveralls/github/zhustec/jekyll-diagrams/master.svg?style=flat-square)](https://coveralls.io/github/zhustec/jekyll-diagrams)
 [![Depfu](https://img.shields.io/depfu/zhustec/jekyll-diagrams.svg?style=flat-square)](https://depfu.com/repos/zhustec/jekyll-diagrams)
 [![license](https://img.shields.io/github/license/zhustec/jekyll-diagrams.svg?style=flat-square)](https://github.com/zhustec/jekyll-diagrams/blob/master/LICENSE)
 
@@ -84,7 +83,7 @@ S -> A [label=a];
 S -> B [label=b];
 A -> D [label=c];
 B -> D [label=d];
-{% endgraphviz %}
+{% enddigraph %}
 ```
 
 ### Blockdiag
@@ -132,14 +131,15 @@ seqdiag {
 
 ## Configuration
 
-A simple configuration shows below:
+You need to provide a configuration.
+A simple configuration is shown below:
 
 ```yaml
 diagrams:
   graphviz:
     engine: dot
     options: '-Tsvg'
-  diag:
+  blockdiag:
     options: '-Tsvg --nodoctype'
 ```
 
@@ -164,11 +164,11 @@ digraph {
 {% endgraphviz %}
 ```
 
-`options` is the command line options, and will be appended to the command. Default is set to '-Tsvg'.
+`options` is the command line options, and will be appended to the command.
 
-### Blockiag
+### Blockdiag
 
-`options` is the command line options, and will be appended to the command. Default is set to '-Tsvg --nodoctype'.
+`options` is the command line options, and will be appended to the command.
 
 ## Contributing
 

data/Rakefile

@@ -1,9 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 

data/jekyll-diagrams.gemspec

@@ -1,30 +1,28 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'jekyll/diagrams/version'
+require 'jekyll-diagrams/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 2.3.7'
-
   spec.name          = 'jekyll-diagrams'
+  spec.summary       = 'Jekyll plugins for diagrams support'
   spec.version       = Jekyll::Diagrams::VERSION
   spec.authors       = ['zhustec']
   spec.email         = ['zhustec@foxmail.com']
-
-  spec.summary       = 'Jekyll plugins for diagrams support'
-  spec.description   = 'Jekyll plugins for diagrams support, including Graphviz, Blockdiag, Seqdiag and so on.'
   spec.homepage      = 'https://github.com/zhustec/jekyll-diagrams'
   spec.license       = 'MIT'
+  spec.description   = 'Jekyll plugins for diagrams support, including Graphviz, Blockdiag, Seqdiag and so on.'
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.test_files    = spec.files.grep(%r!^(test|spec|features)!)
 
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'jekyll', '~> 3.6'
+  spec.required_ruby_version = '>= 2.3.0'
+
+  spec.add_dependency 'jekyll', '>= 3.7', '< 5.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'minitest', '~> 5.1'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest', '~> 5.0'
 end

data/lib/{jekyll/diagrams → jekyll-diagrams}/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Diagrams
-    VERSION = "0.4.2"
+    VERSION = "0.5.0"
   end
 end

data/test/fixtures/_config.yml

@@ -0,0 +1,6 @@
+diagrams:
+  graphviz:
+    engine: dot
+    options: '-Tsvg'
+  blockdiag:
+    options: '-Tsvg --nodoctype'

data/test/fixtures/_layouts/default.html

@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Jekyll Diagrams Testing Page</title>
+  </head>
+  <body>
+    {{ content }}
+  </body>
+</html>

data/test/fixtures/_posts/2019-08-25-blockdiag.md

@@ -0,0 +1,23 @@
+---
+title: A post with blockdiag
+description: A post with blockdiag
+layout: default
+---
+
+{% blockdiag %}
+blockdiag {
+   A -> B -> C -> D;
+   A -> E -> F -> G;
+}
+{% endblockdiag %}
+
+{% seqdiag %}
+seqdiag {
+  browser  -> webserver [label = "GET /index.html"];
+  browser <-- webserver;
+  browser  -> webserver [label = "POST /blog/comment"];
+              webserver  -> database [label = "INSERT comment"];
+              webserver <-- database;
+  browser <-- webserver;
+}
+{% endseqdiag %}

data/test/fixtures/_posts/2019-08-25-graphviz.md

@@ -0,0 +1,48 @@
+---
+title: A post with graphviz
+description: A post with graphviz
+layout: default
+---
+
+{% graphviz %}
+digraph {
+  node [shape=circle, style=filled];
+  S [fillcolor=green];
+  A [fillcolor=yellow];
+  B [fillcolor=yellow];
+  C [fillcolor=yellow];
+  D [shape=doublecircle, fillcolor=green];
+  S -> A [label=a];
+  S -> B [label=b];
+  A -> D [label=c];
+  B -> D [label=d];
+}
+{% endgraphviz %}
+
+{% digraph %}
+node [shape=circle, style=filled];
+S [fillcolor=green];
+A [fillcolor=yellow];
+B [fillcolor=yellow];
+C [fillcolor=yellow];
+D [shape=doublecircle, fillcolor=green];
+S -> A [label=a];
+S -> B [label=b];
+A -> D [label=c];
+B -> D [label=d];
+{% enddigraph %}
+
+{% graphviz neato %}
+digraph {
+  node [shape=circle, style=filled];
+  S [fillcolor=green];
+  A [fillcolor=yellow];
+  B [fillcolor=yellow];
+  C [fillcolor=yellow];
+  D [shape=doublecircle, fillcolor=green];
+  S -> A [label=a];
+  S -> B [label=b];
+  A -> D [label=c];
+  B -> D [label=d];
+}
+{% endgraphviz %}

data/test/jekyll-diagrams_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class TestJekyllDiagrams < Minitest::Test
+  def setup
+    @config = Jekyll.configuration({
+      source: source_dir,
+      destination: dest_dir,
+      url: 'http://example.org'
+    })
+  
+    @site = Jekyll::Site.new(@config)
+    @site.process
+    @graphviz_contents = File.read(dest_dir('2019/08/25/graphviz.html'))
+    @blockdiag_contents = File.read(dest_dir('2019/08/25/blockdiag.html'))
+  end
+
+
+  def test_render_graphviz
+    assert_match %r!<div class="graphviz">!, @graphviz_contents
+  end
+
+  def test_render_blockdiag
+    assert_match %r!<div class="diag \w+">!, @blockdiag_contents
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,18 @@
+require 'jekyll'
+require 'fileutils'
+require File.expand_path('../lib/jekyll-diagrams', __dir__)
+
+Jekyll.logger.log_level = :error
+
+SOURCE_DIR = File.expand_path("fixtures", __dir__)
+DEST_DIR   = File.expand_path("dest", __dir__)
+
+def source_dir(*files)
+  File.join(SOURCE_DIR, *files)
+end
+
+def dest_dir(*files)
+  File.join(DEST_DIR, *files)
+end
+
+require 'minitest/autorun'

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-diagrams
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - zhustec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
 description: Jekyll plugins for diagrams support, including Graphviz, Blockdiag, Seqdiag
   and so on.
 email:
@@ -82,10 +88,16 @@ files:
 - Rakefile
 - jekyll-diagrams.gemspec
 - lib/jekyll-diagrams.rb
+- lib/jekyll-diagrams/version.rb
 - lib/jekyll/diagrams.rb
 - lib/jekyll/diagrams/blockdiag.rb
 - lib/jekyll/diagrams/graphviz.rb
-- lib/jekyll/diagrams/version.rb
+- test/fixtures/_config.yml
+- test/fixtures/_layouts/default.html
+- test/fixtures/_posts/2019-08-25-blockdiag.md
+- test/fixtures/_posts/2019-08-25-graphviz.md
+- test/jekyll-diagrams_test.rb
+- test/test_helper.rb
 homepage: https://github.com/zhustec/jekyll-diagrams
 licenses:
 - MIT
@@ -98,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.7
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -106,8 +118,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Jekyll plugins for diagrams support
-test_files: []
+test_files:
+- test/fixtures/_config.yml
+- test/fixtures/_layouts/default.html
+- test/fixtures/_posts/2019-08-25-blockdiag.md
+- test/fixtures/_posts/2019-08-25-graphviz.md
+- test/jekyll-diagrams_test.rb
+- test/test_helper.rb