asciidoctor-diagram 1.2.0.preview.1-java → 1.2.0.preview.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe98da9ad5dba77722c3e092814cd6657260826
-  data.tar.gz: 47ba6fae4b23ef051f04e0bdab19eb3d8399ac67
+  metadata.gz: 952619d93cde27f68bf1739980da524a726ffdc5
+  data.tar.gz: 3410e9e1a782f07fd8e9143118f08b6f3b7a9739
 SHA512:
-  metadata.gz: e491ad1eb615aadaa1da87b761ad51dd5e423fd35c3ac587dde39a9cd4194459cca0eaaa114445afbf34ab8ea55099a3c77ba350d3679cdff6c7fee6763758b1
-  data.tar.gz: 9995f7236fa0d66b17e293d094e8c391a5500a0a220e9c670983fd0956d09eb958c44ffd8d97e03483ed9ca7fe9be5d39ff66ba4af7bdf394e9d787fa164b6f0
+  metadata.gz: 81352018260910259419b91d3d4858206b4b5cc762f4b3504bd12eb325233d191469fd697a3257c9c6c8420414d9136e0d6090c34c122e29d442bc8b6e6fb7f0
+  data.tar.gz: 37fbe270d7885a05cf16e6301be67ba0a7c5c51e79c74013bef0e13c95978197b575bb0f516d8cd2e006f839a1b422384ee3f0c666af7f5205a56e4361e3737c

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("\n")
       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.2.0.preview.1"
+    VERSION = "1.2.0.preview.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,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.2.0.preview.1
+  version: 1.2.0.preview.3
 platform: java
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-27 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.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An extension for asciidoctor that adds support for UML diagram generation