asciidoctor-plantuml 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34593810e67a089ee25f0e4ebfb7e14a0b307c18
-  data.tar.gz: df526472cb4c78416f747fca5718d3800df0ce3f
+  metadata.gz: 7718a31ed4888ccbacef471e5e5fda271b371336
+  data.tar.gz: 7cf588d1ff45b671122be55961f007dcce2fdbb7
 SHA512:
-  metadata.gz: bba398cd880168512cb502dabeb581f5fcd8b060450507693efab5d02dc8ab07fe78544d32553f99ee03be963cb103a4e5f4442410bb340af046d6af9472741c
-  data.tar.gz: 1efcbd60cc11db47b30d6050e1fa9ca8abcd1f5c523628f545fada264f17055af493eb433400c99d99d531a21288eac027be84d38d23d1dd7a12c0fc6d3906f9
+  metadata.gz: bc542c286ccb6e1a9379560d3e3caa6dee8087de7f4f3d14cd0d43f27cef34df5e75a1051c9185f4376b9ba82b23f1a24656456ee90682024c81c322976f2f4a
+  data.tar.gz: 8fce5b5f981e13e0fd4dcad119b73a6685e64a58ad2ec2678e849bb2b58776cc98ea8288c8670346ea5c96dc0086b1ff23b8ca565f5a09128b290675efdf716b

data/lib/asciidoctor-plantuml/plantuml.rb

@@ -32,226 +32,223 @@ module Asciidoctor
       yield(configuration)
     end
 
-    module Processor
+    class Processor
 
       FORMATS = ["png", "svg", "txt"]
       DEFAULT_FORMAT = FORMATS[0]
 
-      def valid_format?(format)
-        FORMATS.include?(format)
-      end
+      class << self
+        def valid_format?(format)
+          FORMATS.include?(format)
+        end
 
-      def server_url
-        PlantUml::configuration.url
-      end
+        def server_url
+          PlantUml::configuration.url
+        end
 
-      def txt_enabled?
-        PlantUml::configuration.txt_enable
-      end
+        def txt_enabled?
+          PlantUml::configuration.txt_enable
+        end
 
-      def png_enabled?
-        PlantUml::configuration.png_enable
-      end
+        def png_enabled?
+          PlantUml::configuration.png_enable
+        end
 
-      def svg_enabled?
-        PlantUml::configuration.svg_enable
-      end
+        def svg_enabled?
+          PlantUml::configuration.svg_enable
+        end
 
-      def enabled?
-        txt_enabled? || png_enabled? || svg_enabled?
-      end
+        def enabled?
+          txt_enabled? || png_enabled? || svg_enabled?
+        end
 
-      def plantuml_content(code, attrs = {})
+        def plantuml_content(code, attrs = {})
 
-        format = attrs["format"] || DEFAULT_FORMAT
+          format = attrs["format"] || DEFAULT_FORMAT
 
-        if !enabled?
-          return plantuml_disabled_content(code, attrs)
-        end
+          if !enabled?
+            return plantuml_disabled_content(code, attrs)
+          end
 
-        if !valid_uri?(server_url)
-          return plantuml_server_unavailable_content(server_url, attrs)
-        end
+          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"
-          if txt_enabled?
-            plantuml_txt_content(code, format, attrs)
+          case format
+          when "png"
+            plantuml_img_content(code, format, attrs)
+          when "txt"
+            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
             plantuml_invalid_content(format, attrs)
           end
-        when "svg"
-          plantuml_img_content(code, format, attrs)
-        else
-          plantuml_invalid_content(format, attrs)
         end
-      end
 
-      def plantuml_txt_content(code, format, attrs = {})
-        begin
-          url = gen_url(code, format)
-          open(url) do |f|
-            plantuml_ascii_content(f.read, format, attrs)
+        # Compression code used to generate PlantUML URLs. Taken directly from the
+        # Transcoder class in the PlantUML java code.
+        def gen_url(text, format)
+          result = ""
+          compressedData = Zlib::Deflate.deflate(text)
+          compressedData.chars.each_slice(3) do |bytes|
+            #print bytes[0], ' ' , bytes[1] , ' ' , bytes[2]
+            b1 = bytes[0].nil? ? 0 : (bytes[0].ord & 0xFF)
+            b2 = bytes[1].nil? ? 0 : (bytes[1].ord & 0xFF)
+            b3 = bytes[2].nil? ? 0 : (bytes[2].ord & 0xFF)
+            result += append3bytes(b1, b2, b3)
           end
-        rescue
-          plantuml_img_content(code, format, attrs)
+          join_paths(server_url, "/#{format}/", result).to_s
         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>"
-      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
-
-      def plantuml_disabled_content(code, attrs = {})
-        content = "<div class=\"listingblock\">"
-        content += "<div class=\"content\">"
-        content += "<pre "
-        content +="id=\"#{attrs['id']}\" " if attrs['id']
-        content +="class=\"plantuml plantuml-error\">\n"
-        content += code
-        content +="</pre>"
-        content += "</div>"
-        content += "</div>"
-      end
+        private
 
+        def plantuml_txt_content(code, format, attrs = {})
+          begin
+            url = gen_url(code, format)
+            open(url) do |f|
+              plantuml_ascii_content(f.read, format, attrs)
+            end
+          rescue
+            plantuml_img_content(code, format, attrs)
+          end
+        end
 
