asciidoctor-diagram 1.1.6-java → 1.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09829992d77c04af14ead06c234d1bd419290c63
-  data.tar.gz: 35a0b6376b1546967d093fb1e26acefce3cb7c08
+  metadata.gz: b96d5a431581be8bf355db36824853b11e0e3a36
+  data.tar.gz: 831efee428dad02cf3d13428b7ecd3a1264e48d2
 SHA512:
-  metadata.gz: c0cc883aeeb61dad988639e95cdcb24cd7019d328c57dfdcc20078d07e9830078d0a5ffc292cdfaef9ad577c9ac1b0b6cbda0c8dc8b34fe33d100f2506548cea
-  data.tar.gz: 1a113811b3b33ba6529aba3973a9f2359544c07fcafebe9f58339b794beb16706dd82fdfb312f592a825e954c5a3e440b69cedfd22b7bcaaa175ce42171a3bec
+  metadata.gz: 24e10af295c6b2f3c886f3fd0c9b986a74f3b5805df3d2649d41916ffc77f40d20d0e653d63acf9a9c6873228125260a9cd4d94cd7d9a0299a7d3dace9a2cbba
+  data.tar.gz: 0eaf95d9a2a1683d7d7b1798f055b23882ca56435162ef7b071d638ef6bcb1aba027ae4e79ba7b257c4b467993fdab06b48a807e55f942c28a6ecf44f2393830

data/CHANGELOG.adoc

@@ -1,5 +1,11 @@
 = Asciidoctor-diagram Changelog
 
+== 1.2.0
+
+Enhancements::
+
+  * Updated to Asciidoctor 1.5.0
+
 == 1.1.6
 
 Enhancements::

data/examples/README.adoc

@@ -1,6 +1,18 @@
 = Asciidoctor-diagram Examples
 
 This directory contains a number of example files that illustrate how to use the asciidoctor-diagram extension.
-Asciidoctor 0.1.4 does not support loading extensions via the command line.
-In order to process the examples correctly you should use the `build-example.rb` script.
-This wraps the regular `asciidoctor` command line tool and automatically loads the asciidoctor-diagram extension.
+
+In order to build the examples correctly the asciidoctor-diagram extension should be loaded.
+This can be done using bundler by running
+
+----
+bundle exec asciidoctor -r asciidoctor-diagram <asciidoc file>
+----
+
+If you do not want to use bundler you can alternatively run
+
+----
+asciidoctor -r asciidoctor-diagram -I ../lib <asciidoc file>
+----
+
+This variant requires you to explicitly specify the load path from which asciidoctor-diagram can be loaded.

data/lib/asciidoctor-diagram/blockdiag.rb

@@ -3,6 +3,6 @@ require_relative 'version'
 
 Asciidoctor::Extensions.register do
   require_relative 'blockdiag/extension'
-  block :blockdiag, Asciidoctor::Diagram::BlockDiagBlock
-  block_macro :blockdiag, Asciidoctor::Diagram::BlockDiagBlockMacro
+  block Asciidoctor::Diagram::BlockDiagBlock, :blockdiag
+  block_macro Asciidoctor::Diagram::BlockDiagBlockMacro, :blockdiag
 end

data/lib/asciidoctor-diagram/blockdiag/extension.rb

@@ -4,7 +4,7 @@ require_relative '../util/diagram'
 module Asciidoctor
   module Diagram
     ['BlockDiag', 'SeqDiag', 'ActDiag', 'NwDiag', 'RackDiag', 'PacketDiag'].each do |tool|
-      DiagramProcessor.define_processors(tool) do
+      define_processors(tool) do
         [:png, :svg].each do |f|
           register_format(f, :image) do |c, p|
             CliGenerator.generate(tool.downcase, p, c) do |tool_path, output_path|

data/lib/asciidoctor-diagram/ditaa.rb

@@ -3,6 +3,6 @@ require_relative 'version'
 
 Asciidoctor::Extensions.register do
   require_relative 'ditaa/extension'
-  block :ditaa, Asciidoctor::Diagram::DitaaBlock
-  block_macro :ditaa, Asciidoctor::Diagram::DitaaBlockMacro
+  block Asciidoctor::Diagram::DitaaBlock, :ditaa
+  block_macro Asciidoctor::Diagram::DitaaBlockMacro, :ditaa
 end

data/lib/asciidoctor-diagram/ditaa/extension.rb

@@ -27,7 +27,7 @@ module Asciidoctor
       end
     end
 
-    DiagramProcessor.define_processors('Ditaa') do
+    define_processors('Ditaa') do
       register_format(:png, :image) do |c|
         DitaaGenerator.ditaa(c)
       end

data/lib/asciidoctor-diagram/graphviz.rb

@@ -3,6 +3,6 @@ require_relative 'version'
 
 Asciidoctor::Extensions.register do
   require_relative 'graphviz/extension'
