asciidoctor-diagram 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0f22feab9b140a44c8beff1324a9c6c80a44c2d
-  data.tar.gz: 2923f841a55ed9ca7f1cc965a0dcc1299a951ff0
+  metadata.gz: 58d14ba5e18dc4427eb55a9a9472939de9f0fc31
+  data.tar.gz: 3af41c9149de5a88e06e8eacafe16f55a5580dc8
 SHA512:
-  metadata.gz: 4031f6c3fd7a115b699c55dfd8b030230ad390f576e251417dccbceb85c08d9356e0977e205b81c6e84ed4bc5318ed430d0a54225e03afa17a09521eff3c07b4
-  data.tar.gz: 9ac14361407421bc48155c5f79a581480a54616c235e02ffb0b85cfc97db3507c9c283c6e9f9407e96067b6c933603def1b5a60f2a27f93a86bf7a8c0b387de2
+  metadata.gz: 0a1e03a029afb9ee6c81e550f541b03e3d9d4d28fd82a3700daf9d0009c77a2ee4bd42f810ed70e5473e26a7b98704a9b1742dddb43e25b1d8e82824b8b8b086
+  data.tar.gz: 2d244e715c478627049baf87f7f8adb581213a0759df56c0a3dac9f7f24fc036e575117551cfd3be427e7439206b7c81d31411aad93764ad90690eda2efd6205

data/CHANGELOG.adoc

@@ -1,5 +1,13 @@
 = Asciidoctor-diagram Changelog
 
+== 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.1.4"
+    VERSION = "1.1.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,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 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: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !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
@@ -129,17 +129,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: '0'
 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