jekyll-diagrams 0.10.0 → 0.11.0.pre

data/features/support/env.rb

@@ -4,8 +4,10 @@ lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'simplecov'
+
 require 'rspec'
 require 'tmpdir'
+
 require 'jekyll-diagrams'
 
 TEST_DIR = File.join(Dir.tmpdir, 'jekyll-diagrams-features')
@@ -26,7 +28,8 @@ end
 def run_jekyll
   options = Jekyll.configuration(
     source: TEST_DIR,
-    quiet: true
+    quiet: true,
+    liquid: { error_mode: :strict }
   )
 
   Jekyll::Site.new(options).process

data/lib/jekyll-diagrams.rb

@@ -1,40 +1,3 @@
 # frozen_string_literal: true
 
-require 'jekyll'
-
-require_relative 'jekyll-diagrams/errors'
-require_relative 'jekyll-diagrams/utils'
-require_relative 'jekyll-diagrams/rendering'
-
-require_relative 'jekyll-diagrams/basic_renderer'
-require_relative 'jekyll-diagrams/basic_block'
-
-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/smcat'
-require_relative 'jekyll-diagrams/svgbob'
-require_relative 'jekyll-diagrams/syntrax'
-require_relative 'jekyll-diagrams/vega'
-require_relative 'jekyll-diagrams/wavedrom'
-
-module Jekyll
-  module Diagrams
-    class << self
-      def config_name
-        'jekyll-diagrams'
-      end
-
-      def logger_topic
-        'Jekyll Diagrams:'
-      end
-
-      def default_error_mode
-        :warn
-      end
-    end
-  end
-end
+require_relative 'jekyll_diagrams'

data/lib/jekyll_diagrams.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'jekyll'
+require 'liquid-diagrams'
+
+require_relative 'jekyll_diagrams/version'
+
+LiquidDiagrams.register_diagrams(LiquidDiagrams.diagrams)
+
+module LiquidDiagrams
+  class BasicBlock
+    alias origin_render render
+    alias origin_config config
+
+    def render(context)
+      JekyllDiagrams.wrap_class(origin_render(context), block_name)
+    end
+
+    def config
+      jekyll_config = JekyllDiagrams.configuration(@context, block_name) || {}
+
+      origin_config.merge(jekyll_config)
+    end
+
+    def handle_error(error)
+      JekyllDiagrams.handle_error(@context, error)
+    end
+  end
+end
+
+module JekyllDiagrams
+  class << self
+    def config_name
+      'jekyll-diagrams'
+    end
+
+    def logger_topic
+      'Jekyll Diagrams:'
+    end
+
+    def jekyll_configuration(context)
+      site_config = context.registers[:site].config
+      page_config = context.registers[:page]
+
+      site_config.merge(page_config)
+    end
+
+    def configuration(context, key = nil)
+      config = jekyll_configuration(context).fetch(config_name, {})
+
+      config.dup.delete(key) if key
+    end
+
+    def error_mode(context)
+      liquid_mode = jekyll_configuration(context).dig('liquid', 'error_mode')
+      custom_mode = configuration(context, 'error_mode')
+
+      (custom_mode || liquid_mode || :warn).to_sym
+    end
+
+    def handle_error(context, error)
+      mode = error_mode(context)
+
+      case mode
+      when :lax
+        ''
+      when :warn
+        Jekyll.logger.warn logger_topic, error
+        error
+      when :strict
+        Jekyll.logger.abort_with logger_topic, error
+      else
+        raise StandardError
+      end
+    end
+
+    def wrap_class(content, class_names)
+      <<~CONTENT
+        <div class='#{config_name} diagrams #{class_names}'>
+          #{content}
+        </div>
+      CONTENT
+    end
+  end
+end

data/lib/jekyll_diagrams/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module JekyllDiagrams
+  VERSION = '0.11.0.pre'
+end

data/spec/{utils_spec.rb → jekyll_diagrams_spec.rb}

@@ -2,27 +2,26 @@
 
 require 'spec_helper'
 
-RSpec.describe Jekyll::Diagrams::Utils do
-  describe '.config_for' do
-    context 'when the key is not found' do
-      subject do
-        described_class.config_for(context_with_config, 'not_exist_key')
-      end
+RSpec.describe JekyllDiagrams do
+  describe '.config_name' do
+    subject { described_class.config_name }
 
-      it { is_expected.to eq({}) }
-    end
+    it { is_expected.to eq 'jekyll-diagrams' }
+  end
 
-    context 'when the key is found' do
-      subject do
-        described_class.config_for(
-          context_with_config(
-            Jekyll::Diagrams.config_name => { 'key' => 'value' }
-          ),
-          'key'
-        )
-      end
+  describe '.logger_topic' do
+    subject { described_class.logger_topic }
 
