rubytree 0.9.5pre4 → 0.9.5pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a006133c7e37526b79f4256d041a29af0f34b04
-  data.tar.gz: 88eae77ba40ffc4a7a4e1e84bad59f25c3de0f91
+  metadata.gz: 850e06171da2b8d2ce18e1c2a753940720fa995f
+  data.tar.gz: d135be3794997cded9a37f969270e007878371b3
 SHA512:
-  metadata.gz: f951cea5ef06e9419b19e17d07c821e6b8c09dd57cd6eafe0e2cee60e9d1293ae645165f2f66e90a7577536fef3ed2e5f8d1441dca9cd934c4bf6816e8e245a0
-  data.tar.gz: 5a6ae6fb1df04a15dbf11b8293a2e566482d0372af299b49c4c33778a50c1b2f159feb9606422ec1c539ca17594122fb954d08712cd01ce40c25f9cb06f0f7d1
+  metadata.gz: c4a868546b8c5e32d216ac7ea5614bff5edd440ce6ef9927b210962f1aa5690afe8b36e797d0a077db4a955b6e42485b0dd3a8da45e52fbbbba9fc1bb4e7c271
+  data.tar.gz: d4f1e908972b00e23a7d93722e7cd32c7b40750bbfc8604cd527764dc8fb84d0e7cff42aa29e25041ca49b39cc738a4fdfcb907f487d79a575efd4415e8cf9a7

data/API-CHANGES.rdoc

@@ -9,6 +9,14 @@ Note: API level changes are expected to reduce dramatically after the 1.x
 release. In most cases, an alternative will be provided to ensure relatively
 smooth transition to the new APIs.
 
