asciidoctor-diagram 1.2.0.preview.4-java → 1.2.0.preview.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 043f19546d87bf380b9033fcaf0484b7b3c3e8c9
-  data.tar.gz: 7177c6504241eeffda1853fa9d829486db7bc96b
+  metadata.gz: 6d442d91fe6669ed506966b3a0986f5c847b9210
+  data.tar.gz: c2ba98ed53a5405b4e95ce72f03d4c7158e7b561
 SHA512:
-  metadata.gz: d20500b05fc3f0a63da62968038212a2fd1a0fce575cfbd4b779fcac91b75faf8eb505bf672d84d3b9b741109fd77898a7c13732a2712403d8898fe9dcfdd4ca
-  data.tar.gz: db1febbb4e68a028d57662e65f8efd360db70da99dd7e2c5809d0250be96dc0d65cb73873ee5c7a4912d89463c6677ced409a7200168993ebe773a6395e2f595
+  metadata.gz: c44d51a81c8cba3c256c2c33b26e2100d37aebb5ff7d8a9ae785d445fbe31eaba77dc8cabbff3594c2ea7f8e294eeb222b12a03b876c289a9447363525cff93f
+  data.tar.gz: 36ded3b76a7980587dd546f52ce1f64ae39ff87c51ac2d8e88be6d46ee1881944b302e890967c1b32716b3cae6a067f1400f57c328d3768791e1255caad0052d

data/CHANGELOG.adoc

@@ -6,6 +6,14 @@ Enhancements::
 
   * Updated to Asciidoctor 1.5.0
 
+== 1.1.5
+
+Enhancements::
+
+  * Use the output directory (outdir attribute) as base directory if it's specified.
+  * Do not auto-generate width/height attributes when outputting to a non-HTML backend. This resolves issues with
+    oversized images in docbook output.
+
 == 1.1.4
 
 Bug Fixes::

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

@@ -1,6 +1,7 @@
 require 'asciidoctor/extensions'
 require 'digest'
 require 'json'
+require 'fileutils'
 require_relative 'java'
 require_relative 'png'
 require_relative 'svg'
@@ -96,7 +97,7 @@ module Asciidoctor
         target = attributes.delete('target')
 
         image_name = "#{target || ('diag-' + source.checksum)}.#{format}"
-        image_dir = File.expand_path(parent.document.attributes['imagesdir'] || '', parent.document.attributes['docdir'])
+        image_dir = File.expand_path(parent.document.attributes['imagesdir'] || '', parent.document.attributes['outdir'] || parent.document.attributes['docdir'])
         image_file = File.expand_path(image_name, image_dir)
         metadata_file = File.expand_path("#{image_name}.cache", image_dir)
 
@@ -116,14 +117,17 @@ module Asciidoctor
           metadata = {'checksum' => source.checksum}
           metadata['width'], metadata['height'] = params[:decoder].get_image_size(result)
 
+          FileUtils.mkdir_p(image_dir) unless Dir.exists?(image_dir)
           File.open(image_file, 'wb') { |f| f.write result }
           File.open(metadata_file, 'w') { |f| JSON.dump(metadata, f) }
         end
 
         attributes['target'] = image_name
-        attributes['width'] ||= metadata['width'] if metadata['width']
-        attributes['height'] ||= metadata['height'] if metadata['height']
-        attributes['alt'] ||= if (title_text = attributes['title'])
+        if /html/i =~ parent.document.attributes['backend']
+          attributes['width'] ||= metadata['width'] if metadata['width']
+          attributes['height'] ||= metadata['height'] if metadata['height']
+        end
+        attributes['alt'] ||= if title_text = attributes['title']
                                 title_text
                               elsif target
                                 (File.basename target, (File.extname target) || '').tr '_-', ' '

data/lib/asciidoctor-diagram/version.rb

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

data/spec/plantuml_spec.rb

@@ -271,4 +271,55 @@ plantuml::plantuml.txt["foobaz"]
     expect(File.exists?('foobaz.png')).to be_true
     expect(File.exists?('plantuml.png')).to be_false
   end
-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

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.2.0.preview.4
+  version: 1.2.0.preview.5
 platform: java
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-04-11 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: 1.5.0.preview.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0.preview.2
 description: Asciidoctor diagramming extension
@@ -114,17 +114,17 @@ 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation