asciidoctor-diagram 1.5.4 → 1.5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d38f932148312e67e4249a2c171c71da2c796a49
-  data.tar.gz: c50317e4443b383f73be0b3e068364185cba7a97
+  metadata.gz: de0f65375e0acd83e5884ac89c8151c1fb84fd58
+  data.tar.gz: 6866a207a0e8976c4d8adde384815d22bd8be118
 SHA512:
-  metadata.gz: 9d8544bb90e946c5b20b9e675268e519cf52f9dd89a3b054b4214a9c1b3dff59d6ce9683569616c3ed9d81441dc089179cb559e1569b1c11e4d586f99d457a41
-  data.tar.gz: d26cbf53122d923276a543f49efe434ba8690fbb85ba0e44ced6c52bd4c24779fb110bcef1c3f03c29f5b731dfc15c4a30c06d78516742987815c70a6d6886ab
+  metadata.gz: 17ea60fdf32b733cfc6708a800b69b538ad280148430286c8b7d896f710fd98b3b1209879971e399497073b8d7fa14fdd71d3bdcaec50403b2af8595080b61d4
+  data.tar.gz: f877d2242b1187f7f20173675950257fde3b749842eb896b2a4fee2a6d77cebedeb2d2ba38e338c4beca6095058a3ac3d22b149d4e63ce2b9b6ee39a51fc9f5d

data/CHANGELOG.adoc

@@ -1,5 +1,11 @@
 = Asciidoctor-diagram Changelog
 
+== 1.5.4.1
+
+Enhancements::
+
+  * Resolve compatibility issues with Asciidoctor 1.5.6 (@robertpanzer, @mojavelinux)
+
 == 1.5.4
 
 Enhancements::

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

@@ -21,9 +21,9 @@ module Asciidoctor
 
       def mermaid(parent_block, source, format)
         mermaid = which(parent_block, 'mermaid')
-        @is_mermaid_v6 ||= ::Asciidoctor::Diagram::Cli.run(mermaid, '--version').split('.')[0].to_i >= 6
+        config['mermaid>=6'] ||= ::Asciidoctor::Diagram::Cli.run(mermaid, '--version').split('.')[0].to_i >= 6
         # Mermaid >= 6.0.0 requires PhantomJS 2.1; older version required 1.9
-        phantomjs = which(parent_block, 'phantomjs', :alt_attrs => [@is_mermaid_v6 ? 'phantomjs_2' : 'phantomjs_19'])
+        phantomjs = which(parent_block, 'phantomjs', :alt_attrs => [config['mermaid>=6'] ? 'phantomjs_2' : 'phantomjs_19'])
 
         css = source.attr('css', nil, 'mermaid')
         if css

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

@@ -20,10 +20,10 @@ module Asciidoctor
         attr_names = options[:attrs] || options.fetch(:alt_attrs, []) + [cmd]
         cmd_names = [cmd] + options.fetch(:alt_cmds, [])
 
-        cmd_var = '@' + attr_names[0]
+        cmd_var = 'cmd-' + attr_names[0]
 
-        if instance_variable_defined?(cmd_var)
-          cmd_path = instance_variable_get(cmd_var)
+        if config.key? cmd_var
+          cmd_path = config[cmd_var]
         else
           cmd_path = attr_names.map { |attr_name| parent_block.attr(attr_name, nil, true) }.find { |attr| !attr.nil? }
 
@@ -35,7 +35,7 @@ module Asciidoctor
             cmd_path = cmd_paths.reject { |c| c.nil? }.first
           end
 
-          instance_variable_set(cmd_var, cmd_path)
+          config[cmd_var] = cmd_path
 
           if cmd_path.nil? && options.fetch(:raise_on_error, true)
             raise "Could not find the #{cmd_names.map { |c| "'#{c}'" }.join(', ')} executable in PATH; add it to the PATH or specify its location using the '#{attr_names[0]}' document attribute"

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.5.4"
+    VERSION = "1.5.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.4.1
 platform: ruby
 authors:
 - Pepijn Van Eeckhoudt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler