rbgraph 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 04c0debc8573783bc81a27d9e0ed6c7497bece33
4
- data.tar.gz: 6dff770d2106f9d740031c4af4f7178f17843532
3
+ metadata.gz: dc324b633811b9faf98e7eec3a283acd20e2651d
4
+ data.tar.gz: a77f9c42cea61a87af0633387bbd861af186998b
5
5
  SHA512:
6
- metadata.gz: cfb496a7a08258851191f7c7ad3c0d38721722cf259129a4c2cc457c50f789d4e122f7ef6d2a36a560a5701abe4f73b273a725da0d53a2d3c3c608cb704604cc
7
- data.tar.gz: 7128ebc5da90577cc29ddaf49e7daea40a915df2906b3b988c013a64cd0aabb811b5d9c60eee0727121459b1063a5b558e8eb355389ebf407aecd32fb2089e63
6
+ metadata.gz: d302d3788a0265a792c7bcb05af1d7086afc5181e71bb820c1179fa7ceda77bf1a4ce0e6fbbb23ac96e42b2cb3e63a8681fc0aedfb26c560a39383eb4467d6da
7
+ data.tar.gz: 2affb7c812e5f5679af555925ff1eff1af2834173655d86c36093af12b3b918d6871acdef9782b6b631672f4818e402ac9bd737c122ee83b85f84a67090a9a9d
data/lib/rbgraph/graph.rb CHANGED
@@ -67,6 +67,7 @@ module Rbgraph
67
67
  if new_node_id.nil?
68
68
  # If new_node_id is nil then select the first from the list as the surviving node.
69
69
  new_node = nodes[node_ids.shift]
70
+ new_node.data.merge!(new_node_data)
70
71
  else
71
72
  # Otherwise either check if a node with the given id exists, or create a new one.
72
73
  if nodes[new_node_id].nil?
@@ -74,7 +75,7 @@ module Rbgraph
74
75
  else
75
76
  new_node = nodes[new_node_id]
76
77
  random_not_existent_id = nodes.keys.sort_by { |k| -k.to_s.length } .first.to_s + "_"
77
- new_node.merge!(Node.new(self, 0, new_node_data))
78
+ new_node.merge!(Node.new(self, 0, new_node_data), keep_other_data: true)
78
79
  node_ids.delete(new_node_id)
79
80
  end
80
81
  end
data/lib/rbgraph/node.rb CHANGED
@@ -41,6 +41,9 @@ module Rbgraph
41
41
  end
42
42
 
43
43
  def merge!(node, options = {}, &block)
44
+ if options[:keep_other_data]
45
+ data.merge!(node.data)
46
+ end
44
47
  node.edges.values.group_by(&:kind).each do |kind, edges|
45
48
  edges.each do |edge|
46
49
  other_node = edge.other_node(node)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbgraph
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - George Lamprianidis
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
86
86
  version: '0'
87
87
  requirements: []
88
88
  rubyforge_project:
89
- rubygems_version: 2.4.6
89
+ rubygems_version: 2.5.1
90
90
  signing_key:
91
91
  specification_version: 4
92
92
  summary: Ruby graphs!