asciidoctor-plantuml 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed5ecef9a1e029694a9d18e2800a7a95869455e6
-  data.tar.gz: b47a156f1e832ac35092f3ff6dfec092ebda99a6
+  metadata.gz: 4f6246a07cb6ee77b07fdecc5e32d30ef9def178
+  data.tar.gz: 995226fa46cd4ea93df420da01adb17f9456e6e5
 SHA512:
-  metadata.gz: 4b8ee673ee3d5a3432a27d94bee9525e7e941791f6055a529300a5a065a1d659925d7d63b8a5d942e35ec4ec6ca11d2a5387232c9fb2cd2e28988b0500850742
-  data.tar.gz: 34a6ebd97cacd0ee47361c6ba1e62aa014f6e4ba028f0e7a43863a51212ae2985be179db107db811daf3094097453189d77938d3d65f3e5eac0ad5ba3f86cb22
+  metadata.gz: b5718a88809d793a13d872a84e146acce5adb6d17561b15f2ad5f983d2b65fb876f5a3dbbb3d637e2f0bd5321cfb1944afbb14f87f920ecf5061c47b6467dcd1
+  data.tar.gz: e0864e23a800018aa552c7a96df18bb7c7985ab4d7a08d1ec4c91d3244d7f7b45afc5960006053c5b7fb81e751c3c75e6b3110339c45f3f0f2af492b817ae145

data/lib/asciidoctor-plantuml/plantuml.rb

@@ -43,16 +43,84 @@ module Asciidoctor
         PlantUml::configuration.url
       end
 
-      def plantuml_content(code, format, attrs = {})
-        content = "<img "
+      def plantuml_content(code, attrs = {})
+
+        testing = attrs["test"] == "true"
+
+        format = attrs["format"] || DEFAULT_FORMAT
+
+        case format
+        when "png"
+          plantuml_img_content(code, format, attrs)
+        when "txt"
+          plantuml_txt_content(code, format, attrs)
+        when "svg"
+          plantuml_img_content(code, format, attrs)
+        else
+          plantuml_invalid_content(format, attrs)
+        end
+      end
+
+      def plantuml_txt_content(code, format, attrs = {})
+        url = gen_url(code, format)
+        content = "<div class=\"listingblock\">"
+        content += "<div class=\"content\">"
+        content += "<pre "
+        content +="id=\"#{attrs['id']}\" " if attrs['id']
+        content +="class=\"plantuml\">\n"
+
+        begin
+          open(url) do |f|
+            content += f.read
+          end
+        rescue
+          content += "Failed to query PlantUML server #{url}"
+        end
+
+        content +="</pre>"
+        content += "</div>"
+        content += "</div>"
+      end
+
+      def plantuml_img_content(code, format, attrs = {})
+        content = "<div class=\"imageblock\">"
+        content += "<div class=\"content\">"
+        content += "<img "
         content +="id=\"#{attrs['id']}\" " if attrs['id']
         content +="class=\"plantuml\" "
         content +="width=\"#{attrs['width']}\" " if attrs['width']
         content +="height=\"#{attrs['height']}\" " if attrs['height']
         content +="alt=\"#{attrs['alt']}\" " if attrs['alt']
         content +="src=\"#{gen_url(code, format)}\" />"
+        content += "</div>"
+        content += "</div>"
+      end
+
+      def plantuml_invalid_content(format, attrs = {})
+        content = "<div class=\"listingblock\">"
+        content += "<div class=\"content\">"
+        content += "<pre "
+        content +="id=\"#{attrs['id']}\" " if attrs['id']
+        content +="class=\"plantuml plantuml-error\"> "
+        content += "PlantUML Error: Invalid format \"#{format}\""
+        content +="</pre>"
+        content += "</div>"
+        content += "</div>"
+      end
+
+      def plantuml_server_unavailable_content(url, attrs = {})
+        content = "<div class=\"listingblock\">"
+        content += "<div class=\"content\">"
+        content += "<pre "
+        content +="id=\"#{attrs['id']}\" " if attrs['id']
+        content +="class=\"plantuml plantuml-error\"> "
+        content += "PlantUML Error: cannot connect to PlantUML server at \"#{url}\""
+        content +="</pre>"
+        content += "</div>"
+        content += "</div>"
       end
 
