asciidoctor-diagram 1.0.1-java → 1.1.0-java

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/spec/ditaa_spec.rb

@@ -1,5 +1,48 @@
 require_relative 'test_helper'
 
+describe Asciidoctor::Diagram::DitaaBlockMacro do
+  it "should generate PNG images when format is set to 'png'" do
+    code = <<-eos
++--------+   +-------+    +-------+
+|        | --+ ditaa +--> |       |
+|  Text  |   +-------+    |diagram|
+|Document|   |!magic!|    |       |
+|     {d}|   |       |    |       |
++---+----+   +-------+    +-------+
+    :                         ^
+    |       Lots of work      |
+    +-------------------------+
+    eos
+
+    File.write('ditaa.txt', code)
+
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+ditaa::ditaa.txt[format="png"]
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc)
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match /\.png$/
+    expect(File.exists?(target)).to be_true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+end
+
 describe Asciidoctor::Diagram::DitaaBlock do
   it "should generate PNG images when format is set to 'png'" do
     doc = <<-eos
@@ -53,4 +96,26 @@ Doc Writer <doc@example.com>
 
     expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
   end
+
+  it "should use a default format when none was given" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[ditaa]
+----
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc)
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+    target = b.attributes['target']
+    expect(target).to match /\.png$/
+    expect(File.exists?(target)).to be_true
+  end
 end

data/spec/graphviz_spec.rb

@@ -0,0 +1,134 @@
+require_relative 'test_helper'
+
+describe Asciidoctor::Diagram::GraphvizBlockMacro do
+  it "should generate PNG images when format is set to 'png'" do
+    code = <<-eos
+digraph foo {
+  node [style=rounded]
+  node1 [shape=box]
+  node2 [fillcolor=yellow, style="rounded,filled", shape=diamond]
+  node3 [shape=record, label="{ a | b | c }"]
+
+  node1 -> node2 -> node3
+}
+    eos
+
+    File.write('graphviz.txt', code)
+
+    doc = <<-eos
+= Hello, graphviz!
+Doc Writer <doc@example.com>
+
+== First Section
+
+graphviz::graphviz.txt[format="png"]
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc)
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match /\.png$/
+    expect(File.exists?(target)).to be_true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+end
+
+describe Asciidoctor::Diagram::GraphvizBlock do
+  it "should generate PNG images when format is set to 'png'" do
+    doc = <<-eos
+= Hello, graphviz!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[graphviz, format="png"]
+----
+digraph foo {
+  node [style=rounded]
+  node1 [shape=box]
+  node2 [fillcolor=yellow, style="rounded,filled", shape=diamond]
+  node3 [shape=record, label="{ a | b | c }"]
+
+  node1 -> node2 -> node3
+}
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc)
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match /\.png$/
+    expect(File.exists?(target)).to be_true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should generate SVG images when format is set to 'svg'" do
+    doc = <<-eos
+= Hello, graphviz!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[graphviz, format="svg"]
+----
+digraph foo {
+  node [style=rounded]
+  node1 [shape=box]
+  node2 [fillcolor=yellow, style="rounded,filled", shape=diamond]
+  node3 [shape=record, label="{ a | b | c }"]
+
+  node1 -> node2 -> node3
+}
+----
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc)
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match /\.svg$/
+    expect(File.exists?(target)).to be_true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+
+  it "should raise an error when when format is set to an invalid value" do
+    doc = <<-eos
+= Hello, graphviz!
+Doc Writer <doc@example.com>
+
+== First Section
+
+[graphviz, format="foobar"]
+----
+----
+    eos
+
+    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+  end
+end

data/spec/plantuml_spec.rb

@@ -1,5 +1,43 @@
 require_relative 'test_helper'
 
+describe Asciidoctor::Diagram::PlantUmlBlockMacro do
+  it "should generate PNG images when format is set to 'png'" do
+    code = <<-eos
+User -> (Start)
+User --> (Use the application) : Label
+
+:Main Admin: ---> (Use the application) : Another label
+    eos
+
+    File.write('plantuml.txt', code)
+
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <doc@example.com>
+
+== First Section
+
+plantuml::plantuml.txt[format="png"]
+    eos
+
+    d = Asciidoctor.load StringIO.new(doc)
+    expect(d).to_not be_nil
+
+    b = d.find { |b| b.context == :image }
+    expect(b).to_not be_nil
+
+    expect(b.content_model).to eq :empty
+
+    target = b.attributes['target']
+    expect(target).to_not be_nil
+    expect(target).to match /\.png$/
+    expect(File.exists?(target)).to be_true
+
+    expect(b.attributes['width']).to_not be_nil
+    expect(b.attributes['height']).to_not be_nil
+  end
+end
+
 describe Asciidoctor::Diagram::PlantUmlBlock do
   it "should generate PNG images when format is set to 'png'" do
     doc = <<-eos

data/spec/test_helper.rb

@@ -7,6 +7,7 @@ require 'tmpdir'
 
 require_relative '../lib/asciidoctor-diagram'
 require_relative '../lib/asciidoctor-diagram/ditaa/extension'
+require_relative '../lib/asciidoctor-diagram/graphviz/extension'
 require_relative '../lib/asciidoctor-diagram/plantuml/extension'
 
 module Asciidoctor

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: java
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
 description: Asciidoctor diagramming extension
@@ -73,31 +73,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
+- CHANGELOG.adoc
 - LICENSE.txt
 - README.adoc
 - Rakefile
-- asciidoctor-diagram.gemspec
-- ditaamini-license.txt
+- examples/Gemfile
+- examples/README.adoc
+- examples/build_example.rb
+- examples/design.adoc
+- examples/features.adoc
 - lib/asciidoctor-diagram.rb
-- lib/asciidoctor-diagram/binaryio.rb
-- lib/asciidoctor-diagram/diagram.rb
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/extension.rb
-- lib/asciidoctor-diagram/java.rb
-- lib/asciidoctor-diagram/java_jruby.rb
-- lib/asciidoctor-diagram/java_rjb.rb
+- lib/asciidoctor-diagram/ditaa/generator.rb
+- lib/asciidoctor-diagram/graphviz.rb
+- lib/asciidoctor-diagram/graphviz/extension.rb
 - lib/asciidoctor-diagram/plantuml.rb
 - lib/asciidoctor-diagram/plantuml/extension.rb
-- lib/asciidoctor-diagram/png.rb
-- lib/asciidoctor-diagram/svg.rb
+- lib/asciidoctor-diagram/plantuml/generator.rb
+- lib/asciidoctor-diagram/util/binaryio.rb
+- lib/asciidoctor-diagram/util/diagram.rb
+- lib/asciidoctor-diagram/util/java.rb
+- lib/asciidoctor-diagram/util/java_jruby.rb
+- lib/asciidoctor-diagram/util/java_rjb.rb
+- lib/asciidoctor-diagram/util/png.rb
+- lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/version.rb
 - lib/ditaamini0_9.jar
 - lib/plantuml.jar
-- plantuml-license.txt
 - spec/ditaa_spec.rb
+- spec/graphviz_spec.rb
 - spec/plantuml_spec.rb
 - spec/test_helper.rb
 homepage: https://github.com/asciidoctor/asciidoctor-diagram
@@ -110,22 +115,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
   using PlantUML
 test_files:
 - spec/ditaa_spec.rb
+- spec/graphviz_spec.rb
 - spec/plantuml_spec.rb
 - spec/test_helper.rb

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-*.iml
-.idea
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp