family-reunion 0.2.2 → 0.2.3
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/family-reunion.gemspec +1 -1
- data/lib/family-reunion/nomatch_organizer.rb +2 -2
- metadata +3 -3
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.2.
|
1
|
+
0.2.3
|
data/family-reunion.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{family-reunion}
|
8
|
-
s.version = "0.2.
|
8
|
+
s.version = "0.2.3"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Dmitry Mozzherin", "David Shorthouse"]
|
@@ -49,7 +49,7 @@ class FamilyReunion
|
|
49
49
|
|
50
50
|
def add_merged_node(primary_paths, secondary_node_id)
|
51
51
|
primary_path = primary_paths[0]
|
52
|
-
primary_path_ids = primary_paths[1]
|
52
|
+
primary_path_ids = primary_paths[1].map { |i| i.to_s }
|
53
53
|
primary_node_id = primary_paths[1][-1]
|
54
54
|
secondary_node_id = secondary_node_id.to_s.to_sym
|
55
55
|
secondary_path = @fr.secondary_node.ids_hash[secondary_node_id][:path]
|
@@ -57,7 +57,7 @@ class FamilyReunion
|
|
57
57
|
if @fr.merges.has_key?(primary_node_id) #never happens?
|
58
58
|
@fr.merges[primary_node_id][:nonmatches][secondary_node_id] = { :merge_type => "new", :path => secondary_path, :path_ids => secondary_path_ids }
|
59
59
|
else
|
60
|
-
@fr.merges[primary_node_id] = { :path => primary_path, :path_ids => primary_path_ids, :matches => {}, :nonmatches => {secondary_node_id => { :merge_type =>
|
60
|
+
@fr.merges[primary_node_id] = { :path => primary_path, :path_ids => primary_path_ids, :matches => {}, :nonmatches => {secondary_node_id => { :merge_type => "new", :path => secondary_path, :path_ids => secondary_path_ids } } }
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 2
|
8
|
-
-
|
9
|
-
version: 0.2.
|
8
|
+
- 3
|
9
|
+
version: 0.2.3
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Dmitry Mozzherin
|
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
233
233
|
requirements:
|
234
234
|
- - ">="
|
235
235
|
- !ruby/object:Gem::Version
|
236
|
-
hash: -
|
236
|
+
hash: -2172044088905792961
|
237
237
|
segments:
|
238
238
|
- 0
|
239
239
|
version: "0"
|