asciidoctor-diagram 1.5.1 → 1.5.2

data/spec/shaape_spec.rb

@@ -25,15 +25,15 @@ shaape::shaape.txt[format="png"]
     d = load_asciidoc doc
     expect(d).to_not be_nil
 
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.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(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -62,15 +62,15 @@ Doc Writer <doc@example.com>
     d = load_asciidoc doc
     expect(d).to_not be_nil
 
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.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(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -97,15 +97,15 @@ Doc Writer <doc@example.com>
     d = load_asciidoc doc
     expect(d).to_not be_nil
 
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.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(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -123,7 +123,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { load_asciidoc 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
@@ -158,7 +158,7 @@ shaape::shaape.txt
     eos
 
     d = load_asciidoc doc
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.context == :image }
     expect(b).to_not be_nil
     target = b.attributes['target']
     mtime1 = File.mtime(target)
@@ -195,7 +195,7 @@ shaape::shaape.txt[]
     eos
 
     load_asciidoc doc
-    expect(File.exists?('shaape.png')).to be true
+    expect(File.exist?('shaape.png')).to be true
   end
 
   it "should respect target attribute in block macros" do
@@ -221,8 +221,8 @@ shaape::shaape.txt["foobaz"]
     eos
 
     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
+    expect(File.exist?('foobar.png')).to be true
+    expect(File.exist?('foobaz.png')).to be true
+    expect(File.exist?('shaape.png')).to be false
   end
 end

data/spec/test_helper.rb

@@ -8,6 +8,7 @@ require 'tmpdir'
 require_relative '../lib/asciidoctor-diagram'
 require_relative '../lib/asciidoctor-diagram/blockdiag/extension'
 require_relative '../lib/asciidoctor-diagram/ditaa/extension'
+require_relative '../lib/asciidoctor-diagram/erd/extension'
 require_relative '../lib/asciidoctor-diagram/graphviz/extension'
 require_relative '../lib/asciidoctor-diagram/meme/extension'
 require_relative '../lib/asciidoctor-diagram/mermaid/extension'
@@ -62,20 +63,24 @@ RSpec.configure do |c|
       c.filter_run_excluding :broken_on_windows => true
   end
 
+  if ENV['TRAVIS']
+    c.filter_run_excluding :broken_on_travis => true
+  end
+
   TEST_DIR = File.expand_path('testing')
 
   c.before(:suite) do
-    FileUtils.rm_r TEST_DIR if Dir.exists? TEST_DIR
+    FileUtils.rm_r TEST_DIR if Dir.exist? TEST_DIR
     FileUtils.mkdir_p TEST_DIR
   end
 
   c.around(:each) do |example|
     metadata = example.metadata
     group_dir = File.expand_path(metadata[:example_group][:full_description].gsub(/[^\w]+/, '_'), TEST_DIR)
-    Dir.mkdir(group_dir) unless Dir.exists?(group_dir)
+    FileUtils.mkdir_p(group_dir) unless Dir.exist?(group_dir)
 
     test_dir = File.expand_path(metadata[:description].gsub(/[^\w]+/, '_'), group_dir)
-    Dir.mkdir(test_dir)
+    FileUtils.mkdir_p(test_dir) unless Dir.exist?(test_dir)
 
     Dir.chdir(test_dir) do
       example.run

data/spec/wavedrom_spec.rb

@@ -24,15 +24,15 @@ wavedrom::wavedrom.txt[format="png"]
     d = load_asciidoc doc
     expect(d).to_not be_nil
 
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.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(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -53,15 +53,15 @@ wavedrom::wavedrom.txt[format="svg"]
     d = load_asciidoc doc
     expect(d).to_not be_nil
 
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.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(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -85,15 +85,15 @@ Doc Writer <doc@example.com>
     d = load_asciidoc doc
     expect(d).to_not be_nil
 
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.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(target).to match(/\.png$/)
+    expect(File.exist?(target)).to be true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -115,15 +115,15 @@ Doc Writer <doc@example.com>
     d = load_asciidoc doc
     expect(d).to_not be_nil
 
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.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(target).to match(/\.svg/)
+    expect(File.exist?(target)).to be true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -141,7 +141,7 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    expect { load_asciidoc 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
@@ -162,7 +162,7 @@ wavedrom::wavedrom.txt
     eos
 
     d = load_asciidoc doc
-    b = d.find { |b| b.context == :image }
+    b = d.find { |bl| bl.context == :image }
     expect(b).to_not be_nil
     target = b.attributes['target']
     mtime1 = File.mtime(target)
@@ -190,7 +190,7 @@ wavedrom::wavedrom.txt[]
     eos
 
     load_asciidoc doc
-    expect(File.exists?('wavedrom.png')).to be true
+    expect(File.exist?('wavedrom.png')).to be true
   end
 
   it "should respect target attribute in block macros" do
@@ -207,8 +207,8 @@ wavedrom::wavedrom.txt["foobaz"]
     eos
 
     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
+    expect(File.exist?('foobar.png')).to be true
+    expect(File.exist?('foobaz.png')).to be true
+    expect(File.exist?('wavedrom.png')).to be false
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,8 @@ files:
 - lib/asciidoctor-diagram/blockdiag/extension.rb
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/extension.rb
+- lib/asciidoctor-diagram/erd.rb
+- lib/asciidoctor-diagram/erd/extension.rb
 - lib/asciidoctor-diagram/extensions.rb
 - lib/asciidoctor-diagram/graphviz.rb
 - lib/asciidoctor-diagram/graphviz/extension.rb
@@ -103,6 +105,7 @@ files:
 - lib/asciidoctor-diagram/shaape.rb
 - lib/asciidoctor-diagram/shaape/extension.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
+- lib/asciidoctor-diagram/util/cli.rb
 - lib/asciidoctor-diagram/util/cli_generator.rb
 - lib/asciidoctor-diagram/util/gif.rb
 - lib/asciidoctor-diagram/util/java.rb
@@ -119,6 +122,7 @@ files:
 - lib/plantuml.jar
 - spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
+- spec/erd_spec.rb
 - spec/graphviz_spec.rb
 - spec/man.jpg
 - spec/meme_spec.rb
@@ -147,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
@@ -155,6 +159,7 @@ summary: An extension for asciidoctor that adds support for UML diagram generati
 test_files:
 - spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
+- spec/erd_spec.rb
 - spec/graphviz_spec.rb
 - spec/man.jpg
 - spec/meme_spec.rb
@@ -163,4 +168,3 @@ test_files:
 - spec/shaape_spec.rb
 - spec/test_helper.rb
 - spec/wavedrom_spec.rb
-has_rdoc: