pxgraphviz 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f73184b1cef8e81842516e538451db8d8560579ae2ef32e4df8bf90d48d459
-  data.tar.gz: af7d1eeb5592936825ba4865eed0c6573641140669d53a0a11edab252594a8aa
+  metadata.gz: a78ce580851bb82d22fa2fb8cae46f76b00983960ae6c5a5eb2a1b9a1a8345e2
+  data.tar.gz: ecb6566e9be469c2af046ea6be9fb80334a4c6bdbd94ce2bd7529224d6f39c24
 SHA512:
-  metadata.gz: 3378a5d20a452a3d2f9edc6f33add84ef84d5eb3c8936e9980bd0e8b7d1bef76a6b42b49896e8fbbe3832ac07ba0a2381f181b9fe50f815f3cf87e0f6531097c
-  data.tar.gz: ddf70aa9c62d18e4083d0ffa9f9012f91936cfd91537fe99c74496a7b5400759bafd69915020c9c11149d2f8dc2898f5ac2c6fe2d2cbb712cf15d99f56d71e2a
+  metadata.gz: e3c0eaf7ca54185fff20f64523bc34ed8a18d411dd61b63b03f5771a87a3ea86084f4a3e01ad6f7ee11e409ea3a2095b2128e95e30a16b5a987d84a96dcf5878
+  data.tar.gz: ffa438ed496981f3d213c83f920d2cd3fd38ff5ceb712aefd96fce90a462e1886da551ea17427a583dbc18f21739562d1d6209224591dc0390ff7cc4bf5a68be

data/lib/pxgraphviz.rb

@@ -7,38 +7,55 @@ require 'polyrex'
 require 'graphvizml'
 
 
+module RegGem
+
+  def self.register()
+'
+hkey_gems
+  doctype
+    pxgraphviz
+      require pxgraphviz
+      class PxGraphViz
+      media_type svg
+'      
+  end
+end
+
+
 class PxGraphViz < GraphVizML
   using ColouredText
 
   attr_reader :doc, :px
 
-  def initialize(s, style: nil, debug: false, fill: '#778833', 
+  def initialize(obj=nil, style: nil, debug: false, fill: '#778833', 
                  stroke: '#999999', text_color: '#ffeecc')
 
-    @px = s =~ /^<\?/ ? Polyrex.new.import(s) : Polyrex.new(s)
+    if obj then
 
-    @type = @px.summary[:type] == 'digraph' ? 'dir: forward;' : 'dir: none;'
-    @shape = @px.summary[:shape] || 'ellipse;'
-    
-    style ||= default_stylesheet()
-    doc = Rexslt.new(xslt_stylesheet(), @px.to_xml)\
-        .to_doc.root.element('nodes')
-    
-    doc.root.elements.first.insert_before Rexle::Element.new('style')\
-        .add_text style
-    @doc = doc
-    puts 'pxgraphviz: before super'.info if debug
+      s = RXFHelper.read(obj).first
+      @doc = import_string(s)
 
-    super(doc, debug: debug, fill: fill, 
-                 stroke: stroke, text_color: text_color)
+      puts 'pxgraphviz: before super'.info if debug
+
+      super(@doc, debug: debug, fill: fill, 
+                  stroke: stroke, text_color: text_color)
+      
+    end
     
     @css = "
-      .node ellipse {stroke: #{stroke}; fill: #{fill}}
+      .node polygon {stroke: #{stroke}; fill: #{fill}}
       .node text {fill: #{text_color}}
       .edge path {stroke: #{stroke}}
       .edge polygon {stroke: #{stroke}; fill: #{stroke}}
     "
     
+  end
+
+  def import(s)
+    s2 = RXFHelper.read(s).first
+    @doc = import_string s2
+    @g = build_from_nodes Domle.new(@doc.root.xml)
+    self
   end  
     
   
@@ -49,8 +66,8 @@ class PxGraphViz < GraphVizML
 <<STYLE
   node { 
     color: #ddaa66; 
-    fillcolor: #778833;
-    fontcolor: #ffeecc; 
+    fillcolor: #{@fill};
+    fontcolor: #{@text_color}; 
     fontname: 'Trebuchet MS';
     fontsize: 8; 
     margin: 0.0;
@@ -65,7 +82,7 @@ class PxGraphViz < GraphVizML
 
   edge {
     arrowsize: 0.5;
-    color: #999999; 
+    color: #{@stroke}; 
     fontcolor: #444444; 
     fontname: Verdana; 
     fontsize: 8; 
@@ -76,8 +93,62 @@ STYLE
 
   end
 
+  
   private
   
+  def import_string(s)
+
+    @px = if s =~ /<\?pxgraphviz\b/ then
+      
+header = "<?polyrex schema='items[type, shape]/item[label, connection]' delimiter =' # '?>
+type: digraph
+shape: box    
+"
+      s2 = s.slice!(/<\?pxgraphviz\b[^>]*\?>/)
+
+      if s2 then
+        
+        attributes = %w(id fill stroke text_color).inject({}) do |r, keyword|
+          found = s2[/(?<=#{keyword}=['"])[^'"]+/]
+          found ? r.merge(keyword.to_sym => found) : r
+        end
+        
+      fill, stroke, text_color = %i(fill stroke text_color).map do |x|
+        attributes[x] ? attributes[x] : method(x).call
+      end
+      
+      @css = "
+        .node ellipse {stroke: #{stroke}; fill: #{fill}}
+        .node text {fill: #{text_color}}
+        .edge path {stroke: #{stroke}}
+        .edge polygon {stroke: #{stroke}; fill: #{stroke}}
+      "      
+        
+      end 
+      s3 = header + s
+      puts 's3: ' + s3.inspect if @debug
+      Polyrex.new.import(s3)
+      
+    else
+      
+      Polyrex.new(s)
+      
+    end    
+
+    @type = @px.summary[:type] == 'digraph' ? 'dir: forward;' : 'dir: none;'
+    @shape = @px.summary[:shape] || 'ellipse;'
+    
+    style ||= default_stylesheet()
+    doc = Rexslt.new(xslt_stylesheet(), @px.to_xml)\
+        .to_doc.root.element('nodes')
+    
+    doc.root.elements.first.insert_before Rexle::Element.new('style')\
+        .add_text style
+    
+    doc
+    
+  end
+  
   def xslt_stylesheet()
     
 <<XSLT    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pxgraphviz
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson