Add support for Ditaa command line options

lib/asciidoctor-diagram/ditaa/extension.rb

@@ -10,12 +10,15 @@ module Ditaa
       end
       Java.classpath.concat JARS
 
-      def ditaa(code)
+      def ditaa(code, attrs)
         Java.load
 
         response = Java.send_request(
             :url => '/ditaa',
-            :body => code
+            :body => code,
+            :headers => {
+                'X-Options' => attrs.delete('options') || ''
+            }
         )
 
         unless response[:code] == 200
@@ -26,8 +29,8 @@ def ditaa(code)
       end
 
       def self.included(mod)
-        mod.register_format(:png, :image) do |c|
-          ditaa(c.to_s)
+        mod.register_format(:png, :image) do |c, _, attrs|
+          ditaa(c.to_s, attrs)
         end
       end
     end

lib/asciidoctor-diagram/extensions.rb

@@ -141,10 +141,12 @@ def create_image_block(parent, source, attributes, format, generator_info)
             metadata = {}
           end
 
+          image_attributes = attributes.dup
+
           if !File.exists?(image_file) || source.should_process?(image_file, metadata)
             params = IMAGE_PARAMS[format]
 
-            result = instance_exec(source, parent, &generator_info[:generator])
+            result = instance_exec(source, parent, image_attributes, &generator_info[:generator])
 
             result.force_encoding(params[:encoding])
 
@@ -156,7 +158,6 @@ def create_image_block(parent, source, attributes, format, generator_info)
             File.open(metadata_file, 'w') { |f| JSON.dump(metadata, f) }
           end
 
-          image_attributes = attributes.dup
           image_attributes['target'] = image_name
 
           scale = image_attributes['scale']

lib/asciidoctor-diagram/util/java.rb

@@ -4,7 +4,7 @@ module Diagram
     module Java
       def self.classpath
         @classpath ||= [
-            File.expand_path(File.join('../..', 'asciidoctor-diagram-java-1.3.1.jar'), File.dirname(__FILE__))
+            File.expand_path(File.join('../..', 'asciidoctor-diagram-java-1.3.2.jar'), File.dirname(__FILE__))
         ]
       end
 

spec/ditaa_spec.rb

@@ -118,4 +118,35 @@
     expect(target).to match /\.png$/
     expect(File.exists?(target)).to be true
   end
+
+  it "should support ditaa options as attributes" do
+    doc = <<-eos
+= Hello, PlantUML!
+Doc Writer <[email protected]>
+
+== First Section
+
+[ditaa, options="--no-shadows --no-separation --round-corners --scale 2.5"]
+----
++--------+   +-------+    +-------+
+|        | --+ ditaa +--> |       |
+|  Text  |   +-------+    |diagram|
+|Document|   |!magic!|    |       |
+|     {d}|   |       |    |       |
++---+----+   +-------+    +-------+
+    :                         ^
+    |       Lots of work      |
+    +-------------------------+
+----
+    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
+    target = b.attributes['target']
+    expect(target).to match /\.png$/
+    expect(File.exists?(target)).to be true
+  end
 end