-      it { is_expected.to eq 'value' }
+    it { is_expected.to eq 'Jekyll Diagrams:' }
+  end
+
+  describe '.jekyll_configuration' do
+    it 'read jekyll configurations from context' do
+    end
+  end
+
+  describe '.configuration' do
+    it 'read configurations from jekyll configurations' do
     end
   end
 
@@ -98,62 +97,11 @@ RSpec.describe Jekyll::Diagrams::Utils do
           described_class.handle_error(
             context_with_config(liquid: { 'error_mode' => 'unkown' }), error
           )
-        end.to raise_error(Jekyll::Diagrams::Errors::UnkownErrorModeError)
+        end.to raise_error StandardError
       end
     end
   end
 
-  describe '.vendor_path' do
-    context 'with no input' do
-      subject { described_class.vendor_path }
-
-      it { is_expected.to end_with 'vendor/' }
-    end
-
-    context 'with the input is "test_file' do
-      subject { described_class.vendor_path('test_file') }
-
-      it { is_expected.to end_with 'vendor/test_file' }
-    end
-  end
-
-  describe '.run_jar' do
-    context 'when the input is "test.jar"' do
-      subject { described_class.run_jar('test.jar') }
-
-      it { is_expected.to match '-Djava.awt.headless=true' }
-      it { is_expected.to match '-jar test.jar' }
-    end
-  end
-
-  describe '.normalized_attrs' do
-    context 'when the input is string' do
-      subject do
-        described_class.normalized_attrs('auto', prefix: '--color ')
-      end
-
-      it { is_expected.to eq '--color auto' }
-    end
-
-    context 'when the input is array' do
-      subject do
-        described_class.normalized_attrs(%w[a b], prefix: ' --include ')
-      end
-
-      it { is_expected.to eq ' --include a --include b' }
-    end
-
-    context 'when the input is hash' do
-      subject do
-        described_class.normalized_attrs(
-          { scales: 2, color: 'red' }, prefix: ' --', sep: ' '
-        )
-      end
-
-      it { is_expected.to eq ' --scales 2 --color red' }
-    end
-  end
-
   describe '.wrap_class' do
     subject { described_class.wrap_class('content', 'active') }
 

data/spec/spec_helper.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
-require 'rspec'
+require 'bundler/setup'
+
 require 'simplecov'
+require 'pry-byebug'
 
 require 'jekyll-diagrams'
 
 RSpec.configure do |config|
-  config.order = :random
-  config.example_status_persistence_file_path = 'tmp/rspec_examples.txt'
-end
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = '.rspec_status'
+
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
 
-# Mocking this method for testing
-class Jekyll::Diagrams::Renderer
-  def render_with_command(command, _output = :stdout, **_options)
-    command
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-diagrams
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0.pre
 platform: ruby
 authors:
 - zhustec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,203 +30,174 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: liquid-diagrams
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.82.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.30'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: |
   A Jekyll plugin with support for Blockdiag, Erd, GraphViz, Mermaid,
   Nomnoml, PlantUML, Svgbob, Syntrax, Vega, Vega-Lite and WaveDrom.
-email: zhustec@foxmail.com
+email:
+- zhustec@foxmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- features/blockdiag/block.feature
-- features/graphviz/block.feature
-- features/graphviz/config.feature
-- features/mermaid/block.feature
-- features/nomnoml/block.feature
-- features/plantuml/block.feature
-- features/smcat/block.feature
-- features/step_definitions/jekyll-diagrams.rb
+- features/blockdiag_block.feature
+- features/graphviz_block.feature
+- features/graphviz_config.feature
+- features/mermaid_block.feature
+- features/nomnoml_block.feature
+- features/plantuml_block.feature
+- features/smcat_block.feature
+- features/step_definitions/diagrams.rb
 - features/support/env.rb
-- features/syntrax/block.feature
-- features/vega/block.feature
-- features/wavedrom/block.feature
+- features/syntrax_block.feature
+- features/vega_block.feature
+- features/wavedrom_block.feature
 - lib/jekyll-diagrams.rb
