asciidoctor-diagram 1.3.0.preview.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2afa05e275154704010cd26743547999d25f7b
-  data.tar.gz: 35f0709598867295eeca7435718eaad9e7f6cae4
+  metadata.gz: 3a2f204cc0c29acb26136512bd4a8d50b94eb19d
+  data.tar.gz: 0115d195b3546f4ab1a1967a45891769b4d28fb5
 SHA512:
-  metadata.gz: 4c5137cb403ced6164b826f22c76f485c0bd75e89b6017ea83c96c939fe97987d5576e3caa808a8b3f42082e428098a831c379a97e5f1f445da3270ff4e6d041
-  data.tar.gz: 1a4608f53e812b5c1cc205c24636d3fefaa5149c33410ca6ceace5402ef11d289695cc74a6846381b3689f3fd9ff127973bdc0104ea26a86e0649a57e3ec410c
+  metadata.gz: 8bedbbef25acb0ea9d0617b67521f8b92f57a66a730f58b35090e221936cc3ee3a1ff76af260f78f7ccec6e88467188744b048e9997701c46d667e37f2f142f6
+  data.tar.gz: fc0668cb0299126c80f392efccba75c8eda819a835e69b3c27c99fd57c50d1d4b312271bba3cbae7cbebf34a23dbd56a7adfd470a7a48fe8079fb3b4ae210345

data/lib/asciidoctor-diagram/ditaa/extension.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 require_relative '../extensions'
 require_relative '../util/java'
 
@@ -5,19 +7,19 @@ module Asciidoctor
   module Diagram
     # @private
     module Ditaa
-      JARS = ['ditaamini0_9.jar'].map do |jar|
+      JARS = ['ditaamini-0.10.jar'].map do |jar|
         File.expand_path File.join('../..', jar), File.dirname(__FILE__)
       end
       Java.classpath.concat JARS
 
-      def ditaa(code, attrs)
+      def ditaa(code, source)
         Java.load
 
         response = Java.send_request(
             :url => '/ditaa',
             :body => code,
             :headers => {
-                'X-Options' => attrs.delete('options') || ''
+                'X-Options' => source.options
             }
         )
 
@@ -29,25 +31,56 @@ module Asciidoctor
       end
 
       def self.included(mod)
-        mod.register_format(:png, :image) do |c, _, attrs|
-          ditaa(c.to_s, attrs)
+        mod.register_format(:png, :image) do |c, _, source|
+          ditaa(c.to_s, source)
         end
       end
 
       def create_source(parent, reader, attributes)
         source = super(parent, reader, attributes)
         source.extend DitaaSource
+
+        source.init_ditaa_options(parent, attributes)
+
         source
       end
 
       module DitaaSource
+        attr_reader :options
+
+        OPTIONS = {
+          'scale' => lambda { |o, v| o << '--scale' << v if v },
+          'tabs' => lambda { |o, v| o << '--tabs' << v if v },
+          'background' => lambda { |o, v| o << '--background' << v if v },
+          'antialias' => lambda { |o, v| o << '--no-antialias' if v == 'false' },
+          'separation' => lambda { |o, v| o  << '--no-separation' if v == 'false'},
+          'round-corners' => lambda { |o, v| o  << '--round-corners' if v == 'true'},
+          'shadows' => lambda { |o, v| o  << '--no-shadows' if v == 'false'},
+          'debug' => lambda { |o, v| o  << '--debug' if v == 'true'},
+          'fixed-slope' => lambda { |o, v| o  << '--fixed-slope' if v == 'true'},
+          'transparent' => lambda { |o, v| o  << '--transparent' if v == 'true'}
+        }
+
+        def init_ditaa_options(parent, attributes)
+          global_attributes = parent.document.attributes
+
+          options = []
+
+          OPTIONS.keys.each do |key|
+            value = attributes.delete(key) || global_attributes["ditaa-option-#{key}"]
+            OPTIONS[key].call(options, value)
+          end
+
+          @options = options.join(' ')
+        end
+
         def should_process?(image_file, image_metadata)
-          super(image_file, image_metadata) || image_metadata['options'] != attributes['options']
+          super(image_file, image_metadata) || image_metadata['options'] != @options
         end
 
         def create_image_metadata
           metadata = super
-          metadata['options'] = attributes['options']
+          metadata['options'] = @options
           metadata
         end
       end

data/lib/asciidoctor-diagram/extensions.rb

@@ -84,9 +84,9 @@ module Asciidoctor
         # @param attributes [Hash] the attributes of the block or block macro
         # @return [Asciidoctor::AbstractBlock] a new block that replaces the original block or block macro
         def process(parent, reader_or_target, attributes)
-          source = create_source(parent, reader_or_target, attributes)
+          source = create_source(parent, reader_or_target, attributes.dup)
 
-          format = attributes.delete('format') || self.class.default_format
+          format = source.attributes.delete('format') || self.class.default_format
           format = format.to_sym if format.respond_to?(:to_sym)
 
           raise "Format undefined" unless format
@@ -98,9 +98,9 @@ module Asciidoctor
           begin
             case generator_info[:type]
               when :literal
-                create_literal_block(parent, source, attributes, generator_info)
+                create_literal_block(parent, source, generator_info)
               else
-                create_image_block(parent, source, attributes, format, generator_info)
+                create_image_block(parent, source, format, generator_info)
             end
           rescue => e
             text = "Failed to generate image: #{e.message}"
