depviz 0.4.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ada6d7a48c5f347acc4eab8947406b53d1b01966809b6fedb1ba7a7367c573
-  data.tar.gz: 8d4bc6609bd75a80b5f57f2f734b76d5f28a503b045947e43c08799375fc88cf
+  metadata.gz: 0bea5e848933306a1774c6d5359f9129249c1c1eabae2e17a2272e25deba7014
+  data.tar.gz: e6a5bb5267bf93e7c38532538b4c98d3dbe437a3a17f6b1146ad682fae40f6af
 SHA512:
-  metadata.gz: 6dc83fc3c3743fd1fb3c91023a574da6c49a7c29114c47717d2d5f1bab50c5c5f3034d45882d93b951167e06d5598ea302a051eaa986f648885905acb10b8081
-  data.tar.gz: d457c0dc75540fb146b5403c34df33ff38bc0a4de1d9dfb2dc16fbb86513dc93a8c692be4973718a34295954c70165ec9a9df70621a11cde0ccb8c37a45a04f6
+  metadata.gz: 6682223bb805da84b4d4e639bdbb0cebce966a1f9b46f7b27395fa40aeab5e18536e5101aead00919a765aad58af19de6e060bf44091b1ca70ad266b943851eb
+  data.tar.gz: 6d2ae657451b3523ff329e3af5f653027da64d14d1924fa278576326e5af7abd0ff844ee56bc9775f81eb3edc845a957e4ede37bdae70c2767406a01d1dee5f3

data/lib/depviz.rb

@@ -8,41 +8,82 @@ require 'xml_to_sliml'
 require 'dependency_builder'
 
 
-class DepViz
-  
+module RegGem
+
+  def self.register()
+'
+hkey_gems
+  doctype
+    depviz
+      require depviz
+      class DepViz
+      media_type svg
+'
+  end
+end
+
+class DepViz < PxGraphViz
+  using ColouredText
+
   class Item
-    
-    def initialize(s, root: nil, name: name, debug: false)
+
+    def initialize(s, root: nil, name: nil, debug: false)
       @s, @root, @name, @debug = s, root, name, debug
     end
-    
+
     def dependencies()
-      
+
       if @debug then
         puts 'inside DepViz::Item::dependencies'
         puts '@s: ' + @s.inspect
         puts '@root: ' + @root.inspect
       end
-      
+
       a = LineTree.new(@s).to_doc.root.xpath('//' + @name)
       puts 'dep: a: ' + a.inspect if @debug
-      
+
+      enclose = ->(a) do
+        a.length > 1 ? [a.first] << enclose.call(a[1..-1]) : a
+      end
+
       a2 = a.map do |x|
         puts '  dependencies x: ' + x.inspect if @debug
-        x.backtrack.to_s.split('/')[1..-1]
+        enclose.call x.backtrack.to_s.split('/')[1..-1]
       end
+
       puts 'a2: ' + a2.inspect if @debug
-      
-      s = a2.map {|x| x.map.with_index {|y,i| '  ' * i + y }.join("\n")}\
-          .join("\n")
+
+      # group the items in order to merge branches with the same parent
+      a3 = a2.group_by(&:first)
+      a4 = a3.map {|x| [x.first] + x.last.map(&:last)}
+
+      treeize = ->(obj, indent=-2) do
+
+        if obj.is_a? Array then
+
+          r = obj.map {|x| treeize.call(x, indent+1)}.join("\n")
+          puts 'r: ' + r.inspect if @debug
+          r
+
+        else
+
+          '  ' * indent + obj
+
+        end
+      end
+
+      s = treeize.call(a4)
+
       puts 'child s: ' + s.inspect if @debug
 
       dv3 = DepViz.new()
       dv3.read s
       dv3
-      
+
     end
-    
+
+    # returns a DepViz document
+    #
     def reverse_dependencies()
 
       a = LineTree.new(@s, root: @root).to_doc.root.xpath('//' + @name)
@@ -50,100 +91,133 @@ class DepViz
       s = a.select {|x| x.has_elements? }\
           .map{|x| XmlToSliml.new(x).to_s }.join("\n")
 
-      return if s.empty?
-      
+      return DepViz.new if s.empty?
+
       dv3 = DepViz.new(root: nil)
       dv3.read s
       dv3
-      
-    end    
-    
-  end  
 
-  def initialize(s='', root: 'platform', style: default_stylesheet(), debug: false)
-    
+    end
+
+  end
+
+  def initialize(s='',  fields: %w(label shape), delimiter: ' # ',
+                 root: 'platform', style: nil,
+                 debug: false, fill: '#ccffcc', stroke: '#999999',
+                 text_color: '#330055')
+
     @style, @root, @debug = style, root, debug
     @header = "
 <?polyrex schema='items[type]/item[label]' delimiter =' # '?>
 type: digraph
 
     "
-        
-    build(s)    
-    
+    if s.length > 0 then
+
+      if s =~ /<?depviz / then
+
+        raw_dv = s.clone
+        s2 = raw_dv.slice!(/<\?depviz [^>]+\?>/)
+
+        # attributes being sought =>  root fields delimiter id
+        attributes = Shellwords::shellwords(s).map {|x| key,
+                          value = x.split(/=/, 2); [key.to_sym, value]}.to_h
+
+        h = {
+          fields: fields.join(', '),
+          delimiter: delimiter
+        }.merge attributes
+
+        s = if h[:root] then
+          "\n\n" + h[:root] + "\n" +
+            raw_dv.strip.lines.map {|line| '  ' + line}.join
+        else
+          raw_dv
+        end
+
+        delimiter = h[:delimiter]
+        fields = h[:fields].split(/ *, */)
+
+      end
+
+      @s = tree = DependencyBuilder.new(s).to_s
+      s3 = @root ? (@root + "\n" + tree.lines.map {|x| '  ' + x}.join) : tree
+      @pxg = super(@header + s3, style: @style)
+
+    end
+
 
   end
-  
+
+  def count()
+    return 0 unless @s
+    child_nodes.length
+  end
+
   def item(name)
-    
+
     puts 'inside DepViz::item for ' + name.inspect if @debug
     puts '_@s : ' + @s.inspect if @debug
     Item.new @s, root: @root, name: name, debug: @debug
-    
+
+  end
+
+  def nodes()
+
+    child_nodes.map {|x| x.name}.uniq
+
   end
-  
+
   def read(s)
-    
+
     @s = s
     s2 = @root ? @root + "\n" + s.lines.map {|x| '  ' + x}.join : s
     @pxg = PxGraphViz.new(@header + s2, style: @style)
-    
+
+  end
+
+  def to_doc()
+    Rexle.new(LineTree.new(@s, root: @root).to_xml).root.elements.first
   end
 
   def to_s()
     @s
   end
-  
-  def to_svg()
-    @pxg.to_svg
-  end
 
   def to_xml()
-    LineTree.new(@s, root: @root).to_xml
-  end  
-  
-  def build(s)
-    
-
-    return if s.empty?
-    
-    tree = DependencyBuilder.new(s).to_s    
-    
-    s3 = @root ? (@root + "\n" + tree.lines.map {|x| '  ' + x}.join) : tree
-
-    @pxg = PxGraphViz.new(@header + s3, style: @style)    
-    
-    tree
+    to_doc.xml
   end
-  
-  alias import build
 
   private
 
+  def child_nodes()
+    to_doc.root.xpath('//*')
+  end
+
   def default_stylesheet()
 
 <<STYLE
