family-reunion 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/family-reunion.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{family-reunion}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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/nomatch_organizer.rb

@@ -39,21 +39,25 @@ class FamilyReunion
         name = path.pop.to_sym
         if paths_hash.has_key?(name)
           found_node = true
-          add_merged_node(paths_hash[name][1][-1], node[:id].to_s.to_sym)
+          add_merged_node(paths_hash[name], node[:id].to_s.to_sym)
           break
         end
       end
-      add_merged_node(@fr.primary_node.root_id, node[:id].to_s.to_sym) unless found_node
+      root_paths = @fr.primary_node.root_paths
+      add_merged_node(root_paths, node[:id].to_s.to_sym) unless found_node
     end
 
-    def add_merged_node(primary_node_id, secondary_node_id)
+    def add_merged_node(primary_paths, secondary_node_id)
+      primary_path = primary_paths[0]
+      primary_path_ids = primary_paths[1]
+      primary_node_id = primary_paths[1][-1]
       secondary_node_id = secondary_node_id.to_s.to_sym
-      path = @fr.secondary_node.ids_hash[secondary_node_id][:path]
-      path_ids = @fr.secondary_node.ids_hash[secondary_node_id][:path_ids]
+      secondary_path = @fr.secondary_node.ids_hash[secondary_node_id][:path]
+      secondary_path_ids = @fr.secondary_node.ids_hash[secondary_node_id][:path_ids]
       if @fr.merges.has_key?(primary_node_id) #never happens?
-        @fr.merges[primary_node_id][:nonmatches][secondary_node_id] = { :merge_type => "new", :path => path, :path_ids => path_ids }
+        @fr.merges[primary_node_id][:nonmatches][secondary_node_id] = { :merge_type => "new", :path => secondary_path, :path_ids => secondary_path_ids }
       else
-        @fr.merges[primary_node_id] = { :matches => {}, :nonmatches => {secondary_node_id => { :merge_type => nil, :path => path, :path_ids => path_ids } } }
+        @fr.merges[primary_node_id] = { :path => primary_path, :path_ids => primary_path_ids, :matches => {}, :nonmatches => {secondary_node_id => { :merge_type => nil, :path => secondary_path, :path_ids => secondary_path_ids } } }
       end
     end
 

data/lib/family-reunion/top_node.rb

@@ -91,11 +91,12 @@ class FamilyReunion
       end
     end
 
-    def root_id
-      unless @root_id
+    def root_paths
+      unless @root_name && @root_id
         @root_id = data[:leaves][0][:path_ids][0].to_s.to_sym
+        @root_name = data[:leaves][0][:path][0]
       end
-      @root_id
+      [[@root_name], [@root_id]]
     end
 
   end

data/spec/top_node_spec.rb

@@ -18,8 +18,8 @@ describe FamilyReunion::TopNode do
     res[:Linepithema].should == [[:Formicidae, :Linepithema], [:"invasiveants:tid:1381", :"invasiveants:tid:1425"]]
   end
 
-  it "should return root id" do
-    @node.root_id.should == :"invasiveants:tid:1381"
+  it "should return root paths" do
+    @node.root_paths.should == [["Formicidae"], [:"invasiveants:tid:1381"]]
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1781090361424484395
+      hash: -4464048702986745703
       segments: 
       - 0
       version: "0"