graphvizml 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70367b15cd9ecda5a2010ca241fdd7e5ff80c3356df9ab7b599c8a4e0a812fc7
-  data.tar.gz: 8fc13a6a0f08d6786a12327ed39fdb0735d5ff7b7f43359eefd05b6771ca43b4
+  metadata.gz: 57e4bd5177b9a6a52b44ac67dce1e976552bf7f3c0d155fcb4370aa867a2db3f
+  data.tar.gz: db88a92bb05f7dd7b70fe4ec71ac3554b8ce03d8416a25237c6ac778dff63d7c
 SHA512:
-  metadata.gz: 75ba5f6d83152d16c870101bb3157cb5fcd6aa651586992d84f19a34631ce67a5d88601bb9682b5bd3e5881f2374098d59ab400d484bc8bfbb3e39f4470561a4
-  data.tar.gz: 661c553f24df368c9c8855d9bb98c39dba70d5bf35eba744ca349647847754691a339bbb46457689cd36b080387b3a19e9e0a2de401002ea0ddd4cddfe5b70f5
+  metadata.gz: 56018ce66a16026318eb72d0286fb67045488625175255e1e872dff7747eb0558a6e72571c5b7fb362f094b74fadf771267213ffcadb5f01af0c6bbf3ee6a2f9
+  data.tar.gz: ad2cfda911d1585ca6d18625d4fdafbb09c867b00e1c09f1950ac1e727dae9858e43a1000778a5d63fc615ea29acde81963693f09d6e54d2729e9f8270ce3598

data/lib/graphvizml.rb

@@ -35,24 +35,35 @@ class GraphVizML
     @fill, @stroke, @text_color = fill, stroke, text_color
     
     if obj then
+    
+            
+      xml = if obj.is_a? Rexle or obj.is_a? Rexle::Element
       
-      s = RXFHelper.read(obj).first
+        obj.xml
       
-      if s =~ /<\?graphvizml\b/ then
-        
-        import_string s        
+      else 
         
-      else
+        s = RXFHelper.read(obj).first
       
-        if @debug then
-          #File.write '/tmp/graphviz.xml', xml
-          puts('graphvizml xml: ' + s.inspect) 
+        if  s =~ /<\?graphvizml\b/ then
+          
+          import_string s        
+          
+        else
+        
+          if @debug then
+            #File.write '/tmp/graphviz.xml', xml
+            puts('graphvizml xml: ' + s.inspect) 
+          end        
+          
+          s
+        
         end
         
-        @g = build_from_nodes Domle.new(s)
-      
       end
       
+      @g = build_from_nodes Domle.new(xml)
+      
     end
     
     @css = "
@@ -67,7 +78,9 @@ class GraphVizML
   def import(obj)
     
     s = RXFHelper.read(obj).first
-    import_string s
+    xml = import_string s
+    @g = build_from_nodes Domle.new(xml)
+    self
     
   end
 
@@ -265,8 +278,6 @@ EOF
     end 
     
     xml = LineTree.new(s, root: 'nodes', debug: true).to_xml
-    @g = build_from_nodes Domle.new(xml)
-    self
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphvizml
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - James Robertson