rubytree 0.9.5pre → 0.9.5pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e0fdbd846f7fada7cd50d0e0ab414834f464dc
-  data.tar.gz: 3e70254cbc163580c3b7e40a497292a8e4d15128
+  metadata.gz: 3228b0b44776c265981c6e870b806eac361f8adf
+  data.tar.gz: 310b261873bc3d2ba5ad1e45e5f56145bc02d6f8
 SHA512:
-  metadata.gz: 957a7cdbb556f41f9c599f82483f058e72cf432837a73bf71d1c86a26c0a3f1c2e1d3a8706a419d1c057b46920215ba2b9046bd83f10720efe46f3bb29bb2486
-  data.tar.gz: e74fb819ae9e568a1d5409f98ae89c18e0bd85f98300df7cc272dbfa9a7c4f01aa1d9474a8bc7fbb0f334019e3b045e2313621f16b2276aaf206bec24f241c6e
+  metadata.gz: 65f56e0e2848d8f3756ed0225beb92dc055200f1b94e7c376a5593253c844966634e38362b1aedf82160434878985c27ded1805da419d5b508ad309db8ec4ae3
+  data.tar.gz: 38777f6bf8ed9164df5f740e01120640f1df2f4cb26156795c0e8dc884e4d7fd8a881bf7400e3ab1d24fca0ea49cb1f6ae371ba2726ee37283dc6f9d87111513

data/Gemfile.lock

@@ -1,30 +1,28 @@
 PATH
   remote: .
   specs:
-    rubytree (0.9.5pre)
+    rubytree (0.9.5pre2)
       json (~> 1.8)
       structured_warnings (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coveralls (0.7.1)
+    coveralls (0.7.2)
       multi_json (~> 1.3)
-      rest-client
+      rest-client (= 1.6.7)
       simplecov (>= 0.7)
-      term-ansicolor
-      thor
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
     docile (1.1.5)
     json (1.8.1)
     mime-types (2.4.3)
     multi_json (1.10.1)
-    netrc (0.8.0)
-    rake (10.3.2)
-    rdoc (4.1.2)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rtags (0.98)
     rtagstask (0.0.4)
       rtags (> 0.0.0)
@@ -34,10 +32,10 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     structured_warnings (0.1.4)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.3.3)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    tins (0.13.2)
     yard (0.8.7.6)
 
 PLATFORMS

data/History.rdoc

@@ -2,6 +2,12 @@
 
 = History of Changes
 