-  block :graphviz, Asciidoctor::Diagram::GraphvizBlock
-  block_macro :graphviz, Asciidoctor::Diagram::GraphvizBlockMacro
+  block Asciidoctor::Diagram::GraphvizBlock, :graphviz
+  block_macro Asciidoctor::Diagram::GraphvizBlockMacro, :graphviz
 end

data/lib/asciidoctor-diagram/graphviz/extension.rb

@@ -3,13 +3,11 @@ require_relative '../util/diagram'
 
 module Asciidoctor
   module Diagram
-    module Diagram
-      DiagramProcessor.define_processors('Graphviz') do
-        [:png, :svg].each do |f|
-          register_format(f, :image) do |c, p|
-            CliGenerator.generate('dot', p, c) do |tool_path, output_path|
-              [tool_path, "-o#{output_path}", "-T#{f.to_s}"]
-            end
+    define_processors('Graphviz') do
+      [:png, :svg].each do |f|
+        register_format(f, :image) do |c, p|
+          CliGenerator.generate('dot', p, c) do |tool_path, output_path|
+            [tool_path, "-o#{output_path}", "-T#{f.to_s}"]
           end
         end
       end

data/lib/asciidoctor-diagram/plantuml.rb

@@ -3,6 +3,7 @@ require_relative 'version'
 
 Asciidoctor::Extensions.register do
   require_relative 'plantuml/extension'
-  block :plantuml, Asciidoctor::Diagram::PlantUmlBlock
-  block_macro :plantuml, Asciidoctor::Diagram::PlantUmlBlockMacro
+
+  block Asciidoctor::Diagram::PlantUmlBlock, :plantuml
+  block_macro Asciidoctor::Diagram::PlantUmlBlockMacro, :plantuml
 end

data/lib/asciidoctor-diagram/plantuml/extension.rb

@@ -3,7 +3,7 @@ require_relative 'generator'
 
 module Asciidoctor
   module Diagram
-    DiagramProcessor.define_processors('PlantUml') do
+    define_processors('PlantUml') do
       def config_args(parent)
         config_args = []
         config = parent.document.attributes['plantumlconfig']

data/lib/asciidoctor-diagram/plantuml/generator.rb

@@ -22,6 +22,11 @@ module Asciidoctor
 
         flags += ['-charset', 'UTF-8', '-failonerror', '-graphvizdot', @graphvizdot]
 