-- lib/jekyll-diagrams/basic_block.rb
-- lib/jekyll-diagrams/basic_renderer.rb
-- lib/jekyll-diagrams/blockdiag.rb
-- lib/jekyll-diagrams/blockdiag/block.rb
-- lib/jekyll-diagrams/blockdiag/renderer.rb
-- lib/jekyll-diagrams/erd.rb
-- lib/jekyll-diagrams/erd/block.rb
-- lib/jekyll-diagrams/erd/renderer.rb
-- lib/jekyll-diagrams/errors.rb
-- lib/jekyll-diagrams/graphviz.rb
-- lib/jekyll-diagrams/graphviz/block.rb
-- lib/jekyll-diagrams/graphviz/renderer.rb
-- lib/jekyll-diagrams/mermaid.rb
-- lib/jekyll-diagrams/mermaid/block.rb
-- lib/jekyll-diagrams/mermaid/renderer.rb
-- lib/jekyll-diagrams/nomnoml.rb
-- lib/jekyll-diagrams/nomnoml/block.rb
-- lib/jekyll-diagrams/nomnoml/renderer.rb
-- lib/jekyll-diagrams/plantuml.rb
-- lib/jekyll-diagrams/plantuml/block.rb
-- lib/jekyll-diagrams/plantuml/renderer.rb
-- lib/jekyll-diagrams/rendering.rb
-- lib/jekyll-diagrams/smcat.rb
-- lib/jekyll-diagrams/smcat/block.rb
-- lib/jekyll-diagrams/smcat/renderer.rb
-- lib/jekyll-diagrams/svgbob.rb
-- lib/jekyll-diagrams/svgbob/block.rb
-- lib/jekyll-diagrams/svgbob/renderer.rb
-- lib/jekyll-diagrams/syntrax.rb
-- lib/jekyll-diagrams/syntrax/block.rb
-- lib/jekyll-diagrams/syntrax/renderer.rb
-- lib/jekyll-diagrams/utils.rb
-- lib/jekyll-diagrams/vega.rb
-- lib/jekyll-diagrams/vega/block.rb
-- lib/jekyll-diagrams/vega/renderer.rb
-- lib/jekyll-diagrams/version.rb
-- lib/jekyll-diagrams/wavedrom.rb
-- lib/jekyll-diagrams/wavedrom/block.rb
-- lib/jekyll-diagrams/wavedrom/renderer.rb
-- spec/basic_block_spec.rb
-- spec/basic_renderer_spec.rb
-- spec/blockdiag_renderer_spec.rb
-- spec/erd_renderer_spec.rb
-- spec/graphviz_renderer_spec.rb
-- spec/jekyll-diagrams_spec.rb
-- spec/mermaid_renderer_spec.rb
-- spec/nomnoml_renderer_spec.rb
-- spec/plantuml_renderer_spec.rb
-- spec/rendering_spec.rb
-- spec/smcat_renderer_spec.rb
+- lib/jekyll_diagrams.rb
+- lib/jekyll_diagrams/version.rb
+- spec/jekyll_diagrams_spec.rb
 - spec/spec_helper.rb
-- spec/svgbob_renderer_spec.rb
-- spec/syntrax_renderer_spec.rb
-- spec/utils_spec.rb
-- spec/vega_renderer_spec.rb
-- spec/wavedrom_renderer_spec.rb
-- vendor/mermaid_puppeteer_config.json
-- vendor/plantuml.1.2020.1.jar
 homepage: https://github.com/zhustec/jekyll-diagrams
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/zhustec/jekyll-diagrams
+  bug_tracker_uri: https://github.com/zhustec/jekyll-diagrams
+  changelog_uri: https://github.com/zhustec/jekyll-diagrams/releases
+  homepage_uri: https://github.com/zhustec/jekyll-diagrams
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -238,41 +209,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Jekyll plugins for diagrams support.
 test_files:
-- features/wavedrom/block.feature
-- features/step_definitions/jekyll-diagrams.rb
-- features/smcat/block.feature
-- features/plantuml/block.feature
-- features/nomnoml/block.feature
-- features/graphviz/config.feature
-- features/graphviz/block.feature
+- features/step_definitions/diagrams.rb
 - features/support/env.rb
-- features/vega/block.feature
-- features/mermaid/block.feature
-- features/blockdiag/block.feature
-- features/syntrax/block.feature
-- spec/basic_renderer_spec.rb
+- features/graphviz_config.feature
+- features/syntrax_block.feature
+- features/mermaid_block.feature
+- features/nomnoml_block.feature
+- features/vega_block.feature
+- features/blockdiag_block.feature
+- features/graphviz_block.feature
+- features/plantuml_block.feature
+- features/wavedrom_block.feature
+- features/smcat_block.feature
 - spec/spec_helper.rb
-- spec/basic_block_spec.rb
-- spec/vega_renderer_spec.rb
-- spec/wavedrom_renderer_spec.rb
-- spec/nomnoml_renderer_spec.rb
-- spec/mermaid_renderer_spec.rb
-- spec/smcat_renderer_spec.rb
-- spec/svgbob_renderer_spec.rb
-- spec/syntrax_renderer_spec.rb
-- spec/rendering_spec.rb
-- spec/graphviz_renderer_spec.rb
-- spec/blockdiag_renderer_spec.rb
-- spec/plantuml_renderer_spec.rb
-- spec/utils_spec.rb
-- spec/erd_renderer_spec.rb
-- spec/jekyll-diagrams_spec.rb
+- spec/jekyll_diagrams_spec.rb