-  node { 
-    color: #ddaa66; 
+  node {
+    color: #ddaa66;
     fillcolor: #447722;
-    fontcolor: #ffeecc; 
+    fontcolor: #ffeecc;
     fontname: 'Trebuchet MS';
-    fontsize: 10; 
+    fontsize: 10;
     margin: 0.1;
-    penwidth: 1.3; 
+    penwidth: 1.3;
     style: filled;
   }
-  
+
   a node {
-    color: #0011ee;   
+    color: #0011ee;
   }
 
   edge {
     arrowsize: 0.9;
-    color: #666; 
-    fontcolor: #444444; 
-    fontname: Verdana; 
-    fontsize: 8; 
+    color: #666;
+    fontcolor: #444444;
+    fontname: Verdana;
+    fontsize: 8;
     dir: forward;
     weight: 1;
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depviz
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMTIxMTkyMzE2WhcN
-  MTkwMTIxMTkyMzE2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ3L67
-  8183BAMBswfY/06QuC63URRc8KHhoCfFC+3DE5h+bSycpUnu4lJ44QvFi1fycMmm
-  2HchCK0cLDX9ZxOqSO4YJWmh99TmA8nvqIDfe0hFx5Zcrn/b6SdKaUOxv6rWpvPw
-  OfF3YjaHkeAvgar0xYvagUKESSKLr0Pbc/a7gJKaVZkHJFbnoyEguLYut6OpEEPP
-  M78+Mtai/tFbVRwhDmid2BHZS57+4kTXFuA4UqePNVyXt8mrtic1vgNKbsQ0nSbJ
-  t9QgEaqEAGSCkFye6b+dx8WVgq0MAchgQ2tvQhifzqRqtmEOhzf0785yKxNEHsDt
-  F49kONjTsDQXtJd5AgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFGsQrpJ6RZLNIpwQeKMZLs8ZbFFaMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAGT7n8qvDZb8tAeB600O
-  a054HpBNHLJ/HxbMyv+gE2n7yDg3D4sR2X6ekQVW8Rg6emZAhDWa+dREHzL2j+dp
-  hU13ewBbz3Oh2+M7+AsLWlp6lB1CwJ/HBaC7ePq2ijbDd8OpJaTRCDh/ICH6vkfm
-  otS5scbDgYhQ2MmW2beylEznx9C+GhixFVcxWIDikknpEUvoOYoJalM0a8x5I7JG
-  R/eJT/8JSL1Sz0ywBXzMSh8mBjYP5EkovU82TyiYbg0kJ7PSNIM2vb0x/VAO9LCY
-  TCqBEF2WnZz6KeKywr1qQSkgenmZJAIRJf6Yc2GlE/o9rTHz+kWZGg9ZvB3AU6qZ
-  2QY=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMjA5MjAzNDIzWhcN
+  MjIxMjA5MjAzNDIzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDfmSNE
+  ueVR4Rw/+iOZCBFm8C2VKKRPEpuJotEYC64fLdssnfOx8ItCMadp0ou9+q/RAzMB
+  OjNsrE9l2IS0n9YkOfeMLqhjLRfa9OhTl62n595gETOfI5bXyTmqiYz+mJG4QZrf
+  PzARfL2zF589xNqRyHzPdRLZxLLXPyRI795mqVmB0bYWibrSBb0rmKmVvpWd8SvA
+  t99RS9eGZE2fw06ngNk7/wUbvpwql8/p6EEXHDOZswfkCJw46qhPrAn1d0VM1i9K
+  kNabJbiRzh9WzL/qtqYck2hAdTxqsMN/jJBGJ18n4MLlZCbb6/+doy1N/PDR0C3u
+  XMK8Xsp5dX2+b3SP4mp9uw0RaE74zZ+anJdZ8JUCf3TBcBfX7Q2QJHqclb9OqVoq
+  TqxCsbZOgUuQc0eozOXC8Z518OBqJ+a5S+uyQl2Ecnqd2I20IzXF7q6a2XP2IyMM
+  S8Vui76C+WgXkRi95haT7955vQRJf4EY6Q7Jgf1CTABAYrjhVF/it6tEjJECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUKYwVgC2R
+  3zCOc27gpnSm5WkG/ucwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAS2Rq49RGwtcxjN9jto0LK5Pi/9F/T8fOaA6mS+Jm
+  TpIOGZppcqy/c9S7+duS0boopB0wy6WKgcrBFl7sMzvhY8HsC+1IvfK/OrEnGf5E
+  RKb+gj1LHMLNDDDjmR49hxr4HC5q0xdQjNROKecJK/9pd26FEzh83h91/y4eTDHB
+  R+CoV+XxQQZsaM7ob0/XXo6CLNVfexXZjaVmLb/hte8h2TsjB8ACyBE5aOPHlTqk
+  Q2N93GgIEx7mTTkmp0GbDx3+C5CCYTAaDzl37blfWJor24FhhKVZwSeIb0BEJDmZ
+  4FZeY1kID07JzDljwH+svLG4pYTOxSj0EVmiKKvVNKmHr4vDxovt/MJvRfEcTKic
+  zTKnpkkAKBz5bx1IPHZNy3lDcizHKyyM9NpqnhahDLay2bvPziCTFZ4TSUTY1+uT
+  OtP+/rSpQ79ezyeNwN9qKx23SWrNBvMkeNyMBMDdoNL+vA/sRwmiKuaWJuqIVaay
+  B7KTOXvQC2+5guaFLzsIiU9w
   -----END CERTIFICATE-----
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxgraphviz
@@ -38,60 +43,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: dependency_builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: xml_to_sliml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -119,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Generates a complete dependency tree from disparate dependencies to an SVG