markdoc 1.1.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: a313ccc3aef3a547c0d688e8a84dac9097c6fad2e7e5e27e46475311646e1e67
+  data.tar.gz: 4491396850eac63988494d4e68f110db83813304a9cc1bab00458eb5875e497e
+SHA512:
+  metadata.gz: 949e3a80919e9b9b54f624b659c5bbb72ca0cf9b7746c9080dd8fd08a27b012147099cc2c50397d68694f05a717eb8265d14bb058146b8174416cb59dbce9db3
+  data.tar.gz: a32fbb8e268d9035ff15c4b2d93726e48a9bb5ab3fb9af6e13c95a7d8979f7b6ee57b1d469c23871c6179b3d2b83c0da9c6658351cf8932a66c6ecf777682f7b

data/bin/markdoc

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'markdoc'
 

data/bin/pseudo2svg

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Pseudo code to Graphviz converter
 #

data/bin/sequence2svg

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Sequence definition to image converter using sequence.pic macros.
 #   http://www.umlgraph.org/doc/seq-intro.html

data/lib/markdoc/pseudocode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'polyglot'
 require 'treetop'
 
@@ -13,14 +15,17 @@ module Markdoc
 
     class ActionLiteral < Treetop::Runtime::SyntaxNode
       def out(file)
-        file.write %Q(#{id} [shape=box label="#{label}"]\n)
+        file.write %(#{id} [shape=box label="#{label}"]\n)
       end
+
       def id
         sentence.id
       end
+
       def label
         sentence.value
       end
+
       def ends
         [id]
       end
@@ -28,33 +33,34 @@ module Markdoc
 
     class IfLiteral < Treetop::Runtime::SyntaxNode
       def out(file)
-        file.write %Q(#{id} [shape=diamond label="#{cond.value}"]\n)
+        file.write %(#{id} [shape=diamond label="#{cond.value}"]\n)
 
         unless yes.nil?
           yes.out(file)
-          file.write %Q(  #{id} -> #{yes.id} [label="Yes"]\n)
+          file.write %(  #{id} -> #{yes.id} [label="Yes"]\n)
         end
         unless no.nil?
           no.out(file)
-          file.write %Q(  #{id} -> #{no.id} [label="No"]\n)
+          file.write %(  #{id} -> #{no.id} [label="No"]\n)
         end
       end
 
       def id
         cond.id
       end
+
       def ends
         ary = []
-        if yes.elements.empty?
-          ary << yes.id
-        else
-          ary << yes.elements.last.ends
-        end
-        if no.elements.empty?
-          ary << no.id
-        else
-          ary << no.elements.last.ends
-        end
+        ary << if yes.elements.empty?
+                 yes.id
+               else
+                 yes.elements.last.ends
+               end
+        ary << if no.elements.empty?
+                 no.id
+               else
+                 no.elements.last.ends
+               end
         ary.flatten
       end
     end
@@ -63,6 +69,7 @@ module Markdoc
       def value
         text_value.strip
       end
+
       def id
         @id ||= Register.id
       end
@@ -73,11 +80,10 @@ module Markdoc
         prev = nil
         elements.each do |node|
           next if node.nil?
+
           node.out(file)
-          unless prev.nil?
-            prev.ends.each do |endid|
-              file.write %Q(#{endid} -> #{node.id}\n)
-            end
+          prev&.ends&.each do |endid|
+            file.write %(#{endid} -> #{node.id}\n)
           end
           prev = node
         end
@@ -90,11 +96,11 @@ module Markdoc
       def ends
         ary = []
         elements.each do |node|
-          if node.elements.empty?
-            ary << node.id
-          else
-            ary << node.ends
-          end
+          ary << if node.elements.empty?
+                   node.id
+                 else
+                   node.ends
+                 end
         end
         ary.flatten
       end
@@ -104,7 +110,7 @@ module Markdoc
       parser = PseudocodeParser.new
       tree = parser.parse(code)
 
-      if(tree.nil?)
+      if tree.nil?
         puts parser.failure_reason
         raise "Can't generate graphviz code"
       else
@@ -118,9 +124,7 @@ module Markdoc
           graphviz = file.path
         end
 
-        if format == :graphviz
-          return IO.read(graphviz)
-        end
+        return IO.read(graphviz) if format == :graphviz
 
         image = Tempfile.new([digest, ".#{format}"])
         image.close

data/lib/markdoc/renderer.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'redcarpet'
 require 'pygments'
 
 module Markdoc
   class Renderer < Redcarpet::Render::HTML
-
     def block_code(code, language)
       case language
       when 'pseudo', 'pseudocode'
@@ -17,27 +18,27 @@ module Markdoc
 
     # removes xml or doctype meta info
     def wrap_svg(source)
-      stripped = source.
-                 sub(/<\?xml[^>]+>/i, '').
-                 sub(/<!DOCTYPE[^>]+>/im, '').
-                 gsub(/<!\-\-[^>]+\-\->/, '')
+      stripped = source
+                 .sub(/<\?xml[^>]+>/i, '')
+                 .sub(/<!DOCTYPE[^>]+>/im, '')
+                 .gsub(/<!--[^>]+-->/, '')
 
-      %Q(<div class="svg-holder">\n#{stripped}\n</div>)
+      %(<div class="svg-holder">\n#{stripped}\n</div>)
     end
 
     def doc_header
-      <<-END
-<html>
-<head>
-  <title>Doc</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <style>
-#{IO.read File.expand_path('../../../css/style.css', __FILE__)}
-#{IO.read File.expand_path('../../../css/pygments.css', __FILE__)}
-  </style>
-</head>
-<body>
-END
+      <<~HEADER
+        <html>
+        <head>
+          <title>Doc</title>
+          <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+          <style>
+        #{IO.read File.expand_path('../../css/style.css', __dir__)}
+        #{IO.read File.expand_path('../../css/pygments.css', __dir__)}
+          </style>
+        </head>
+        <body>
+      HEADER
     end
 
     def doc_footer

data/lib/markdoc/sequence.rb

@@ -1,210 +1,319 @@
+# frozen_string_literal: false
+
 module Markdoc
   module Sequence
-    def self.draw(code, format = :svg)
-      parser = Parser.new(code)
+    DEFAULTS = {
+      diagram: {
+        offsetx: 10,
+        offsety: 10,
+        width: 900,
+        height: 600
+      },
+      role: {
+        font: "'Roboto Condensed', sans-serif",
+        border: '#3c4260',
+        fill: '#dcd7d7',
+        radius: 2,
+        spacing: 100,
+        width: 100,
+        height: 55,
+        line: 3
+      },
+      message: {
+        color: '#3c4260',
+        font: "'Roboto Condensed', sans-serif",
+        size: 11,
+        spacing: 40,
+        offset: 100, # from top
+        line: 3,
+        dash: '4,2'
+      }
+    }.freeze
+
+    def self.draw(code)
+      diagram = Diagram.new(code)
+      diagram.parse
+      diagram.print
+    end
 
-      digest = Digest::MD5.hexdigest code
+    class Role
+      include Comparable
+
+      attr_accessor :id, :label, :messages, :column,
+                    :offsetx, :offsety, :border, :fill, :radius, :spacing, :width, :height, :line, :font,
+                    :prev, :succ
+
+      def initialize(args)
+        self.messages = []
+        self.id = args[:id].strip
+        self.label = args[:label].strip
 
-      pic = nil
-      Tempfile.open([digest, '.pic']) do |file|
-        file.write parser.parse
-        pic = file.path
+        # ui settings
+        self.column = args[:column]
+        self.offsetx = args[:diagram][:offsetx]
+        self.offsety = args[:diagram][:offsety]
+        self.border = args[:ui][:border]
+        self.fill = args[:ui][:fill]
+        self.radius = args[:ui][:radius]
+        self.spacing = args[:ui][:spacing]
+        self.width = args[:ui][:width]
+        self.height = args[:ui][:height]
+        self.line = args[:ui][:line]
+        self.font = args[:ui][:font]
       end
 
-      if format == :pic
-        return IO.read(pic)
+      def <=>(other)
+        column <=> other.column
       end
 
-      image = Tempfile.new([digest, ".#{format}"])
-      image.close
+      def type
+        case label
+        when /actor/i
+          :actor
+        when /database/i
+          :database
+        when /site|web/i
+          :website
+        when /application|system/i
+          :system
+        else
+          :component
+        end
+      end
 
-      if system("pic2plot -T#{format} #{pic} > #{image.path}")
-        IO.read image
-      else
-        raise "Can't generate sequence diagram"
+      def center
+        x + width / 2
       end
-    end
 
-    class Role
-      attr_accessor :type, :id, :label, :active
-      def initialize(type, id, label)
-        self.type, self.id, self.label = type, id, label
-        self.active = false
+      def x
+        offsetx + column * (width + spacing)
       end
-      def activate
-        return if active
-        self.active = true
-        "active(#{id});"
+
+      def y
+        offsety
       end
-      def deactivate
-        return unless active
-        self.active = false
-        "inactive(#{id});"
+
+      def print
+        elements = []
+        case type
+        when :actor
+          elements << %[<g transform="translate(#{x + 10},0)"><path d="M74,64 a30,30 0 0,0 -27,-27 a16,18 0 1,0 -16,0 a30,30 0, 0,0 -27,27 z" stroke-width="#{line}" fill="#{fill}" stroke="#{border}"/></g>]
+          elements << %(<text x="#{x + 46 - 2 * id.size}" y="#{y + height - 5}" font-family="#{font}" font-size="12" fill="#{border}">#{id}</text>)
+        else
+          elements << %(<rect fill="#{fill}" stroke="#{border}" rx="#{radius}" ry="#{radius}" x="#{x}" y="#{y}" width="#{width}" height="#{height}" stroke-width="#{line}"/>)
+          elements << %(<text x="#{x + 10}" y="#{y + 20}" font-family="#{font}" font-size="12" fill="#{border}">#{label}</text>)
+        end
+
+        x1 = center
+        y1 = offsety + height
+        x2 = center
+        y2 = messages.last.y + 10
+        elements << %(<line x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}" stroke="#{border}" stroke-width="#{line}"/>)
+
+        elements.join("\n")
       end
     end
 
     class Message
-      attr_accessor :type, :source, :dest, :label, :comment
-      def initialize(type, source, dest, label, comment)
-        self.type, self.source, self.dest, self.label, self.comment = type, source, dest, label.strip, comment.strip
-      end
+      attr_accessor :source, :dest, :op, :label, :comment, :row,
+                    :offset, :color, :font, :size, :spacing, :line, :dash,
+                    :options
+
+      def initialize(args)
+        self.options = []
+        self.label = args[:label].strip
+        self.comment = args[:comment].strip
+
+        self.op = args[:op]
+        self.row = args[:row]
+        # ui
+        self.offset  = args[:ui][:offset]
+        self.color   = args[:ui][:color]
+        self.font    = args[:ui][:font]
+        self.size    = args[:ui][:size]
+        self.spacing = args[:ui][:spacing]
+        self.line    = args[:ui][:line]
+        self.dash    = args[:ui][:dash]
+
+        if op.index('~')
+          options << %(stroke-dasharray="#{dash}")
+        elsif op.index('-').nil?
+          raise 'Message direction must be one of ->, ~>, <-, <~'
+        end
 
-      def roles
-        [source, dest]
+        if op.index('>')
+          self.source = args[:role1]
+          self.dest = args[:role2]
+        elsif op.index('<')
+          self.source = args[:role2]
+          self.dest = args[:role1]
+        else
+          raise 'Message direction must be one of ->, ~>, <-, <~'
+        end
+
+        source.messages << self
+        dest.messages << self unless source.eql?(dest)
       end
 
-      def deliver
-        %Q[#{type}(#{source.id},#{dest.id}, "#{label}");]
+      def print
+        role1, role2 = *(source < dest ? [source, dest] : [dest, source])
+        elements = []
+
+        x1 = role1.center
+        if role1.eql?(role2)
+          y1 = y
+          x2 = x1 + 50
+          y2 = y1 + spacing
+
+          elements << %(<polyline points="#{x1},#{y1} #{x2},#{y1} #{x2},#{y2} #{x1 + 5},#{y2}" fill="none" stroke-width="2" stroke-linejoin="round" stroke="#{color}" #{options.join ' '}/>)
+          elements << %(<polygon points="#{x1 + 10},#{y2 - 5} #{x1},#{y2} #{x1 + 10},#{y2 + 5}" fill="#{color}"/>)
+          elements << %(<text x="#{x1 + 10}" y="#{y1 - 5}" font-family="#{font}" font-size="#{size}" fill="#{color}">#{label}</text>)
+        else
+          x2 = role2.center
+
+          if role1 == source
+            x2 -= 10
+            elements << %(<polygon points="#{x2},#{y - 5} #{x2 + 10},#{y} #{x2},#{y + 5}" fill="#{color}"/>)
+          else
+            x1 += 10
+            elements << %(<polygon points="#{x1},#{y - 5} #{x1 - 10},#{y} #{x1},#{y + 5}" fill="#{color}"/>)
+          end
+
+          elements << %(<line x1="#{x1}" y1="#{y}" x2="#{x2}" y2="#{y}" stroke="#{color}" stroke-width="2" #{options.join ' '}/>)
+          elements << %(<text x="#{x1 + 40}" y="#{y - 5}" font-family="#{font}" font-size="#{size}" fill="#{color}">#{label}</text>)
+
+          if comment.size.positive?
+            x = role2.prev.center + 15
+            elements << %(<path fill="#eeeeee" d="M#{x2 - 30},#{y + 1} L#{x2 - 30},#{y + 10} H#{x} V#{y + 2 * spacing - 25} H#{x2} V#{y + 10} H#{x2 - 20} z" />)
+            elements << %(<text x="#{x + 5}" y="#{y + 23}" font-family="#{font}" font-size="#{size}" fill="#{color}">)
+            split(comment).each_with_index do |line, i|
+              elements << %(<tspan x="#{x + 5}" y="#{y + 23 + 13 * i}">#{line}</tspan>)
+            end
+            elements << '</text>'
+          end
+        end
+
+        elements.join("\n")
       end
 
-      def describe
-        return if comment.empty?
-        width = comment.length > 10 ? 1 : comment.length * 0.13
-        width = 0.5 if width < 0.5
-        %Q[comment(#{dest.id},C,up 0.2 right, wid #{'%.1f' % width} ht 0.3 "#{comment}");]
+      def y
+        offset + row * spacing
       end
 
-      def height
-        source == dest ? 2 : 1
+      private
+
+      def split(text, max = 35)
+        ary = []
+        line = ''
+        text.split.each do |word|
+          if (line + word).length < max
+            line << ' ' << word
+          else
+            ary << line
+            line = word
+          end
+        end
+        ary << line if line.length.positive?
+        ary
       end
     end
 
-    class Parser
-      attr_accessor :source, :variables, :roles, :messages, :output
-
-      def defaults
-        {
-          boxht:     '0.5', # Object box height
-          boxwid:    '1.3', # Object box width
-          awid:      '0.1', # Active lifeline width
-          spacing:   '0.25', # Spacing between messages
-          movewid:   '0.75', # Spacing between objects
-          dashwid:   '0.05', # Interval for dashed lines
-          maxpswid:  '20', # Maximum width of picture
-          maxpsht:   '20', # Maximum height of picture
-          underline: '0', # Underline the name of objects
-        }
-      end
-
-      def initialize(source, options = {})
-        self.source = source
+    class Diagram
+      attr_accessor :input, :output, :attributes, :roles, :messages, :rows
+
+      def initialize(input, options = {})
+        self.input = input
         self.output = []
         self.roles = []
         self.messages = []
-        self.variables = defaults.dup
+        self.rows = 0
+        self.attributes = DEFAULTS.dup
+
         options.each do |key, value|
-          variables[key] = value
+          attributes.merge!(key => value)
         end
       end
 
       def find(id)
-        id.strip!
-        roles.detect{|role| role.id == id}
+        roles.detect { |role| role.id == id.strip } or raise("Non-declared role: #{id}")
       end
 
       def parse
-        source.split("\n").each do |line|
+        input.split("\n").each do |line|
           next if line.strip.empty?
-          if match = line.match(/^([a-zA-Z0-9_ \t]+) *= *([a-zA-Z0-9_ \t]+)/)
-            if match[2] =~ /Actor/
-              roles << Role.new(:actor, match[1].strip, match[1].strip)
-            else
-              roles << Role.new(:object, match[1].strip, match[2].strip)
-            end
-          elsif match = line.match(/^([a-zA-Z0-9_ \t]+) *([<\-~>]{2}) *([a-zA-Z0-9_ \t]+):([^#]+)#?(.*)/)
-            role1, role2, op = find(match[1]), find(match[3]), match[2]
-
-            if op.index('>')
-              source, dest = role1, role2
-            elsif op.index('<')
-              source, dest = role2, role1
-            else
-              raise "Message direction must be one of ->, ~>, <-, <~"
-            end
 
-            if op.index('-')
-              type = :message
-            elsif op.index('~')
-              type = :rmessage
-            else
-              raise "Message direction must be one of ->, ~>, <-, <~"
-            end
-
-            message = Message.new(type, source, dest, match[4], match[5])
-            # deactivate prev messages roles
-            if last = messages.last
-              (last.roles - message.roles).each do |role|
-                output << role.deactivate if role.active
-              end
-            end
-            # activate source before send message
-            output << source.activate unless source.active
-            output << message.deliver
-            output << message.describe
-            # activate dest
-            output << dest.activate unless dest.active
-            messages << message
-          elsif match = line.match(/^([a-zA-Z0-9_ \t]+) *:([^#]+)#?(.*)/)
-            role = find(match[1])
-            message = Message.new(:message, role, role, match[2], match[3])
-            # deactivate prev messages roles
-            if last = messages.last
-              (last.roles - message.roles).each do |role|
-                output << role.deactivate if role.active
-              end
-            end
-            # activate role before send message
-            output << role.activate unless role.active
-            output << message.deliver
-            output << message.describe
-            messages << message
+          if (matches = line.match(/^(?<id>[a-zA-Z0-9_ \t]+) *= *(?<label>[a-zA-Z0-9_ \t]+)/))
+            # User = Actor
+            roles << Role.new(
+              id: matches[:id],
+              label: matches[:label],
+              column: roles.size,
+              diagram: attributes[:diagram],
+              ui: attributes[:role]
+            )
+          elsif (matches = line.match(/^(?<role1>[a-zA-Z0-9_ \t]+) *(?<op>[<\-~>]{2}) *(?<role2>[a-zA-Z0-9_ \t]+):(?<label>[^#]+)#?(?<comment>.*)/))
+            # User -> Web : Login
+            messages << Message.new(
+              role1: find(matches[:role1]),
+              role2: find(matches[:role2]),
+              row: rows,
+              op: matches[:op],
+              label: matches[:label],
+              comment: matches[:comment],
+              diagram: attributes[:diagram],
+              ui: attributes[:message]
+            )
+            self.rows += 1
+            # comment takes 1 more row
+            self.rows += 1 if matches[:comment].length.positive?
+          elsif (matches = line.match(/^(?<role>[a-zA-Z0-9_ \t]+) *:(?<label>[^#]+)#?(?<comment>.*)/))
+            # Web : Save the form
+            messages << Message.new(
+              role1: find(matches[:role]),
+              role2: find(matches[:role]),
+              row: rows,
+              op: '->',
+              label: matches[:label],
+              comment: matches[:comment],
+              diagram: attributes[:diagram],
+              ui: attributes[:message]
+            )
+            # self message takes 2 rows
+            self.rows += 2
           end
         end
 
-        header
-        footer
-
-        output.compact.join("\n")
+        prev = nil
+        roles.each do |succ|
+          succ.prev = prev
+          prev.succ = succ if prev
+          prev = succ
+        end
       end
 
-      def macros
-        IO.read File.join(File.dirname(__FILE__), 'sequence.pic')
+      def print
+        format(template, width: width, height: height, content: (roles + messages).map(&:print).join("\n"))
       end
 
-      def header
-        headers = []
-        headers << '.PS'
-        headers << ''
-        headers << macros
-        headers << ''
-        headers << '# Variables'
-        # calculate height
-
-        variables[:maxpsht] = ((variables[:spacing].to_f *
-                                messages.map(&:height).reduce(:+)) +
-                               variables[:boxht].to_f).ceil
+      def height
+        attributes[:message][:offset] +
+          attributes[:message][:spacing] * rows +
+          attributes[:diagram][:offsety] * 2
+      end
 
-        variables.each do |key, value|
-          headers << "#{key} = #{value};"
-        end
-        headers << '# Actors and Objects'
-        roles.each do |object|
-          headers << %Q[#{object.type}(#{object.id},"#{object.label}");]
-        end
-        headers << 'step();'
-        headers << ''
-        self.output =  headers + output
+      def width
+        (attributes[:role][:spacing] + attributes[:role][:width]) * roles.size +
+          attributes[:diagram][:offsetx]
       end
 
-      def footer
-        output << ''
-        output << 'step();'
-        output << '# Complete the lifelines'
-        roles.each do |object|
-          output << "complete(#{object.id});"
-        end
-        output << ''
-        output << '.PE'
+      private
+
+      def template
+        '<svg xmlns="http://www.w3.org/2000/svg" ' \
+          'xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" ' \
+          'width="%<width>s" height="%<height>s" ' \
+          'viewBox="0 0 %<width>s %<height>s">' \
+          '%<content>s</svg>'
       end
     end
   end

data/lib/markdoc/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Markdoc
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

data/lib/markdoc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 require 'tempfile'
 

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: markdoc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
-- Lkhagva Ochirkhuyag
-autorequire: 
+- Ochirkhuyag.L
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyglot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '13.0'
 description: Markdown with support for pseudocode to flowchart and sequence diagram
   generation
 email: ochkoo@gmail.com
@@ -85,41 +90,38 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/markdoc
+- bin/pseudo2svg
+- bin/sequence2svg
+- css/pygments.css
+- css/style.css
 - lib/markdoc.rb
 - lib/markdoc/pseudocode.rb
 - lib/markdoc/pseudocode.treetop
 - lib/markdoc/renderer.rb
 - lib/markdoc/sequence.rb
-- lib/markdoc/sequence.pic
 - lib/markdoc/version.rb
-- css/style.css
-- css/pygments.css
-- bin/markdoc
-- bin/pseudo2svg
-- bin/sequence2svg
 homepage: https://github.com/ochko/markdoc
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.7.6
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.6
+signing_key:
+specification_version: 4
 summary: Markdown to HTML converter with diagrams
 test_files: []

data/lib/markdoc/sequence.pic

@@ -1,406 +0,0 @@
-#/usr/bin/pic2plot -Tps
-#
-# Pic macros for drawing UML sequence diagrams
-#
-# (C) Copyright 2004-2005 Diomidis Spinellis.
-#
-# Permission to use, copy, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted,
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in
-# supporting documentation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#
-
-
-# Default parameters (can be redefined)
-
-# Spacing between messages
-spacing = 0.25;
-# Active box width
-awid = .1;
-# Box height
-boxht = 0.3;
-# Commend folding
-corner_fold=awid
-# Comment distance
-define comment_default_move {up 0.25 right 0.25};
-# Comment height
-comment_default_ht=0.5;
-# Comment width
-comment_default_wid=1;
-# Underline object name
-underline=1;
-
-# Create a new object(name,label)
-define object {
-	$1: box $2; move;
-	# Could also underline text with \mk\ul\ul\ul...\rt
-	if (underline) then {
-		line from $1.w + (.1, -.07) to $1.e + (-.1, -.07);
-	}
-	move to $1.e;
-	move right;
-	# Active is the level of activations of the object
-	# 0 : inactive : draw thin line swimlane
-	# 1 : active : draw thick swimlane
-	# > 1: nested : draw nested swimlane
-	active_$1 = 0;
-	lifestart_$1 = $1.s.y;
-}
-
-# Create a new external actor(name,label)
-define actor {
-	$1: [
-		XSEQC: circle rad 0.06;
-		XSEQL: line from XSEQC.s down .12;
-		line from XSEQL.start - (.15,.02) to XSEQL.start + (.15,-.02);
-		XSEQL1: line from XSEQL.end left .08 down .15;
-		XSEQL2: line from XSEQL.end right .08 down .15;
-		line at XSEQC.n invis "" "" "" $2;
-	]
-	move to $1.e;
-	move right;
-	active_$1 = 0;
-	lifestart_$1 = $1.s.y - .05;
-}
-
-# Create a new placeholder object(name)
-define placeholder_object {
-	$1: box invisible;
-	move;
-	move to $1.e;
-	move right;
-	active_$1 = 0;
-	lifestart_$1 = $1.s.y;
-}
-
-define pobject {
-	placeholder_object($1);
-}
-
-define extend_lifeline {
-	if (active_$1 > 0) then {
-                # draw the left edges of the boxes
-		move to ($1.x - awid/2, Here.y);
-		for level = 1 to active_$1 do {
-			line from (Here.x, lifestart_$1) to Here;
-			move right awid/2
-		}
-
-                # draw the right edge of the innermost box
-		move right awid/2;
-		line from (Here.x, lifestart_$1) to Here;
-	} else {
-		line from ($1.x, lifestart_$1) to ($1.x, Here.y) dashed;
-	}
-	lifestart_$1 = Here.y;
-}
-
-# complete(name)
-# Complete the lifeline of the object with the given name
-define complete {
-	extend_lifeline($1)
-	if (active_$1) then {
-		# draw bottom of all active boxes
-		line right ((active_$1 + 1) * awid/2) from ($1.x - awid/2, Here.y);
-	}
-}
-
-# Draw a message(from_object,to_object,label)
-define message {
-	down;
-	move spacing;
-	# Adjust so that lines and arrows do not fall into the
-	# active box.  Should be .5, but the arrow heads tend to
-	# overshoot.
-	if ($1.x <= $2.x) then {
-		off_from = awid * .6;
-		off_to = -awid * .6;
-	} else {
-		off_from = -awid * .6;
-		off_to = awid * .6;
-	}
-
-        # add half a box width for each level of nesting
-        if (active_$1 > 1) then {
-                off_from = off_from + (active_$1 - 1) * awid/2;
-        }
-
-        # add half a box width for each level of nesting
-        if (active_$2 > 1) then {
-                off_to = off_to + (active_$2 - 1) * awid/2;
-        }
-
-	if ($1.x == $2.x) then {
-		arrow from ($1.x + off_from, Here.y) right then down .25 then left $3 ljust " " " " " " ;
-	} else {
-		arrow from ($1.x + off_from, Here.y) to ($2.x + off_to, Here.y) $3 " ";
-	}
-}
-
-# Display a lifeline constraint(object,label)
-define lifeline_constraint {
-        off_from = awid;
-        # add half a box width for each level of nesting
-        if (active_$1 > 1) then {
-                off_from = off_from + (active_$1 - 1) * awid/2;
-        }
-
-	box at ($1.x + off_from, Here.y) invis $2 ljust " " ;
-}
-
-define lconstraint {
-	lifeline_constraint($1,$2);
-}
-
-# Display an object constraint(label)
-# for the last object drawn
-define object_constraint {
-	{ box invis with .s at last box .nw $1 ljust; }
-}
-
-define oconstraint {
-	object_constraint($1);
-}
-
-# Draw a creation message(from_object,to_object,object_label)
-define create_message {
-	down;
-	move spacing;
-	if ($1.x <= $2.x) then {
-		off_from = awid * .6;
-		off_to = -boxwid * .51;
-	} else {
-		off_from = -awid * .6;
-		off_to = boxwid * .51;
-	}
-
-        # add half a box width for each level of nesting
-        if (active_$1 > 1) then {
-                off_from = off_from + (active_$1 - 1) * awid/2;
-        }
-
-	# See comment in destroy_message
-	XSEQA: arrow from ($1.x + off_from, Here.y) to ($2.x + off_to, Here.y) "�create�" " ";
-	if ($1.x <= $2.x) then {
-		{ XSEQB: box $3 with .w at XSEQA.end; }
-	} else {
-		{ XSEQB: box $3 with .e at XSEQA.end; }
-	}
-	{
-		line from XSEQB.w + (.1, -.07) to XSEQB.e + (-.1, -.07);
-	}
-	lifestart_$2 = XSEQB.s.y;
-	move (spacing + boxht) / 2;
-}
-
-define cmessage {
-	create_message($1,$2,$3);
-}
-
-# Draw an X for a given object
-define drawx {
-	{
-	line from($1.x - awid, lifestart_$1 - awid) to ($1.x + awid, lifestart_$1 + awid);
-	line from($1.x - awid, lifestart_$1 + awid) to ($1.x + awid, lifestart_$1 - awid);
-	}
-}
-
-# Draw a destroy message(from_object,to_object)
-define destroy_message {
-	down;
-	move spacing;
-	# The troff code is \(Fo \(Fc
-	# The groff code is also \[Fo] \[Fc]
-	# The pic2plot code is \Fo \Fc
-	# See http://www.delorie.com/gnu/docs/plotutils/plotutils_71.html
-	# To stay compatible with all we have to hardcode the characters
-	message($1,$2,"�destroy�");
-	complete($2);
-	drawx($2);
-}
-
-define dmessage {
-	destroy_message($1,$2);
-}
-
-# An object deletes itself: delete(object)
-define delete {
-	complete($1);
-	lifestart_$1 = lifestart_$1 - awid;
-	drawx($1);
-}
-
-# Draw a message return(from_object,to_object,label)
-define return_message {
-	down;
-	move spacing;
-	# See comment in message
-	if ($1.x <= $2.x) then {
-		off_from = awid * .6;
-		off_to = -awid * .6;
-	} else {
-		off_from = -awid * .6;
-		off_to = awid * .6;
-	}
-
-        # add half a box width for each level of nesting
-        if (active_$1 > 1) then {
-                off_from = off_from + (active_$1 - 1) * awid/2;
-        }
-
-        # add half a box width for each level of nesting
-        if (active_$2 > 1) then {
-                off_to = off_to + (active_$2 - 1) * awid/2;
-        }
-
-	arrow from  ($1.x + off_from, Here.y) to ($2.x + off_to, Here.y) dashed $3 " ";
-}
-
-define rmessage {
-	return_message($1,$2,$3);
-}
-
-# Object becomes active
-# Can be nested to show recursion
-define active {
-	extend_lifeline($1);
-	# draw top of new active box
-	line right awid from ($1.x + (active_$1 - 1) * awid/2, Here.y);
-	active_$1 = active_$1 + 1;
-}
-
-# Object becomes inactive
-# Can be nested to show recursion
-define inactive {
-	extend_lifeline($1);
-	active_$1 = active_$1 - 1;
-	# draw bottom of innermost active box
-	line right awid from ($1.x + (active_$1 - 1) * awid/2, Here.y);
-}
-
-# Time step
-# Useful at the beginning and the end
-# to show object states
-define step {
-	down;
-	move spacing;
-}
-
-# Switch to asynchronous messages
-define async {
-	arrowhead = 0;
-	arrowwid = arrowwid * 2;
-}
-
-# Switch to synchronous messages
-define sync {
-	arrowhead = 1;
-	arrowwid = arrowwid / 2;
-}
-
-# same as lifeline_constraint, but Text and empty string are exchanged.
-define lconstraint_below{
-        off_from = awid;
-        # add half a box width for each level of nesting
-        if (active_$1 > 1) then {
-                off_from = off_from + (active_$1 - 1) * awid/2;
-        }
-
-	box at ($1.x + off_from, Here.y) invis "" $2 ljust;
-}
-
-# begin_frame(left_object,name,label_text);
-define begin_frame {
-	# The lifeline will be cut here
-	extend_lifeline($1);
-	# draw the frame-label
-	$2: box $3 invis with .n at ($1.x, Here.y);
-	d = $2.e.y - $2.se.y;
-	line from $2.ne to $2.e then down d left d then to $2.sw;
-	# continue the lifeline below the frame-label
-	move to $2.s;
-	lifestart_$1 = Here.y;
-}
-
-# end_frame(right_object,name);
-define end_frame {
-	# dummy-box for the lower right corner:
-	box invis "" with .s at ($1.x, Here.y);
-	# draw the frame
-	frame_wid = last box.se.x - $2.nw.x
-	frame_ht = - last box.se.y + $2.nw.y
-	box with .nw at $2.nw wid frame_wid ht frame_ht;
-	# restore Here.y
-	move to last box.s;
-}
-
-# comment(object,[name],[line_movement], [box_size] text);
-define comment {
-	old_y = Here.y
-	# draw the first connecting line, at which's end the box wil be positioned
-	move to ($1.x, Here.y)
-	if "$3" == "" then {
-		line comment_default_move() dashed;
-	} else {
-		line $3 dashed;
-	}
-
-	# draw the box, use comment_default_xx if no explicit
-	# size is given together with the text in parameter 4
-	old_boxht=boxht;
-	old_boxwid=boxwid;
-	boxht=comment_default_ht;
-	boxwid=comment_default_wid;
-	if "$2" == "" then {
-		box invis $4;
-	} else {
-		$2: box invis $4;
-	}
-	boxht=old_boxht;
-	boxwid=old_boxwid;
-
-	# draw the frame of the comment
-	line from       last box.nw \
-		to          last box.ne - (corner_fold, 0) \
-		then to last box.ne - (0, corner_fold) \
-		then to last box.se \
-		then to last box.sw \
-		then to last box.nw ;
-	line from       last box.ne - (corner_fold, 0) \
-		to          last box.ne - (corner_fold, corner_fold) \
-		then to last box.ne - (0, corner_fold) ;
-
-	# restore Here.y
-	move to ($1.x, old_y)
-}
-
-# connect_to_comment(object,name);
-define connect_to_comment {
-	old_y = Here.y
-	# start at the object
-	move to ($1.x, Here.y)
-	# find the best connection-point of the comment to use as line-end
-	if $1.x < $2.w.x then {
-		line to $2.w dashed;
-	} else {
-		if $1.x > $2.e.x then {
-			line to $2.e dashed;
-		} else {
-			if Here.y < $2.s.y then {
-				line to $2.s dashed;
-			} else {
-				if Here.y > $2.n.y then {
-					line to $2.n dashed;
-				}
-			}
-		}
-	}
-	# restore Here.y
-	move to ($1.x, old_y)
-}