@@ -129,7 +129,7 @@ module Asciidoctor
         end
 
         private
-        def create_image_block(parent, source, attributes, format, generator_info)
+        def create_image_block(parent, source, format, generator_info)
           image_name = "#{source.image_name}.#{format}"
           image_dir = image_output_dir(parent)
           image_file = parent.normalize_system_path image_name, image_dir
@@ -141,12 +141,12 @@ module Asciidoctor
             metadata = {}
           end
 
-          image_attributes = attributes.dup
+          image_attributes = source.attributes
 
           if !File.exists?(image_file) || source.should_process?(image_file, metadata)
             params = IMAGE_PARAMS[format]
 
-            result = instance_exec(source, parent, image_attributes, &generator_info[:generator])
+            result = instance_exec(source, parent, source, &generator_info[:generator])
 
             result.force_encoding(params[:encoding])
 
@@ -161,8 +161,8 @@ module Asciidoctor
           image_attributes['target'] = image_name
 
           scale = image_attributes['scale']
-          if scalematch = /(\d+)%/.match(scale)
-            scale_factor = scalematch[1].to_i / 100.0
+          if scalematch = /(\d+(?:\.\d+))/.match(scale)
+            scale_factor = scalematch[1].to_f
           else
             scale_factor = 1.0
           end
@@ -177,9 +177,9 @@ module Asciidoctor
             end
           end
 
-          image_attributes['alt'] ||= if title_text = attributes['title']
+          image_attributes['alt'] ||= if title_text = image_attributes['title']
                                         title_text
-                                      elsif target = attributes['target']
+                                      elsif target = image_attributes['target']
                                         (File.basename(target, File.extname(target)) || '').tr '_-', ' '
                                       else
                                         'Diagram'
@@ -213,8 +213,8 @@ module Asciidoctor
           parent.normalize_system_path(images_dir, base_dir)
         end
 
-        def create_literal_block(parent, source, attributes, generator_info)
-          literal_attributes = attributes.dup
+        def create_literal_block(parent, source, generator_info)
+          literal_attributes = source.attributes
           literal_attributes.delete('target')
 
           result = instance_exec(source, parent, &generator_info[:generator])
@@ -254,7 +254,7 @@ module Asciidoctor
         #
         # @return [FileSource] a FileSource
         def create_source(parent, target, attributes)
-          FileSource.new(File.expand_path(target, parent.document.attributes['docdir']), attributes)
+          FileSource.new(File.expand_path(target, parent.document.base_dir), attributes)
         end
       end
 
@@ -366,7 +366,9 @@ module Asciidoctor
         end
 
         def code
-          @code ||= File.read(@file_name)
+          lines = File.readlines(@file_name)
+          lines = ::Asciidoctor::Helpers.normalize_lines(lines)
+          @code ||= lines.join("\n")
         end
       end
     end

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

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

data/lib/asciidoctor-diagram/version.rb

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

data/spec/ditaa_spec.rb

@@ -121,12 +121,14 @@ Doc Writer <doc@example.com>
 
   it "should support ditaa options as attributes" do
     doc = <<-eos
+:ditaa-option-antialias: false
+:ditaa-option-round-corners: true
 = Hello, PlantUML!
 Doc Writer <doc@example.com>
 
 == First Section
 
-[ditaa, options="--no-shadows --no-separation --round-corners --scale 2.5"]
+[ditaa, shadows=false, separation=false, round-corners=false, scale=2.3]
 ----
 +--------+   +-------+    +-------+
 |        | --+ ditaa +--> |       |
@@ -157,7 +159,7 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-[ditaa, options="{opts}"]
+[ditaa, {opts}]
 ----
 +--------+   +-------+    +-------+
 |        | --+ ditaa +--> |       |
@@ -171,14 +173,14 @@ Doc Writer <doc@example.com>
 ----
     eos
 
-    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'no-shadow'))
+    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'shadow=false'))
     b = d.find { |b| b.context == :image }
     target = b.attributes['target']
     mtime1 = File.mtime(target)
 
     sleep 1
 
-    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'round-corners'))
+    d = Asciidoctor.load StringIO.new(doc.sub('{opts}', 'round-corners=true'))
 
     mtime2 = File.mtime(target)
 

data/spec/plantuml_spec.rb

@@ -470,7 +470,7 @@ Doc Writer <doc@example.com>
 
 == First Section
 
-[plantuml, format="png", scale="150%"]
+[plantuml, format="png", scale="1.5"]
 ----
 A -> B
 ----

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.3.0.preview.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ files:
 - examples/README.adoc
 - examples/design.adoc
 - examples/features.adoc
-- lib/asciidoctor-diagram-java-1.3.2.jar
+- lib/asciidoctor-diagram-java-1.3.4.jar
 - lib/asciidoctor-diagram.rb
 - lib/asciidoctor-diagram/blockdiag.rb
 - lib/asciidoctor-diagram/blockdiag/extension.rb
@@ -104,7 +104,7 @@ files:
 - lib/asciidoctor-diagram/util/svg.rb
 - lib/asciidoctor-diagram/util/which.rb
 - lib/asciidoctor-diagram/version.rb
-- lib/ditaamini0_9.jar
+- lib/ditaamini-0.10.jar
 - lib/plantuml.jar
 - spec/blockdiag_spec.rb
 - spec/ditaa_spec.rb
@@ -127,12 +127,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation