asciidoctor-diagram 1.4.0 → 1.5.0

data/spec/shaape_spec.rb

@@ -22,7 +22,7 @@ Doc Writer <doc@example.com>
 shaape::shaape.txt[format="png"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -59,7 +59,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -94,7 +94,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -123,7 +123,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+    expect { load_asciidoc doc }.to raise_error /support.*format/i
   end
 
   it "should not regenerate images when source has not changed" do
@@ -157,7 +157,7 @@ shaape::shaape.txt
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     b = d.find { |b| b.context == :image }
     expect(b).to_not be_nil
     target = b.attributes['target']
@@ -165,7 +165,7 @@ shaape::shaape.txt
 
     sleep 1
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
 
     mtime2 = File.mtime(target)
 
@@ -194,7 +194,7 @@ shaape::shaape.txt[]
 shaape::shaape.txt[]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('shaape.png')).to be true
   end
 
@@ -220,7 +220,7 @@ shaape::shaape.txt["foobar"]
 shaape::shaape.txt["foobaz"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('foobar.png')).to be true
     expect(File.exists?('foobaz.png')).to be true
     expect(File.exists?('shaape.png')).to be false

data/spec/test_helper.rb

@@ -34,13 +34,32 @@ module Asciidoctor
   end
 end
 
-RSpec.configure do |c|
-  if ::Asciidoctor::Diagram::Platform.os == :macosx
-    c.filter_run_excluding :broken_on_osx => true
+module Asciidoctor
+  module Diagram
+    module TestHelpers
+      def load_asciidoc(source, options = {})
+        options = options.dup
+        options[:trace] = true
+        options[:attributes] ||= {}
+        options[:attributes]['phantomjs_19'] = ENV['PHANTOMJS_19']
+        options[:attributes]['phantomjs_2'] = ENV['PHANTOMJS_2']
+        options[:attributes]['diagram-on-error'] = 'abort'
+        ::Asciidoctor.load(StringIO.new(source), options.merge({:trace => true}))
+      end
+    end
   end
+end
+
+RSpec.configure do |c|
+  c.formatter = :documentation
+
+  c.include ::Asciidoctor::Diagram::TestHelpers
 
-  if ENV['TRAVIS']
-    c.filter_run_excluding :broken_on_ci => true
+  case ::Asciidoctor::Diagram::Platform.os
+    when :macosx
+      c.filter_run_excluding :broken_on_osx => true
+    when :windows
+      c.filter_run_excluding :broken_on_windows => true
   end
 
   TEST_DIR = File.expand_path('testing')

data/spec/wavedrom_spec.rb

@@ -8,7 +8,7 @@ code = <<-eos
 ]}
 eos
 
-describe Asciidoctor::Diagram::WavedromBlockMacroProcessor do
+describe Asciidoctor::Diagram::WavedromBlockMacroProcessor, :broken_on_windows do
   it "should generate PNG images when format is set to 'png'" do
     File.write('wavedrom.txt', code)
 
@@ -21,7 +21,7 @@ Doc Writer <doc@example.com>
 wavedrom::wavedrom.txt[format="png"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -50,7 +50,7 @@ Doc Writer <doc@example.com>
 wavedrom::wavedrom.txt[format="svg"]
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -68,7 +68,7 @@ wavedrom::wavedrom.txt[format="svg"]
   end
 end
 
-describe Asciidoctor::Diagram::WavedromBlockProcessor do
+describe Asciidoctor::Diagram::WavedromBlockProcessor, :broken_on_windows do
   it "should generate PNG images when format is set to 'png'" do
     doc = <<-eos
 = Hello, Wavedrom!
@@ -82,7 +82,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -112,7 +112,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     expect(d).to_not be_nil
 
     b = d.find { |b| b.context == :image }
@@ -141,7 +141,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
+    expect { load_asciidoc doc }.to raise_error /support.*format/i
   end
 
   it "should not regenerate images when source has not changed" do
@@ -161,7 +161,7 @@ wavedrom::wavedrom.txt
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
     b = d.find { |b| b.context == :image }
     expect(b).to_not be_nil
     target = b.attributes['target']
@@ -169,7 +169,7 @@ wavedrom::wavedrom.txt
 
     sleep 1
 
-    d = Asciidoctor.load StringIO.new(doc)
+    d = load_asciidoc doc
 
     mtime2 = File.mtime(target)
 
@@ -189,7 +189,7 @@ wavedrom::wavedrom.txt[]
 wavedrom::wavedrom.txt[]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('wavedrom.png')).to be true
   end
 
@@ -206,7 +206,7 @@ wavedrom::wavedrom.txt["foobar"]
 wavedrom::wavedrom.txt["foobaz"]
     eos
 
-    Asciidoctor.load StringIO.new(doc)
+    load_asciidoc doc
     expect(File.exists?('foobar.png')).to be true
     expect(File.exists?('foobaz.png')).to be true
     expect(File.exists?('wavedrom.png')).to be false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,12 +76,15 @@ files:
 - CHANGELOG.adoc
 - LICENSE.txt
 - README.adoc
+- README_zh-CN.adoc
 - Rakefile
 - examples/Gemfile
 - examples/README.adoc
 - examples/design.adoc
 - examples/features.adoc
-- lib/asciidoctor-diagram-java-1.3.8.jar
+- images/asciidoctor-diagram-classes.png
+- images/asciidoctor-diagram-process.png
+- lib/asciidoctor-diagram-java-1.3.10.jar
 - lib/asciidoctor-diagram.rb
 - lib/asciidoctor-diagram/blockdiag.rb
 - lib/asciidoctor-diagram/blockdiag/extension.rb