family-reunion 0.1.7 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/family-reunion.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{family-reunion}
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitry Mozzherin", "David Shorthouse"]

data/lib/family-reunion/exact_matcher.rb

@@ -27,11 +27,23 @@ class FamilyReunion
       # Homonyms are treated separately, and are not matched by the algorithm,
       # they are excluded from valid_matches
       valid_matches.each do |name|
-        primary_id = @fr.primary_node.valid_names_hash[name][:id].to_s.to_sym
-        path = @fr.primary_node.valid_names_hash[name][:path]
-        path_ids = @fr.primary_node.valid_names_hash[name][:path_ids]
-        secondary_id = @fr.secondary_node.valid_names_hash[name][:id].to_s.to_sym
-        @fr.merges[primary_id] = {:matches => {secondary_id => {:merge_type => :exact_valid_to_valid, :path => path, :path_ids => path_ids }}, :nonmatches => {}}
+        pn = @fr.primary_node.valid_names_hash[:name]
+        sn = @fr.secondary_node.valid_names_hash[:name]
+        primary_id = pn[:id].to_s.to_sym
+        primary_path = pn[:path]
+        primary_path_ids = pn[:path_ids]
+        secondary_id = sn[:id].to_s.to_sym
+        secondary_path = sn[:path]
+        secondary_path_ids = sn[:path_ids]
+        @fr.merges[primary_id] = { 
+          :path => primary_path, 
+          :path_ids => primary_path_ids, 
+          :matches => {secondary_id => {
+            :merge_type => :exact_valid_to_valid, 
+            :path => secondary_path, 
+            :path_ids => secondary_path_ids}}, 
+          :nonmatches => {}
+        }
       end
     end
 

data/lib/family-reunion/matcher_helper.rb

@@ -6,7 +6,7 @@ class FamilyReunion
         raise "Secondary id is not a symbol" unless i.is_a?(Symbol)
         path = @fr.secondary_node.ids_hash[i][:path]
         path_ids = @fr.secondary_node.ids_hash[i][:path_ids]
-        res[i] = {:merge_type => merge_type, :path => path, :path_ids => path_ids} unless res.has_key?(i)
+        res[i] = { :merge_type => merge_type, :path => path, :path_ids => path_ids } unless res.has_key?(i)
         res
       end
     end
@@ -18,7 +18,9 @@ class FamilyReunion
           @fr.merges[primary_id][:matches][key] = val unless @fr.merges[primary_id][:matches].has_key?(key)
         end
       else
-        @fr.merges[primary_id] = {:matches => secondary_id_matches, :nonmatches => {}}
+        path = @fr.primary_node.ids_hash[i][:path]
+        path_ids = @fr.primary_node.ids_hash[i][:path_ids]     
+        @fr.merges[primary_id] = { :path => path, :path_ids => path_ids, :matches => secondary_id_matches, :nonmatches => {} }
       end
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1909949291295368264
+      hash: -402388446761307485
       segments: 
       - 0
       version: "0"