asciidoctor-diagram 1.1.6 → 1.2.0.preview.1

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

@@ -31,10 +31,6 @@ module Asciidoctor
         load
         ::Java.send(meth)
       end
-
-      def self.new_object(java_class, signature = nil, *args)
-        java_class.new(*args)
-      end
     end
   end
 end

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

@@ -77,14 +77,6 @@ module Asciidoctor
         @root_package ||= Package.send(:create_package, nil)
         @root_package.send(meth, *args)
       end
-
-      def self.new_object(java_class, signature = nil, *args)
-        if signature
-          java_class.new_with_sig(signature, *args)
-        else
-          java_class.new(*args)
-        end
-      end
     end
   end
 end

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

@@ -4,30 +4,34 @@ module Asciidoctor
   module Diagram
     module SVG
       def self.get_image_size(data)
-        if m = START_TAG_REGEX.match(data)
-          start_tag = m[0]
-          if (w = WIDTH_REGEX.match(start_tag)) && (h = HEIGHT_REGEX.match(start_tag))
-            width = w[:value].to_i * to_px_factor(w[:unit])
-            height = h[:value].to_i * to_px_factor(h[:unit])
-            return [width.to_i, height.to_i]
-          end
+        get_from_style(data) || get_from_viewport(data)
+      end
 
-          if v = VIEWBOX_REGEX.match(start_tag)
-            width = v[:width]
-            height = v[:height]
-            return [width.to_i, height.to_i]
-          end
-        end
+      private
+
+      SVG_STYLE_REGEX = /style\s*=\s*"width:(?<width>\d+)px;height:(?<height>\d+)px/
 
-        nil
+      def self.get_from_style(data)
+        match_data = SVG_STYLE_REGEX.match(data)
+        if match_data
+          [match_data[:width].to_i, match_data[:height].to_i]
+        else
+          nil
+        end
       end
 
-      private
+      SVG_VIEWPORT_REGEX = /<svg width="(?<width>\d+)(?<width_unit>[a-zA-Z]+)" height="(?<height>\d+)(?<height_unit>[a-zA-Z]+)"/
 
-      START_TAG_REGEX = /<svg[^>]*>/
-      WIDTH_REGEX = /width="(?<value>\d+)(?<unit>[a-zA-Z]+)"/
-      HEIGHT_REGEX = /height="(?<value>\d+)(?<unit>[a-zA-Z]+)"/
-      VIEWBOX_REGEX = /viewBox="\d+ \d+ (?<width>\d+) (?<height>\d+)"/
+      def self.get_from_viewport(data)
+        match_data = SVG_VIEWPORT_REGEX.match(data)
+        if match_data
+          width = match_data[:width].to_i * to_px_factor(match_data[:width_unit])
+          height = match_data[:height].to_i * to_px_factor(match_data[:height_unit])
+          [width.to_i, height.to_i]
+        else
+          nil
+        end
+      end
 
       def self.to_px_factor(unit)
         case unit

data/lib/asciidoctor-diagram/version.rb

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

data/spec/ditaa_spec.rb

@@ -36,7 +36,7 @@ ditaa::ditaa.txt[format="png"]
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.png$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -76,7 +76,7 @@ Doc Writer <doc@example.com>
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.png$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -116,6 +116,6 @@ Doc Writer <doc@example.com>
     expect(b).to_not be_nil
     target = b.attributes['target']
     expect(target).to match /\.png$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
   end
 end

data/spec/graphviz_spec.rb

