rbgraph 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00fbccd2d3d6d3581cc4f83a4e5a2558d75973fd
-  data.tar.gz: aa59996c09a895c62cc07771f41fb32230225eb1
+  metadata.gz: b0c267f9931130e8382595cdab738beee199b049
+  data.tar.gz: 841e41cd4ac0a71daa5ed6600776e00504bf4941
 SHA512:
-  metadata.gz: 9357c46c09c8a6d354ad2c2f2f09b16f40997da435e1272ce897836ffc449ad91fbd798ed505269782d058befb1ccbf100ea47a25d69cacd3b830ff2b34e257b
-  data.tar.gz: fe0d188133e96de5f9be8c40ad4cbe53f0eaf3fa4e0e313c3ad10b2eb407eaeffb9df94c62fd41dfc7d71d653d69ab7bae074a31c1629a7bc0a8bc952fb634f3
+  metadata.gz: 9eb091cd1521b53c428e324fb29218cc7f5fb99420576e001fb08260566a189c149b3b39200febf030c5c923b68840948c99471ff7578552cbedfb9a0afde329
+  data.tar.gz: 7725b8902851b2c13606b8fe3b21398ef277bf32cf03190284e1792d9602e4211d0a5c5aa7075ef4e53dcbcc4d23524b429286e0b0ae1c7155c3181ac1c692e4

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.12+
+Version 0.0.13+
 
 Support for node merging.
 ```ruby

data/lib/rbgraph/edge.rb

@@ -39,8 +39,9 @@ module Rbgraph
     end
 
     def merge(edge)
+      raise "Cannot merge directed and undirected edge!" if directed ^ edge.directed # XOR
       self.weight += edge.weight unless edge.weight.nil?
-      attributes.merge!(edge.attributes.reject { |k, v| k == :id })
+      attributes.merge!(edge.attributes)
       self
     end
 
@@ -60,6 +61,10 @@ module Rbgraph
       end
     end
 
+    def original_attributes
+      attributes.merge({directed: directed, weight: weight})
+    end
+
     def inspect
       "<Rbgraph::Edge:##{id} (#{weight}) [#{node1.inspect} #{directed ? "=(#{attributes[:kind]})=>>" : "==(#{attributes[:kind]})=="} #{node2.inspect}] #{attributes.inspect}>"
     end

data/lib/rbgraph/node.rb

@@ -42,9 +42,9 @@ module Rbgraph
       node.edges.values.each do |edge|
         other_node = edge.other_node(node)
         if edge.out_for?(node)
-          graph.add_edge!(self, other_node, edge.attributes) unless other_node == self
+          graph.add_edge!(self, other_node, edge.original_attributes) unless other_node == self
         elsif edge.in_for?(node)
-          graph.add_edge!(other_node, self, edge.attributes) unless other_node == self
+          graph.add_edge!(other_node, self, edge.original_attributes) unless other_node == self
         end
       end
       graph.remove_node!(node)

metadata

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