rbgraph 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d54e0a6798c66bbdf2100e1f4e6126778614e1
-  data.tar.gz: ace6a8ba9bfabea5c31b4203a63d01e4a1807749
+  metadata.gz: 00fbccd2d3d6d3581cc4f83a4e5a2558d75973fd
+  data.tar.gz: aa59996c09a895c62cc07771f41fb32230225eb1
 SHA512:
-  metadata.gz: 3a07510e4fd9dcc379817e91b226234a955496d80d64bde4cfc73a61a8f27124da836a0cdcc33d34638e8f855f8440f12e4de1129a9bdc7ea7270f7b75c888bb
-  data.tar.gz: a86f82fd3c4a9ea55ccf0fb0ebb3caba4d378f331121142187eecc07ec3d71dcbc218bbb4ccb0178331d7ec5e442acde8a0d09cf2eb720fccb3e0c99edff69c6
+  metadata.gz: 9357c46c09c8a6d354ad2c2f2f09b16f40997da435e1272ce897836ffc449ad91fbd798ed505269782d058befb1ccbf100ea47a25d69cacd3b830ff2b34e257b
+  data.tar.gz: fe0d188133e96de5f9be8c40ad4cbe53f0eaf3fa4e0e313c3ad10b2eb407eaeffb9df94c62fd41dfc7d71d653d69ab7bae074a31c1629a7bc0a8bc952fb634f3

data/README.md

@@ -63,7 +63,7 @@ graph.add_edge!({id: 1}, {id: 2}, {weight: 3})
 graph.edges["1==2"].weight => 5
 ```
 
-Version 0.0.11+
+Version 0.0.12+
 
 Support for node merging.
 ```ruby

data/lib/rbgraph/graph.rb

@@ -59,8 +59,15 @@ module Rbgraph
     def merge_nodes!(node_ids, new_attrs = {})
       node_ids = node_ids.map { |node_id| nodes[node_id].nil? ? nil : node_id } .compact
       return nil if node_ids.empty?
-      if new_attrs[:id].nil?
-        new_node = nodes[node_ids.shift]
+      new_id = new_attrs[:id]
+      new_node = nil
+      if new_id.nil?
+        if nodes[new_id].nil?
+          new_node = nodes[node_ids.shift]
+        else
+          new_node = nodes[new_id]
+          node_ids.delete(new_id)
+        end
         new_node.merge(Node.new({id: 0}.merge(new_attrs)))
       else
         new_node = add_node!(new_attrs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - George Lamprianidis