+
       # Compression code used to generate PlantUML URLs. Taken directly from the
       # Transcoder class in the PlantUML java code.
       def gen_url(text, format)
@@ -142,22 +210,6 @@ module Asciidoctor
 
       def process(parent, target, attrs)
 
-        testing = attrs["test"] == "true"
-
-        check_url = join_paths(server_url, "/png/SyfFKj2rKt3CoKnELR1Io4ZDoSa70000")
-
-        if ! check_server(check_url) && ! testing
-          content = "<div class='plantuml'>PlantUML server [#{check_url}] is unreachable</div>"
-          return create_plantuml_block(parent, content)
-        end
-
-        format = attrs["format"] || DEFAULT_FORMAT
-
-        if ! valid_format?(format)
-          content = "<div class='plantuml'>Invalid format #{format}</div>"
-          return create_plantuml_block(parent, content)
-        end
-
         lines = target.lines
 
         if !(target.lines[0] =~ /@startuml/)
@@ -168,7 +220,8 @@ module Asciidoctor
           lines += ["@enduml"]
         end
 
-        content = plantuml_content(lines.join("\n"), format, attrs)
+        content = plantuml_content(lines.join("\n"), attrs)
+
         return create_plantuml_block(parent, content)
 
       end

data/lib/asciidoctor-plantuml/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module PlantUML
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

data/test/test_plantuml.rb

@@ -8,8 +8,10 @@ DOC_BASIC = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="png", test="true"]
+--
 User -> (Start)
 User --> (Use the application) : Label
+--
 eos
 
 DOC_BASIC2 = <<-eos
@@ -61,6 +63,10 @@ DOC_MULTI = <<-eos
 User -> (Start)
 User --> (Use the application) : Label
 
+[plantuml, format="png", test="true"]
+User -> (Start)
+User --> (Use the application) : Label
+
 [plantuml, format="txt", test="true"]
 User -> (Start)
 User --> (Use the application) : Label
@@ -70,6 +76,12 @@ class PlantUmlTest < Test::Unit::TestCase
 
   GENURL = "http://localhost:8080/plantuml/png/U9npA2v9B2efpStX2YrEBLBGjLFG20Q9Q4Bv804WIw4a8rKXiQ0W9pCviIGpFqzJmKh19p4fDOVB8JKl1QWT05kd5wq0"
 
+  def setup
+    Asciidoctor::PlantUml.configure do |c|
+      c.url = "http://localhost:8080/plantuml"
+    end
+  end
+
   def test_plantuml_block_processor
 
     html = ::Asciidoctor.convert(StringIO.new(DOC_BASIC), backend: "html5")
@@ -145,11 +157,9 @@ class PlantUmlTest < Test::Unit::TestCase
 
     page = Nokogiri::HTML(html)
 
-    elements = page.css('img.plantuml')
-    assert_equal elements.size, 0
-
-    elements = page.css('div.plantuml')
+    elements = page.css('pre.plantuml-error')
     assert_equal elements.size, 1
+
   end
 
   def test_plantuml_multiple
@@ -161,6 +171,23 @@ class PlantUmlTest < Test::Unit::TestCase
 
     assert_equal elements.size, 2
 
+    elements = page.css('pre.plantuml')
+    assert_equal elements.size, 1
+
+  end
+
+  def test_plantuml_bad_server
+
+    Asciidoctor::PlantUml.configure do |c|
+      c.url = "http://nonexistent.com/plantuml"
+    end
+
+    html = ::Asciidoctor.convert(StringIO.new(DOC_MULTI), backend: "html5")
+    page = Nokogiri::HTML(html)
+
+    elements = page.css('img.plantuml')
+    assert_equal elements.size, 2
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-plantuml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Horacio Sanson