graph 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 945fcc7c3bb48cd8b29c4d0256fb8ac8da6019c0
-  data.tar.gz: 4b4b4198c09670a896e3b0e207505622b565a3b1
+  metadata.gz: 574ca778f479293c4fb24c185b89154f57704c82
+  data.tar.gz: e33fba3e10c00412b59b70f28bb35176bda1200c
 SHA512:
-  metadata.gz: c87418ac8521f4d3f00ea09d3a7a28a6859bc7b2bdc3b2f4a8d7ab01a9a3ed7e6998788db292b48c33317c33fac0e4fe137b7e234599326b07406ea51677a891
-  data.tar.gz: f38de70e44669917a624bb4735fe2d78258691f0241c30130f2936fc9e2196f6f6a620cd5966a3e1b86e843089c44696406de729759720f725c1f418a0dea75f
+  metadata.gz: 3b6f02a139e1b6d7b587800d2f49901175f05fcdf83ddbbf365d7e0564160d4ffeed72dedcf4ce063f66b4e1222dd03cb47f1d8730bd802c16c1b98bc1761ae6
+  data.tar.gz: a4a6a9c7762e7f70f7a5a932765f52a52b54b79f532e6f6991fd0395ca6a2b647104e59757d6dc94f0bf972a114a3b3b8d299770ace10b8d9c517099a2031315

data/.autotest

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 
 require 'autotest/restart'
-require 'autotest/rcov'
+# require 'autotest/rcov'
 
 Autotest.add_hook :initialize do |at|
   at.testlib = "minitest/autorun"

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.8.2 / 2016-10-09
+
+* 2 bug fixes:
+
+  * delete_node cleans up edges and edges_order.
+  * escape_label better deals with symbols.
+
 === 2.8.1 / 2016-01-21
 
 * 1 bug fix:

data/Rakefile

@@ -8,6 +8,7 @@ Hoe.plugin :seattlerb
 
 Hoe.spec 'graph' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
+  license "MIT"
 end
 
 gallery = Dir["gallery/*.rb"]

data/lib/graph.rb

@@ -7,7 +7,7 @@ require "enumerator"
 # dot format.
 
 class Graph
-  VERSION = "2.8.1" # :nodoc:
+  VERSION = "2.8.2" # :nodoc:
 
   # :stopdoc:
 
@@ -291,7 +291,7 @@ class Graph
   end
 
   def self.escape_label s
-    s = s.gsub(/\n/, '\n').gsub(/\"/, '\\\"')
+    s = s.to_s.gsub(/\n/, '\n').gsub(/\"/, '\\\"')
     if s[0] == ?< and s[-1] == ?> then
       s
     else
@@ -377,6 +377,14 @@ class Graph
   def delete_node node_name
     nodes.delete node_name
     nodes_order.delete node_name
+
+    edges_order.each do |(a, b)|
+      edges[a].delete b if b == node_name
+      edges.delete a if a == node_name
+      edges.delete a if edges[a].empty?
+    end
+
+    edges_order.delete_if { |ary| ary.include? node_name }
   end
 
   ##

data/test/test_graph.rb

@@ -109,23 +109,41 @@ class TestGraph < Minitest::Test
     assert_graph graph, 'label = "blah"', '"a" -> "b"'
   end
 
+  def assert_delete_node name, exp, edges=true
+    assert_equal 2,       graph.nodes.length
+    assert_equal 2,       graph.nodes_order.length
+    assert_equal %w[a b], graph.nodes.keys.sort
+
+    if edges then
+      assert_equal 1, graph.edges.length
+      assert_equal 1, graph.edges_order.length
+    end
+
+    graph.delete_node name
+
+    assert_equal 1,   graph.nodes.length
+    assert_equal 1,   graph.nodes_order.length
+    assert_equal exp, graph.nodes.keys.sort
+    assert_equal 0,   graph.edges.length
+    assert_equal 0,   graph.edges_order.length
+  end
+
   def test_delete_node
-    g = digraph do
+    @graph = digraph do
       node "a"
       node "b"
     end
 
-    assert_equal 2, g.nodes.length
-    assert_equal 2, g.nodes_order.length
-    assert_equal %w[a b], g.nodes.keys.sort
-
-    g.delete_node "a"
+    assert_delete_node "a", %w[b], false
+  end
 
-    assert_equal 1, g.nodes.length
-    assert_equal 1, g.nodes_order.length
-    assert_equal %w[b], g.nodes.keys.sort
+  def test_delete_node_edges_front
+    assert_delete_node "a", %w[b]
   end
 
+  def test_delete_node_edges_back
+    assert_delete_node "b", %w[a]
+  end
 
   def test_label_html
     graph.label "<<B>blah</B>>"
@@ -183,11 +201,11 @@ class TestGraph < Minitest::Test
   end
 
   def test_save
-    util_save "png"
+    assert_save "png"
   end
 
   def test_save_nil
-    util_save nil
+    assert_save nil
   end
 
   def test_shape
@@ -269,20 +287,21 @@ g_s = "subgraph \"subgraph\"
                  '"a" -> "b"')
   end
 
-  def util_save type
+  def assert_save type
     path = File.join(Dir.tmpdir, "blah.#{$$}")
 
-    $x = nil
+    actual = expected = false
 
-    def graph.system(*args)
-      $x = args
+    mc = (class << graph; self; end)
+    mc.send :define_method, :system do |*args|
+      actual = args
     end
 
     graph.save(path, type)
 
     assert_equal graph.to_s + "\n", File.read("#{path}.dot")
     expected = ["dot -T#{type} #{path}.dot > #{path}.png"] if type
-    assert_equal expected, $x
+    assert_equal expected, actual
   ensure
     File.unlink path rescue nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graph
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,31 +20,18 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
-  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
-  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
-  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
-  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
-  NLq5jm1fq6Y9Uolu3RJbmycf
+  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
+  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
+  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
+  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
+  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
+  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
+  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
+  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +52,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 description: "Graph is a type of hash that outputs in graphviz's dot format. It\ncomes
   with a command-line interface that is easily pluggable.\n\nIt ships with plugins
   to graph dependencies and status of installed\nrubygems, rake tasks, homebrew ports,