+        config_file = parent.document.attributes['plantumlconfig']
+        if config_file
+          flags += ['-config', File.expand_path(config_file, parent.document.attributes['docdir'])]
+        end
+        
         option = Java.new_object( Java.net.sourceforge.plantuml.Option, '[Ljava.lang.String;', Java.array_to_java_array(flags, :string) )
         source_reader = Java.new_object( Java.net.sourceforge.plantuml.SourceStringReader,
                                          'Lnet.sourceforge.plantuml.preproc.Defines;Ljava.lang.String;Ljava.util.List;',

data/lib/asciidoctor-diagram/shaape.rb

@@ -3,6 +3,7 @@ require_relative 'version'
 
 Asciidoctor::Extensions.register do
   require_relative 'shaape/extension'
-  block :shaape, Asciidoctor::Diagram::ShaapeBlock
-  block_macro :shaape, Asciidoctor::Diagram::ShaapeBlockMacro
+
+  block Asciidoctor::Diagram::ShaapeBlock, :shaape
+  block_macro Asciidoctor::Diagram::ShaapeBlockMacro, :shaape
 end

data/lib/asciidoctor-diagram/shaape/extension.rb

@@ -3,7 +3,7 @@ require_relative '../util/diagram'
 
 module Asciidoctor
   module Diagram
-    DiagramProcessor.define_processors('Shaape') do
+    define_processors('Shaape') do
       [:png, :svg].each do |f|
         register_format(f, :image) do |c, p|
           CliGenerator.generate('shaape', p, c) do |tool_path, output_path|

data/lib/asciidoctor-diagram/util/diagram.rb

@@ -8,83 +8,85 @@ require_relative 'svg'
 
 module Asciidoctor
   module Diagram
-    module DiagramProcessor
-      IMAGE_PARAMS = {
-          :svg => {
-              :encoding => Encoding::UTF_8,
-              :decoder => SVG
-          },
-          :png => {
-              :encoding => Encoding::ASCII_8BIT,
-              :decoder => PNG
-          }
-      }
-
-      module ClassMethods
-        #
-        # Registers a supported format. The first registered format becomes the default format for the block processor.
-        #
-        # +format+ is a symbol with the format name
-        # +type+ is a symbol and should be either :image or :literal
-        # +block+ is a block that produces the diagrams from code. The block receives the parent asciidoc block and the diagram code as arguments
-        #
-        def register_format(format, type, &block)
-          unless @default_format
-            @default_format = format
-          end
-
-          formats[format] = {
-              :type => type,
-              :generator => block
-          }
+    def self.define_processors(name, &init)
+      block = Class.new(Asciidoctor::Extensions::BlockProcessor) do
+        class << self
+          include FormatRegistry
         end
+        include DiagramProcessor
 
-        def formats
-          @formats ||= {}
-        end
+        option :pos_attrs, ['target', 'format']
+        option :contexts, [:listing, :literal, :open]
+        option :content_model, :simple
 
-        def default_format
-          @default_format
+        def process(parent, reader, attributes)
+          generate_block(parent, ReaderSource.new(reader), attributes)
         end
-      end
 
-      def self.included base
-        base.extend ClassMethods
+        self.instance_eval &init
       end
 
-      def self.define_processors(name, &init)
-        block = Class.new(Asciidoctor::Extensions::BlockProcessor) do
-          include DiagramProcessor
+      block_macro = Class.new(Asciidoctor::Extensions::BlockMacroProcessor) do
+        class << self
+          include FormatRegistry
+        end
+        include DiagramProcessor
 
-          option :pos_attrs, ['target', 'format']
-          option :contexts, [:listing, :literal, :open]
-          option :content_model, :simple
+        option :pos_attrs, ['target', 'format']
 
-          def process(parent, reader, attributes)
-            generate_block(parent, ReaderSource.new(reader), attributes)
-          end
+        def process(parent, target, attributes)
+          source = FileSource.new(File.expand_path(target, parent.document.attributes['docdir']))
+          attributes['target'] ||= File.basename(target, File.extname(target))
 
-          self.instance_eval &init
+          generate_block(parent, source, attributes)
         end
 
-        block_macro = Class.new(Asciidoctor::Extensions::BlockMacroProcessor) do
-          include DiagramProcessor
+        self.instance_eval &init
+      end
 
-          option :pos_attrs, ['target', 'format']
+      Asciidoctor::Diagram.const_set("#{name}Block", block)
+      Asciidoctor::Diagram.const_set("#{name}BlockMacro", block_macro)
+    end
 
-          def process(parent, target, attributes)
-            source = FileSource.new(File.expand_path(target, parent.document.attributes['docdir']))
-            attributes['target'] ||= File.basename(target, File.extname(target))
+    module FormatRegistry
+      #
+      # Registers a supported format. The first registered format becomes the default format for the block processor.
+      #
+      # +format+ is a symbol with the format name
+      # +type+ is a symbol and should be either :image or :literal
+      # +block+ is a block that produces the diagrams from code. The block receives the parent asciidoc block and the diagram code as arguments
+      #
+      def register_format(format, type, &block)
+        unless @default_format
+          @default_format = format
+        end
 
-            generate_block(parent, source, attributes)
-          end
+        formats[format] = {
+            :type => type,
+            :generator => block
+        }
+      end
 
-          self.instance_eval &init
-        end
+      def formats
+        @formats ||= {}
+      end
 
-        Asciidoctor::Diagram.const_set("#{name}Block", block)
-        Asciidoctor::Diagram.const_set("#{name}BlockMacro", block_macro)
+      def default_format
+        @default_format
       end
+    end
+
+    module DiagramProcessor
+      IMAGE_PARAMS = {
+          :svg => {
+              :encoding => Encoding::UTF_8,
+              :decoder => SVG
+          },
+          :png => {
+              :encoding => Encoding::ASCII_8BIT,
+              :decoder => PNG
+          }
+      }
 
       private
 
@@ -197,7 +199,7 @@ module Asciidoctor
       end
 
       def code
-        @code ||= @reader.lines.join
+        @code ||= @reader.lines.join("\n")
       end
     end
 

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.1.6"
+    VERSION = "1.2.0"
   end
 end

data/spec/plantuml_spec.rb

@@ -127,7 +127,7 @@ User --> (Use the application) : Label
     b = d.find { |b| b.context == :literal }
     expect(b).to_not be_nil
 
-    expect(b.content_model).to eq :simple
+    expect(b.content_model).to eq :verbatim
 
     expect(b.attributes['target']).to be_nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: java
 authors:
 - Pepijn Van Eeckhoudt
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.5.0
 description: Asciidoctor diagramming extension
 email:
 - pepijn@vaneeckhoudt.net
@@ -79,7 +79,6 @@ files:
 - Rakefile
 - examples/Gemfile
 - examples/README.adoc
-- examples/build_example.rb
 - examples/design.adoc
 - examples/features.adoc
 - lib/asciidoctor-diagram.rb

data/examples/build_example.rb

@@ -1,9 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require 'asciidoctor'
-require 'asciidoctor/cli/options'
-require 'asciidoctor/cli/invoker'
-require 'asciidoctor-diagram'
-
-Asciidoctor::Cli::Invoker.new(*ARGV).invoke!