rubytree 0.9.5pre5 → 0.9.5pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 850e06171da2b8d2ce18e1c2a753940720fa995f
-  data.tar.gz: d135be3794997cded9a37f969270e007878371b3
+  metadata.gz: beae3fd153b5ddbad1ab19265ca8bf64a7776ada
+  data.tar.gz: 145cc70d51f4355f623d2abe35eb31eefe745fb4
 SHA512:
-  metadata.gz: c4a868546b8c5e32d216ac7ea5614bff5edd440ce6ef9927b210962f1aa5690afe8b36e797d0a077db4a955b6e42485b0dd3a8da45e52fbbbba9fc1bb4e7c271
-  data.tar.gz: d4f1e908972b00e23a7d93722e7cd32c7b40750bbfc8604cd527764dc8fb84d0e7cff42aa29e25041ca49b39cc738a4fdfcb907f487d79a575efd4415e8cf9a7
+  metadata.gz: dca4bb879aeff95228214b79177426da728bec7eff50273035397d67acd22329d8ba157ff4d5507584c1cac8a2ae1c4980d86051f50a42f386dae6a130700ed6
+  data.tar.gz: 81e2f5def082d451130d464d40930e48e4e4633c287216a98c870a216527de4d47876f9e3862409e90f15008fd7441b052858aadeb0de5be2effe5bb2c4bddd6

data/Gemfile

@@ -4,7 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem "rake", "~> 10.1"
+  gem "rake", "~> 10.4"
+  gem "test-unit", "~> 3.0"
   gem "coveralls", ">= 0.7", :require => false, :platforms => :mri_21
 end
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubytree (0.9.5pre5)
+    rubytree (0.9.5pre6)
       json (~> 1.8)
       structured_warnings (~> 0.1)
 
@@ -18,9 +18,9 @@ GEM
     json (1.8.1)
     mime-types (2.4.3)
     multi_json (1.10.1)
+    power_assert (0.2.2)
     rake (10.4.2)
     rdoc (4.2.0)
-      json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rtags (0.97)
@@ -34,6 +34,8 @@ GEM
     structured_warnings (0.1.4)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
+    test-unit (3.0.9)
+      power_assert
     thor (0.18.1)
     tins (0.13.2)
     yard (0.8.7.6)
@@ -42,10 +44,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.5)
+  bundler (~> 1.7)
   coveralls (>= 0.7)
-  rake (~> 10.1)
-  rdoc (~> 4.1)
+  rake (~> 10.4)
+  rdoc (~> 4.2)
   rtagstask (~> 0.0)
   rubytree!
+  test-unit (~> 3.0)
   yard (~> 0.8)

data/History.rdoc

@@ -4,7 +4,7 @@
 
 === 0.9.5pre5 / 2015-01-01
 
-* Fixed {issue 32}{https://github.com/evolve75/RubyTree/issues/32} and enabled
+* 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.
@@ -12,7 +12,7 @@
 === 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}.
+  {Tree::Utils::TreeMetricsHandler#node_depth}. Thanks to {https://github.com/aidansteele Aidan Steel}.
 
 === 0.9.5pre3 / 2014-12-16
 

data/lib/tree/utils/hash_converter.rb

@@ -5,9 +5,9 @@
 #
 # Author::  Jen Hamon (http://www.github.com/jhamon)
 #
-# Time-stamp: <2014-10-25 16:20:23 anupam>
+# Time-stamp: <2015-01-02 15:11:03 anupam>
 #
-# Copyright (C) 2014 Jen Hamon (http://www.github.com/jhamon) and
+# Copyright (C) 2014, 2015 Jen Hamon (http://www.github.com/jhamon) and
 #                    Anupam Sengupta <anupamsg@gmail.com>
 #
 # All rights reserved.

data/lib/tree/version.rb

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

data/test/test_binarytree.rb

@@ -3,7 +3,7 @@
 # test_binarytree.rb - This file is part of the RubyTree package.
 #
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2012, 2013 Anupam Sengupta
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015 Anupam Sengupta
 #
 # All rights reserved.
 #
@@ -64,7 +64,7 @@ module TestTree
     end
 
     def test_from_hash
-      # Can make a root note without a name
+      # Can't make a root node without a name
       assert_raise (ArgumentError) { Tree::BinaryTreeNode.from_hash({})}
       # Can't have multiple roots
       assert_raise (ArgumentError) { Tree::BinaryTreeNode.from_hash({:A => {}, :B => {}}) }
@@ -82,20 +82,18 @@ module TestTree
       #      D
 
       assert_same(tree.class, Tree::BinaryTreeNode)
-      assert_same(tree.name, :A)
-      assert_equal(tree.is_root?, true)
-      assert_equal(tree.is_leaf?, false)
-      assert_equal(tree.children.count, 2) # B, C, D
-      assert_equal(tree.size, 4)
-      assert_equal(tree.left_child.name, :B)
-      assert_equal(tree.right_child.name, :C)
+      assert_same(:A, tree.name)
+      assert_equal(true, tree.is_root?)
+      assert_equal(false, tree.is_leaf?)
+      assert_equal(2, tree.children.count) # B, C, D
+      assert_equal(4, tree.size)
 
       valid_hash_with_content = {[:A, "Content!"] => {:B => {}, :C => { [:D, "More content"] => {} } } }
       tree2 = Tree::BinaryTreeNode.from_hash(valid_hash_with_content)
 
-      assert_equal(tree2.class, Tree::BinaryTreeNode)
-      assert_equal(tree2.content, "Content!" )
-      assert_equal(tree2[:C][:D].content, "More content")
+      assert_equal(Tree::BinaryTreeNode, tree2.class)
+      assert_equal("Content!" , tree2.content)
+      assert_equal("More content", tree2[:C][:D].content)
     end
 
     def test_add_from_hash
@@ -104,11 +102,11 @@ module TestTree
       # Can't have too many children
       too_many_kids = {:child1 => {}, :child2 => {}, :child3 => {}}
       assert_raise(ArgumentError) { root.add_from_hash(too_many_kids) }
-      assert_equal(root.children.count, 0) # Nothing added
+      assert_equal(0, root.children.count) # Nothing added
 
       # Well behaved when adding nothing
-      assert_equal(root.add_from_hash({}), [])
-      assert_equal(root.size, 1)
+      assert_equal([], root.add_from_hash({}))
+      assert_equal(1, root.size)
 
       valid_hash = {:A => {}, :B => { :C => {}, [:D, "leaf"] => {} } }
       added = root.add_from_hash(valid_hash)
@@ -118,11 +116,11 @@ module TestTree
       #     / \
       #    C   D
 
-      assert_equal(added.class, Array)
-      assert_equal(added.count, 2)
-      assert_equal(root.size, 5)
+      assert_equal(Array, added.class)
+      assert_equal(2, added.count)
+      assert_equal(5, root.size)
       assert_equal(root.children.count, 2)
-      assert_equal(root[:B][:D].content, "leaf")
+      assert_equal("leaf", root[:B][:D].content)
 
       # Can't add more than two children
       assert_raise(ArgumentError) { root.add_from_hash({:X => {}}) }
@@ -186,7 +184,7 @@ module TestTree
       result_array = []
       result = f.inordered_each { |node| result_array << node.detached_copy}
 
-      assert_equal(result, f)   # each should return the original object
+      assert_equal(f, result)   # each should return the original object
 
       expected_array.each_index do |i|
         # Match only the names.

data/test/test_tree.rb

@@ -146,24 +146,24 @@ module TestTree
 
       tree = Tree::TreeNode.from_hash(hash)
 
-      assert_same(tree.class, Tree::TreeNode)
+      assert_same(Tree::TreeNode, tree.class)
       assert_same(tree.name, :A)
-      assert_equal(tree.is_root?, true)
-      assert_equal(tree.is_leaf?, false)
-      assert_equal(tree.size, 9)
-      assert_equal(tree.content, "Root content")
-      assert_equal(tree.children.count, 3) # B, C, D
+      assert_equal(true, tree.is_root?)
+      assert_equal(false, tree.is_leaf?)
+      assert_equal(9, tree.size)
+      assert_equal("Root content", tree.content)
+      assert_equal(3, tree.children.count) # B, C, D
 
       leaf_with_content = tree[:B][:F][:I]
-      assert_equal(leaf_with_content.content, "Leaf content")
-      assert_equal(leaf_with_content.is_leaf?, true)
+      assert_equal("Leaf content", leaf_with_content.content)
+      assert_equal(true, leaf_with_content.is_leaf?)
 
       leaf_without_content = tree[:C]
-      assert_equal(leaf_without_content.is_leaf?, true)
+      assert_equal(true, leaf_without_content.is_leaf?)
 
       interior_node = tree[:B][:F]
-      assert_equal(interior_node.is_leaf?, false)
-      assert_equal(interior_node.children.count, 2)
+      assert_equal(false, interior_node.is_leaf?)
+      assert_equal(2, interior_node.children.count)
 
       # Can't make a node without a name
       assert_raise (ArgumentError) { Tree::TreeNode.from_hash({}) }
@@ -198,24 +198,24 @@ module TestTree
 
       tree = Tree::TreeNode.from_hash(hash)
 
-      assert_same(tree.class, Tree::TreeNode)
-      assert_same(tree.name, :A)
-      assert_equal(tree.is_root?, true)
-      assert_equal(tree.is_leaf?, false)
-      assert_equal(tree.size, 9)
-      assert_equal(tree.content, "Root content")
-      assert_equal(tree.children.count, 3) # B, C, D
+      assert_same(Tree::TreeNode, tree.class)
+      assert_same(:A, tree.name)
+      assert_equal(true, tree.is_root?)
+      assert_equal(false, tree.is_leaf?)
+      assert_equal(9, tree.size)
+      assert_equal("Root content", tree.content)
+      assert_equal(3, tree.children.count) # B, C, D
 
       leaf_with_content = tree[:B][:F][:I]
-      assert_equal(leaf_with_content.content, "Leaf content")
-      assert_equal(leaf_with_content.is_leaf?, true)
+      assert_equal("Leaf content", leaf_with_content.content)
+      assert_equal(true, leaf_with_content.is_leaf?)
 
       leaf_without_content = tree[:C]
-      assert_equal(leaf_without_content.is_leaf?, true)
+      assert_equal(true, leaf_without_content.is_leaf?)
 
       interior_node = tree[:B][:F]
-      assert_equal(interior_node.is_leaf?, false)
-      assert_equal(interior_node.children.count, 2)
+      assert_equal(false, interior_node.is_leaf?)
+      assert_equal(2, interior_node.children.count)
     end
 
     def test_add_from_hash
@@ -223,7 +223,7 @@ module TestTree
 
       # Doesn't blow up when added an empty hash
       hash = {}
-      assert_equal(tree.add_from_hash(hash), [])
+      assert_equal([], tree.add_from_hash(hash))
 
       # Okay, now try a real hash
       hash = {:B => {:C => {:D => nil}, :E => {}, :F => {}}, [:G, "G content"] => {}}
@@ -236,13 +236,13 @@ module TestTree
       #  D
 
       added_children = tree.add_from_hash(hash)
-      assert_equal(added_children.class, Array)
-      assert_equal(added_children.count, 2)
-      assert_equal(tree.size, 7)
-      assert_equal(tree[:G].content, "G content")
-      assert_equal(tree[:G].is_leaf?, true)
-      assert_equal(tree[:B].size, 5)
-      assert_equal(tree[:B].children.count, 3)
+      assert_equal(Array, added_children.class)
+      assert_equal(2, added_children.count)
+      assert_equal(7, tree.size)
+      assert_equal("G content", tree[:G].content)
+      assert_equal(true, tree[:G].is_leaf?)
+      assert_equal(5, tree[:B].size)
+      assert_equal(3, tree[:B].children.count)
 
       assert_raise (ArgumentError) { tree.add_from_hash([]) }
       assert_raise (ArgumentError) { tree.add_from_hash("not a hash") }
@@ -272,7 +272,7 @@ module TestTree
 
       exported = a.to_h
       expected = {:A => {:B => {:E => {}}, :C => {:F => {}, :G => {}}}}
-      assert_equal(exported, expected)
+      assert_equal(expected, exported)
     end
 
     # Test that from_hash and to_h are symmetric
@@ -288,7 +288,7 @@ module TestTree
       input = {:A => {:B => {:E => {:I => {}, :J =>{}}, :F => {}, :G => {}}, :C =>{:H => {:K => {}}}}}
 
       node = Tree::TreeNode.from_hash(input)
-      assert_equal(node.to_h, input)
+      assert_equal(input, node.to_h)
     end
 
     # Test the presence of content in the nodes.
@@ -316,20 +316,20 @@ module TestTree
       first_node  = Tree::TreeNode.new(1)
       second_node = Tree::TreeNode.new(2)
 
-      assert_equal(first_node <=> nil, +1)
-      assert_equal(first_node <=> second_node, -1)
+      assert_equal(+1, first_node <=> nil)
+      assert_equal(-1, first_node <=> second_node)
 
       second_node = Tree::TreeNode.new(1)
-      assert_equal(first_node <=> second_node, 0)
+      assert_equal(0, first_node <=> second_node)
 
       first_node  = Tree::TreeNode.new("ABC")
       second_node = Tree::TreeNode.new("XYZ")
 
-      assert_equal(first_node <=> nil, +1)
-      assert_equal(first_node <=> second_node, -1)
+      assert_equal(+1, first_node <=> nil)
+      assert_equal(-1, first_node <=> second_node)
 
       second_node = Tree::TreeNode.new("ABC")
-      assert_equal(first_node <=> second_node, 0)
+      assert_equal(0, first_node <=> second_node)
 
       StandardWarning.enable
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytree
 version: !ruby/object:Gem::Version
-  version: 0.9.5pre5
+  version: 0.9.5pre6
 platform: ruby
 authors:
 - Anupam Sengupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: structured_warnings
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ post_install_message: |2
       ========================================================================
                       Thank you for installing RubyTree.
 
-      Note:: As of 0.9.3, node names do not need to be globally unique.
+      Note:: As of 0.9.5, the Tree::TreeNode#add method has 'move' semantics.
 
       Details of the API changes are documented in the API-CHANGES file.
       ========================================================================