depviz 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6037b596e71f9ff2a6ed62528b7ce87621b9052295b536002822085ea3887b8
-  data.tar.gz: 32000dc1bdd1c9055572a8cb281eb4188d59c187d886a8cc4d17d3f8b830e227
+  metadata.gz: 919a4f624b20360846e7ac4569a777f8674593e5d82f5bd9d3f02ada22d4a36e
+  data.tar.gz: 6fe55085a07c60d0cf71e37211216c19c55d7522d9362e3edd4466b26c6aa6d4
 SHA512:
-  metadata.gz: a8a1e16425d5c4b40c27b213d1c73e9a4e8c15746e3d791282a67981d99a9ff43379ecf20a4c76a26f49afbe5f8fd67f1a0c91bd3375a577213e99226e382118
-  data.tar.gz: 7fb7a161ecfd965b71d45b49a1174fa287e7d7d6d6cfb957377c75e5d219e4fe634e78f4405fd2e1b9a80a984e638589697785e313a3163c202384ffbbe3acb9
+  metadata.gz: adfd9406c3e1a22bff3ac512b4a4975de9546789a6ce5dcb2cee39cc51f906596ee5f4e23854c0f668418b0e2c2bf7d935cd62e2898dfba5f5a6d0ad058f2eba
+  data.tar.gz: 5713e6cc767a6fd74f4ecc379b2481f7712872ac4699d063dd2125b9f77b53840249f61e46494ec3fe84f1c7d902a5acb9de3933220c1767ff9309d5d1464355

data/lib/depviz.rb

@@ -8,7 +8,22 @@ 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
     
@@ -86,15 +101,50 @@ class DepViz
     
   end  
 
-  def initialize(s='', root: 'platform', style: default_stylesheet(), debug: false)
+  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
 
-    "      
-    @s = build(s) unless s.nil? or s.empty? 
+    "
+    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
@@ -132,30 +182,11 @@ type: digraph
 
   def to_s()
     @s
-  end
-  
-  def to_svg()
-    @pxg.to_svg
-  end
+  end  
 
   def to_xml()
     to_doc.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
-  end
-  
-  alias import build
+  end        
 
   private
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depviz
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   zoPaOSt4xoowKqommO0RHQimrbPQWds1bnkTc//n7y6ALRc9fqvN/8MJHf0wpUja
   dsRU+5pPlIOwJbnDyYzEZrS9
   -----END CERTIFICATE-----
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pxgraphviz
@@ -43,20 +43,20 @@ 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