asciidoctor-plantuml 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f6246a07cb6ee77b07fdecc5e32d30ef9def178
-  data.tar.gz: 995226fa46cd4ea93df420da01adb17f9456e6e5
+  metadata.gz: d237e41919909a5acb269df07453ddaacb86f70e
+  data.tar.gz: 8a9bf93e2949704fd34072d77dad08ba7c6a1153
 SHA512:
-  metadata.gz: b5718a88809d793a13d872a84e146acce5adb6d17561b15f2ad5f983d2b65fb876f5a3dbbb3d637e2f0bd5321cfb1944afbb14f87f920ecf5061c47b6467dcd1
-  data.tar.gz: e0864e23a800018aa552c7a96df18bb7c7985ab4d7a08d1ec4c91d3244d7f7b45afc5960006053c5b7fb81e751c3c75e6b3110339c45f3f0f2af492b817ae145
+  metadata.gz: 8966c1145904166a1ba1ab7c9a90eea626814025dffed69a9db7c5e3f65941b781188a72c5271b966d949851a97fbeb129b17a9e8e1791a8d2529358e2b4622b
+  data.tar.gz: 381214dd99a3b8f99a4ba692cc741206e601bd4ad4ecc85decf4024e3af8f6dd9da9f17cd8ac20d300ce421c057d654b5ebd9625002b14a3cdb3b16d08a8a5e0

data/lib/asciidoctor-plantuml/plantuml.rb

@@ -8,13 +8,13 @@ module Asciidoctor
 
     class Configuration
 
-      DEFAULT_URL = ENV["PLANTUML_URL"] || "http://localhost:8080/plantuml"
+      DEFAULT_URL = ENV["PLANTUML_URL"] || ""
 
-      attr_accessor :url, :test
+      attr_accessor :url, :txt_enable
 
       def initialize
         @url = DEFAULT_URL
-        @test = false
+        @txt_enable = true
       end
     end
 
@@ -43,17 +43,27 @@ module Asciidoctor
         PlantUml::configuration.url
       end
 
-      def plantuml_content(code, attrs = {})
+      def txt_enabled?
+        PlantUml::configuration.txt_enable
+      end
 
-        testing = attrs["test"] == "true"
+      def plantuml_content(code, attrs = {})
 
         format = attrs["format"] || DEFAULT_FORMAT
 
+        if !valid_uri?(server_url)
+          return plantuml_server_unavailable_content(server_url, attrs)
+        end
+
         case format
         when "png"
           plantuml_img_content(code, format, attrs)
         when "txt"
-          plantuml_txt_content(code, format, attrs)
+          if txt_enabled?
+            plantuml_txt_content(code, format, attrs)
+          else
+            plantuml_invalid_content(format, attrs)
+          end
         when "svg"
           plantuml_img_content(code, format, attrs)
         else
@@ -62,21 +72,23 @@ module Asciidoctor
       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
+          url = gen_url(code, format)
           open(url) do |f|
-            content += f.read
+            plantuml_ascii_content(f.read, format, attrs)
           end
         rescue
-          content += "Failed to query PlantUML server #{url}"
+          plantuml_img_content(code, format, attrs)
         end
+      end
 
+      def plantuml_ascii_content(code, format, attrs = {})
+        content = "<div class=\"listingblock\">"
+        content += "<div class=\"content\">"
+        content += "<pre "
+        content +="id=\"#{attrs['id']}\" " if attrs['id']
+        content +="class=\"plantuml\">\n"
+        content += code
         content +="</pre>"
         content += "</div>"
         content += "</div>"
@@ -178,6 +190,9 @@ module Asciidoctor
         return false
       end
 