+=== 0.9.5pre2 / 2014-12-16
+
+* Added {Tree::TreeNode#rename} and {Tree::TreeNode#rename_child} methods by
+  merging in code from {https://github.com/evolve75/RubyTree/pull/35}. Thanks
+  to {http://github.com/packetmonkey Evan Sharp}.
+
 === 0.9.5pre / 2014-11-01
 
 * Fixed {issue 13}[https://github.com/evolve75/RubyTree/issues/13] with the

data/README.md

@@ -211,6 +211,9 @@ A big thanks to the following contributors for helping improve **RubyTree**:
 6. [Paul de Courcel](https://github.com/pdecourcel) for adding the
    `postordered_each` method.
 7. [Jen Hamon](http://www.github.com/jhamon) for adding the `from_hash` method.
+8. [Evan Sharp](https://github.com/packetmonkey) for adding the `rename` and
+   `rename_child` methods.
+
 
 ## LICENSE: ##
 

data/TAGS

@@ -68,56 +68,59 @@ module Tree::Tree
39,1838
 lib/tree/version.rb,27
 module Tree::Tree
38,1723
 
-lib/tree.rb,2790
+lib/tree.rb,2947
 module Tree::Tree
48,2158
   class TreeNode::Tree::TreeNode
85,3731
-    attr_reader   :name::Tree::TreeNode#name
109,4522
-    attr_accessor :content::Tree::TreeNode#content
116,4721
-    attr_reader   :parent::Tree::TreeNode#parent
120,4837
-    def root::Tree::TreeNode#root
127,5049
-    def is_root?::Tree::TreeNode#is_root?
138,5355
-    def has_content?::Tree::TreeNode#has_content?
146,5538
-    def is_leaf?::Tree::TreeNode#is_leaf?
157,5792
-    def parentage::Tree::TreeNode#parentage
169,6167
-    def has_children?::Tree::TreeNode#has_children?
187,6593
-    def initialize::Tree::TreeNode#Tree::TreeNode.new
210,7419
-    def detached_copy::Tree::TreeNode#detached_copy
228,8036
-    def detached_subtree_copy::Tree::TreeNode#detached_subtree_copy
238,8322
-    alias :dup::Tree::TreeNode#dup
247,8583
-    def marshal_dump::Tree::TreeNode#marshal_dump
252,8761
-    def create_dump_rep::Tree::TreeNode#create_dump_rep
258,8929
-    def marshal_load::Tree::TreeNode#marshal_load
273,9467
-    def to_s::Tree::TreeNode#to_s
298,10251
-    def <<::Tree::TreeNode#<<
321,11022
-    def add::Tree::TreeNode#add
356,12550
-    def insertion_range::Tree::TreeNode#insertion_range
376,13512
-    def replace!::Tree::TreeNode#replace!
391,13930
-    def replace_with::Tree::TreeNode#replace_with
405,14303
-    def remove!::Tree::TreeNode#remove!
423,15035
-    def parent=::Tree::TreeNode#parent=
438,15438
-    def remove_from_parent!::Tree::TreeNode#remove_from_parent!
451,15823
-    def remove_all!::Tree::TreeNode#remove_all!
462,16195
-    def set_as_root!::Tree::TreeNode#set_as_root!
473,16424
-    def freeze_tree!::Tree::TreeNode#freeze_tree!
483,16750
-    def []::Tree::TreeNode#[]
523,18268
-    def each::Tree::TreeNode#each
548,19235
-    def preordered_each::Tree::TreeNode#preordered_each
576,20195
-    def postordered_each::Tree::TreeNode#postordered_each
588,20607
-    def breadth_each::Tree::TreeNode#breadth_each
624,22052
-    def children::Tree::TreeNode#children
650,23005
-    def each_leaf::Tree::TreeNode#each_leaf
671,23626
-    def first_child::Tree::TreeNode#first_child
688,24048
-    def last_child::Tree::TreeNode#last_child
696,24259
-    def first_sibling::Tree::TreeNode#first_sibling
712,24706
-    def is_first_sibling?::Tree::TreeNode#is_first_sibling?
722,24980
-    def last_sibling::Tree::TreeNode#last_sibling
736,25396
-    def is_last_sibling?::Tree::TreeNode#is_last_sibling?
746,25666
-    def siblings::Tree::TreeNode#siblings
762,26219
-    def is_only_child?::Tree::TreeNode#is_only_child?
781,26771
-    def next_sibling::Tree::TreeNode#next_sibling
794,27174
-    def previous_sibling::Tree::TreeNode#previous_sibling
810,27648
-    def <=>::Tree::TreeNode#<=>
826,28159
-    def print_tree::Tree::TreeNode#print_tree
836,28539
+    attr_reader   :name::Tree::TreeNode#name
113,4634
+    attr_accessor :content::Tree::TreeNode#content
120,4833
+    attr_reader   :parent::Tree::TreeNode#parent
124,4949
+    def root::Tree::TreeNode#root
131,5161
+    def is_root?::Tree::TreeNode#is_root?
142,5467
+    def has_content?::Tree::TreeNode#has_content?
150,5650
+    def is_leaf?::Tree::TreeNode#is_leaf?
161,5904
+    def parentage::Tree::TreeNode#parentage
173,6279
+    def has_children?::Tree::TreeNode#has_children?
191,6705
+    def initialize::Tree::TreeNode#Tree::TreeNode.new
214,7531
+    def detached_copy::Tree::TreeNode#detached_copy
232,8148
+    def detached_subtree_copy::Tree::TreeNode#detached_subtree_copy
242,8434
+    alias :dup::Tree::TreeNode#dup
251,8695
+    def marshal_dump::Tree::TreeNode#marshal_dump
256,8873
+    def create_dump_rep::Tree::TreeNode#create_dump_rep
262,9041
+    def marshal_load::Tree::TreeNode#marshal_load
277,9579
+    def to_s::Tree::TreeNode#to_s
302,10363
+    def <<::Tree::TreeNode#<<
325,11134
+    def add::Tree::TreeNode#add
360,12662
+    def insertion_range::Tree::TreeNode#insertion_range
380,13624
+    def rename::Tree::TreeNode#rename
394,13993
+    def rename_child::Tree::TreeNode#rename_child
413,14502
+    def name=::Tree::TreeNode#name=
426,14986
+    def replace!::Tree::TreeNode#replace!
436,15333
+    def replace_with::Tree::TreeNode#replace_with
450,15706
+    def remove!::Tree::TreeNode#remove!
468,16438
+    def parent=::Tree::TreeNode#parent=
483,16841
+    def remove_from_parent!::Tree::TreeNode#remove_from_parent!
496,17234
+    def remove_all!::Tree::TreeNode#remove_all!
507,17606
+    def set_as_root!::Tree::TreeNode#set_as_root!
518,17835
+    def freeze_tree!::Tree::TreeNode#freeze_tree!
528,18161
+    def []::Tree::TreeNode#[]
568,19679
+    def each::Tree::TreeNode#each
593,20646
+    def preordered_each::Tree::TreeNode#preordered_each
621,21606
+    def postordered_each::Tree::TreeNode#postordered_each
633,22018
+    def breadth_each::Tree::TreeNode#breadth_each
669,23463
+    def children::Tree::TreeNode#children
695,24416
+    def each_leaf::Tree::TreeNode#each_leaf
716,25037
+    def first_child::Tree::TreeNode#first_child
733,25459
+    def last_child::Tree::TreeNode#last_child
741,25670
+    def first_sibling::Tree::TreeNode#first_sibling
757,26117
+    def is_first_sibling?::Tree::TreeNode#is_first_sibling?
767,26391
+    def last_sibling::Tree::TreeNode#last_sibling
781,26807
+    def is_last_sibling?::Tree::TreeNode#is_last_sibling?
791,27077
+    def siblings::Tree::TreeNode#siblings
807,27630
+    def is_only_child?::Tree::TreeNode#is_only_child?
826,28182
+    def next_sibling::Tree::TreeNode#next_sibling
839,28585
+    def previous_sibling::Tree::TreeNode#previous_sibling
855,29059
+    def <=>::Tree::TreeNode#<=>
871,29570
+    def print_tree::Tree::TreeNode#print_tree
881,29950
 
 test/run_test.rb,0
 
@@ -159,7 +162,7 @@ module TestTree::TestTree
39,1695
     def test_fiber_for_recursion::TestTree::TestFiberAndThreadOnNode#test_fiber_for_recursion
59,2260
     def test_thread_for_recursion::TestTree::TestFiberAndThreadOnNode#test_thread_for_recursion
73,2807
 
-test/test_tree.rb,6262
+test/test_tree.rb,6492
 module TestTree::TestTree
39,1725
   class TestTreeNode::TestTree::TestTreeNode
41,1777
     def setup::TestTree::TestTreeNode#setup
65,2610
@@ -240,3 +243,6 @@ module TestTree::TestTree
39,1725
     def setup_other_test_tree::TestTree::TestTreeNode#setup_other_test_tree
1507,57927
     def test_merge::TestTree::TestTreeNode#test_merge
1535,58916
     def test_merge_bang::TestTree::TestTreeNode#test_merge_bang
1564,60354
+    def test_name_accessor::TestTree::TestTreeNode#test_name_accessor
1589,61441
+    def test_rename::TestTree::TestTreeNode#test_rename
1597,61657
+    def test_rename_child::TestTree::TestTreeNode#test_rename_child
1608,62028

data/lib/tree.rb

@@ -105,7 +105,11 @@ module Tree
     # retain unique names within the tree structure, and use the
     # +content+ attribute for any non-unique node requirements.
     #
+    # If you want to change the name, you probably want to call +rename+
+    # instead.
+    #
     # @see content
+    # @see rename
     attr_reader   :name
 
     # @!attribute [rw] content
@@ -381,6 +385,47 @@ module Tree
 
     private :insertion_range
 
+    # Renames the node and updates the parent's reference to it
+    #
+    # @param [Object] new_name Name of the node.  Conventional usage is to pass a String
+    #   (Integer names may cause *surprises*)
+    #
+    # @return [Object] The old name
+    def rename(new_name)
+      old_name = @name
+
+      if is_root?
+        self.name=(new_name)
+      else
+        @parent.rename_child old_name, new_name
+      end
+
+      old_name
+    end
+
+    # Renames the specified child node
+    #
+    # @param [Object] old_name old Name of the node. Conventional usage is to pass
+    #   a String (Integer names may cause *surprises*)
+    #
+    # @param [Object] new_name new Name of the node. Conventional usage is to pass
+    #   a String (Integer names may cause *surprises*)
+    def rename_child(old_name, new_name)
+      raise ArgumentError, "Invalid child name specified: " + old_name unless @children_hash.has_key?(old_name)
+
+      @children_hash[new_name] = @children_hash.delete(old_name)
+      @children_hash[new_name].name=(new_name)
+    end
+
+    # Protected method to set the name of this node.
+    # This method should *NOT* be invoked by client code.
+    #
+    # @param [Object] new_name The node Name to set.
+    #
+    # @return [Object] The new name.
+    def name=(new_name)
+      @name = new_name
+    end
 
     # Replaces the specified child node with another child node on this node.
     #
@@ -439,7 +484,7 @@ module Tree
       @parent = parent
     end
 
-    protected :parent=
+    protected :parent=, :name=
 
     # Removes this node from its parent. This node becomes the new root for its subtree.
     #

data/lib/tree/version.rb

@@ -37,5 +37,5 @@
 #
 module Tree
   # Rubytree Package Version
-  VERSION = '0.9.5pre'
+  VERSION = '0.9.5pre2'
 end

data/test/test_tree.rb

@@ -1586,6 +1586,34 @@ module TestTree
       assert_raise(TypeError) { @root.merge!('ROOT') }
     end
 
+    def test_name_accessor
+      setup_test_tree
+
+      assert_equal 'ROOT', @root.name, "Name should be 'ROOT'"
+
+    end
+
+    def test_rename
+      setup_test_tree
+
+      @root.rename 'ALT_ROOT'
+      assert_equal('ALT_ROOT', @root.name, "Name should be 'ALT_ROOT'")
+
+      @child1.rename 'ALT_Child1'
+      assert_equal('ALT_Child1', @child1.name, "Name should be 'ALT_Child1'")
+      assert_equal(@child1, @root['ALT_Child1'], 'Should be able to access from parent using new name')
+    end
+
+    def test_rename_child
+      setup_test_tree
+
+      assert_raise(ArgumentError) {@root.rename_child('Not_Present_Child1', 'ALT_Child1')}
+
+      @root.rename_child('Child1', 'ALT_Child1')
+      assert_equal('ALT_Child1', @child1.name, "Name should be 'ALT_Child1'")
+      assert_equal(@child1, @root['ALT_Child1'], 'Should be able to access from parent using new name')
+
+    end
   end
 end
 

metadata

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