+== Release 0.9.5 Changes
+
+- The {Tree::TreeNode#add} method now provides 'move' semantics, if a child
+  which is on an existing tree is added to another tree, or location on the same
+  tree. In this situation, the child node is removed from its old position, and
+  added to the new parent node. After the add operation is complete, the child
+  no longer exists on the old tree/location.
+
 == Release 0.9.3 Changes
 
 - The validation for unique node names has changed in the {Tree::TreeNode#add}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubytree (0.9.5pre4)
+    rubytree (0.9.5pre5)
       json (~> 1.8)
       structured_warnings (~> 0.1)
 
@@ -23,7 +23,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rtags (0.98)
+    rtags (0.97)
     rtagstask (0.0.4)
       rtags (> 0.0.0)
     simplecov (0.9.1)

data/History.rdoc

@@ -2,6 +2,13 @@
 
 = History of Changes
 
+=== 0.9.5pre5 / 2015-01-01
+
+* Fixed {issue 32}{https://github.com/evolve75/RubyTree/issues/32} and enabled
+  'move' semantics on the {Tree::TreeNode#add} method, so that a child being
+  added, that has an existing parent, will be removed from its old parent, prior
+  to being added to the new location.
+
 === 0.9.5pre4 / 2014-12-17
 
 * Added performance improvements to {Tree::TreeNode#is_root?} and

data/TODO.org

@@ -187,6 +187,8 @@
 
 
 * R0.9.5
+** DONE Fix [[Issue:32][Issue #32]] and enable move semantics on the TreeNode#add method.               :ARCHIVE:
+   CLOSED: [2015-01-01 Thu 16:05]
 ** DONE Check the lazy initialization of =@node_depth= and changes in parent nodes          :ARCHIVE:
    CLOSED: [2014-12-18 Thu 11:05]
 ** DONE Pull the performance improvements from Aidan [[Pull:37][#37]]                                  :ARCHIVE:
@@ -235,6 +237,7 @@
       restructure the internals to make better use of memory.
 ** STARTED Convert all documentation to markdown mode.
 ** TODO Expand the examples section, and add supporting documentation
+
 * Unplanned / Not assigned to any release
 *** DONE [#A] Migrate the website and references from http://rubyforge.org/               :ARCHIVE:
     CLOSED: [2014-07-04 Fri 22:18]

data/lib/tree.rb

@@ -9,7 +9,7 @@
 # Author:: Anupam Sengupta (anupamsg@gmail.com)
 #
 
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Anupam Sengupta
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Anupam Sengupta
 #
 # All rights reserved.
 #
@@ -347,6 +347,12 @@ module Tree
     #
     # This is to prevent +nil+ nodes being created as children if a non-existant position is used.
     #
+    # If the new node being added has an existing parent node, then it will be
+    # removed from this pre-existing parent prior to being added as a child to
+    # this node. I.e., the child node will effectively be moved from its old
+    # parent to this node. In this situation, after the operation is complete,
+    # the node will no longer exist as a child for its old parent.
+    #
     # @param [Tree::TreeNode] child The child node to add.
     # @param [optional, Number] at_index The optional position where the node is to be inserted.
     #
@@ -365,6 +371,8 @@ module Tree
       # Lazy mans unique test, won't test if children of child are unique in this tree too.
       raise "Child #{child.name} already added!" if @children_hash.include?(child.name)
 
+      child.parent.remove! child if child.parent # Detach from the old parent
+
       if insertion_range.include?(at_index)
         @children.insert(at_index, child)
       else

data/lib/tree/version.rb

@@ -4,7 +4,7 @@
 #
 # Author:: Anupam Sengupta (anupamsg@gmail.com)
 #
-# Copyright (c) 2012, 2013, 2014 Anupam Sengupta
+# Copyright (c) 2012, 2013, 2014, 2015 Anupam Sengupta
 #
 # All rights reserved.
 #
@@ -37,5 +37,5 @@
 #
 module Tree
   # Rubytree Package Version
-  VERSION = '0.9.5pre4'
+  VERSION = '0.9.5pre5'
 end

data/test/test_tree.rb

@@ -2,7 +2,7 @@
 
 # test_tree.rb - This file is part of the RubyTree package.
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Anupam Sengupta
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Anupam Sengupta
 #
 # All rights reserved.
 #
@@ -512,6 +512,7 @@ module TestTree
 
       # Test the addition of a nil node.
       assert_raise(ArgumentError) { @root.add(nil) }
+
     end
 
     # Test the addition of a duplicate node (duplicate being defined as a node with the same name).
@@ -1615,28 +1616,45 @@ module TestTree
       root_node = Tree::TreeNode.new("OLDROOT")
 
       child_node = Tree::TreeNode.new("CHILD")
-      assert_equal(child_node.node_depth, 0)
+      assert_equal(0, child_node.node_depth)
 
       root_node << child_node
       assert_equal(root_node["CHILD"].name, "CHILD")
-      assert_equal(root_node.node_depth, 0)
-      assert_equal(child_node.node_depth, 1)
+      assert_equal(0, root_node.node_depth)
+      assert_equal(1, child_node.node_depth)
 
       grandchild_node = Tree::TreeNode.new("GRANDCHILD")
       child_node << grandchild_node
       assert_equal(root_node["CHILD"]["GRANDCHILD"].name, "GRANDCHILD")
-      assert_equal(root_node.node_depth, 0)
-      assert_equal(child_node.node_depth, 1)
-      assert_equal(grandchild_node.node_depth, 2)
+      assert_equal(0, root_node.node_depth)
+      assert_equal(1, child_node.node_depth)
+      assert_equal(2, grandchild_node.node_depth)
 
       root2_node = Tree::TreeNode.new("NEWROOT")
-      assert_equal(root2_node.node_depth, 0)
+      assert_equal(0, root2_node.node_depth)
 
       # Move the grand child to a new root.
       root2_node << grandchild_node
       assert_equal(root2_node["GRANDCHILD"].name, "GRANDCHILD")
-      assert_equal(grandchild_node.parent, root2_node)
-      assert_equal(grandchild_node.node_depth, 1)
+      assert_equal(root2_node, grandchild_node.parent)
+      assert_equal(1, grandchild_node.node_depth)
+
+      # Test the move semantics for addition of an existing child node
+      root1 = Tree::TreeNode.new("1")
+      root1 << Tree::TreeNode.new("2") << Tree::TreeNode.new("4")
+      root1 << Tree::TreeNode.new("3") << Tree::TreeNode.new("5")
+      root1["3"] << Tree::TreeNode.new("6")
+      assert_equal(root1["3"]["6"].name, "6")
+
+      # Create a new tree
+      root2 = root1.dup
+      assert_equal(root1, root2)
+      assert_not_same(root1, root2)
+
+      # Now 'move' the "4" node to the new tree. This should have 'dup' semantics.
+      root2["3"] << root1["2"]["4"]
+      assert_equal("3", root2["3"]["4"].parent.name) # This is on the new tree
+      assert_nil(root1["2"]["4"])                    # This is on the old tree
 
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytree
 version: !ruby/object:Gem::Version
-  version: 0.9.5pre4
+  version: 0.9.5pre5
 platform: ruby
 authors:
 - Anupam Sengupta