asciidoctor-diagram 1.1.1-java → 1.1.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39492da724ad540e40f7ab2f94c2ddddb360d1dc
-  data.tar.gz: 71c56837a403619e4d2af14860bdfd5f3f269914
+  metadata.gz: f0f69b3d47bad0cef1b5b515d030c2bdd41ef13d
+  data.tar.gz: 84fab6e64ec3fc13e1638ab44c4104a20b369eb9
 SHA512:
-  metadata.gz: d4db4cf84706e5f043432d2915218563c590fa8d42cf4dceed49614e3c74d3e37169c1588d2d4a7338a604af5458bae178e229ddfff7cf2413b89b1f110fe371
-  data.tar.gz: 93428cb3c6066462496719501dc06d1d844d9f6ba3175fbd5a93c7d02c0cfebb9a5ba0d04b567e14556fcfb9392b98c4c05a30dea6c33e62a709b4c4844d03c3
+  metadata.gz: 5c7f3dea8bb76b394345bec0354ad49b1fc0d94be25ac1ce38b02528076c96f14dc2b1eac7860916153dd41c269db57c7cd4c38ef52ff6479ef4ea3d0a583d8d
+  data.tar.gz: c1ecba019813053288283abf6f529c6f0ca6eca836536445983e18028d1ce9fb09d9b6317725d8fb4f3f3c8b27041142287162a2a96091505dd5851362b407a9

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

@@ -39,7 +39,7 @@ module Asciidoctor
 
       def process_macro(parent, target, attributes)
         source = FileSource.new(File.expand_path(target, parent.document.attributes['docdir']))
-        attributes['target'] = File.basename(target, File.extname(target))
+        attributes['target'] ||= File.basename(target, File.extname(target))
 
         generate_block(parent, source, attributes)
       end
@@ -98,29 +98,26 @@ module Asciidoctor
         image_name = "#{target || ('diag-' + source.checksum)}.#{format}"
         image_dir = File.expand_path(parent.document.attributes['imagesdir'] || '', parent.document.attributes['docdir'])
         image_file = File.expand_path(image_name, image_dir)
+        metadata_file = File.expand_path("#{image_name}.cache", image_dir)
 
-        if source.newer_than?(image_file)
-          cache_file = File.expand_path("#{image_name}.cache", image_dir)
-
-          if File.exists? cache_file
-            metadata = File.open(cache_file, 'r') { |f| JSON.load f }
-          else
-            metadata = nil
-          end
+        if File.exists? metadata_file
+          metadata = File.open(metadata_file, 'r') { |f| JSON.load f }
+        else
+          metadata = {}
+        end
 
-          unless File.exists?(image_file) && metadata && metadata['checksum'] == source.checksum
-            params = IMAGE_PARAMS[format]
+        if source.should_process?(image_file, metadata['checksum'])
+          params = IMAGE_PARAMS[format]
 
-            result = generator_info[:generator].call(source.code, parent)
+          result = generator_info[:generator].call(source.code, parent)
 
-            result.force_encoding(params[:encoding])
+          result.force_encoding(params[:encoding])
 
-            metadata = {'checksum' => source.checksum}
-            metadata['width'], metadata['height'] = params[:decoder].get_image_size(result)
+          metadata = {'checksum' => source.checksum}
+          metadata['width'], metadata['height'] = params[:decoder].get_image_size(result)
 
-            File.open(image_file, 'w') { |f| f.write result }
-            File.open(cache_file, 'w') { |f| JSON.dump(metadata, f) }
-          end
+          File.open(image_file, 'wb') { |f| f.write result }
+          File.open(metadata_file, 'w') { |f| JSON.dump(metadata, f) }
         end
 
         attributes['target'] = image_name
@@ -154,14 +151,14 @@ module Asciidoctor
     end
 
     class Source
-      def newer_than?(image)
-        true
-      end
-
       def checksum
         @checksum ||= compute_checksum(code)
       end
 
+      def should_process?(image_file, old_checksum)
+        !File.exists?(image_file) || (newer_than?(image_file) && old_checksum != checksum)
+      end
+
       private
 
       def compute_checksum(code)
@@ -176,6 +173,10 @@ module Asciidoctor
         @reader = reader
       end
 
+      def newer_than?(image_file)
+        true
+      end
+
       def code
         @code ||= @reader.lines.join
       end
@@ -186,12 +187,12 @@ module Asciidoctor
         @file_name = file_name
       end
 
-      def code
-        @code ||= File.read(@file_name)
+      def newer_than?(image_file)
+        File.mtime(@file_name) > File.mtime(image_file)
       end
 
-      def newer_than?(image)
-        !File.exists?(image) || File.mtime(@file_name) > File.mtime(image)
+      def code
+        @code ||= File.read(@file_name)
       end
     end
   end

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.1.1"
+    VERSION = "1.1.3"
   end
 end

data/spec/plantuml_spec.rb

@@ -181,4 +181,94 @@ ArrowColor #DEADBE
     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
 end

data/spec/test_helper.rb

@@ -30,13 +30,18 @@ end
 RSpec.configure do |c|
   TEST_DIR = 'testing'
 
-  c.before(:all) do
-    #FileUtils.rm_r TEST_DIR if Dir.exists? TEST_DIR
+  c.before(:suite) do
+    FileUtils.rm_r TEST_DIR if Dir.exists? TEST_DIR
     FileUtils.mkdir_p TEST_DIR
   end
 
   c.around(:each) do |example|
-    test_dir = Dir.mktmpdir 'test', File.expand_path(TEST_DIR)
+    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)
 
     old_wd = Dir.pwd
     Dir.chdir test_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: java
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler