graph 2.5.2 → 2.5.3

data/History.txt

@@ -1,3 +1,14 @@
+=== 2.5.3 / 2013-05-10
+
+* 2 minor enhancements:
+
+  * Added <> quoted labels.
+  * Added Graph.escape_label.
+
+* 1 bug fix:
+
+  * Fixed issue with labels not escaping double quotes. (tenderlove)
+
 === 2.5.2 / 2013-02-07
 
 * 1 minor enhancement:

data/lib/graph.rb

@@ -7,7 +7,7 @@ require "enumerator"
 # dot format.
 
 class Graph
-  VERSION = "2.5.2" # :nodoc:
+  VERSION = "2.5.3" # :nodoc:
 
   # :stopdoc:
 
@@ -288,11 +288,20 @@ class Graph
     Attribute.new "fontsize = #{size}"
   end
 
+  def self.escape_label s
+    s = s.gsub(/\n/, '\n').gsub(/\"/, '\\\"')
+    if s[0] == ?< and s[-1] == ?> then
+      s
+    else
+      "\"#{s}\""
+    end
+  end
+
   ##
   # Shortcut method to set the graph's label. Usually used with subgraphs.
 
   def label name
-    graph_attribs << "label = \"#{name.gsub(/\n/, '\n')}\""
+    graph_attribs << "label = #{Graph.escape_label name}"
   end
 
   ##
@@ -493,7 +502,7 @@ class Graph
 
     def label name
       attributes.reject! { |s| s =~ /^label =/ }
-      attributes << "label = \"#{name.gsub(/\n/, '\n')}\""
+      attributes << "label = #{Graph.escape_label name}"
       self
     end
 

data/test/test_graph.rb

@@ -109,6 +109,18 @@ class TestGraph < MiniTest::Unit::TestCase
     assert_graph graph, 'label = "blah"', '"a" -> "b"'
   end
 
+  def test_label_html
+    graph.label "<<B>blah</B>>"
+
+    assert_graph graph, 'label = <<B>blah</B>>', '"a" -> "b"'
+  end
+
+  def test_label_quote
+    graph.label 'blah"blah'
+
+    assert_graph graph, 'label = "blah\\"blah"', '"a" -> "b"'
+  end
+
   def test_label_newline
     graph.label "blah\nblah"
 
@@ -369,6 +381,12 @@ class TestNode < MiniTest::Unit::TestCase
     assert_equal ["label = \"blah\""], n.attributes
   end
 
+  def test_label_html
+    n.label "<<B>Foo</B>>"
+
+    assert_equal ["label = <<B>Foo</B>>"], n.attributes
+  end
+
   def test_label_newline
     n.label "blah\nblah"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graph
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 5
-  - 2
-  version: 2.5.2
+  - 3
+  version: 2.5.3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-02-07 00:00:00 Z
+date: 2013-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -46,11 +46,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 31
         segments: 
-        - 4
         - 5
-        version: "4.5"
+        - 0
+        version: "5.0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 4
+        - 0
+        version: "4.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
-        - 5
-        version: "3.5"
+        - 6
+        version: "3.6"
   type: :development
   version_requirements: *id003
 description: |-