@@ -35,7 +35,7 @@ graphviz::graphviz.txt[format="png"]
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.png$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -74,7 +74,7 @@ digraph foo {
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.png$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -111,7 +111,7 @@ digraph foo {
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.svg$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -131,29 +131,4 @@ Doc Writer <doc@example.com>
 
     expect { Asciidoctor.load StringIO.new(doc) }.to raise_error /support.*format/i
   end
-
-  it "should support single line digraphs" do
-    doc = <<-eos
-= Hello, graphviz!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[graphviz]
-----
-digraph g { rankdir=LR; Text->Graphviz->Image }
-----
-    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(File.exists?(target)).to be true
-  end
 end

data/spec/plantuml_spec.rb

@@ -31,7 +31,7 @@ plantuml::plantuml.txt[format="png"]
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.png$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -66,7 +66,7 @@ User --> (Use the application) : Label
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.png$/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -99,7 +99,7 @@ User --> (Use the application) : Label
     target = b.attributes['target']
     expect(target).to_not be_nil
     expect(target).to match /\.svg/
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     expect(b.attributes['width']).to_not be_nil
     expect(b.attributes['height']).to_not be_nil
@@ -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
@@ -176,150 +176,9 @@ ArrowColor #DEADBE
 
     target = b.attributes['target']
     expect(target).to_not be_nil
-    expect(File.exists?(target)).to be true
+    expect(File.exists?(target)).to be_true
 
     svg = File.read(target)
     expect(svg).to match /<path.*fill="#DEADBE"/
   end
-
-  it "should not regenerate images when source has not changed" 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
-
-[plantuml, format="png"]
-----
-actor Foo1
-boundary Foo2
-Foo1 -> Foo2 : To boundary
-----
-    eos
-
-    d = Asciidoctor.load StringIO.new(doc)
-    b = d.find { |b| b.context == :image }
-    target = b.attributes['target']
-    mtime1 = File.mtime(target)
-
-    sleep 1
-
-    d = Asciidoctor.load StringIO.new(doc)
-
-    mtime2 = File.mtime(target)
-
-    expect(mtime2).to eq mtime1
-  end
-
-  it "should handle two block macros with the same source" 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[]
-plantuml::plantuml.txt[]
-    eos
-
-    Asciidoctor.load StringIO.new(doc)
-    expect(File.exists?('plantuml.png')).to be true
-  end
-
-  it "should respect target attribute in block macros" 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["foobar"]
-plantuml::plantuml.txt["foobaz"]
-    eos
-
-    Asciidoctor.load StringIO.new(doc)
-    expect(File.exists?('foobar.png')).to be true
-    expect(File.exists?('foobaz.png')).to be true
-    expect(File.exists?('plantuml.png')).to be false
-  end
-
-
-  it "should write files to outdir if set" do
-    doc = <<-eos
-= Hello, PlantUML!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[plantuml, format="svg"]
-----
-actor Foo1
-boundary Foo2
-Foo1 -> Foo2 : To boundary
-----
-    eos
-
-    d = Asciidoctor.load StringIO.new(doc), {:attributes => {'outdir' => 'foo'}}
-    b = d.find { |b| b.context == :image }
-
-    target = b.attributes['target']
-    expect(target).to_not be_nil
-    expect(File.exists?(target)).to be false
-    expect(File.exists?(File.expand_path(target, 'foo'))).to be true
-  end
-
-  it "should omit width/height attributes when generating docbook" do
-    doc = <<-eos
-= Hello, PlantUML!
-Doc Writer <doc@example.com>
-
-== First Section
-
-[plantuml, format="png"]
-----
-User -> (Start)
-----
-    eos
-
-    d = Asciidoctor.load StringIO.new(doc), :attributes => {'backend' => 'docbook5' }
-    expect(d).to_not be_nil
-
-    b = d.find { |b| b.context == :image }
-    expect(b).to_not be_nil
-
-    target = b.attributes['target']
-    expect(File.exists?(target)).to be true
-
-    expect(b.attributes['width']).to be_nil
-    expect(b.attributes['height']).to be_nil
-  end
-end
+end

data/spec/test_helper.rb

@@ -6,11 +6,9 @@ require 'stringio'
 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/graphviz/extension'
 require_relative '../lib/asciidoctor-diagram/plantuml/extension'
-require_relative '../lib/asciidoctor-diagram/shaape/extension'
 
 module Asciidoctor
   class AbstractBlock
@@ -32,18 +30,13 @@ end
 RSpec.configure do |c|
   TEST_DIR = 'testing'
 
-  c.before(:suite) do
-    FileUtils.rm_r TEST_DIR if Dir.exists? TEST_DIR
+  c.before(:all) do
+    #FileUtils.rm_r TEST_DIR if Dir.exists? 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)
-
-    test_dir = File.expand_path(metadata[:description].gsub(/[^\w]+/, '_'), group_dir)
-    Dir.mkdir(test_dir)
+    test_dir = Dir.mktmpdir 'test', File.expand_path(TEST_DIR)
 
     old_wd = Dir.pwd
     Dir.chdir test_dir

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0.preview.1
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-02-24 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
+        version: 1.5.0.preview.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.5.0.preview.2
 - !ruby/object:Gem::Dependency
   name: rjb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.8
 description: Asciidoctor diagramming extension
@@ -93,38 +93,30 @@ files:
 - Rakefile
 - examples/Gemfile
 - examples/README.adoc
-- examples/build_example.rb
 - examples/design.adoc
 - examples/features.adoc
 - lib/asciidoctor-diagram.rb
-- lib/asciidoctor-diagram/blockdiag.rb
-- lib/asciidoctor-diagram/blockdiag/extension.rb
 - lib/asciidoctor-diagram/ditaa.rb
 - lib/asciidoctor-diagram/ditaa/extension.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/plantuml/generator.rb
-- lib/asciidoctor-diagram/shaape.rb
-- lib/asciidoctor-diagram/shaape/extension.rb
 - lib/asciidoctor-diagram/util/binaryio.rb
-- lib/asciidoctor-diagram/util/cli_generator.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/util/which.rb
 - lib/asciidoctor-diagram/version.rb
 - lib/ditaamini0_9.jar
 - lib/plantuml.jar
-- spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
 - spec/graphviz_spec.rb
 - spec/plantuml_spec.rb
-- spec/shaape_spec.rb
 - spec/test_helper.rb
 homepage: https://github.com/asciidoctor/asciidoctor-diagram
 licenses:
@@ -136,25 +128,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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation
   using PlantUML
 test_files:
-- spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
 - spec/graphviz_spec.rb
 - spec/plantuml_spec.rb
-- spec/shaape_spec.rb
 - spec/test_helper.rb