rubytree 0.9.5pre2 → 0.9.5pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3228b0b44776c265981c6e870b806eac361f8adf
-  data.tar.gz: 310b261873bc3d2ba5ad1e45e5f56145bc02d6f8
+  metadata.gz: 0a006133c7e37526b79f4256d041a29af0f34b04
+  data.tar.gz: 88eae77ba40ffc4a7a4e1e84bad59f25c3de0f91
 SHA512:
-  metadata.gz: 65f56e0e2848d8f3756ed0225beb92dc055200f1b94e7c376a5593253c844966634e38362b1aedf82160434878985c27ded1805da419d5b508ad309db8ec4ae3
-  data.tar.gz: 38777f6bf8ed9164df5f740e01120640f1df2f4cb26156795c0e8dc884e4d7fd8a881bf7400e3ab1d24fca0ea49cb1f6ae371ba2726ee37283dc6f9d87111513
+  metadata.gz: f951cea5ef06e9419b19e17d07c821e6b8c09dd57cd6eafe0e2cee60e9d1293ae645165f2f66e90a7577536fef3ed2e5f8d1441dca9cd934c4bf6816e8e245a0
+  data.tar.gz: 5a6ae6fb1df04a15dbf11b8293a2e566482d0372af299b49c4c33778a50c1b2f159feb9606422ec1c539ca17594122fb954d08712cd01ce40c25f9cb06f0f7d1

data/Gemfile.lock

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

data/History.rdoc

@@ -2,11 +2,21 @@
 
 = History of Changes
 
+=== 0.9.5pre4 / 2014-12-17
+
+* Added performance improvements to {Tree::TreeNode#is_root?} and
+  {Tree::TreeNode#node_depth}. Thanks to {https://github.com/aidansteele Aidan Steel}.
+
+=== 0.9.5pre3 / 2014-12-16
+
+* Minor fix to correct the release date. This release is otherwise identical to
+  0.9.5pre2.
+
 === 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}.
+  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
 

data/README.md

@@ -213,6 +213,8 @@ A big thanks to the following contributors for helping improve **RubyTree**:
 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.
+9. [Aidan Steele](https://github.com/aidansteele) for performance improvements
+   to `is_root?` and `node_depth`.
 
 
 ## LICENSE: ##

data/TODO.org

@@ -187,6 +187,10 @@
 
 
 * R0.9.5
+** 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:
+   CLOSED: [2014-12-18 Thu 10:27]
 ** DONE Pull the =hash= converter code from [[https://github.com/markthomas/RubyTree/commits/master][Mark Thomas]] ([[Issue:13][Issue #13]]).                        :ARCHIVE:
    CLOSED: [2014-11-01 Sat 20:10]
    This was contributed by @jhamon.

data/lib/tree.rb

@@ -140,7 +140,7 @@ module Tree
     #
     # @return [Boolean] +true+ if this is a root node.
     def is_root?
-      @parent == nil
+      @parent.nil?
     end
 
     # @!attribute [r] has_content?
@@ -360,7 +360,7 @@ module Tree
     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.equal?(child)
-      raise ArgumentError, "Attempting add root as a child" if self.equal?(root) unless self.is_root?
+      raise ArgumentError, "Attempting add root as a child" if child.equal?(root)
 
       # 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)
@@ -482,6 +482,7 @@ module Tree
     # @return [Tree::TreeNode] The parent node.
     def parent=(parent)         # :nodoc:
       @parent = parent
+      @node_depth = nil
     end
 
     protected :parent=, :name=
@@ -516,7 +517,7 @@ module Tree
     #
     # @return +nil+.
     def set_as_root!              # :nodoc:
-      @parent = nil
+      self.parent = nil
     end
 
     protected :set_as_root!

data/lib/tree/utils/metrics_methods.rb

@@ -94,8 +94,7 @@ module Tree::Utils
       #
       # @return [Integer] Depth of this node.
       def node_depth
-        return 0 if is_root?
-        1 + parent.node_depth
+        @node_depth ||= is_root? ? 0 : (1 + parent.node_depth)
       end
 
       # @!attribute [r] level

data/lib/tree/version.rb

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

data/test/test_tree.rb

@@ -1470,11 +1470,7 @@ module TestTree
 
       # And now a scenario where the node addition is done down the hierarchy
       child =  Tree::TreeNode.new("child")
-      begin
-        root << child << root
-      rescue ArgumentError => e
-        fail("The ArgumentError should not have been raised.")
-      end
+      assert_raise(ArgumentError) { root << child << root }
     end
 
     # Test whether the tree_leaf method works correctly
@@ -1614,6 +1610,35 @@ module TestTree
       assert_equal(@child1, @root['ALT_Child1'], 'Should be able to access from parent using new name')
 
     end
+
+    def test_change_parent
+      root_node = Tree::TreeNode.new("OLDROOT")
+
+      child_node = Tree::TreeNode.new("CHILD")
+      assert_equal(child_node.node_depth, 0)
+
+      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)
+
+      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)
+
+      root2_node = Tree::TreeNode.new("NEWROOT")
+      assert_equal(root2_node.node_depth, 0)
+
+      # 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)
+
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytree
 version: !ruby/object:Gem::Version
-  version: 0.9.5pre2
+  version: 0.9.5pre4
 platform: ruby
 authors:
 - Anupam Sengupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: structured_warnings
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A generic tree data structure.