-      # Compression code used to generate PlantUML URLs. Taken directly from the
-      # Transcoder class in the PlantUML java code.
-      def gen_url(text, format)
-        result = ""
-        compressedData = Zlib::Deflate.deflate(text)
-        compressedData.chars.each_slice(3) do |bytes|
-          #print bytes[0], ' ' , bytes[1] , ' ' , bytes[2]
-          b1 = bytes[0].nil? ? 0 : (bytes[0].ord & 0xFF)
-          b2 = bytes[1].nil? ? 0 : (bytes[1].ord & 0xFF)
-          b3 = bytes[2].nil? ? 0 : (bytes[2].ord & 0xFF)
-          result += append3bytes(b1, b2, b3)
+        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>"
         end
-        join_paths(server_url, "/#{format}/", result).to_s
-      end
 
-      def encode6bit(b)
-        if b < 10
-          return ('0'.ord + b).chr
+        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
-        b = b - 10
-        if b < 26
-          return ('A'.ord + b).chr
+
+        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
-        b = b - 26
-        if b < 26
-          return ('a'.ord + b).chr
+
+        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
-        b = b - 26
-        if b == 0
-          return '-'
+
+        def plantuml_disabled_content(code, attrs = {})
+          content = "<div class=\"listingblock\">"
+          content += "<div class=\"content\">"
+          content += "<pre "
+          content +="id=\"#{attrs['id']}\" " if attrs['id']
+          content +="class=\"plantuml plantuml-error\">\n"
+          content += code
+          content +="</pre>"
+          content += "</div>"
+          content += "</div>"
         end
-        if b == 1
-          return '_'
+
+        def encode6bit(b)
+          if b < 10
+            return ('0'.ord + b).chr
+          end
+          b = b - 10
+          if b < 26
+            return ('A'.ord + b).chr
+          end
+          b = b - 26
+          if b < 26
+            return ('a'.ord + b).chr
+          end
+          b = b - 26
+          if b == 0
+            return '-'
+          end
+          if b == 1
+            return '_'
+          end
+          return '?'
         end
-        return '?'
-      end
 
-      def append3bytes(b1, b2, b3)
-        c1 = b1 >> 2
-        c2 = ((b1 & 0x3) << 4) | (b2 >> 4)
-        c3 = ((b2 & 0xF) << 2) | (b3 >> 6)
-        c4 = b3 & 0x3F
-        return encode6bit(c1 & 0x3F).chr +
-               encode6bit(c2 & 0x3F).chr +
-               encode6bit(c3 & 0x3F).chr +
-               encode6bit(c4 & 0x3F).chr
-      end
+        def append3bytes(b1, b2, b3)
+          c1 = b1 >> 2
+          c2 = ((b1 & 0x3) << 4) | (b2 >> 4)
+          c3 = ((b2 & 0xF) << 2) | (b3 >> 6)
+          c4 = b3 & 0x3F
+          return encode6bit(c1 & 0x3F).chr +
+                 encode6bit(c2 & 0x3F).chr +
+                 encode6bit(c3 & 0x3F).chr +
+                 encode6bit(c4 & 0x3F).chr
+        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)
-        response = Net::HTTP.get_response(URI(check_url))
-        return response.is_a?(Net::HTTPSuccess)
-      rescue
-        return false
-      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)
+          response = Net::HTTP.get_response(URI(check_url))
+          return response.is_a?(Net::HTTPSuccess)
+        rescue
+          return false
+        end
 
-      def valid_uri?(uri)
-        !(uri =~ /\A#{URI::regexp(['http', 'https'])}\z/).nil?
-      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,
-          :source => content, :subs => :default
-      end
+        def join_paths(*paths, separator: '/')
+          paths = paths.compact.reject(&:empty?)
+          last = paths.length - 1
+          paths.each_with_index.map { |path, index|
+            expand_path(path, index, last, separator)
+          }.join
+        end
 
-      def join_paths(*paths, separator: '/')
-        paths = paths.compact.reject(&:empty?)
-        last = paths.length - 1
-        paths.each_with_index.map { |path, index|
-          expand_path(path, index, last, separator)
-        }.join
-      end
+        def expand_path(path, current, last, separator)
+          if path.start_with?(separator) && current != 0
+            path = path[1..-1]
+          end
 
-      def expand_path(path, current, last, separator)
-        if path.start_with?(separator) && current != 0
-          path = path[1..-1]
-        end
+          unless path.end_with?(separator) || current == last
+            path = [path, separator]
+          end
 
-        unless path.end_with?(separator) || current == last
-          path = [path, separator]
+          path
         end
-
-        path
       end
     end
 
     class BlockProcessor < Asciidoctor::Extensions::BlockProcessor
-      include Processor
 
       def process(parent, target, attrs)
 
@@ -265,11 +262,19 @@ module Asciidoctor
           lines += ["@enduml"]
         end
 
-        content = plantuml_content(lines.join("\n"), attrs)
+        content = Processor.plantuml_content(lines.join("\n"), attrs)
 
         return create_plantuml_block(parent, content)
 
       end
+
+      private
+
+      def create_plantuml_block(parent, content)
+        Asciidoctor::Block.new parent, :pass, :content_model => :raw,
+          :source => content, :subs => :default
+      end
+
     end
 
   end

data/lib/asciidoctor-plantuml/version.rb

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

metadata

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