+      def valid_uri?(uri)
+        !(uri =~ /\A#{URI::regexp(['http', 'https'])}\z/).nil?
+      end
 
       def create_plantuml_block(parent, content)
         Asciidoctor::Block.new parent, :pass, :content_model => :raw,

data/lib/asciidoctor-plantuml/version.rb

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

data/test/test_plantuml.rb

@@ -7,7 +7,7 @@ require "asciidoctor-plantuml"
 DOC_BASIC = <<-eos
 = Hello PlantUML!
 
-[plantuml, format="png", test="true"]
+[plantuml, format="png"]
 --
 User -> (Start)
 User --> (Use the application) : Label
@@ -17,7 +17,7 @@ eos
 DOC_BASIC2 = <<-eos
 = Hello PlantUML!
 
-[plantuml, format="png", test="true"]
+[plantuml, format="png"]
 @startuml
 User -> (Start)
 User --> (Use the application) : Label
@@ -27,7 +27,7 @@ eos
 DOC_ID = <<-eos
 = Hello PlantUML!
 
-[plantuml, format="png", test="true", id="myId"]
+[plantuml, format="png", id="myId"]
 User -> (Start)
 User --> (Use the application) : Label
 eos
@@ -35,7 +35,7 @@ eos
 DOC_DIM = <<-eos
 = Hello PlantUML!
 
-[plantuml, format="png", test="true", width="100px", height="50px"]
+[plantuml, format="png", width="100px", height="50px"]
 User -> (Start)
 User --> (Use the application) : Label
 eos
@@ -43,7 +43,7 @@ eos
 DOC_ALT = <<-eos
 = Hello PlantUML!
 
-[plantuml, format="png", test="true", alt="alt"]
+[plantuml, format="png", alt="alt"]
 User -> (Start)
 User --> (Use the application) : Label
 eos
@@ -51,7 +51,7 @@ eos
 DOC_BAD_FORMAT = <<-eos
 = Hello PlantUML!
 
-[plantuml, format="jpg", test="true"]
+[plantuml, format="jpg"]
 User -> (Start)
 User --> (Use the application) : Label
 eos
@@ -59,19 +59,29 @@ eos
 DOC_MULTI = <<-eos
 = Hello PlantUML!
 
-[plantuml, format="png", test="true"]
+[plantuml, format="png"]
 User -> (Start)
 User --> (Use the application) : Label
 
-[plantuml, format="png", test="true"]
+[plantuml, format="png"]
 User -> (Start)
 User --> (Use the application) : Label
 
-[plantuml, format="txt", test="true"]
+[plantuml, format="txt"]
 User -> (Start)
 User --> (Use the application) : Label
 eos
 
+DOC_TXT = <<-eos
+= Hello PlantUML!
+
+[plantuml, format="txt"]
+--
+User -> (Start)
+User --> (Use the application) : Label
+--
+eos
+
 class PlantUmlTest < Test::Unit::TestCase
 
   GENURL = "http://localhost:8080/plantuml/png/U9npA2v9B2efpStX2YrEBLBGjLFG20Q9Q4Bv804WIw4a8rKXiQ0W9pCviIGpFqzJmKh19p4fDOVB8JKl1QWT05kd5wq0"
@@ -79,6 +89,7 @@ class PlantUmlTest < Test::Unit::TestCase
   def setup
     Asciidoctor::PlantUml.configure do |c|
       c.url = "http://localhost:8080/plantuml"
+      c.txt_enable = true
     end
   end
 
@@ -168,11 +179,10 @@ class PlantUmlTest < Test::Unit::TestCase
     page = Nokogiri::HTML(html)
 
     elements = page.css('img.plantuml')
+    assert elements.size >= 2
 
-    assert_equal elements.size, 2
-
-    elements = page.css('pre.plantuml')
-    assert_equal elements.size, 1
+    elements = page.css('.plantuml-error')
+    assert_equal elements.size, 0
 
   end
 
@@ -186,8 +196,59 @@ class PlantUmlTest < Test::Unit::TestCase
     page = Nokogiri::HTML(html)
 
     elements = page.css('img.plantuml')
-    assert_equal elements.size, 2
+    assert_equal elements.size, 3
+
+    elements = page.css('.plantuml-error')
+    assert_equal elements.size, 0
+  end
+
+  def test_plantuml_invalid_uri
+
+    Asciidoctor::PlantUml.configure do |c|
+      c.url = "ftp://test.com"
+    end
+
+    html = ::Asciidoctor.convert(StringIO.new(DOC_BASIC), backend: "html5")
+    page = Nokogiri::HTML(html)
+    elements = page.css('pre.plantuml-error')
+    assert_equal elements.size, 1
+  end
+
+  def test_plantuml_nil_uri
+
+    Asciidoctor::PlantUml.configure do |c|
+      c.url = nil
+    end
 
+    html = ::Asciidoctor.convert(StringIO.new(DOC_BASIC), backend: "html5")
+    page = Nokogiri::HTML(html)
+    elements = page.css('pre.plantuml-error')
+    assert_equal elements.size, 1
   end
 
+  def test_plantuml_empty_uri
+
+    Asciidoctor::PlantUml.configure do |c|
+      c.url = ""
+    end
+
+    html = ::Asciidoctor.convert(StringIO.new(DOC_BASIC), backend: "html5")
+    page = Nokogiri::HTML(html)
+    elements = page.css('pre.plantuml-error')
+    assert_equal elements.size, 1
+  end
+
+  def test_disable_txt
+
+    Asciidoctor::PlantUml.configure do |c|
+      c.url = "http://localhost:8080/plantuml"
+      c.txt_enable = false
+    end
+
+    html = ::Asciidoctor.convert(StringIO.new(DOC_TXT), backend: "html5")
+    page = Nokogiri::HTML(html)
+    elements = page.css('pre.plantuml-error')
+    assert_equal elements.size, 1
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-plantuml
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Horacio Sanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler