RubyGems - rubytree - Versions diffs - 0.9.3pre → 0.9.3 - Mend

rubytree 0.9.3pre → 0.9.3

Files changed (9) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dd9b9757055ea2f6896146448b13996c7e099cf
-  data.tar.gz: 96f4a3cce558178889c67e64984778ad2192f42f
+  metadata.gz: 2696640cc7392fcb9a3d373ad067d2e58c01d0a0
+  data.tar.gz: 7ebb55c5a07049ff8ee0faa621e198d9e30354aa
 SHA512:
-  metadata.gz: 32066b906cf88e1cba0ebc79c3b824e2f074ca884d90ddbbff76ee128ecc9f13c584fa362231f58c81ffc733574a4a780700e3d7b458b95476fe81920f17a71f
-  data.tar.gz: 7d1eef090b839f6c8a3335d0fc5b8820aea6a614d2c7e2f6de3b784dd318f39fe99ef6bdec5d7105cb4c17c1c403bf69524b1f7411ee7f8d07aba843dc211a34
+  metadata.gz: 84b245a63875a6e70bf3e63a24717430981eaf7c6c2c7671e1ef5e46b95e82aeb9f5890ab85a48bc560ab023062c8cc8b0ed840f9850ba0bf1b627f12705cc02
+  data.tar.gz: f30e25b3626ec5f44214711b4d7b9392469d39410e6c399aca0b94bbd961840a33584c51b553f2cd7e5534af1b8602edf5a1c68d5fff031af41d2e0977ceef3f

data/API-CHANGES.rdoc CHANGED

@@ -9,6 +9,12 @@ 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.3 Changes
+- The validation for unique node names has changed in the {Tree::TreeNode#add}
+  method. RubyTree no longer enforces globally unique names. The node-names need
+  to be unique only between the sibling nodes.
 == Release 0.9.0 Changes
 - New post-ordered traversal via the {Tree::TreeNode#postordered_each} method.

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubytree (0.9.3pre)
+    rubytree (0.9.3)
       json (~> 1.8)
       structured_warnings (~> 0.1)

data/History.rdoc CHANGED

@@ -2,6 +2,10 @@
 = History of Changes
+=== 0.9.3 / 2014-02-01
+* Fixed the issue with globally unique node names. See Github issue #24.
 === 0.9.2 / 2014-01-03
 * Yanked R0.9.1 as the History file was not updated.

data/TAGS CHANGED

@@ -81,32 +81,32 @@ module Tree::Tree48,2158
     def to_s::Tree::TreeNode#to_s297,10212
     def <<::Tree::TreeNode#<<320,10983
     def add::Tree::TreeNode#add355,12489
-    def insertion_range::Tree::TreeNode#insertion_range375,13549
-    def remove!::Tree::TreeNode#remove!397,14336
-    def parent=::Tree::TreeNode#parent=412,14739
-    def remove_from_parent!::Tree::TreeNode#remove_from_parent!425,15124
-    def remove_all!::Tree::TreeNode#remove_all!436,15496
-    def set_as_root!::Tree::TreeNode#set_as_root!447,15725
-    def freeze_tree!::Tree::TreeNode#freeze_tree!457,16051
-    def []::Tree::TreeNode#[]497,17569
-    def each::Tree::TreeNode#each522,18536
-    def preordered_each::Tree::TreeNode#preordered_each550,19496
-    def postordered_each::Tree::TreeNode#postordered_each562,19908
-    def breadth_each::Tree::TreeNode#breadth_each598,21334
-    def children::Tree::TreeNode#children624,22272
-    def each_leaf::Tree::TreeNode#each_leaf645,22893
-    def first_child::Tree::TreeNode#first_child662,23315
-    def last_child::Tree::TreeNode#last_child670,23526
-    def first_sibling::Tree::TreeNode#first_sibling686,23973
-    def is_first_sibling?::Tree::TreeNode#is_first_sibling?696,24247
-    def last_sibling::Tree::TreeNode#last_sibling710,24663
-    def is_last_sibling?::Tree::TreeNode#is_last_sibling?720,24933
-    def siblings::Tree::TreeNode#siblings736,25486
-    def is_only_child?::Tree::TreeNode#is_only_child?755,26038
-    def next_sibling::Tree::TreeNode#next_sibling768,26441
-    def previous_sibling::Tree::TreeNode#previous_sibling784,26915
-    def <=>::Tree::TreeNode#<=>800,27426
-    def print_tree::Tree::TreeNode#print_tree808,27655
+    def insertion_range::Tree::TreeNode#insertion_range375,13451
+    def remove!::Tree::TreeNode#remove!397,14238
+    def parent=::Tree::TreeNode#parent=412,14641
+    def remove_from_parent!::Tree::TreeNode#remove_from_parent!425,15026
+    def remove_all!::Tree::TreeNode#remove_all!436,15398
+    def set_as_root!::Tree::TreeNode#set_as_root!447,15627
+    def freeze_tree!::Tree::TreeNode#freeze_tree!457,15953
+    def []::Tree::TreeNode#[]497,17471
+    def each::Tree::TreeNode#each522,18438
+    def preordered_each::Tree::TreeNode#preordered_each550,19398
+    def postordered_each::Tree::TreeNode#postordered_each562,19810
+    def breadth_each::Tree::TreeNode#breadth_each598,21236
+    def children::Tree::TreeNode#children624,22174
+    def each_leaf::Tree::TreeNode#each_leaf645,22795
+    def first_child::Tree::TreeNode#first_child662,23217
+    def last_child::Tree::TreeNode#last_child670,23428
+    def first_sibling::Tree::TreeNode#first_sibling686,23875
+    def is_first_sibling?::Tree::TreeNode#is_first_sibling?696,24149
+    def last_sibling::Tree::TreeNode#last_sibling710,24565
+    def is_last_sibling?::Tree::TreeNode#is_last_sibling?720,24835
+    def siblings::Tree::TreeNode#siblings736,25388
+    def is_only_child?::Tree::TreeNode#is_only_child?755,25940
+    def next_sibling::Tree::TreeNode#next_sibling768,26343
+    def previous_sibling::Tree::TreeNode#previous_sibling784,26817
+    def <=>::Tree::TreeNode#<=>800,27328
+    def print_tree::Tree::TreeNode#print_tree808,27557
 test/run_test.rb,0
@@ -170,53 +170,53 @@ module TestTree::TestTree39,1725
     def test_previous_sibling::TestTree::TestTreeNode#test_previous_sibling315,13146
     def test_add::TestTree::TestTreeNode#test_add326,13675
     def test_add_duplicate::TestTree::TestTreeNode#test_add_duplicate347,14357
-    def test_add_at_specific_position::TestTree::TestTreeNode#test_add_at_specific_position378,15292
-    def test_remove_bang::TestTree::TestTreeNode#test_remove_bang442,18345
-    def test_remove_all_bang::TestTree::TestTreeNode#test_remove_all_bang474,19308
-    def test_remove_from_parent_bang::TestTree::TestTreeNode#test_remove_from_parent_bang484,19614
-    def test_children::TestTree::TestTreeNode#test_children503,20329
-    def test_first_child::TestTree::TestTreeNode#test_first_child539,21918
-    def test_last_child::TestTree::TestTreeNode#test_last_child548,22246
-    def test_find::TestTree::TestTreeNode#test_find557,22562
-    def test_parentage::TestTree::TestTreeNode#test_parentage572,23157
-    def test_each::TestTree::TestTreeNode#test_each581,23489
-    def test_each_leaf::TestTree::TestTreeNode#test_each_leaf600,24173
-    def test_parent::TestTree::TestTreeNode#test_parent627,25368
-    def test_indexed_access::TestTree::TestTreeNode#test_indexed_access638,25787
-    def test_print_tree::TestTree::TestTreeNode#test_print_tree649,26160
-    def test_marshal_dump::TestTree::TestTreeNode#test_marshal_dump656,26320
-    alias test_marshal_load::TestTree::TestTreeNode#test_marshal_load698,28442
-    def test_collect::TestTree::TestTreeNode#test_collect701,28563
-    def test_freeze_tree_bang::TestTree::TestTreeNode#test_freeze_tree_bang711,28829
-    def test_content::TestTree::TestTreeNode#test_content725,29351
-    def test_depth::TestTree::TestTreeNode#test_depth733,29742
-    def do_deprecated_depth::TestTree::TestTreeNode#do_deprecated_depth744,30115
-    def test_node_height::TestTree::TestTreeNode#test_node_height762,30683
-    def test_node_depth::TestTree::TestTreeNode#test_node_depth787,31892
-    def test_level::TestTree::TestTreeNode#test_level800,32329
-    def test_breadth::TestTree::TestTreeNode#test_breadth815,32872
-    def test_breadth_each::TestTree::TestTreeNode#test_breadth_each834,33519
-    def test_preordered_each::TestTree::TestTreeNode#test_preordered_each875,34825
-    def test_postordered_each::TestTree::TestTreeNode#test_postordered_each914,36079
-    def test_detached_copy::TestTree::TestTreeNode#test_detached_copy953,37334
-    def test_detached_subtree_copy::TestTree::TestTreeNode#test_detached_subtree_copy970,38062
-    def test_has_children_eh::TestTree::TestTreeNode#test_has_children_eh1004,40314
-    def test_is_leaf_eh::TestTree::TestTreeNode#test_is_leaf_eh1010,40476
-    def test_is_root_eh::TestTree::TestTreeNode#test_is_root_eh1017,40682
-    def test_content_equals::TestTree::TestTreeNode#test_content_equals1023,40845
-    def test_size::TestTree::TestTreeNode#test_size1031,41110
-    def test_lt2::TestTree::TestTreeNode#test_lt21040,41374
-    def test_index::TestTree::TestTreeNode#test_index1051,41866
-    def test_in_degree::TestTree::TestTreeNode#test_in_degree1072,42962
-    def test_out_degree::TestTree::TestTreeNode#test_out_degree1083,43429
-    def test_json_serialization::TestTree::TestTreeNode#test_json_serialization1094,43916
-    def test_json_deserialization::TestTree::TestTreeNode#test_json_deserialization1118,44716
-    def test_json_roundtrip::TestTree::TestTreeNode#test_json_roundtrip1146,45902
-    def test_old_camelCase_method_names::TestTree::TestTreeNode#test_old_camelCase_method_names1162,46643
-    def test_integer_node_names::TestTree::TestTreeNode#test_integer_node_names1193,47711
-    def test_add_node_to_self_as_child::TestTree::TestTreeNode#test_add_node_to_self_as_child1224,48941
-    def test_single_node_becomes_leaf::TestTree::TestTreeNode#test_single_node_becomes_leaf1236,49367
-    def test_unique_node_names::TestTree::TestTreeNode#test_unique_node_names1248,49788
-    def setup_other_test_tree::TestTree::TestTreeNode#setup_other_test_tree1262,50143
-    def test_merge::TestTree::TestTreeNode#test_merge1290,51132
-    def test_merge_bang::TestTree::TestTreeNode#test_merge_bang1319,52570
+    def test_add_at_specific_position::TestTree::TestTreeNode#test_add_at_specific_position388,15785
+    def test_remove_bang::TestTree::TestTreeNode#test_remove_bang452,18838
+    def test_remove_all_bang::TestTree::TestTreeNode#test_remove_all_bang484,19801
+    def test_remove_from_parent_bang::TestTree::TestTreeNode#test_remove_from_parent_bang494,20107
+    def test_children::TestTree::TestTreeNode#test_children513,20822
+    def test_first_child::TestTree::TestTreeNode#test_first_child549,22411
+    def test_last_child::TestTree::TestTreeNode#test_last_child558,22739
+    def test_find::TestTree::TestTreeNode#test_find567,23055
+    def test_parentage::TestTree::TestTreeNode#test_parentage582,23650
+    def test_each::TestTree::TestTreeNode#test_each591,23982
+    def test_each_leaf::TestTree::TestTreeNode#test_each_leaf610,24666
+    def test_parent::TestTree::TestTreeNode#test_parent637,25861
+    def test_indexed_access::TestTree::TestTreeNode#test_indexed_access648,26280
+    def test_print_tree::TestTree::TestTreeNode#test_print_tree659,26653
+    def test_marshal_dump::TestTree::TestTreeNode#test_marshal_dump666,26813
+    alias test_marshal_load::TestTree::TestTreeNode#test_marshal_load708,28935
+    def test_collect::TestTree::TestTreeNode#test_collect711,29056
+    def test_freeze_tree_bang::TestTree::TestTreeNode#test_freeze_tree_bang721,29322
+    def test_content::TestTree::TestTreeNode#test_content735,29844
+    def test_depth::TestTree::TestTreeNode#test_depth743,30235
+    def do_deprecated_depth::TestTree::TestTreeNode#do_deprecated_depth754,30608
+    def test_node_height::TestTree::TestTreeNode#test_node_height772,31176
+    def test_node_depth::TestTree::TestTreeNode#test_node_depth797,32385
+    def test_level::TestTree::TestTreeNode#test_level810,32822
+    def test_breadth::TestTree::TestTreeNode#test_breadth825,33365
+    def test_breadth_each::TestTree::TestTreeNode#test_breadth_each844,34012
+    def test_preordered_each::TestTree::TestTreeNode#test_preordered_each885,35318
+    def test_postordered_each::TestTree::TestTreeNode#test_postordered_each924,36572
+    def test_detached_copy::TestTree::TestTreeNode#test_detached_copy963,37827
+    def test_detached_subtree_copy::TestTree::TestTreeNode#test_detached_subtree_copy980,38555
+    def test_has_children_eh::TestTree::TestTreeNode#test_has_children_eh1014,40807
+    def test_is_leaf_eh::TestTree::TestTreeNode#test_is_leaf_eh1020,40969
+    def test_is_root_eh::TestTree::TestTreeNode#test_is_root_eh1027,41175
+    def test_content_equals::TestTree::TestTreeNode#test_content_equals1033,41338
+    def test_size::TestTree::TestTreeNode#test_size1041,41603
+    def test_lt2::TestTree::TestTreeNode#test_lt21050,41867
+    def test_index::TestTree::TestTreeNode#test_index1061,42359
+    def test_in_degree::TestTree::TestTreeNode#test_in_degree1082,43455
+    def test_out_degree::TestTree::TestTreeNode#test_out_degree1093,43922
+    def test_json_serialization::TestTree::TestTreeNode#test_json_serialization1104,44409
+    def test_json_deserialization::TestTree::TestTreeNode#test_json_deserialization1128,45209
+    def test_json_roundtrip::TestTree::TestTreeNode#test_json_roundtrip1156,46395
+    def test_old_camelCase_method_names::TestTree::TestTreeNode#test_old_camelCase_method_names1172,47136
+    def test_integer_node_names::TestTree::TestTreeNode#test_integer_node_names1203,48204
+    def test_add_node_to_self_as_child::TestTree::TestTreeNode#test_add_node_to_self_as_child1234,49434
+    def test_single_node_becomes_leaf::TestTree::TestTreeNode#test_single_node_becomes_leaf1250,49947
+    def test_unique_node_names::TestTree::TestTreeNode#test_unique_node_names1262,50368
+    def setup_other_test_tree::TestTree::TestTreeNode#setup_other_test_tree1276,50723
+    def test_merge::TestTree::TestTreeNode#test_merge1304,51712
+    def test_merge_bang::TestTree::TestTreeNode#test_merge_bang1333,53150

data/lib/tree.rb CHANGED

@@ -354,11 +354,11 @@ module Tree
     # @see #<<
     def add(child, at_index = -1)
       raise ArgumentError, "Attempting to add a nil node" unless child # Only handles the immediate child scenario
-      raise ArgumentError, "Attempting add node to itself" if self == child
-      raise ArgumentError, "Attempting to add root as a child" if self.root == child
+      raise ArgumentError, "Attempting add node to itself" if self.equal?(child)
+      raise ArgumentError, "Attempting add root as a child" if self.equal?(root) unless self.is_root?
       # Lazy mans unique test, won't test if children of child are unique in this tree too.
-      #self.root.each { |node| raise "Child #{child.name} already added!" if node.name == child.name }
-      self.children.each { |node| raise "Child #{child.name} already added!" if node.name == child.name }
+      raise "Child #{child.name} already added!" if @children_hash.include?(child.name)
       if insertion_range.include?(at_index)
         @children.insert(at_index, child)

data/lib/tree/version.rb CHANGED

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

data/test/test_tree.rb CHANGED

@@ -359,9 +359,9 @@ module TestTree
       root = Tree::TreeNode.new("root")
       one  = Tree::TreeNode.new("one")
       two  = Tree::TreeNode.new("two")
+      three= Tree::TreeNode.new("three")
       deep = Tree::TreeNode.new("deep")
       root << one << deep
       # The same child cannot be added under any circumstance
       assert_raise(RuntimeError) { root.add(Tree::TreeNode.new(one.name)) }
@@ -370,7 +370,17 @@ module TestTree
       begin
         root << two << deep
       rescue RuntimeError => e
-        fail("Error! The RuntimeError should not have been thrown.")
+        fail("Error! The RuntimeError should not have been thrown. The same node can be added to different branches.")
+      end
+      assert_raise(ArgumentError) {root << three << three }
+      root.remove_all!          # Because the first child 'three' whould have been added.
+      begin
+        three_dup = Tree::TreeNode.new("three")
+        root << three << three_dup
+      rescue RuntimeError => e
+        fail("Error! The RuntimeError should not have been thrown. The same node name can be used in the branch.")
       end
     end
@@ -1229,7 +1239,11 @@ module TestTree
       # And now a scenario where the node addition is done down the hierarchy
       child =  Tree::TreeNode.new("child")
-      assert_raise(ArgumentError) { root << child << root }
+      begin
+        root << child << root
+      rescue ArgumentError => e
+        fail("The ArgumentError should not have been raised.")
+      end
     end
     # Test whether the tree_leaf method works correctly

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubytree
 version: !ruby/object:Gem::Version
-  version: 0.9.3pre
+  version: 0.9.3
 platform: ruby
 authors:
 - Anupam Sengupta
@@ -161,19 +161,9 @@ licenses:
 metadata: {}
 post_install_message: |2
       ========================================================================
-                      Thank you for installing rubytree.
+                      Thank you for installing RubyTree.
-      Note that the TreeNode#siblings method has changed in 0.8.3.
-      It now returns an empty array for the root node.
-                   WARNING: SIGNIFICANT API CHANGE in 0.8.0 !
-                   ------------------------------------------
-      Please note that as of 0.8.0 the CamelCase method names are DEPRECATED.
-      The new method names follow the ruby_convention (separated by '_').
-      The old CamelCase methods still work (a warning will be displayed),
-      but may go away in the future.
+      Note:: As of 0.9.3, node names do not need to be globally unique.
       Details of the API changes are documented in the API-CHANGES file.
       ========================================================================
@@ -190,9 +180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: rubytree
 rubygems_version: 2.2.1