ruby-graphviz 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b41b2ddc156dd0ea02af2fdc5914e9494e61a4e0
-  data.tar.gz: a10df946f3a81fb23d44dafe6b3d89c46dc64cad
+  metadata.gz: ee3e2c6ea3129992d49749953d36d348aea8266e
+  data.tar.gz: 7d471149cc78c328ab5f676774e442910d432e4d
 SHA512:
-  metadata.gz: 343df04cb63e2694e04ae3c6cb1343207aa13f6e4b7abdbd6f394613045bb04aa508050903179c757eeec9699dd3034dddfe0305a0e2d2ee0244454586593b2e
-  data.tar.gz: 3f9eb3928166fc170e924a6c302d2baf1c685930431700f3bf792fd1d51712c5ba85f8f7f33fa13a533a77629279f4fea270ee9dda6318f81f4d83a18a243a8b
+  metadata.gz: 27f49c9370581d707445cb64645e78f87393346c9d62f3f9d2d84e795d9960d636e443643f44ea9b4fef845e6242ce23ff8102cd351455eb677efbc36dc73d6b
+  data.tar.gz: 588e4688a8896e6ad530b57d4c81ead08a42de98b87e8a8ad05afd744d9eaf7b1612ae2f766b9dee6b3243ef7fa51ada8eccc46c351c51bf711b3d935de28dc4

data/examples/sample73.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" )
+require "graphviz"
+
+g = nil
+if ARGV[0]
+  g = GraphViz::new( "G", :path => ARGV[0] )
+else
+  g = GraphViz::new( "G" )
+end
+
+g.add_nodes "HtmlOne", label: '<<b>This</b> is an<br/>HTML Node>'
+g.add_nodes "HtmlTwo", label: '<This is also<br/>an HTML node>'
+g.add_nodes "NotHtmlOne", label: '<this is not an HTML node>'
+g.add_nodes "NotHtmlTwo", label: 'this is not an HTML node, too!'
+
+g.output( :png => "#{$0}.png" )

data/lib/graphviz.rb

@@ -761,8 +761,8 @@ class GraphViz
   # * :path : Program PATH
   #
   def self.parse_string( str, hOpts = {}, &block )
-    graph = Dot2Ruby::new( hOpts[:path], nil, nil ).eval_string( str )
-    yield( graph ) if( block and graph )
+    graph = Dot2Ruby::new(hOpts[:path], nil, nil).eval_string(str)
+    yield(graph) if(block and graph)
     return graph
   end
 

data/lib/graphviz/constants.rb

@@ -41,7 +41,7 @@
 #
 class GraphViz
   module Constants
-    RGV_VERSION = "1.1.0"
+    RGV_VERSION = "1.2.0"
 
     ## Const: Output formats
     FORMATS = [
@@ -121,11 +121,12 @@ class GraphViz
       "Damping"             => { :usedBy => "G",    :type => :GvDouble },
       "K"                   => { :usedBy => "GC",   :type => :GvDouble },
       "URL"                 => { :usedBy => "ENGC", :type => :EscString },
+      "_background"         => { :usedBy => "G",    :type => :EscString },
       "area"                => { :usedBy => "NC",   :type => :GvDouble },
       "arrowhead"           => { :usedBy => "E",    :type => :ArrowType }, # arrowType
       "arrowsize"           => { :usedBy => "E",    :type => :GvDouble },
       "arrowtail"           => { :usedBy => "E",    :type => :ArrowType }, # arrowType
-      "aspect"              => { :usedBy => "G",    :type => :EscString }, # aspectType
+      #"aspect"              => { :usedBy => "G",    :type => :EscString }, # aspectType
       "bb"                  => { :usedBy => "G",    :type => :Rect }, # rect
       "bgcolor"             => { :usedBy => "GC",   :type => :Color }, # color
       "center"              => { :usedBy => "G",    :type => :GvBool },    # bool
@@ -162,6 +163,7 @@ class GraphViz
       "gradientangle"       => { :usedBy => "NCG",  :type => :EscString }, # int
       "group"               => { :usedBy => "N",    :type => :EscString }, # string
       "headURL"             => { :usedBy => "E",    :type => :EscString },
+      "head_lp"             => { :usedBy => "E",    :type => :EscString }, #point
       "headclip"            => { :usedBy => "E",    :type => :GvBool }, # bool
       "headhref"            => { :usedBy => "E",    :type => :EscString },
       "headlabel"           => { :usedBy => "E",    :type => :EscString }, # LblString
@@ -174,6 +176,7 @@ class GraphViz
       "image"               => { :usedBy => "N",    :type => :EscString }, # string
       "imagepath"           => { :usedBy => "G",    :type => :EscString }, # string
       "imagescale"          => { :usedBy => "N",    :type => :EscString }, # bool, string
+      "inputscale"          => { :usedBy => "G",    :type => :GvDouble },
       "label"               => { :usedBy => "ENGC", :type => :LblString },
       "labelURL"            => { :usedBy => "E",    :type => :EscString },
       "label_scheme"        => { :usedBy => "G",    :type => :EscString }, # int
@@ -221,6 +224,7 @@ class GraphViz
       "outputorder"         => { :usedBy => "G",    :type => :EscString }, # outputMode
       "overlap"             => { :usedBy => "G",    :type => :EscString }, # string, bool
       "overlap_scaling"     => { :usedBy => "G",    :type => :GvDouble },
+      "overlap_shrink"      => { :usedBy => "G",    :type => :GvBool },
       "pack"                => { :usedBy => "G",    :type => :EscString }, # bool, int
       "packmode"            => { :usedBy => "G",    :type => :EscString }, # packMode
       "pad"                 => { :usedBy => "G",    :type => :EscString }, # GvDouble , pointf
@@ -264,6 +268,7 @@ class GraphViz
       "style"               => { :usedBy => "ENCG", :type => :EscString }, # style
       "stylesheet"          => { :usedBy => "G",    :type => :EscString }, # string
       "tailURL"             => { :usedBy => "E",    :type => :EscString },
+      "tail_lp"             => { :usedBy => "E",    :type => :EscString }, #point
       "tailclip"            => { :usedBy => "E",    :type => :GvBool }, # bool
       "tailhref"            => { :usedBy => "E",    :type => :EscString },
       "taillabel"           => { :usedBy => "E",    :type => :EscString }, # lblString
@@ -278,7 +283,9 @@ class GraphViz
       "voro_margin"         => { :usedBy => "G",    :type => :GvDouble },
       "weight"              => { :usedBy => "E",    :type => :GvDouble },
       "width"               => { :usedBy => "N",    :type => :GvDouble },
+      "xdotversion"         => { :usedBy => "G",    :type => :EscString },
       "xlabel"              => { :usedBy => "EN",   :type => :LblString },
+      "xlp"                 => { :usedBy => "EN",   :type => :EscString }, # point
       "z"                   => { :usedBy => "N",    :type => :GvDouble }
     }
 

data/lib/graphviz/dot2ruby.rb

@@ -24,7 +24,7 @@ class Dot2Ruby #:nodoc:
   def initialize( xGVPath, xOutFile, xOutFormat = nil ) #:nodoc:
     paths = (xGVPath.nil?) ? [] : [xGVPath]
     @xGvprPath = find_executable( 'gvpr', paths )
-    if (@xGvprPath.blank?)
+    if(@xGvprPath.nil?)
       raise Exception, "GraphViz is not installed. Please be sure that 'gvpr' is on the search path'"
     end
     @xOutFile = xOutFile

data/lib/graphviz/types/lbl_string.rb

@@ -1,3 +1,5 @@
+require "rexml/document"
+
 class GraphViz
   class Types
     class LblString < Common
@@ -6,9 +8,19 @@ class GraphViz
       end
 
       def output
-        html = /^<([<|(^<)*<].*)>$/m.match(@data.to_s)
+        html = /^<(.*)>$/m.match(@data.to_s)
         if html != nil
-          "<#{html[1]}>"
+          xml = "<gv>" + html[1].to_s + "</gv>"
+          begin
+            doc = REXML::Document.new(xml)
+            unless doc.root.text == html[1].to_s
+              "<#{html[1]}>"
+            else
+              @data.to_s.inspect.gsub( "\\\\", "\\" )
+            end
+          rescue REXML::ParseException => _
+            @data.to_s.inspect.gsub( "\\\\", "\\" )
+          end
         else
           @data.to_s.inspect.gsub( "\\\\", "\\" )
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-graphviz
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Gregoire Lejeune
@@ -200,6 +200,7 @@ files:
 - examples/sample70.rb
 - examples/sample71.rb
 - examples/sample72.rb
+- examples/sample73.rb
 - examples/sample99.rb
 - examples/sdlshapes/README
 - examples/sdlshapes/sdl.ps
@@ -295,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-asp
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Interface to the GraphViz graphing tool