asciidoctor-plantuml 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b550934d0e6408099c74544fa93071a1c04f64392353e1a11a7388d1a897bc8a
-  data.tar.gz: cd0627162cf7f60af7d2b9fc2e4a7edd20c36ac429e4e7340129281968a14422
+  metadata.gz: a0eec1ab5b66560c09d54f1c5a44f4ca764b41fd8112a2c1ba791de3936ff4d8
+  data.tar.gz: a806b6892710155ae5d36aee9e3fe0830f30d4606ec8c6b27b3533187f389f80
 SHA512:
-  metadata.gz: 5d9131c6af8a5be72c7732afe20ac2fd9fd874c22774dafe0cfc37be4c94941d8ab3a1bddacdb973e9a4e7bff6b45a76c6d69b5bd9136375104d9415fff4cb0b
-  data.tar.gz: 8a200585455b8937b6d4f2f7772d3f77321c38de64633a81b2525c38b5e55050f6948870b2010b829cb8b8ce0fb912f77f5e9792a9cd0e548f58e7f93fe4bc07
+  metadata.gz: d4924630cd2c797eed3741a6f1b70c2f8eba15b781884a7b76934d090869570615712dd637be42d472610acbf4ea13894c07319c059a213aa9a3c2559e4ac305
+  data.tar.gz: 4243885ff01513113b5e34412532196b708250cba696c0c094b7a77cb96c656b2302a60aabd37589a6ee398df401506b76cb929ed3ac5631efa54928af580dce

data/lib/asciidoctor_plantuml/plantuml.rb

@@ -12,14 +12,16 @@ module Asciidoctor
     # PlantUML Configuration
     class Configuration
       DEFAULT_URL = ENV['PLANTUML_URL'] || ''
+      DEFAULT_ENCODING = ENV['PLANTUML_ENCODING'] || 'legacy'
 
-      attr_accessor :url, :txt_enable, :svg_enable, :png_enable
+      attr_accessor :url, :txt_enable, :svg_enable, :png_enable, :encoding
 
       def initialize
         @url = DEFAULT_URL
         @txt_enable = true
         @svg_enable = true
         @png_enable = true
+        @encoding = DEFAULT_ENCODING
       end
     end
 
@@ -39,6 +41,13 @@ module Asciidoctor
     class Processor
       FORMATS = %w[png svg txt].freeze
       DEFAULT_FORMAT = FORMATS[0]
+
+      ENCODINGS = %w[legacy deflate].freeze
+      DEFAULT_ENCODING = ENCODINGS[0]
+
+      ENCODINGS_MAGIC_STRINGS_MAP = Hash.new('')
+      ENCODINGS_MAGIC_STRINGS_MAP['deflate'] = '~1'
+
       URI_SCHEMES_REGEXP = ::URI::DEFAULT_PARSER.make_regexp(%w[http https])
 
       class << self
@@ -46,6 +55,10 @@ module Asciidoctor
           FORMATS.include?(format)
         end
 
+        def valid_encoding?(encoding)
+          ENCODINGS.include?(encoding)
+        end
+
         def server_url
           PlantUml.configuration.url
         end
@@ -92,6 +105,7 @@ module Asciidoctor
         # the transcoder class in the PlantUML java code.
         def gen_url(text, format)
           result = ''
+          result += encoding_magic_prefix
           compressed_data = Zlib::Deflate.deflate(text)
           compressed_data.chars.each_slice(3) do |bytes|
             # print bytes[0], ' ' , bytes[1] , ' ' , bytes[2]
@@ -204,6 +218,10 @@ module Asciidoctor
             encode6bit(c4 & 0x3F).chr
         end
 
+        def encoding_magic_prefix
+          ENCODINGS_MAGIC_STRINGS_MAP[PlantUml.configuration.encoding]
+        end
+
         # Make a call to the PlantUML server with the simplest diagram possible
         # to check if the server is available or not.
         def check_server(check_url)

data/lib/asciidoctor_plantuml/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PlantUML
-    VERSION = '0.0.11'
+    VERSION = '0.0.12'
   end
 end

data/test/test_plantuml.rb

@@ -118,6 +118,7 @@ ENDOFSTRING
 class PlantUmlTest < Test::Unit::TestCase
   GENURL = 'http://localhost:8080/plantuml/png/U9npA2v9B2efpStX2YrEBLBGjLFG20Q9Q4Bv804WIw4a8rKXiQ0W9pCviIGpFqzJmKh19p4fDOVB8JKl1QWT05kd5wq0'
   GENURL2 = 'http://localhost:8080/plantuml/png/U9npA2v9B2efpStXYdRszmqmZ8NGHh4mleAkdGAAa15G22Pc7Clba9gN0jGE00W75Cm0'
+  GENURL_ENCODING = 'http://localhost:8080/plantuml/png/~1U9npA2v9B2efpStX2YrEBLBGjLFG20Q9Q4Bv804WIw4a8rKXiQ0W9pCviIGpFqzJmKh19p4fDOVB8JKl1QWT05kd5wq0'
 
   def setup
     Asciidoctor::PlantUml.configure do |c|
@@ -165,6 +166,23 @@ class PlantUmlTest < Test::Unit::TestCase
     assert_equal GENURL2, element['src']
   end
 
+  def test_plantuml_block_processor_encoding
+    Asciidoctor::PlantUml.configure do |c|
+      c.encoding = 'deflate'
+    end
+
+    html = ::Asciidoctor.convert(StringIO.new(DOC_BASIC), backend: 'html5')
+    page = Nokogiri::HTML(html)
+
+    elements = page.css('img.plantuml')
+
+    assert_equal elements.size, 1
+
+    element = elements.first
+
+    assert_equal GENURL_ENCODING, element['src']
+  end
+
   def test_plantuml_id_attribute
     html = ::Asciidoctor.convert(StringIO.new(DOC_ID), backend: 'html5')
     page = Nokogiri::HTML(html)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-plantuml
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Horacio Sanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler