asciidoctor-plantuml 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7718a31ed4888ccbacef471e5e5fda271b371336
-  data.tar.gz: 7cf588d1ff45b671122be55961f007dcce2fdbb7
+  metadata.gz: c25b4e32ecf70068397ea52deddddd097660da66
+  data.tar.gz: 9608a7e5e741c82d4a7dc778639acda1f4dd5df7
 SHA512:
-  metadata.gz: bc542c286ccb6e1a9379560d3e3caa6dee8087de7f4f3d14cd0d43f27cef34df5e75a1051c9185f4376b9ba82b23f1a24656456ee90682024c81c322976f2f4a
-  data.tar.gz: 8fce5b5f981e13e0fd4dcad119b73a6685e64a58ad2ec2678e849bb2b58776cc98ea8288c8670346ea5c96dc0086b1ff23b8ca565f5a09128b290675efdf716b
+  metadata.gz: 14f45816129d36158f4c704c1950f4b6ab7b7a84dc0371b4904892d5fa1d763fe2a3306fb7a45ed2ba4512fab5ddfa3e6a8255114ae08ccc82a5897122e5d808
+  data.tar.gz: 804afa9408568fb49611a736155e9d83723749d66e6f1a41c9470b73acfff91f88cb353e2b453d6b6485734019bc374fbe311006a1b229de540d7acd643bdfdb

data/lib/asciidoctor-plantuml/plantuml.rb

@@ -250,6 +250,11 @@ module Asciidoctor
 
     class BlockProcessor < Asciidoctor::Extensions::BlockProcessor
 
+      use_dsl
+      named :plantuml
+      on_context :listing
+      content_model :simple
+
       def process(parent, target, attrs)
 
         lines = target.lines
@@ -264,15 +269,15 @@ module Asciidoctor
 
         content = Processor.plantuml_content(lines.join("\n"), attrs)
 
-        return create_plantuml_block(parent, content)
+        return create_plantuml_block(parent, content, attrs)
 
       end
 
       private
 
-      def create_plantuml_block(parent, content)
-        Asciidoctor::Block.new parent, :pass, :content_model => :raw,
-          :source => content, :subs => :default
+      def create_plantuml_block(parent, content, attrs)
+        Asciidoctor::Block.new parent, :pass,  { content_model: :raw,
+                                      source: content, subs: :default }.merge(attrs)
       end
 
     end

data/lib/asciidoctor-plantuml/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module PlantUML
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/test/test_plantuml.rb

@@ -8,83 +8,115 @@ DOC_BASIC = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="png"]
---
+.Title Of this
+----
 User -> (Start)
 User --> (Use the application) : Label
---
+----
 eos
 
 DOC_BASIC2 = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="png"]
+.Title Of this
+[[fig-xref]]
+----
 @startuml
 User -> (Start)
 User --> (Use the application) : Label
 @enduml
+----
+eos
+
+DOC_BASIC3 = <<-eos
+= Hello Compound PlantUML!
+
+[plantuml, format="png"]
+----
+[COMP1]
+[COMP2]
+[COMP1] -> [COMP2]
+[COMP2] --> [COMP3]
+----
 eos
 
 DOC_ID = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="png", id="myId"]
+----
 User -> (Start)
 User --> (Use the application) : Label
+----
 eos
 
 DOC_DIM = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="png", width="100px", height="50px"]
+----
 User -> (Start)
 User --> (Use the application) : Label
+----
 eos
 
 DOC_ALT = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="png", alt="alt"]
+----
 User -> (Start)
 User --> (Use the application) : Label
+----
 eos
 
 DOC_BAD_FORMAT = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="jpg"]
+----
 User -> (Start)
 User --> (Use the application) : Label
+----
 eos
 
 DOC_MULTI = <<-eos
 = Hello PlantUML!
 
 [plantuml, format="png"]
+----
 User -> (Start)
 User --> (Use the application) : Label
+----
 
 [plantuml, format="png"]
+----
 User -> (Start)
 User --> (Use the application) : Label
+----
 
 [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"
+  GENURL2 = "http://localhost:8080/plantuml/png/U9npA2v9B2efpStXYdRszmqmZ8NGHh4mleAkdGAAa15G22Pc7Clba9gN0jGE00W75Cm0"
 
   def setup
     Asciidoctor::PlantUml.configure do |c|
@@ -120,6 +152,19 @@ class PlantUmlTest < Test::Unit::TestCase
     assert_equal GENURL, element["src"]
   end
 
+  def test_plantuml_block_processor3
+    html = ::Asciidoctor.convert(StringIO.new(DOC_BASIC3), backend: "html5")
+    page = Nokogiri::HTML(html)
+
+    elements = page.css('img.plantuml')
+
+    assert_equal elements.size, 1
+
+    element = elements.first
+
+    assert_equal GENURL2, element["src"]
+  end
+
   def test_plantuml_id_attribute
 
     html = ::Asciidoctor.convert(StringIO.new(DOC_ID), backend: "html5")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-plantuml
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Horacio Sanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler